From 55736d42a13eb46a21f20ea7f5a76daa88e7ecab Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 九月 2024 16:26:14 +0800
Subject: [PATCH] 305入库优先1号巷道
---
src/main/java/com/zy/common/service/CommonService.java | 11 +++++++++++
1 files changed, 11 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 db1d8a1..455f66a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -22,6 +22,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 璐ф灦鏍稿績鍔熻兘
@@ -240,6 +241,16 @@
return null;
}
+ // 濡傛灉鏄�305鍏ュ簱锛屽湪涓�鍙峰爢鍨涙満绌洪棽鐨勬椂鍊欏簲鍏堝叆涓�鍙峰贩閬擄紝纭繚鍑哄簱鏁堢巼
+ if (sourceStaNo == 305) {
+ // 1鍙峰贩閬撳彲鐢ㄥ簱浣�
+ List<LocMast> collect = locMasts.stream().filter(locMast1 -> locMast1.getCrnNo().equals(1)).collect(Collectors.toList());
+ BasCrnp crnp = basCrnpService.selectById(1);
+ if (crnp.getCrnSts() == 3 && collect.size()>2) {
+ locMasts = collect;
+ }
+ }
+
// 鍏堝潎鍖�鏀炬繁搴�
for (LocMast mast : locMasts) {
List<String> groupLoc = Utils.getGroupLocNo(mast.getLocNo(), true);
--
Gitblit v1.9.1