From 134af8323aab69b405041823dfe6c0593e876c94 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 09 七月 2025 14:02:24 +0800
Subject: [PATCH] 完善erp对接

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 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 68a9c07..6b3d16b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -1226,7 +1226,7 @@
         if (Cools.isEmpty(locMast)) {
             throw new CoolException("搴撲綅涓嶅瓨鍦�");
         }
-        if (!(locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O"))) {
+        if (!(locMast.getLocSts().equals("P") ||locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || locMast.getLocSts().equals("O"))) {
             throw new CoolException("褰撳墠搴撲綅涓嶅彲璋冩暣锛佸簱浣嶇姸鎬侊細" + locMast.getLocSts$());
         }
 
@@ -1337,6 +1337,9 @@
         }
         locMast.setModiUser(userId);
         locMast.setModiTime(now);
+        if (locMast.getLocSts().equals("O")){
+            locMast.setBarcode("");
+        }
         if (!locMastService.updateById(locMast)) {
             throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐�");
         }
@@ -1529,7 +1532,7 @@
         // 鑾峰彇鐩爣绔�
         Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                 .eq("type_no", wrkMast.getIoType() - 50)
-                .eq("stn_no", wrkMast.getStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
+                .eq("stn_no", wrkMast.getSourceStaNo()) // 浣滀笟绔欑偣 = 鎷f枡鍑哄簱鐨勭洰鏍囩珯
                 .eq("crn_no", wrkMast.getCrnNo()); // 鍫嗗灈鏈哄彿
         StaDesc staDesc = staDescService.selectOne(wrapper);
         if (Cools.isEmpty(staDesc)) {

--
Gitblit v1.9.1