From 2baaed8ba32d2f2949eb0e5a2bf87bd05490fad9 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期五, 16 八月 2024 09:45:49 +0800
Subject: [PATCH] 入库推送gwcs增加条码

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |    4 ++--
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java   |    7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 1513336..7dec5e5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1238,7 +1238,7 @@
             }
 
             // 鎺ㄩ�佺粰gwcs鎵ц鍛戒护
-            openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo());
+            openServiceImpl.pushStaNoToGwcs(wrkMast.getSourceStaNo(),wrkMast.getStaNo(),wrkMast.getWrkNo(),wrkMast.getBarcode());
 
             return R.ok("鐩樼偣纭鎴愬姛");
 
@@ -1406,7 +1406,7 @@
         }
 
         // 鎺ㄩ�丟WCS鐩爣娑堟伅
-        openServiceImpl.pushStaNoToGwcs(sourceStaNo,dto.getStaNo(),dto.getWorkNo());
+        openServiceImpl.pushStaNoToGwcs(sourceStaNo,dto.getStaNo(),dto.getWorkNo(),barcode);
         return R.ok("鍏ュ簱鍚姩鎴愬姛");
     }
 
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index f02d5c1..aad5f36 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1043,7 +1043,7 @@
         StartupDto dto = commonService.getLocNo(1, param.getPalletizingNo(), locTypeDto, 0);
 
         // 杩斿洖GWCS鐩爣淇℃伅
-        pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo());
+        pushStaNoToGwcs(param.getPalletizingNo(), dto.getStaNo(), dto.getWorkNo(),param.getBarcode());
 
         int workNo = dto.getWorkNo();
         Date now = new Date();
@@ -1141,7 +1141,7 @@
         StartupDto dto = commonService.getLocNo(iotype, param.getPalletizingNo(), locTypeDto,0);
 
         // 杩斿洖GWCS鐩爣淇℃伅
-        pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo());
+        pushStaNoToGwcs(param.getPalletizingNo(),dto.getStaNo(),dto.getWorkNo(),param.getBarcode());
 
 
         int workNo = dto.getWorkNo();
@@ -1593,7 +1593,7 @@
         return wrkDetls.size() > 1 ? 0 : 1; // 涓�鏉¤褰曞氨鏄竴鍗�
     }
 
-    public void pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo) {
+    public void pushStaNoToGwcs(Integer palletizingNo, Integer staNo, Integer workNo,String barcode) {
         boolean success = false;
         // 鑾峰彇璇锋眰澶�
         Map<String, Object> headers = getHeaders();
@@ -1603,6 +1603,7 @@
         jsonObject.put("workNo", workNo);
         jsonObject.put("staNo", staNo);
         jsonObject.put("sourceStaNo", palletizingNo);
+        jsonObject.put("barcode", barcode);
         String body = jsonObject.toJSONString();
         String response = "";
         try {

--
Gitblit v1.9.1