From 96fc6c344e23e0180881b87aa2291a2fc19e4ab8 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期五, 14 四月 2023 12:55:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 296bbbd..aaba5de 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -453,6 +453,23 @@
}
}
+ //2023-4-13 ADD锛� 鎵惧埌鐨勫簱浣嶃�佷互鍙婂叾娴呭簱浣嶏紝濡傛灉鍦ㄥ伐浣滄。鏈夌Щ搴撲换鍔★紝鍒欒烦杩�
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("io_type", 11));
+ for (WrkMast wrkMast : wrkMasts){
+ if (wrkMast.getSourceLocNo().equals(locMast.getLocNo())){
+ locMast = null;
+ break;
+ }
+ List<String> outerLocList = Utils.getGroupOuterLoc(locMast.getLocNo());
+ for (String outerLocNo : outerLocList) {
+ if (locMast.getLocNo().equals(outerLocNo)){
+ locMast = null;
+ break;
+ }
+ }
+ }
+
// 3.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
if (Cools.isEmpty(locMast)) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
--
Gitblit v1.9.1