From 3e9bbfb50046812a31e20f27498f8936565c326a Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 12 十一月 2020 16:59:16 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/VersionUtils.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java index 5f8abc6..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; @@ -18,6 +19,7 @@ wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸 wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮� wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅 + wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛 } public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) { @@ -25,6 +27,7 @@ wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪 wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸 wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮� + wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛 wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅 wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜 } @@ -34,6 +37,7 @@ locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪 locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸 locDetl.setColor(matCode.getStr3()); // 鍔╄鐮� + locDetl.setBname(matCode.getStr4()); // 瀹㈡埛 locDetl.setAltme(matCode.getStr1()); // 鍗曚綅 } @@ -42,11 +46,21 @@ 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 ---------------------------------------------------------------------- public static MatCodeExcel getExcel(MatCode matCode) { -- Gitblit v1.9.1