From 7203d67cfa3a2fc1cab9b8985dfd35c1797207b1 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期一, 06 十二月 2021 18:36:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 590e82b..d7ca9f8 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;
/**
@@ -56,13 +55,13 @@
}
public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
- waitPakIn.setMatNo(matCode.getMatNo()); // 浜у搧缂栧彿
- waitPakIn.setMatName(matCode.getMatName()); // 浜у搧鎻忚堪
- waitPakIn.setSpecs(matCode.getSpecs()); // 瑙勬牸
- waitPakIn.setUnit(matCode.getUnit()); // 鍗曚綅
- waitPakIn.setSize(matCode.getSize()); // 灏哄
+ 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()); // 鍗曢噸
+ //waitPakIn.setWeight(matCode.getWeight()); // 鍗曢噸
}
// excel ----------------------------------------------------------------------
@@ -121,5 +120,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