From f4338e95f20d745f8fc5f4d035bd5057a01eb50d Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 25 三月 2026 17:07:12 +0800
Subject: [PATCH] #解决拣选回库后库存丢失问题,库存明细的预留字段与工作明细预留字段不一致情况

---
 src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
index 8ce0fd0..31b08b0 100644
--- a/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/BareBoardHandler.java
@@ -67,7 +67,7 @@
             boolean sign = true;
             for (Integer crnNo : crns){
                 sign = true;
-                // 鑾峰彇搴撲綅
+
                 LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts",locStsTarget).eq("crn_no",crnNo));
 
                 if (Cools.isEmpty(locMast)) {
@@ -85,6 +85,10 @@
                             .eq("stn_no", staNo)
                             .eq("crn_no", crnNo);
                     StaDesc staDesc = staDescService.selectOne(wrapper);
+                    if (Cools.isEmpty(staDesc)){
+                        sign = false;
+                        continue;
+                    }
                     Integer sourceStaNo = staDesc.getCrnStn();
                     if (Cools.isEmpty(sourceStaNo)) {
 //                    throw new CoolException("妫�绱㈡簮绔欏け璐�");
@@ -112,6 +116,7 @@
                         wrkMast.setAppeTime(now);
                         wrkMast.setModiUser(9999L);
                         wrkMast.setModiTime(now);
+                        wrkMast.setMk(locMast.getMk());
                         boolean res = wrkMastService.insert(wrkMast);
                         if (!res) {
                             throw new CoolException("淇濆瓨宸ヤ綔妗eけ璐�");

--
Gitblit v1.9.1