From d16c9af7bb89a7e3abb4071003c63b3a6f6b9e4b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 四月 2026 14:45:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java b/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
index f8ef8b9..9daff00 100644
--- a/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
+++ b/src/main/java/com/zy/core/utils/station/StationRegularDispatchProcessor.java
@@ -4,13 +4,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.zy.asrs.domain.enums.NotifyMsgType;
+import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.BasStation;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.BasStationService;
-import com.zy.asrs.service.WrkAnalysisService;
-import com.zy.asrs.service.WrkMastService;
+import com.zy.asrs.service.*;
import com.zy.asrs.utils.NotifyUtils;
import com.zy.common.entity.FindCrnNoResult;
import com.zy.common.service.CommonService;
@@ -64,6 +62,8 @@
private StationCommandDispatcher stationCommandDispatcher;
@Autowired
private StationDispatchLoadSupport stationDispatchLoadSupport;
+ @Autowired
+ private BasCrnpService basCrnpService;
public void stationOutExecuteFinish(StationObjModel stationObjModel) {
try {
@@ -271,6 +271,25 @@
return;
}
+ Integer crnNo = wrkMast.getCrnNo();
+ BasCrnp basCrnp = basCrnpService.getOne(new QueryWrapper<BasCrnp>().eq("crn_no", crnNo));
+ if (basCrnp == null) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鏈壘鍒板爢鍨涙満鏁版嵁", wrkMast.getWrkNo());
+ return;
+ }
+
+ int maxInTask = 3;
+ if (basCrnp.getMaxInTask() != null) {
+ maxInTask = basCrnp.getMaxInTask();
+ }
+
+ long count = wrkMastService.count(new QueryWrapper<WrkMast>().eq("crn_no", crnNo).eq("wrk_sts", WrkStsType.INBOUND_STATION_RUN.sts));
+ if(count >= maxInTask) {
+ News.taskInfo(wrkMast.getWrkNo(), "{}宸ヤ綔,鍫嗗灈鏈哄埌杈句换鍔′笂闄愶紝绋嶅悗鎵ц", wrkMast.getWrkNo());
+ stationProtocol.setSystemWarning(wrkMast.getWrkNo() + "宸ヤ綔," + crnNo + "鍙峰爢鍨涙満鍒拌揪浠诲姟涓婇檺锛岀◢鍚庢墽琛�");
+ return;
+ }
+
String locNo = wrkMast.getLocNo();
FindCrnNoResult findCrnNoResult = commonService.findCrnNoByLocNo(locNo);
if (findCrnNoResult == null) {
--
Gitblit v1.9.1