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 | 78 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index aa623d0..66fa726 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -2,6 +2,7 @@
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;
@@ -13,30 +14,51 @@
// 涓氬姟 ----------------------------------------------------------------------
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.setColor(matCode.getStr3()); // 鍔╄鐮�
wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+ 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.setColor(locDetl.getColor()); // 鍔╄鐮�
+ wrkDetl.setBname(locDetl.getBname()); // 搴撲綅鍚嶇О
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
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.setColor(matCode.getStr3()); // 鍔╄鐮�
+ locDetl.setBname(matCode.getStr4()); // 搴撲綅鍚嶇О
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
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.setColor(wrkDetl.getColor()); // 鍔╄鐮�
+ locDetl.setBname(wrkDetl.getBname()); // 搴撲綅鍚嶇О
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
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 ----------------------------------------------------------------------
@@ -46,6 +68,11 @@
matCode.getMatNo(),
matCode.getBarcode(),
matCode.getMatName(),
+ matCode.getSpecs(),
+ matCode.getUnit(),
+ matCode.getSize(),
+ matCode.getColor(),
+ matCode.getWeight(),
matCode.getStr1(),
matCode.getStr2(),
matCode.getStr3(),
@@ -56,25 +83,11 @@
matCode.getStr8(),
matCode.getStr9(),
matCode.getStr10(),
- matCode.getStr11(),
- matCode.getStr12(),
- matCode.getStr13(),
- matCode.getStr14(),
- matCode.getStr15(),
- matCode.getStr16(),
- matCode.getStr17(),
- matCode.getStr18(),
- matCode.getStr19(),
- matCode.getStr20(),
- matCode.getStr21(),
- matCode.getStr22(),
- matCode.getStr23(),
matCode.getNum1(),
matCode.getNum2(),
matCode.getNum3(),
matCode.getNum4(),
- matCode.getNum5(),
- matCode.getNum6()
+ matCode.getNum5()
);
}
@@ -82,6 +95,11 @@
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());
@@ -92,25 +110,11 @@
matCode.setStr8(excel.getStr8());
matCode.setStr9(excel.getStr9());
matCode.setStr10(excel.getStr10());
- matCode.setStr11(excel.getStr11());
- matCode.setStr12(excel.getStr12());
- matCode.setStr13(excel.getStr13());
- matCode.setStr14(excel.getStr14());
- matCode.setStr15(excel.getStr15());
- matCode.setStr16(excel.getStr16());
- matCode.setStr17(excel.getStr17());
- matCode.setStr18(excel.getStr18());
- matCode.setStr19(excel.getStr19());
- matCode.setStr20(excel.getStr20());
- matCode.setStr21(excel.getStr21());
- matCode.setStr22(excel.getStr22());
- matCode.setStr23(excel.getStr23());
matCode.setNum1(excel.getNum1());
matCode.setNum2(excel.getNum2());
matCode.setNum3(excel.getNum3());
matCode.setNum4(excel.getNum4());
matCode.setNum5(excel.getNum5());
- matCode.setNum6(excel.getNum6());
}
--
Gitblit v1.9.1