From d4c3ebd99e8619c3fc230bb50828e9e762f8dd7a Mon Sep 17 00:00:00 2001
From: zwl <zwl123456>
Date: 星期二, 30 九月 2025 09:23:25 +0800
Subject: [PATCH] 字段完善

---
 src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 8266040..074469f 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -32,6 +32,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Service("orderDetlService")
@@ -172,8 +173,8 @@
         headTable.setCmaker("sys");//鍒跺崟浜哄悕绉�
         headTable.setVt_id("89");//妯℃澘鍙�		榛樿
 
-        headTable.setCiwhcode("1");//杞叆浠撳簱缂栫爜
-        headTable.setCowhcode("1");//杞嚭浠撳簱缂栫爜
+        headTable.setCiwhcode(order.getShipName());//杞叆浠撳簱缂栫爜
+        headTable.setCowhcode(order.getShipCode());//杞嚭浠撳簱缂栫爜
         headTable.setCordcode("");//鍑哄簱绫诲埆缂栫爜      榛樿
         headTable.setCirdcode("");//鍏ュ簱绫诲埆缂栫爜      榛樿
         headTable.setCodepcode("");//杞嚭閮ㄩ棬缂栫爜
@@ -186,10 +187,12 @@
         bodyTable.setCtvbatch(Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch());//鎵瑰彿锛堢壒娈婅鏄庯級
         Double qty = orderDetl.getQty()-(Cools.isEmpty(orderDetl.getUnits())?0:orderDetl.getUnits());
         bodyTable.setItvquantity(String.valueOf(qty));//瀹屾垚浠舵暟
-        bodyTable.setCinposcode("1-1");//绔嬪簱婧愯揣浣�
+//        bodyTable.setCinposcode("1-1");//绔嬪簱婧愯揣浣�
         bodyTable.setCoutposcode("");//鐩爣璐т綅
         bodyTable.setItrsid(orderDetl.getMemo());//琛屼富閿�
-        bodyTable.setEditprop(sts.equals(1) ? "A" : "B");//鐘舵�� A 鏂板
+        bodyTable.setCFree1("鏃�");
+
+//        bodyTable.setEditprop(sts.equals(1) ? "A" : "B");//鐘舵�� A 鏂板
         User user = userService.selectById(orderDetl.getUpdateBy());
         headTable.setWms_operator(user == null ? "" : user.getUsername()); // 鎿嶄綔璐﹀彿鍚嶇О
 
@@ -221,11 +224,11 @@
 
             if (jsonObject.getInteger("code").equals(1)) {
                 orderDetl.setUnits(qty+orderDetl.getUnits());
-                orderDetl.setStatus(sts);
+                orderDetl.setStatus(0);
                 orderDetlService.updateById(orderDetl);
                 success = true;
-                // 濡傛灉鏄柊澧炲垯鍐嶆璋冪敤鍏抽棴
-                if (sts.equals(1)) {
+                // 涓�鏉¤鍗曟槑缁嗗畬鎴愶紝涓婃姤鍏抽棴
+                if (Objects.equals(orderDetl.getAnfme(), orderDetl.getQty())) {
                     boolean success2 = false;
                     try {
                         orderRsult.setCommandType("鍏抽棴");

--
Gitblit v1.9.1