#

Junjie

4 天以前 7620bd47ec7dc59ea1f4c00e35d238d9d6e4ab53

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -2274,17 +2274,12 @@
            }

            //  状态：等待确认 并且  任务完成位 = 1
            if (rgvProtocol.statusType == RgvStatusType.WAITING && rgvProtocol.getTaskNo1() != 0) {
            if (rgvProtocol.statusType1 == RgvStatusType.WAITING && rgvProtocol.getTaskNo1() != 0) {
                News.warnNoLog(""+mark+" - 0"+" - 开始执行对RGV工作档的完成操作");
                // 获取入库待确认工作档
                WrkMast wrkMast = wrkMastMapper.selectPakInStep3(rgvProtocol.getTaskNo1().intValue());
                if (wrkMast == null) {
                    News.error(""+mark+" - 1"+" - RGV处于等待确认且任务完成状态，但未找到工作档。RGV号={}，工作号={}", rgvSlave.getId(), rgvProtocol.getTaskNo1());
                    continue;
                }

                if (Cools.isEmpty(wrkMast.getMemo())) {
                    News.error(""+mark+" - 1"+" - RGV处于等待确认且任务完成状态，但工作档数据异常。RGV号={}，工作号={}", rgvSlave.getId(), rgvProtocol.getTaskNo1());
                    continue;
                }

@@ -2295,13 +2290,13 @@
                    //入库
                    wrkMast.setWrkSts(2L);
                    devpId = 1;
                    devpStaNo = 1090;
                    devpStaNo = 2003;
                    locNo = wrkMast.getLocNo();
                }else {
                    //出库
                    wrkMast.setWrkSts(15L);
                    devpId = 2;
                    devpStaNo = 1091;
                    devpStaNo = 2002;
                    locNo = wrkMast.getSourceLocNo();
                }