From d25daa625c821b214a83609361fdd42f58f521ab Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 11 十月 2025 11:56:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index cc7b2d0..06acf8f 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -197,14 +197,14 @@
continue;
}
- if (inSta.getStaNo() == 1005) {
+ if (inSta.getStaNo() == 1002 || inSta.getStaNo() == 1007) {
//妫�娴嬫槸鍚︽湁鍑哄簱浠诲姟
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.in("io_type", 101, 103, 107)
- .in("sta_no", 1003, 1007)
+ .in("sta_no", 1003, 1004)
);
if (!wrkMasts.isEmpty()) {
- News.error("" + mark + " - 4" + " - 1003绔欏叆搴擄紝妫�娴嬪瓨鍦ㄥ嚭搴撲换鍔★紝绛夊緟鍑哄簱浠诲姟鎵ц瀹屾垚,鎵樼洏鐮�={}", barcode);
+ News.error("" + mark + " - 4" + " - 鍏ュ簱锛屾娴嬪瓨鍦ㄥ嚭搴撲换鍔★紝绛夊緟鍑哄簱浠诲姟鎵ц瀹屾垚,鎵樼洏鐮�={}", barcode);
continue;
}
}
@@ -1181,11 +1181,11 @@
staProtocol = staProtocol.clone();
}
- if (wrkMast.getStaNo() == 1003 || wrkMast.getStaNo() == 1007) {
+ if (wrkMast.getStaNo() == 1003 || wrkMast.getStaNo() == 1007 || wrkMast.getStaNo() == 1004) {
//妫�娴嬫槸鍚︽湁鍏ュ簱浠诲姟
List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.in("io_type", 1, 53, 57)
- .in("source_sta_no", 1005)
+ .in("source_sta_no", 1002, 1007)
);
if (!inWrkMasts.isEmpty()) {
News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦ㄥ叆搴撲换鍔★紝绛夊緟鍏ュ簱浠诲姟鎵ц瀹屾垚鍐嶅嚭搴擄紝宸ヤ綔鍙�={}" + wrkMast.getWrkNo());
@@ -2037,6 +2037,16 @@
continue;
}
+ //妫�娴嬫槸鍚︽湁鍏ュ簱浠诲姟
+ List<WrkMast> inWrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .in("io_type", 1, 53, 57)
+ .in("source_sta_no", 1002, 1007)
+ );
+ if (!inWrkMasts.isEmpty()) {
+ News.error("" + mark + " - 2" + " - 妫�娴嬪瓨鍦ㄥ叆搴撲换鍔★紝绛夊緟鍏ュ簱浠诲姟鎵ц瀹屾垚鍐嶅叆绌烘墭锛屽伐浣滃彿={}");
+ continue;
+ }
+
int workNo = commonService.getWorkNo(3);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast1 = new WrkMast();
--
Gitblit v1.9.1