From b00eeab31bd13ba34a03301aa441b0751d6a93e4 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期五, 19 十二月 2025 17:00:51 +0800
Subject: [PATCH] 第六排成品可以放第七排原材料

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index dc9cad3..636fed1 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -31,6 +31,7 @@
         wrkDetl.setColor(locDetl.getColor()); // 棰滆壊
         wrkDetl.setWeight(locDetl.getWeight()); // 鍗曢噸
         wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜
+        wrkDetl.setSupplier(locDetl.getSupplier());
     }
 
     public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
@@ -52,16 +53,17 @@
         locDetl.setColor(wrkDetl.getColor()); // 棰滆壊
         locDetl.setQty(wrkDetl.getQty()); // 鏁伴噺
         locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
+        locDetl.setSupplier(wrkDetl.getSupplier());
     }
 
     public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
-        waitPakIn.setMatNo(matCode.getMatNo()); // 浜у搧缂栧彿
-        waitPakIn.setMatName(matCode.getMatName()); // 浜у搧鎻忚堪
-        waitPakIn.setSpecs(matCode.getSpecs()); // 瑙勬牸
-        waitPakIn.setUnit(matCode.getUnit()); // 鍗曚綅
-        waitPakIn.setSize(matCode.getSize()); // 灏哄
+        waitPakIn.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+        waitPakIn.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
+        waitPakIn.setLgnum(matCode.getSpecs()); // 瑙勬牸
+        waitPakIn.setAltme(matCode.getUnit()); // 鍗曚綅
+        waitPakIn.setType(matCode.getSize()); // 灏哄
         waitPakIn.setColor(matCode.getColor()); // 棰滆壊
-        waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
+        //waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
     }
 
     // excel ----------------------------------------------------------------------

--
Gitblit v1.9.1