From 4b0fec6fd68a7f6ac0f5b226cf11b3e71cbe68e1 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 12 一月 2021 20:12:29 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/VersionUtils.java | 47 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java index 7ca13d3..8112dba 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; @@ -16,18 +17,26 @@ wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿 wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪 wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸 - wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮� + wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿 + wrkDetl.setColor(matCode.getBarcode()); // 鏉$爜 + wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿 + wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿 + wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁� wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅 - wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛 + 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.setColor(locDetl.getColor()); // 鍔╄鐮� - wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛 + wrkDetl.setType(locDetl.getType()); // 鍨嬪彿 + wrkDetl.setColor(locDetl.getColor()); // 鏉$爜 + wrkDetl.setSupplier(locDetl.getSupplier()); // 鎵瑰彿 + wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿 + wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁� wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅 + wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛鍚嶇О wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜 } @@ -35,22 +44,42 @@ locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿 locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪 locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸 - locDetl.setColor(matCode.getStr3()); // 鍔╄鐮� - locDetl.setBname(matCode.getStr4()); // 瀹㈡埛 + locDetl.setType(matCode.getStr5()); // 鍨嬪彿 + locDetl.setColor(matCode.getBarcode()); // 鏉$爜 + locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿 + locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿 + locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁� locDetl.setAltme(matCode.getStr1()); // 鍗曚綅 + locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О } 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.setType(wrkDetl.getType()); // 鍨嬪彿 + locDetl.setColor(wrkDetl.getColor()); // 鏉$爜 + locDetl.setSupplier(wrkDetl.getSupplier()); // 鎵瑰彿 + locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿 + locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁� locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅 + locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛鍚嶇О 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.setType(matCode.getStr5()); // 鍨嬪彿 + waitPakIn.setColor(matCode.getBarcode()); // 鏉$爜 + waitPakIn.setSupplier(matCode.getStr6()); // 鎵瑰彿 + waitPakIn.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿 + waitPakIn.setBrand(matCode.getStr3()); // 鍝侀」鏁� + waitPakIn.setAltme(matCode.getStr1()); // 鍗曚綅 + waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О + } + // excel ---------------------------------------------------------------------- public static MatCodeExcel getExcel(MatCode matCode) { -- Gitblit v1.9.1