#

Junjie

2025-06-24 c2c24e3e6a148fed7bf9ccce727970e1acdbb82e

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

@@ -2283,11 +2283,6 @@
                    continue;
                }

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

                Integer devpId = null;
                Integer devpStaNo = null;
                String locNo = null;
@@ -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();
                }

@@ -2331,7 +2326,7 @@

                    Date now = new Date();
                    wrkMast.setModiTime(now);
                    wrkMastMapper.updateById(wrkMast);
                    wrkMastService.updateById(wrkMast);

                    rgvThread.setResetFlag1(true);
                }