From b610e067cf2c44fdcc99ec3a3190820d1a5b7bcb Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期三, 10 一月 2024 16:55:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 6265873..5c58614 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -89,12 +89,12 @@
         param.setWarehouseId("1688469798893297665");
         param.setLocationCode(Utils.getWmsLocNo(locMast.getLocNo()));
         param.setEmptyContainer(locMast.getEmptyContainer$());
-        if (locMast.getLocSts().equals("Z")){
+        if (locMast.getLocSts().equals("J")){
             param.setStatus("JY");
         }else {
             param.setStatus("QY");
         }
-        if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("O")){
+        if (Cools.isEmpty(locMast.getBarcode()) || locMast.getLocSts().equals("K")){
             param.setContainerCode("");
             param.setContainerTypeCode("");
         }else {
@@ -111,7 +111,7 @@
                     .build()
                     .doPost();
         }catch (Exception e){
-            log.error("鍫嗗灈鏈轰换鍔″畬鎴愶紝璇锋眰wms浠诲姟瀹屾垚鎺ュ彛澶辫触");
+            log.error("搴撲綅鏇存柊澶辫触");
         }
         JSONObject jsonObject = JSON.parseObject(response);
 

--
Gitblit v1.9.1