From 6a71dd91fc77040eab3ffc37a52f039e293f2a73 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 12 四月 2026 18:41:56 +0800
Subject: [PATCH] #条码站申请入库增加入库模式判断
---
src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java | 116 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 42 deletions(-)
diff --git a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
index babec54..2bc21da 100644
--- a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
+++ b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
@@ -7,7 +7,6 @@
import com.zy.asrs.domain.param.CreateInTaskParam;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
-import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -18,6 +17,8 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.StationObjModel;
import com.zy.core.model.protocol.StationProtocol;
+import com.zy.core.task.MainProcessLane;
+import com.zy.core.task.MainProcessTaskSubmitter;
import com.zy.core.thread.StationThread;
import com.zy.core.utils.StationOperateProcessUtils;
import com.zy.core.utils.WmsOperateUtils;
@@ -25,15 +26,12 @@
import org.springframework.stereotype.Service;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@Service
public class StoreInTaskGenerationService {
private static final int APPLY_IN_TASK_TIMEOUT_SECONDS = 5;
- @Autowired
- private BasDevpService basDevpService;
@Autowired
private WrkMastService wrkMastService;
@Autowired
@@ -44,37 +42,13 @@
private WmsOperateUtils wmsOperateUtils;
@Autowired
private CommonService commonService;
+ @Autowired
+ private MainProcessTaskSubmitter mainProcessTaskSubmitter;
/**
* 淇濈暀褰撳墠鎸夌珯鐐� lane 骞跺彂鐨勮兘鍔涳紝鍚屾椂鐢ㄤ竴涓畝鍗曡鏁伴伩鍏嶅苟鍙戠敓鎴愭妸绔欑偣浠诲姟鏁伴《绌夸笂闄愩��
*/
private int inFlightGenerateCount = 0;
-
- public void generate(StoreInTaskPolicy policy) {
- try {
- if (!policy.isEnabled()) {
- return;
- }
-
- HashMap<String, String> systemConfigMap = getSystemConfigMap();
- if (systemConfigMap == null) {
- return;
- }
- if (!hasAvailableStationTaskCapacity(systemConfigMap)) {
- return;
- }
-
- List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
- for (BasDevp basDevp : basDevps) {
- List<StationObjModel> barcodeStations = policy.getBarcodeStations(basDevp);
- for (StationObjModel stationObjModel : barcodeStations) {
- generateByStation(policy, basDevp, stationObjModel, systemConfigMap);
- }
- }
- } catch (Exception e) {
- News.error("鐢熸垚鍏ュ簱浠诲姟寮傚父锛宲olicy={}", policy.getPolicyName(), e);
- }
- }
public void generate(StoreInTaskPolicy policy, BasDevp basDevp, StationObjModel stationObjModel) {
try {
@@ -97,20 +71,82 @@
}
}
+ public void submitGenerateStoreTask(StoreInTaskPolicy policy,
+ BasDevp basDevp,
+ StationObjModel stationObjModel,
+ long minIntervalMs,
+ Runnable task) {
+ submitGenerateStoreTask(policy, basDevp, stationObjModel, MainProcessLane.GENERATE_STORE, minIntervalMs, task);
+ }
+
+ public void submitGenerateStoreTask(StoreInTaskPolicy policy,
+ BasDevp basDevp,
+ StationObjModel stationObjModel,
+ MainProcessLane lane,
+ long minIntervalMs,
+ Runnable task) {
+ Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
+ mainProcessTaskSubmitter.submitKeyedSerialTask(
+ lane,
+ stationId,
+ "generateStoreWrkFile",
+ minIntervalMs,
+ task
+ );
+ }
+
private void generateByStation(StoreInTaskPolicy policy, BasDevp basDevp, StationObjModel stationObjModel,
HashMap<String, String> systemConfigMap) {
StoreInTaskContext context = buildContext(basDevp, stationObjModel);
if (context == null) {
return;
}
- if (!policy.matchCandidate(context)) {
- return;
- }
- if (!policy.beforeApply(context)) {
+
+ StationProtocol stationProtocol = context.getStationProtocol();
+ if (stationProtocol == null) {
return;
}
- if (hasCreatedTask(context.getStationProtocol().getBarcode())) {
+ if (!stationProtocol.isAutoing()) {
+ return;
+ }
+
+ if (!stationProtocol.isLoading()) {
+ return;
+ }
+
+ if (!stationProtocol.isInEnable()) {
+ return;
+ }
+
+ if (stationProtocol.getTaskNo() == 0) {
+ return;
+ }
+
+ if (Cools.isEmpty(stationProtocol.getBarcode())) {
+ return;
+ }
+
+ if (stationProtocol.getError() > 0) {
+ return;
+ }
+
+ if (stationProtocol.isInBarcodeError()) {
+ return;
+ }
+
+ if (!stationProtocol.getIoMode().equals(1)) {
+ policy.setSystemWarning(context, "褰撳墠绔欑偣涓嶅浜庡叆搴撴ā寮�");
+ return;
+ }
+
+ String barcode = context.getStationProtocol().getBarcode();
+ long count = wrkMastService.count(new QueryWrapper<WrkMast>().eq("barcode", barcode));
+ if (count > 0) {
+ Object tipsLimit = redisUtil.get(RedisKeyType.GENERATE_IN_TASK_SUCCESS_REPEAT_WARNING_TIPS_LIMIT.key + barcode);
+ if (tipsLimit == null) {
+ policy.setSystemWarning(context, "绯荤粺浠诲姟宸插瓨鍦�");
+ }
return;
}
@@ -159,11 +195,6 @@
return new StoreInTaskContext(basDevp, stationThread, stationObjModel, stationProtocol);
}
- private boolean hasCreatedTask(String barcode) {
- List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>().eq("barcode", barcode));
- return !wrkMasts.isEmpty();
- }
-
private void handleSyncApplyResponse(StoreInTaskPolicy policy, StoreInTaskContext context, InTaskApplyRequest request,
String response) {
if (Cools.isEmpty(response)) {
@@ -188,6 +219,7 @@
WrkMast wrkMast = commonService.createInTask(taskParam);
policy.afterTaskCreated(context, wrkMast);
policy.clearSystemWarning(context);
+ redisUtil.set(RedisKeyType.GENERATE_IN_TASK_SUCCESS_REPEAT_WARNING_TIPS_LIMIT.key + wrkMast.getBarcode(), "lock", 30);
} catch (Exception e) {
News.error("澶勭悊WMS鍏ュ簱鍝嶅簲寮傚父锛宐arcode={}锛宻tationId={}", request.getBarcode(),
request.getSourceStaNo(), e);
@@ -202,8 +234,8 @@
result.setResponse(response);
result.setMessage(message);
- News.error("WMS鍏ュ簱璇锋眰澶辫触锛宐arcode={}锛宻tationId={}锛宺esponse={}",
- request.getBarcode(), request.getSourceStaNo(), policy.buildFailureMessage(result));
+ News.error("WMS鍏ュ簱璇锋眰澶辫触锛宐arcode={}锛宻tationId={}锛宺esponse={}锛學CS鍝嶅簲={}",
+ request.getBarcode(), request.getSourceStaNo(), result.getResponse(), result.getMessage());
redisUtil.set(policy.getGenerateLockKey(context), "lock", policy.getRetryLockSeconds(context));
policy.onApplyFailed(context, result);
}
--
Gitblit v1.9.1