From c2c24e3e6a148fed7bf9ccce727970e1acdbb82e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 24 六月 2025 20:41:49 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 458f54a..f662ddf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/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澶勪簬绛夊緟纭涓斾换鍔″畬鎴愮姸鎬侊紝浣嗗伐浣滄。鏁版嵁寮傚父銆俁GV鍙�={}锛屽伐浣滃彿={}", 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);
                 }

--
Gitblit v1.9.1