#1

dubin

2 天以前 bfbb0cbe87bbacbaf3fdfb5fb3caa935ec91da1f

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

@@ -38,6 +38,8 @@
    @Autowired
    private BasCrnpService basCrnpService;
    @Autowired
    private BasDualCrnpService basDualCrnpService;
    @Autowired
    private RedisUtil redisUtil;
    @Autowired
    private LocMastService locMastService;
@@ -83,7 +85,7 @@
                        continue;
                    }

                    if (wrkMast.getWrkSts() == WrkStsType.INBOUND_DEVICE_RUN.sts) {
                    if (wrkMast.getWrkSts() == WrkStsType.INBOUND_DEVICE_RUN.sts || wrkMast.getWrkSts() == WrkStsType.INBOUND_RUN.sts) {
                        continue;
                    }

@@ -130,15 +132,24 @@
    public synchronized void stationOutExecute() {
        List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts));
        for (WrkMast wrkMast : wrkMasts) {
            List<StationObjModel> outStationList = new ArrayList<>();

            BasCrnp basCrnp = basCrnpService.selectOne(new EntityWrapper<BasCrnp>().eq("crn_no", wrkMast.getCrnNo()));
            if (basCrnp == null) {
                continue;
            if (basCrnp != null) {
                outStationList = basCrnp.getOutStationList$();
                if(outStationList.isEmpty()){
                    News.info("堆垛机:{} 出库站点未设置", basCrnp.getCrnNo());
                    continue;
                }
            }

            List<StationObjModel> outStationList = basCrnp.getOutStationList$();
            if(outStationList.isEmpty()){
                News.info("堆垛机:{} 出库站点未设置", basCrnp.getCrnNo());
                continue;
            BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", wrkMast.getDualCrnNo()));
            if (basDualCrnp != null) {
                outStationList = basDualCrnp.getOutStationList$();
                if(outStationList.isEmpty()){
                    News.info("双工位堆垛机:{} 出库站点未设置", basDualCrnp.getCrnNo());
                    continue;
                }
            }

            for (StationObjModel stationObjModel : outStationList) {
@@ -176,6 +187,7 @@
                        MessageQueue.offer(SlaveType.Devp, stationObjModel.getDeviceNo(), new Task(2, command));
                        News.info("输送站点出库命令下发成功，站点号={}，工作号={}，命令数据={}", stationProtocol.getStationId(), wrkMast.getWrkNo(), JSON.toJSONString(command));
                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_LIMIT.key + stationProtocol.getStationId(), "lock", 5);
                        redisUtil.set(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkMast.getWrkNo(), "lock", 60);
                    }
                }
            }
@@ -188,6 +200,11 @@
        for (WrkMast wrkMast : wrkMasts) {
            Integer wrkNo = wrkMast.getWrkNo();

            Object lock = redisUtil.get(RedisKeyType.STATION_OUT_EXECUTE_COMPLETE_LIMIT.key + wrkNo);
            if (lock != null) {
                continue;
            }

            boolean complete = true;
            List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
            for (BasDevp basDevp : basDevps) {
@@ -198,16 +215,15 @@

                List<StationProtocol> list = stationThread.getStatus();
                for (StationProtocol stationProtocol : list) {
                    if (stationProtocol.getTaskNo().equals(wrkNo)) {
                    if (!stationProtocol.getTaskNo().equals(wrkNo)) {
                        complete = false;
                    }
                    if (complete) {
                        wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
                        wrkMast.setIoTime(new Date());
                        wrkMastService.updateById(wrkMast);
                    }
                }
            }

            if (complete) {
                wrkMast.setWrkSts(WrkStsType.COMPLETE_OUTBOUND.sts);
                wrkMast.setIoTime(new Date());
                wrkMastService.updateById(wrkMast);
            }
        }
    }