#

Junjie

20 小时以前 a337569893db242c78a3208a84c3e5e801791c0a

#

 src/main/java/com/zy/asrs/domain/enums/NotifyMsgType.java

@@ -20,6 +20,7 @@
    DUAL_CRN_TRANSFER_TASK_COMPLETE("dual_crn_transfer_task_complete", "双工位堆垛机移库任务执行完成"),

    STATION_OUT_TASK_RUN("station_out_task_run","输送站点出库任务运行中"),
    STATION_OUT_TASK_RUN_COMPLETE("station_out_task_run_complete","输送站点出库任务运行完成"),
    ;

    public String flag;

 src/main/java/com/zy/asrs/task/WrkMastScheduler.java

@@ -95,8 +95,8 @@
                continue;
            }

            if (!locMast.getLocSts().equals("R")) {
                log.info("[workNo={}]库位状态不处于R", wrkMast.getWrkNo());
            if (!(locMast.getLocSts().equals("R") || locMast.getLocSts().equals("O"))) {
                log.info("[workNo={}]库位状态不处于R or O", wrkMast.getWrkNo());
                continue;
            }

@@ -237,4 +237,40 @@
        }
    }

    @Scheduled(cron = "0/1 * * * * ? ")
    @Transactional
    public void processOutStationRun(){
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.STATION_RUN.sts));
        if (wrkMasts.isEmpty()) {
            return;
        }

        for (WrkMast wrkMast : wrkMasts) {
            String locNo = wrkMast.getSourceLocNo();
            LocMast locMast = locMastService.queryByLoc(locNo);
            if (locMast == null) {
                log.info("[workNo={}]库位不存在", wrkMast.getWrkNo());
                continue;
            }

            if (locMast.getLocSts().equals("O")) {
                continue;
            }

            if (!locMast.getLocSts().equals("R")) {
                log.info("[workNo={}]库位状态不处于R", wrkMast.getWrkNo());
                continue;
            }

            locMast.setLocSts("O");
            locMast.setBarcode("");
            locMast.setModiTime(new Date());
            boolean result = locMastService.updateById(locMast);
            if (!result) {
                log.info("[workNo={}]库位状态O更新失败", wrkMast.getWrkNo());
                continue;
            }
        }
    }

}

 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java

@@ -302,6 +302,7 @@
                    wrkMast.setWrkSts(WrkStsType.STATION_RUN_COMPLETE.sts);
                    wrkMast.setIoTime(new Date());
                    wrkMastService.updateById(wrkMast);
                    notifyUtils.notify(String.valueOf(SlaveType.Devp), basStation.getDeviceNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.STATION_OUT_TASK_RUN_COMPLETE, null);
                    redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
                }
            }

 src/main/resources/application.yml

@@ -1,6 +1,6 @@
# ç³»ç»Ÿç‰ˆæœ¬ä¿¡æ¯
app:
  version: 1.0.4.1
  version: 1.0.4.2
  version-type: dev  # prd æˆ– dev

server:

 src/main/resources/docs/WCSÍⲿHTTP API½Ó¿ÚV1.7.docx

Binary files differ