From e025355e317d85114df55be503da3672de1bf535 Mon Sep 17 00:00:00 2001
From: Administrator <56479841@QQ.COM>
Date: 星期五, 02 六月 2023 17:42:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e2be8c9..b725378 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -156,22 +156,23 @@
// 鐩爣搴撲綅
LocMast locMast = null;
- if (!Cools.isEmpty(matNos)) {
- for (String matNo : matNos) {
- Mat mat = matService.selectByMatnr(matNo);
- if (matType == null) {
- matType = mat.getMatType();
- }
- if (matType != mat.getMatType()) {
- throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�");
- }
- }
-
- if (matNos.size() > 1 && matType == 1) {
- //鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱
- throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�");
- }
- }
+ //3鍙峰彲浠ュ叆搴撳墠蹇呴』鎵撳紑鎺у埗
+// if (!Cools.isEmpty(matNos)) {
+// for (String matNo : matNos) {
+// Mat mat = matService.selectByMatnr(matNo);
+// if (matType == null) {
+// matType = mat.getMatType();
+// }
+// if (matType != mat.getMatType()) {
+// throw new CoolException("娣锋斁鐗╂枡绫诲瀷涓嶄竴鑷�");
+// }
+// }
+//
+// if (matNos.size() > 1 && matType == 1) {
+// //鐗╂枡涓哄崟鍝佺被鍨嬶紝涓旂墿鏂欑绫昏秴杩�1(瀹為檯涓洪珮棰戞贩鏀�)锛屽垯绂佹鍏ュ簱
+// throw new CoolException("鐗╂枡绫诲瀷鍜屽疄闄呯绫讳笉涓�鑷�");
+// }
+// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
locMast = getLocNoStep1(staDescId, locTypeDto, start, end);
@@ -219,7 +220,14 @@
//鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
-
+ if(sourceStaNo==103 && mast.getRow1()>7)
+ {
+ continue;
+ }
+ if(sourceStaNo==203 && mast.getRow1()<8)
+ {
+ continue;
+ }
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoFinalStep(staDescId, sourceStaNo, mast);//杩斿洖dto
}
--
Gitblit v1.9.1