Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

ZengTao

2024-10-24 22fb46f2db1714a6b450b353669d26908884653f

 hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassPushMessage.java

@@ -21,34 +21,26 @@
@Component
public class RawGlassPushMessage {

  @Resource private RawGlassStorageStationService rawGlassStorageStationService;
    @Resource
    private RawGlassStorageStationService rawGlassStorageStationService;

  @Resource private RawGlassStorageTaskService rawGlassStorageTaskService;
    @Resource
    private RawGlassStorageTaskService rawGlassStorageTaskService;

  @Scheduled(fixedDelay = 2000)
  public void sendRawGlassMessage() {
    log.info("发送任务信息和架子信息");
    JSONObject jsonObject = new JSONObject();
    List<RawGlassStorageDetails> rawStationDetailsList =
        rawGlassStorageStationService.listRawGlassDetails();
    List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.listRawGlassTask();
    jsonObject.append("rawStationDetailsList", rawStationDetailsList);
    jsonObject.append("tasks", tasks);
//    log.info("获取到的工位详情及任务信息为：{}", jsonObject);

    List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
    if (CollectionUtil.isNotEmpty(sendwServer)) {
      sendwServer.stream().forEach(e->{
        e.sendMessage(String.valueOf(jsonObject));
      });
    @Scheduled(fixedDelay = 2000)
    public void sendRawGlassMessage() {
        log.info("发送任务信息和架子信息");
        JSONObject jsonObject = new JSONObject();
        List<RawGlassStorageDetails> rawStationDetailsList =
                rawGlassStorageStationService.listRawGlassDetails();
        List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.listRawGlassTask();
        jsonObject.append("rawStationDetailsList", rawStationDetailsList);
        jsonObject.append("tasks", tasks);
        List<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("rawGlass");
        if (CollectionUtil.isNotEmpty(sendwServer)) {
            sendwServer.stream().forEach(e -> {
                e.sendMessage(String.valueOf(jsonObject));
            });
        }
    }


  }

  /** todo:入库任务：吊装位有玻璃，先去工位表查询空格子，生成入库任务从吊装位到目标格子 */

  /** todo:出库任务：1、点出库，立马生成出片任务 2、点出库修改工位详情内的状态为待出库，定时任务扫描生成出库任务 */

  /** todo:原片调度：1、查询工程原片表，按照顺序将原片放入上片1号位，后续原片放上片2号位，出现尺寸替换，判断原上片位是否有玻璃，有 先出后进，无 直接进片 */
}