From 2d9665253e34da384fde299e2bc152a99f0c8ece Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:59:56 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 9c36d7a..07bf914 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -26,7 +26,9 @@
 
     public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
         wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
-        wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪w
+        wrkDetl.setBatch(locDetl.getBatch());
+        wrkDetl.setOrderNo(locDetl.getOrderNo());
         wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
         wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
         wrkDetl.setColor(locDetl.getColor()); // 鏉$爜
@@ -54,6 +56,8 @@
     public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
         locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
         locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        locDetl.setBatch(wrkDetl.getBatch());
+        locDetl.setOrderNo(wrkDetl.getOrderNo());
         locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
         locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
         locDetl.setColor(wrkDetl.getColor()); // 鏉$爜
@@ -78,6 +82,36 @@
         waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
     }
 
+    public static void setOrderDetl(OrderDetl orderDetl, MatCode matCode) {
+        orderDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+        orderDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+        orderDetl.setSpecs(matCode.getStr2()); // 瑙勬牸
+        orderDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+    }
+
+    public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
+        waitPakIn.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
+        waitPakIn.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        waitPakIn.setBatch(orderDetl.getBatch());
+        waitPakIn.setOrderNo(orderDetl.getOrderNo());
+        waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
+        waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
+        waitPakIn.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+        waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
+    }
+
+    public static void setWrkDetl(WrkDetl wrkDetl, OrderDetl orderDetl) {
+        wrkDetl.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
+        wrkDetl.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        wrkDetl.setBatch(orderDetl.getBatch());
+        wrkDetl.setOrderNo(orderDetl.getOrderNo());
+        wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
+        wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
+        wrkDetl.setSupplier(orderDetl.getSupplier()); // 鎵瑰彿
+        wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
+    }
+
+
     // excel ----------------------------------------------------------------------
 
     public static MatCodeExcel getExcel(MatCode matCode) {

--
Gitblit v1.9.1