From b7e08df5a07b3fa832a46ecc31983e16f2bccc8c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 24 七月 2023 14:56:01 +0800
Subject: [PATCH] # 出库作业，和库存明细管理 排序
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 107 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 33 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..636fed1 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,9 +1,8 @@
package com.zy.asrs.utils;
-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.core.exception.CoolException;
+import com.zy.asrs.entity.*;
+import com.zy.common.model.LocTypeDto;
import com.zy.common.utils.excel.matcode.MatCodeExcel;
/**
@@ -14,51 +13,57 @@
// 涓氬姟 ----------------------------------------------------------------------
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()); // 鎵樼洏鏉＄爜
+ 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.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()); // 鎵樼洏鏉＄爜
+ locDetl.setSupplier(wrkDetl.getSupplier());
}
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.setLgnum(matCode.getSpecs()); // 瑙勬牸
+ waitPakIn.setAltme(matCode.getUnit()); // 鍗曚綅
+ waitPakIn.setType(matCode.getSize()); // 灏哄
+ waitPakIn.setColor(matCode.getColor()); // 棰滆壊
+ //waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
}
// excel ----------------------------------------------------------------------
@@ -117,5 +122,41 @@
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