From fff999d37a7f9791dabeb9bb802dfe454a86397e Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 16 八月 2025 15:05:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ytflWms' into ytflWms
---
src/main/java/com/zy/common/service/CommonService.java | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 250bc28..df07cec 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -206,6 +206,9 @@
Config crnSearchDetectTaskCountConfig = configService.selectConfigByCode("crnSearchDetectTaskCount");
int crnSearchDetectTaskCount = Integer.parseInt(crnSearchDetectTaskCountConfig.getValue());
+ Config applyInTaskTotalCountConfig = configService.selectConfigByCode("applyInTaskTotalCount");
+ int applyInTaskTotalCount = Integer.parseInt(applyInTaskTotalCountConfig.getValue());
+
Config crnSearchListConfig = configService.selectConfigByCode("123CrnSearchList");
int crnSearchList = Integer.parseInt(crnSearchListConfig.getValue());
@@ -222,6 +225,14 @@
if(wrkMasts.size() > crnSearchDetectTaskCount){
log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒板叆搴撴帶鍒朵笂闄愶紒锛侊紒 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMasts.size(), crnSearchDetectTaskCount);
continue;
+ }
+
+ List<WrkMast> wrkMastsList = wrkMastService.selectList(new EntityWrapper<WrkMast>()
+ .eq("crn_no", crnNo)
+ .in("io_type", 1, 10, 53, 57, 101, 103, 107, 110)
+ );
+ if (wrkMastsList.size() > applyInTaskTotalCount) {
+ log.error(crnNo + "鍙峰爢鍨涙満宸茶揪鍒扮敵璇峰叆搴撴椂鎬讳换鍔℃暟閲忎笂闄�(鍏ュ簱銆佸嚭搴�)锛侊紒锛� 浠诲姟鏁伴噺锛� {}锛� 鎺у埗鏁伴噺锛歿}", wrkMastsList.size(), applyInTaskTotalCount);
}
rowCount = locNecessaryParameters[0];
@@ -244,9 +255,9 @@
//浼樺寲绯荤粺锛屾彁楂樻悳绱�1鍙峰爢鍨涙満娆℃暟
if (crnNo == 2 || crnNo == 3) {
if (crnSearchList >= 2) {
- //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
- crnNo = 1;
- if (basCrnpService.checkSiteError(crnNo, true)) {
+ if (basCrnpService.checkSiteError(1, true)) {
+ //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
+ crnNo = 1;
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>()
.eq("crn_no", crnNo)
.in("io_type", 1, 10, 53, 57)
@@ -579,24 +590,24 @@
- // 鑾峰彇鐩爣绔�
- wrapper = new EntityWrapper<StaDesc>()
- .eq("type_no", staDescId)
- .eq("stn_no", sourceStaNo)
- .eq("crn_no", locMast.getCrnNo());
- staDesc = staDescService.selectOne(wrapper);
- if (Cools.isEmpty(staDesc)) {
- log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+ // 鑾峰彇鐩爣绔�
+ wrapper = new EntityWrapper<StaDesc>()
+ .eq("type_no", staDescId)
+ .eq("stn_no", sourceStaNo)
+ .eq("crn_no", locMast.getCrnNo());
+ staDesc = staDescService.selectOne(wrapper);
+ if (Cools.isEmpty(staDesc)) {
+ log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
- crnNo = 0;
- } else {
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
- log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ crnNo = 0;
+ } else {
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ log.error("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- crnNo = 0;
- }
- startupDto.setStaNo(staNo.getDevNo());
+ crnNo = 0;
+ }
+ startupDto.setStaNo(staNo.getDevNo());
}
String locNo = locMast.getLocNo();
// 鐢熸垚宸ヤ綔鍙�
--
Gitblit v1.9.1