From c382cb4559cf2606883e30efbbdf4bbce0465cf6 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 16 六月 2023 16:59:20 +0800
Subject: [PATCH] # 组托前先查询托盘码是否存在提示
---
src/main/java/com/zy/common/service/CommonService.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 964c038..0f3f7ec 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -140,7 +140,7 @@
end = 21;
//203绔欏垎閰�2锛�3鍫嗗灈鏈�
- crnNos.add(2);
+// crnNos.add(2);
crnNos.add(3);
//鍒嗛厤8锛�14锛�15锛�21鎺�
@@ -193,6 +193,13 @@
if (locMast != null) {
//鎵惧埌搴撲綅锛岃繑鍥瀌to
sign=true;
+ } else {
+ //鍗曞搧娌℃湁鎵惧埌搴撲綅锛屾壘楂橀娣锋斁鍖哄煙搴撲綅
+ locMast = getLocNoStep3(locTypeDto, crnNos);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ sign=true;
+ }
}
} else if (matType == 2) {//楂橀绫诲瀷鍏ユ渶澶栦晶搴撲綅
locMast = getLocNoStep3(locTypeDto, crnNos);
@@ -217,7 +224,7 @@
if (!sign){
//----------------2023.06.02鍏煎浠ｇ爜锛屽悗鏈熷簱浣嶈鍒欑鍚堣姹傚悗鍙垹闄�------------------------
- //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储1銆�2鍫嗗灈鏈虹┖搴撲綅杩涜鍏ュ簱锛屼繚闅�3鍙峰爢鍨涙満搴撲綅閮芥槸绗﹀悎瑕佹眰鐨�
+ //濡傛灉浠ヤ笂閮芥壘涓嶅埌搴撲綅锛屽垯寮哄埗鎼滅储2鍫嗗灈鏈虹┖搴撲綅杩涜鍏ュ簱锛屼繚闅�3鍙峰爢鍨涙満搴撲綅閮芥槸绗﹀悎瑕佹眰鐨�
EntityWrapper<LocMast> wrapper = new EntityWrapper<>();
wrapper.eq("loc_type1", locTypeDto.getLocType1());
wrapper.in("crn_no", "2");
@@ -229,14 +236,9 @@
//鍐呬晶鍏朵粬搴撲綅涓嶆槸D銆丗銆乆銆備笉鑳介�夊彇璇ュ簱浣�
continue;
}
- if(sourceStaNo==103 && mast.getRow1()>7)
- {
- continue;
- }
- if(sourceStaNo==203 && mast.getRow1()<8)
- {
- continue;
- }
+ if(sourceStaNo==103 && mast.getRow1()>14) continue;
+ if(sourceStaNo==103 && mast.getRow1()<8) continue;
+ if(sourceStaNo==203 && mast.getRow1()<15) continue;
//鎵惧埌搴撲綅锛岃繑鍥瀌to
locMast=mast;
sign = true;
@@ -330,7 +332,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) {
locMast = locMast0;
break;
}
@@ -357,7 +359,7 @@
// 娴呭簱浣嶅搴斿爢鍨涙満蹇呴』鍙敤涓旀棤寮傚父
if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
// 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
- if (locMastService.checkEmptyCount(locMast0, 10)) {
+ if (locMastService.checkEmptyCount(locMast0, 10) && locMast0.getCrnNo()>=3) {
locMast = locMast0;
break;
}
--
Gitblit v1.9.1