From ad2697fec86e0bfcc6e3ba20af7f973ccbb5abe7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 16:12:22 +0800
Subject: [PATCH] #物料

---
 src/main/java/com/zy/asrs/utils/VersionUtils.java |   33 ++++++++++++++++++++++++---------
 1 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 4803050..06afa71 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,18 +15,26 @@
         wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
         wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
         wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-        wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
+        wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
+        wrkDetl.setColor(matCode.getBarcode()); // 鏉$爜
+        wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+        wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+        wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
         wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-        wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+        wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
     }
 
     public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
         wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
         wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
         wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
-        wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
-        wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛
+        wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
+        wrkDetl.setColor(locDetl.getColor()); // 鏉$爜
+        wrkDetl.setSupplier(locDetl.getSupplier()); // 鎵瑰彿
+        wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
+        wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
         wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
+        wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛鍚嶇О
         wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜
     }
 
@@ -34,19 +42,26 @@
         locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
         locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
         locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-        locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
-        locDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+        locDetl.setType(matCode.getStr5()); // 鍨嬪彿
+        locDetl.setColor(matCode.getBarcode()); // 鏉$爜
+        locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+        locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+        locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
         locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+        locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
     }
 
     public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
         locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
         locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
         locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
-        locDetl.setColor(wrkDetl.getColor()); // 鍔╄鐮�
-        locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛
-        locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+        locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
+        locDetl.setColor(wrkDetl.getColor()); // 鏉$爜
+        locDetl.setSupplier(wrkDetl.getSupplier()); // 鎵瑰彿
+        locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
+        locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
         locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
+        locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛鍚嶇О
         locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
     }
 

--
Gitblit v1.9.1