From c6ab1a516d8398de65512fcd380d89e46ec8e430 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 27 五月 2022 15:31:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jkasrs' into jkasrs

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    2 ++
 1 files changed, 2 insertions(+), 0 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 d4d7f4c..25c72b6 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -953,8 +953,10 @@
         wrkMast.setWrkSts(2L);
         wrkMast.setLocNo(targetLoc.getLocNo());
         wrkMast.setStaNo(staDesc.getCrnStn());
+        wrkMast.setCrnNo(targetLoc.getCrnNo());
         wrkMast.setModiTime(now);
         wrkMast.setModiUser(userId);
+        wrkMast.setPreHave("N");
         if (!wrkMastService.updateById(wrkMast)) {
             throw new CoolException("淇敼宸ヤ綔妗eけ璐�");
         }

--
Gitblit v1.9.1