From b5ca846c41affe2c41d719be38be326a1931b3de Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 09:47:22 +0800
Subject: [PATCH] 手动完成空桶库任务问题修复

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index db9cc3e..5dd01a3 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -857,13 +857,15 @@
         }
         if(workNoOther != 0) {
             WrkMast wrkMast1 = wrkMastService.selectById(workNoOther);
-            wrkMast1.setWrkSts(wrkMast.getWrkSts());
-            wrkMast1.setCrnStrTime(wrkMast.getCrnStrTime());
-            wrkMast1.setCrnEndTime(now);
-            wrkMast1.setModiTime(now);
-            wrkMast1.setModiUser(userId);
-            wrkMast1.setManuType("鎵嬪姩瀹屾垚");
-            wrkMastService.updateById(wrkMast1);
+            if (wrkMast1 != null) {
+                wrkMast1.setWrkSts(wrkMast.getWrkSts());
+                wrkMast1.setCrnStrTime(wrkMast.getCrnStrTime());
+                wrkMast1.setCrnEndTime(now);
+                wrkMast1.setModiTime(now);
+                wrkMast1.setModiUser(userId);
+                wrkMast1.setManuType("鎵嬪姩瀹屾垚");
+                wrkMastService.updateById(wrkMast1);
+            }
         }
     }
 

--
Gitblit v1.9.1