From 000d8ff50a38cd3464ae81f6e7cabd11753a441d Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期三, 18 八月 2021 16:14:00 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 21a5ed9..66fa726 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -2,50 +2,120 @@
 
 import com.zy.asrs.entity.LocDetl;
 import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.WaitPakin;
 import com.zy.asrs.entity.WrkDetl;
+import com.zy.common.utils.excel.matcode.MatCodeExcel;
 
 /**
  * Created by vincent on 2020/7/14
  */
 public class VersionUtils {
 
+    // 涓氬姟 ----------------------------------------------------------------------
+
     public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
-        wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
-        wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+        wrkDetl.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+        wrkDetl.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
         wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-        wrkDetl.setZmatid(matCode.getStr3()); // 棰滆壊
+        wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
         wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-        wrkDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
+        wrkDetl.setBname(matCode.getStr4()); // 搴撲綅鍚嶇О
     }
 
     public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
-        wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
-        wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        wrkDetl.setMatnr(locDetl.getMatnr()); // 浜у搧缂栧彿
+        wrkDetl.setMaktx(locDetl.getMaktx()); // 浜у搧鎻忚堪
         wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
-        wrkDetl.setZmatid(locDetl.getZmatid()); // 棰滆壊
+        wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
+        wrkDetl.setBname(locDetl.getBname()); // 搴撲綅鍚嶇О
         wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
-        wrkDetl.setBname(locDetl.getBname()); // 鐢ㄦ埛ID
         wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜
     }
 
     public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
-        locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
-        locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+        locDetl.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+        locDetl.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
         locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-        locDetl.setZmatid(matCode.getStr3()); // 棰滆壊
+        locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
+        locDetl.setBname(matCode.getStr4()); // 搴撲綅鍚嶇О
         locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-        locDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
     }
 
     public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
-        locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
-        locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
+        locDetl.setMatnr(wrkDetl.getMatnr()); // 浜у搧缂栧彿
+        locDetl.setMaktx(wrkDetl.getMaktx()); // 浜у搧鎻忚堪
         locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
-        locDetl.setZmatid(wrkDetl.getZmatid()); // 棰滆壊
+        locDetl.setColor(wrkDetl.getColor()); // 鍔╄鐮�
+        locDetl.setBname(wrkDetl.getBname()); // 搴撲綅鍚嶇О
         locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
         locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
-        locDetl.setBname(wrkDetl.getBname()); // 鐢ㄦ埛ID
         locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
     }
 
+    public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
+        waitPakIn.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+        waitPakIn.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
+        waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
+        waitPakIn.setColor(matCode.getStr3()); // 鍔╄鐮�
+        waitPakIn.setAltme(matCode.getStr1()); // 鍗曚綅
+        waitPakIn.setBname(matCode.getStr4()); // 搴撲綅鍚嶇О
+    }
+
+    // excel ----------------------------------------------------------------------
+
+    public static MatCodeExcel getExcel(MatCode matCode) {
+        return new MatCodeExcel(
+                matCode.getMatNo(),
+                matCode.getBarcode(),
+                matCode.getMatName(),
+                matCode.getSpecs(),
+                matCode.getUnit(),
+                matCode.getSize(),
+                matCode.getColor(),
+                matCode.getWeight(),
+                matCode.getStr1(),
+                matCode.getStr2(),
+                matCode.getStr3(),
+                matCode.getStr4(),
+                matCode.getStr5(),
+                matCode.getStr6(),
+                matCode.getStr7(),
+                matCode.getStr8(),
+                matCode.getStr9(),
+                matCode.getStr10(),
+                matCode.getNum1(),
+                matCode.getNum2(),
+                matCode.getNum3(),
+                matCode.getNum4(),
+                matCode.getNum5()
+        );
+    }
+
+    public static void setMatCode(MatCode matCode, MatCodeExcel excel) {
+        matCode.setMatNo(excel.getMatNo());
+        matCode.setMatName(excel.getMatName());
+        matCode.setBarcode(excel.getBarcode());
+        matCode.setSpecs(excel.getSpecs());
+        matCode.setUnit(excel.getUnit());
+        matCode.setSize(excel.getSize());
+        matCode.setColor(excel.getColor());
+        matCode.setWeight(excel.getWeight());
+        matCode.setStr1(excel.getStr1());
+        matCode.setStr2(excel.getStr2());
+        matCode.setStr3(excel.getStr3());
+        matCode.setStr4(excel.getStr4());
+        matCode.setStr5(excel.getStr5());
+        matCode.setStr6(excel.getStr6());
+        matCode.setStr7(excel.getStr7());
+        matCode.setStr8(excel.getStr8());
+        matCode.setStr9(excel.getStr9());
+        matCode.setStr10(excel.getStr10());
+        matCode.setNum1(excel.getNum1());
+        matCode.setNum2(excel.getNum2());
+        matCode.setNum3(excel.getNum3());
+        matCode.setNum4(excel.getNum4());
+        matCode.setNum5(excel.getNum5());
+    }
+
+
 }

--
Gitblit v1.9.1