#

cpT

8 天以前 70c104c001de0c586b0d468a30729a9a944560ef

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

@@ -404,7 +404,25 @@
            return false;
        }

        List<StationObjModel> enableUseStationList = new ArrayList<>();
        for (StationObjModel stationObjModel : outStationList) {
            if (!stationObjModel.getStationId().equals(wrkMast.getSourceStaNo())) {
                continue;
            }

            if(stationObjModel.getDualCrnExecuteStation().equals(station)) {
                enableUseStationList.add(stationObjModel);
            }

            StationObjModel dualCrnSlaveStation = stationObjModel.getDualCrnSlaveStation();
            if(dualCrnSlaveStation != null) {
                if (dualCrnSlaveStation.getDualCrnExecuteStation().equals(station)) {
                    enableUseStationList.add(stationObjModel);
                }
            }
        }

        for (StationObjModel stationObjModel : enableUseStationList) {
            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, stationObjModel.getDeviceNo());
            if (stationThread == null) {
                continue;
@@ -608,15 +626,34 @@
            } else if (wrkMast.getWrkSts() == WrkStsType.OUTBOUND_RUN.sts) {
                updateWrkSts = WrkStsType.OUTBOUND_RUN_COMPLETE.sts;
                notifyUtils.notify(String.valueOf(SlaveType.DualCrn), basDualCrnp.getCrnNo(), String.valueOf(wrkMast.getWrkNo()), wrkMast.getWmsWrkNo(), NotifyMsgType.DUAL_CRN_OUT_TASK_COMPLETE, null);
                

                List<StationObjModel> outStationList = basDualCrnp.getOutStationList$();
                if(outStationList.isEmpty()){
                    News.info("双工位堆垛机:{} 出库站点未设置", basDualCrnp.getCrnNo());
                    return;
                }

                StationObjModel outStationObjModel = null;
                for (StationObjModel stationObjModel : outStationList) {
                    if (stationObjModel.getStationId().equals(wrkMast.getSourceStaNo())) {
                        outStationObjModel = stationObjModel;
                        break;
                    }
                }

                if (outStationObjModel == null) {
                    News.info("双工位堆垛机:{} 未找到匹配的任务出库站", basDualCrnp.getCrnNo());
                    return;
                }

                if (station == 1) {
                    redisUtil.set(RedisKeyType.DUAL_CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo(), JSON.toJSONString(outStationObjModel, SerializerFeature.DisableCircularReferenceDetect), 60 * 60 * 24);
                }else {
                    redisUtil.set(RedisKeyType.DUAL_CRN_OUT_TASK_COMPLETE_STATION_INFO.key + wrkMast.getWrkNo(), JSON.toJSONString(outStationObjModel.getDualCrnSlaveStation(), SerializerFeature.DisableCircularReferenceDetect), 60 * 60 * 24);
                }

                if(mainProcessPlugin.contains("Fake")) {
                    //生成仿真站点数据
                    List<StationObjModel> outStationList = basDualCrnp.getOutStationList$();
                    if(outStationList.isEmpty()){
                        News.info("双工位堆垛机:{} 出库站点未设置", basDualCrnp.getCrnNo());
                        return;
                    }

                    for (StationObjModel stationObjModel : outStationList) {
                        if (!stationObjModel.getStationId().equals(wrkMast.getSourceStaNo())) {
                            continue;