From 641bf75f1b6684ee5b6d13497ad1106b82c59043 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 23:13:59 +0800
Subject: [PATCH] #入库同步串行请求
---
src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java | 60 ++++++++++++++++++++++++++++++++++++------------------------
1 files changed, 36 insertions(+), 24 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 972621c..4405611 100644
--- a/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
+++ b/src/main/java/com/zy/core/plugin/store/StoreInTaskGenerationService.java
@@ -111,21 +111,10 @@
policy.onRequestPermitGranted(context);
InTaskApplyRequest request = policy.buildApplyRequest(context);
- AsyncInTaskResult result = wmsOperateUtils.queryAsyncInTaskResponse(request);
- if (result != null) {
- handleApplyResult(policy, context, request, result);
- continue;
- }
-
- if (wmsOperateUtils.isAsyncRequestInProgress(request)) {
- continue;
- }
-
- News.info("鍙戣捣寮傛WMS鍏ュ簱璇锋眰锛宐arcode={}锛宻tationId={}", request.getBarcode(),
+ News.info("鍙戣捣鍚屾WMS鍏ュ簱璇锋眰锛宐arcode={}锛宻tationId={}", request.getBarcode(),
request.getSourceStaNo());
- wmsOperateUtils.applyInTaskAsync(request);
- redisUtil.set(generateLockKey, "lock", policy.getSubmitLockSeconds(context));
-// policy.onApplySubmitted(context);
+ InTaskApplyResult result = applySyncInTask(request);
+ handleApplyResult(policy, context, request, result);
}
}
} catch (Exception e) {
@@ -134,17 +123,15 @@
}
private void handleApplyResult(StoreInTaskPolicy policy, StoreInTaskContext context, InTaskApplyRequest request,
- AsyncInTaskResult result) {
+ InTaskApplyResult result) {
if (result.isSuccess()) {
handleApplySuccess(policy, context, request, result);
return;
}
if (result.isRetryableFailure()) {
- News.error("WMS鍏ュ簱璇锋眰澶辫触锛岄噸鏂板彂璧疯姹傦紝barcode={}锛宻tationId={}锛宺esponse={}",
+ News.error("WMS鍏ュ簱璇锋眰澶辫触锛宐arcode={}锛宻tationId={}锛宺esponse={}",
request.getBarcode(), request.getSourceStaNo(), policy.buildFailureMessage(result));
- wmsOperateUtils.clearAsyncInTaskResponse(request);
- wmsOperateUtils.applyInTaskAsync(request);
redisUtil.set(policy.getGenerateLockKey(context), "lock", policy.getRetryLockSeconds(context));
policy.onApplyFailed(context, result);
return;
@@ -154,12 +141,12 @@
}
private void handleApplySuccess(StoreInTaskPolicy policy, StoreInTaskContext context, InTaskApplyRequest request,
- AsyncInTaskResult result) {
+ InTaskApplyResult result) {
try {
JSONObject jsonObject = JSON.parseObject(result.getResponse());
if (jsonObject == null || !Integer.valueOf(200).equals(jsonObject.getInteger("code"))) {
- AsyncInTaskResult failResult = new AsyncInTaskResult();
- failResult.setStatus(AsyncInTaskStatus.RETRYABLE_FAIL);
+ InTaskApplyResult failResult = new InTaskApplyResult();
+ failResult.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
failResult.setResponse(result.getResponse());
failResult.setMessage("WMS杩斿洖闈�200");
handleApplyResult(policy, context, request, failResult);
@@ -168,8 +155,8 @@
StartupDto dto = jsonObject.getObject("data", StartupDto.class);
if (dto == null) {
- AsyncInTaskResult failResult = new AsyncInTaskResult();
- failResult.setStatus(AsyncInTaskStatus.RETRYABLE_FAIL);
+ InTaskApplyResult failResult = new InTaskApplyResult();
+ failResult.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
failResult.setResponse(result.getResponse());
failResult.setMessage("WMS杩斿洖data涓虹┖");
handleApplyResult(policy, context, request, failResult);
@@ -180,11 +167,36 @@
WrkMast wrkMast = commonService.createInTask(taskParam);
policy.afterTaskCreated(context, wrkMast);
context.getStationProtocol().setSystemWarning("");
- wmsOperateUtils.clearAsyncInTaskResponse(request);
} catch (Exception e) {
News.error("澶勭悊WMS鍏ュ簱鎴愬姛鍝嶅簲澶辫触锛宐arcode={}锛宻tationId={}", request.getBarcode(),
request.getSourceStaNo(), e);
}
}
+ private InTaskApplyResult applySyncInTask(InTaskApplyRequest request) {
+ InTaskApplyResult result = new InTaskApplyResult();
+ result.setBizKey(request.getBizKey());
+
+ String response = wmsOperateUtils.applyInTask(request);
+ result.setResponse(response);
+ if (Cools.isEmpty(response)) {
+ result.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
+ result.setMessage("FAILED");
+ return result;
+ }
+
+ try {
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject != null && Integer.valueOf(200).equals(jsonObject.getInteger("code"))) {
+ result.setStatus(InTaskApplyStatus.SUCCESS);
+ return result;
+ }
+ } catch (Exception ignored) {
+ }
+
+ result.setStatus(InTaskApplyStatus.RETRYABLE_FAIL);
+ result.setMessage(response);
+ return result;
+ }
+
}
--
Gitblit v1.9.1