From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 23 十二月 2023 19:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 229 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 113 insertions(+), 116 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..89530db 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,129 +1,126 @@
package com.zy.asrs.utils;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WrkDetl;
-import com.zy.common.utils.excel.matcode.MatCodeExcel;
+import com.zy.asrs.entity.LocMast;
+import com.zy.common.model.LocTypeDto;
/**
* Created by vincent on 2020/7/14
*/
public class VersionUtils {
+
// 涓氬姟 ----------------------------------------------------------------------
- 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()); // 瀹㈡埛
+// public static void setWrkDetl(WrkDetl wrkDetl, Mat mat) {
+// wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+// wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+// 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()); // 瀹㈡埛鍚嶇О
+// }
+//
+// public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
+// wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
+// wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪w
+// wrkDetl.setBatch(locDetl.getBatch());
+// wrkDetl.setOrderNo(locDetl.getOrderNo());
+// wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
+// 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()); // 鎵樼洏鏉＄爜
+// }
+//
+// public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
+// locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+// locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
+// 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.setBatch(wrkDetl.getBatch());
+// locDetl.setOrderNo(wrkDetl.getOrderNo());
+// locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
+// 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()); // 瀹㈡埛鍚嶇О
+// }
+//
+// public static void setOrderDetl(OrderDetl orderDetl, MatCode matCode) {
+// orderDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
+// orderDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+// orderDetl.setSpecs(matCode.getStr2()); // 瑙勬牸
+// orderDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
+// }
+//
+// public static void setWaitPakIn(WaitPakin waitPakIn, OrderDetl orderDetl) {
+// waitPakIn.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
+// waitPakIn.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
+// waitPakIn.setBatch(orderDetl.getBatch());
+// waitPakIn.setOrderNo(orderDetl.getOrderNo());
+// waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
+// waitPakIn.setType(orderDetl.getModel()); // 鎵规
+// waitPakIn.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
+// waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
+// }
+//
+// public static void setWrkDetl(WrkDetl wrkDetl, OrderDetl orderDetl) {
+// wrkDetl.setMatnr(orderDetl.getMatnr()); // 鐗╂枡缂栧彿
+// wrkDetl.setMaktx(orderDetl.getMaktx()); // 鐗╂枡鎻忚堪
+// wrkDetl.setBatch(orderDetl.getBatch());
+// wrkDetl.setOrderNo(orderDetl.getOrderNo());
+// wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
+// wrkDetl.setType(orderDetl.getModel()); // 鎵规
+// wrkDetl.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
+// wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
+// }
+
+
+ /**
+ * 搴撲綅绫诲瀷妫�娴�
+ **/
+ public static boolean checkLocType(LocMast loc, LocTypeDto dto){
+ //搴撲綅绫诲瀷蹇呴』鍜屼紶鍏ョ殑搴撲綅淇″彿涓�鑷�
+ if (loc.getLocType1().equals(dto.getLocType1())) {
+ return true;
+ }
+ return false;
}
-
- 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.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()); // 鍗曚綅
- }
-
- 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.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
- }
-
- // excel ----------------------------------------------------------------------
-
- public static MatCodeExcel getExcel(MatCode matCode) {
- return new MatCodeExcel(
- matCode.getMatNo(),
- matCode.getBarcode(),
- matCode.getMatName(),
- matCode.getStr1(),
- matCode.getStr2(),
- matCode.getStr3(),
- matCode.getStr4(),
- matCode.getStr5(),
- matCode.getStr6(),
- matCode.getStr7(),
- 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()
- );
- }
-
- public static void setMatCode(MatCode matCode, MatCodeExcel excel) {
- matCode.setMatNo(excel.getMatNo());
- matCode.setMatName(excel.getMatName());
- matCode.setBarcode(excel.getBarcode());
- matCode.setStr1(excel.getStr1());
- matCode.setStr2(excel.getStr2());
- matCode.setStr3(excel.getStr3());
- matCode.setStr4(excel.getStr4());
- matCode.setStr5(excel.getStr5());
- matCode.setStr6(excel.getStr6());
- matCode.setStr7(excel.getStr7());
- 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