From 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 26 八月 2021 08:50:57 +0800
Subject: [PATCH] Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 66fa726..590e82b 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -14,51 +14,55 @@
// 涓氬姟 ----------------------------------------------------------------------
public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
- wrkDetl.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
- wrkDetl.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
- wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
- wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- wrkDetl.setBname(matCode.getStr4()); // 搴撲綅鍚嶇О
+ wrkDetl.setMatNo(matCode.getMatNo()); // 浜у搧缂栫爜
+ wrkDetl.setMatName(matCode.getMatName()); // 浜у搧鍚嶇О
+ wrkDetl.setSpecs(matCode.getSpecs()); // 瑙勬牸
+ wrkDetl.setUnit(matCode.getUnit()); // 鍗曚綅
+ wrkDetl.setSize(matCode.getSize()); // 灏哄
+ wrkDetl.setColor(matCode.getColor()); // 棰滆壊
+ wrkDetl.setWeight(matCode.getWeight()); // 鍗曢噸
}
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.setAltme(locDetl.getAltme()); // 鍗曚綅
+ wrkDetl.setMatNo(locDetl.getMatNo()); // 浜у搧缂栧彿
+ wrkDetl.setMatName(locDetl.getMatName()); // 浜у搧鎻忚堪
+ wrkDetl.setSpecs(locDetl.getSpecs()); // 瑙勬牸
+ wrkDetl.setUnit(locDetl.getUnit()); // 鍗曚綅
+ wrkDetl.setSize(locDetl.getSize()); // 灏哄
+ wrkDetl.setColor(locDetl.getColor()); // 棰滆壊
+ wrkDetl.setWeight(locDetl.getWeight()); // 鍗曢噸
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
- locDetl.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
- locDetl.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
- locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
- locDetl.setBname(matCode.getStr4()); // 搴撲綅鍚嶇О
- locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+ locDetl.setMatNo(matCode.getMatNo()); // 浜у搧缂栧彿
+ locDetl.setMatName(matCode.getMatName()); // 浜у搧鎻忚堪
+ locDetl.setSpecs(matCode.getSpecs()); // 瑙勬牸
+ locDetl.setUnit(matCode.getUnit()); // 鍗曚綅
+ locDetl.setSize(matCode.getSize()); // 灏哄
+ locDetl.setColor(matCode.getColor()); // 棰滆壊
+ locDetl.setWeight(matCode.getWeight()); // 鍗曢噸
}
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.setAltme(wrkDetl.getAltme()); // 鍗曚綅
+ locDetl.setMatNo(wrkDetl.getMatNo()); // 浜у搧缂栧彿
+ locDetl.setMatName(wrkDetl.getMatName()); // 浜у搧鎻忚堪
+ locDetl.setSpecs(wrkDetl.getSpecs()); // 瑙勬牸
+ locDetl.setUnit(wrkDetl.getUnit()); // 鍗曚綅
+ locDetl.setSize(wrkDetl.getSize()); // 灏哄
+ locDetl.setColor(wrkDetl.getColor()); // 棰滆壊
+ locDetl.setQty(wrkDetl.getQty()); // 鏁伴噺
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()); // 搴撲綅鍚嶇О
+ waitPakIn.setMatNo(matCode.getMatNo()); // 浜у搧缂栧彿
+ waitPakIn.setMatName(matCode.getMatName()); // 浜у搧鎻忚堪
+ waitPakIn.setSpecs(matCode.getSpecs()); // 瑙勬牸
+ waitPakIn.setUnit(matCode.getUnit()); // 鍗曚綅
+ waitPakIn.setSize(matCode.getSize()); // 灏哄
+ waitPakIn.setColor(matCode.getColor()); // 棰滆壊
+ waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
}
// excel ----------------------------------------------------------------------
--
Gitblit v1.9.1