From 2d48eb3d32262cfbb21ec21debefa84d870fdff5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 11 四月 2026 12:34:12 +0800
Subject: [PATCH] #入库异常
---
src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java | 65 +++++++++++++++-----------------
1 files changed, 31 insertions(+), 34 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 32116ca..a2611a5 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;
@@ -27,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
@@ -53,32 +49,6 @@
* 淇濈暀褰撳墠鎸夌珯鐐� 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 {
@@ -131,10 +101,37 @@
if (context == null) {
return;
}
- if (!policy.matchCandidate(context)) {
+
+ StationProtocol stationProtocol = context.getStationProtocol();
+ if (stationProtocol == null) {
return;
}
- if (!policy.beforeApply(context)) {
+
+ 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;
}
@@ -227,8 +224,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