From b91211bcb11e4bbe2e827de0510d90d65c25e965 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 11 二月 2022 09:15:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 167 ++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 139 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 21a5ed9..636fed1 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,51 +1,162 @@
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.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.common.model.LocTypeDto;
+import com.zy.common.utils.excel.matcode.MatCodeExcel;
/**
* 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.setZmatid(matCode.getStr3()); // 棰滆壊
- wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- wrkDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
+ 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.setZmatid(locDetl.getZmatid()); // 棰滆壊
- wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
- wrkDetl.setBname(locDetl.getBname()); // 鐢ㄦ埛ID
+ 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()); // 鎵樼洏鏉＄爜
+ wrkDetl.setSupplier(locDetl.getSupplier());
}
public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
- locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
- locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- locDetl.setZmatid(matCode.getStr3()); // 棰滆壊
- locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- locDetl.setBname(matCode.getStr4()); // 鐢ㄦ埛ID
+ 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.setZmatid(wrkDetl.getZmatid()); // 棰滆壊
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
- locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
- locDetl.setBname(wrkDetl.getBname()); // 鐢ㄦ埛ID
+ 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()); // 鎵樼洏鏉＄爜
+ locDetl.setSupplier(wrkDetl.getSupplier());
+ }
+
+ public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
+ waitPakIn.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+ waitPakIn.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
+ waitPakIn.setLgnum(matCode.getSpecs()); // 瑙勬牸
+ waitPakIn.setAltme(matCode.getUnit()); // 鍗曚綅
+ waitPakIn.setType(matCode.getSize()); // 灏哄
+ waitPakIn.setColor(matCode.getColor()); // 棰滆壊
+ //waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
+ }
+
+ // excel ----------------------------------------------------------------------
+
+ public static MatCodeExcel getExcel(MatCode matCode) {
+ return new MatCodeExcel(
+ matCode.getMatNo(),
+ matCode.getBarcode(),
+ matCode.getMatName(),
+ matCode.getSpecs(),
+ matCode.getUnit(),
+ matCode.getSize(),
+ matCode.getColor(),
+ matCode.getWeight(),
+ matCode.getStr1(),
+ matCode.getStr2(),
+ matCode.getStr3(),
+ matCode.getStr4(),
+ matCode.getStr5(),
+ matCode.getStr6(),
+ matCode.getStr7(),
+ matCode.getStr8(),
+ matCode.getStr9(),
+ matCode.getStr10(),
+ matCode.getNum1(),
+ matCode.getNum2(),
+ matCode.getNum3(),
+ matCode.getNum4(),
+ matCode.getNum5()
+ );
+ }
+
+ public static void setMatCode(MatCode matCode, MatCodeExcel excel) {
+ matCode.setMatNo(excel.getMatNo());
+ matCode.setMatName(excel.getMatName());
+ matCode.setBarcode(excel.getBarcode());
+ matCode.setSpecs(excel.getSpecs());
+ matCode.setUnit(excel.getUnit());
+ matCode.setSize(excel.getSize());
+ matCode.setColor(excel.getColor());
+ matCode.setWeight(excel.getWeight());
+ 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.setNum1(excel.getNum1());
+ matCode.setNum2(excel.getNum2());
+ matCode.setNum3(excel.getNum3());
+ matCode.setNum4(excel.getNum4());
+ matCode.setNum5(excel.getNum5());
+ }
+
+ /**
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ **/
+ public static void locMoveCheckLocType(LocMast sourceLoc, LocMast loc){
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ if (sourceLoc.getLocType1() == 2 && loc.getLocType1() == 1) {
+ throw new CoolException("楂樺簱浣嶄笉鑳界Щ杞嚦浣庡簱浣�");
+ }
+// // 濡傛灉婧愬簱浣嶆槸瀹藉簱浣嶏紝鐩爣搴撲綅鏄獎搴撲綅
+// if (sourceLoc.getLocType2() == 2 && loc.getLocType2() == 1) {
+// throw new CoolException("瀹藉簱浣嶄笉鑳界Щ杞嚦绐勫簱浣�");
+// }
+// // 濡傛灉婧愬簱浣嶆槸閲嶅簱浣嶏紝鐩爣搴撲綅鏄交搴撲綅
+// if (sourceLoc.getLocType3() == 2 && loc.getLocType3() == 1) {
+// throw new CoolException("閲嶅簱浣嶄笉鑳界Щ杞嚦杞诲簱浣�");
+// }
+ }
+
+ /**
+ * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ **/
+ public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
+ // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+ if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+ return false;
+ }
+// // 濡傛灉婧愬簱浣嶆槸瀹藉簱浣嶏紝鐩爣搴撲綅鏄獎搴撲綅
+// if (dto.getLocType2() == 2 && loc.getLocType2() == 1) {
+// return false;
+// }
+// // 濡傛灉婧愬簱浣嶆槸閲嶅簱浣嶏紝鐩爣搴撲綅鏄交搴撲綅
+// if (dto.getLocType3() == 2 && loc.getLocType3() == 1) {
+// return false;
+// }
+ return true;
}
}
--
Gitblit v1.9.1