From 45333415b7634fc20b03b7e8ae3b7eee91101bda Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 07 十二月 2023 10:48:31 +0800
Subject: [PATCH] 增加筛选条件
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 6b46fa9..89530db 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,7 +15,7 @@
// wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// wrkDetl.setType(matCode.getStr5()); // 鎵规
// wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
// wrkDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
// wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
@@ -30,7 +30,7 @@
// wrkDetl.setBatch(locDetl.getBatch());
// wrkDetl.setOrderNo(locDetl.getOrderNo());
// wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
-// wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
+// wrkDetl.setType(locDetl.getType()); // 鎵规
// wrkDetl.setColor(locDetl.getColor()); // 鏉＄爜
// wrkDetl.setSupplier(locDetl.getSupplier()); // 搴忓垪鐮�
// wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
@@ -44,7 +44,7 @@
// locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// locDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// locDetl.setType(matCode.getStr5()); // 鎵规
// locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
// locDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
// locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
@@ -59,7 +59,7 @@
// locDetl.setBatch(wrkDetl.getBatch());
// locDetl.setOrderNo(wrkDetl.getOrderNo());
// locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
-// locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
+// locDetl.setType(wrkDetl.getType()); // 鎵规
// locDetl.setColor(wrkDetl.getColor()); // 鏉＄爜
// locDetl.setSupplier(wrkDetl.getSupplier()); // 搴忓垪鐮�
// locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
@@ -73,7 +73,7 @@
// waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
-// waitPakIn.setType(matCode.getStr5()); // 鍨嬪彿
+// waitPakIn.setType(matCode.getStr5()); // 鎵规
// waitPakIn.setColor(matCode.getBarcode()); // 鏉＄爜
// waitPakIn.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
// waitPakIn.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
@@ -95,7 +95,7 @@
// waitPakIn.setBatch(orderDetl.getBatch());
// waitPakIn.setOrderNo(orderDetl.getOrderNo());
// waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-// waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
+// waitPakIn.setType(orderDetl.getModel()); // 鎵规
// waitPakIn.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
// waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
@@ -106,21 +106,21 @@
// wrkDetl.setBatch(orderDetl.getBatch());
// wrkDetl.setOrderNo(orderDetl.getOrderNo());
// wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-// wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
+// wrkDetl.setType(orderDetl.getModel()); // 鎵规
// wrkDetl.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
// wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
/**
- * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+ * 搴撲綅绫诲瀷妫�娴�
**/
- public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto){
- // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
-// if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
-// return false;
-// }
- return true;
+ public static boolean checkLocType(LocMast loc, LocTypeDto dto){
+ //搴撲綅绫诲瀷蹇呴』鍜屼紶鍏ョ殑搴撲綅淇″彿涓�鑷�
+ if (loc.getLocType1().equals(dto.getLocType1())) {
+ return true;
+ }
+ return false;
}
}
--
Gitblit v1.9.1