From a2ca6580028f1d1583002c7516ff333f89b5e224 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 02 一月 2021 14:27:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 0c84a50..f79da50 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;
@@ -15,24 +16,18 @@
public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- wrkDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
- wrkDetl.setType(matCode.getStr2()); // 鍟嗗搧绫诲埆
- wrkDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
- wrkDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
- wrkDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
- wrkDetl.setBrand(matCode.getStr8()); // 鍝佺墝
+ 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.setLgnum(locDetl.getLgnum()); // 瑙勬牸
- wrkDetl.setType(locDetl.getType()); // 鍟嗗搧绫诲埆
- wrkDetl.setMnemonic(locDetl.getMnemonic()); // 鍔╄鐮�
- wrkDetl.setSupplier(locDetl.getSupplier()); // 榛樿渚涘簲鍟�
- wrkDetl.setWarehouse(locDetl.getWarehouse()); // 榛樿浠撳簱
- wrkDetl.setBrand(locDetl.getBrand()); // 鍝佺墝
+ wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
+ wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -40,12 +35,9 @@
public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- locDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
- locDetl.setType(matCode.getStr2()); // 鍟嗗搧绫诲埆
- locDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
- locDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
- locDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
- locDetl.setBrand(matCode.getStr8()); // 鍝佺墝
+ locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+ locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
+ locDetl.setBname(matCode.getStr4()); // 瀹㈡埛
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
@@ -53,16 +45,22 @@
locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
- locDetl.setType(wrkDetl.getType()); // 鍟嗗搧绫诲埆
- locDetl.setMnemonic(wrkDetl.getMnemonic()); // 鍔╄鐮�
- locDetl.setSupplier(wrkDetl.getSupplier()); // 榛樿渚涘簲鍟�
- locDetl.setWarehouse(wrkDetl.getWarehouse()); // 榛樿浠撳簱
- locDetl.setBrand(wrkDetl.getBrand()); // 鍝佺墝
+ 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 ----------------------------------------------------------------------
public static MatCodeExcel getExcel(MatCode matCode) {
--
Gitblit v1.9.1