From a8a10ec2a3fe7d8db166413a92a34926fb178533 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期三, 29 四月 2026 19:59:17 +0800
Subject: [PATCH] 重发机制兼容
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 78 ++++++++++++++++++++++++++++++++++----
1 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 20dfcd1..8b6c53f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -55,6 +55,8 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -211,6 +213,7 @@
throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
}
});
+ syncAsnOrderItemBarcodeByPakin(waitPakinItems, pakin.getBarcode(), loginUserId);
});
if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
@@ -301,6 +304,7 @@
throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
}
});
+ syncAsnOrderItemBarcodeByPakin(waitPakinItems, pakin.getBarcode(), loginUserId);
});
if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
@@ -453,6 +457,7 @@
throw new CoolException("缁勬墭鏄庣粏淇墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
}
});
+ syncAsnOrderItemBarcodeByPakin(waitPakinItems, pakin.getBarcode(), loginUserId);
});
if (!waitPakinService.update(new LambdaUpdateWrapper<WaitPakin>()
@@ -463,6 +468,27 @@
throw new CoolException("缁勬嫋鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
return R.ok("浠诲姟鐢熸垚瀹屾瘯锛�");
+ }
+
+ /** 缁勬墭鍚庡皢閫氱煡鍗曟槑缁嗘潯鐮佸洖鍐欎负鏂欑鐮� */
+ private void syncAsnOrderItemBarcodeByPakin(List<WaitPakinItem> waitPakinItems, String pakinBarcode, Long loginUserId) {
+ if (waitPakinItems == null || waitPakinItems.isEmpty() || StringUtils.isBlank(pakinBarcode)) {
+ return;
+ }
+ Set<Long> asnItemIds = waitPakinItems.stream()
+ .map(WaitPakinItem::getAsnItemId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ if (asnItemIds.isEmpty()) {
+ return;
+ }
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .in(WkOrderItem::getId, asnItemIds)
+ .set(WkOrderItem::getBarcode, pakinBarcode)
+ .set(WkOrderItem::getUpdateBy, loginUserId)
+ .set(WkOrderItem::getUpdateTime, new Date()))) {
+ throw new CoolException("閫氱煡鍗曟槑缁嗘潯鐮佸洖鍐欏け璐ワ紒锛�");
+ }
}
/**
@@ -597,7 +623,36 @@
if (StringUtils.isNotBlank(task.getTaskCode())) {
rcsBusTaskNoticeService.notifyTaskStatus(task.getTaskCode(), task.getTaskStatus());
}
+ final Long taskIdForFinish = task.getId();
+ if (TransactionSynchronizationManager.isSynchronizationActive()) {
+ TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+ @Override
+ public void afterCommit() {
+ taskService.runStockFinishAfterManualComplete(taskIdForFinish);
+ }
+ });
+ }
return task;
+ }
+
+ @Override
+ public void runStockFinishAfterManualComplete(Long taskId) {
+ if (taskId == null) {
+ return;
+ }
+ try {
+ Task t = taskService.getById(taskId);
+ if (t == null) {
+ return;
+ }
+ if (Objects.equals(t.getTaskStatus(), TaskStsType.COMPLETE_IN.id)) {
+ taskService.complateInTask(Collections.singletonList(t));
+ } else if (Objects.equals(t.getTaskStatus(), TaskStsType.COMPLETE_OUT.id)) {
+ taskService.completeTask(Collections.singletonList(t));
+ }
+ } catch (Exception e) {
+ log.warn("鎵嬪姩瀹岀粨鍚庣珛鍗冲簱瀛樻敹灏惧け璐ワ紝灏嗙敱瀹氭椂浠诲姟閲嶈瘯锛宼askId={}锛歿}", taskId, e.getMessage());
+ }
}
/**
@@ -2566,6 +2621,10 @@
WkOrder o = asnOrderService.getById(e.getKey());
if (o != null) {
Double newQty = QuantityUtils.roundToScale(QuantityUtils.add(o.getQty() != null ? o.getQty() : 0.0, e.getValue()));
+ Double planQty = QuantityUtils.roundToScale(o.getAnfme() != null ? o.getAnfme() : 0.0);
+ if (QuantityUtils.compare(newQty, planQty) > 0) {
+ newQty = planQty;
+ }
o.setQty(newQty);
if (!asnOrderService.updateById(o)) {
throw new CoolException("鍏ュ簱鍗曞畬鎴愭暟閲忔洿鏂板け璐ワ紒锛�");
@@ -2576,6 +2635,10 @@
WkOrderItem oi = asnOrderItemService.getById(e.getKey());
if (oi != null) {
Double newQty = QuantityUtils.roundToScale(QuantityUtils.add(oi.getQty() != null ? oi.getQty() : 0.0, e.getValue()));
+ Double planQty = QuantityUtils.roundToScale(oi.getAnfme() != null ? oi.getAnfme() : 0.0);
+ if (QuantityUtils.compare(newQty, planQty) > 0) {
+ newQty = planQty;
+ }
oi.setQty(newQty);
if (!asnOrderItemService.updateById(oi)) {
throw new CoolException("鍏ュ簱鍗曟槑缁嗗畬鎴愭暟閲忔洿鏂板け璐ワ紒锛�");
@@ -2817,19 +2880,16 @@
}
}
}
- // 鍑哄簱浠呬簯浠撴潵婧愬崟鎹弬涓庝笂鎶�
- if (!isInbound) {
- boolean hasCloudSource = taskItems.stream().anyMatch(this::hasCloudOrderRef);
- if (!hasCloudSource) {
-// log.info("鍏�/鍑哄簱缁撴灉涓婃姤寰呭姙璺宠繃锛氭棤浜戜粨鏉ユ簮鍗曟嵁锛宼askId={}", task.getId());
- log.info("鍏�/鍑哄簱缁撴灉涓婃姤寰呭姙璺宠繃锛氭墜鍔ㄥ垱寤哄嚭搴撳崟鎹笉閫氱煡浜戜粨锛宼askId={}", task.getId());
- return;
- }
+ // 鍏�/鍑哄簱鍧囦粎浜戜粨鏉ユ簮鍗曟嵁鍙備笌涓婃姤锛堟槑缁嗛渶甯� platOrderCode 鎴� platWorkCode锛�
+ boolean hasCloudSource = taskItems.stream().anyMatch(this::hasCloudOrderRef);
+ if (!hasCloudSource) {
+ log.info("鍏�/鍑哄簱缁撴灉涓婃姤寰呭姙璺宠繃锛氭棤浜戜粨鏉ユ簮鍗曟嵁锛宼askId={}", task.getId());
+ return;
}
ObjectMapper om = new ObjectMapper();
Date now = new Date();
for (TaskItem item : taskItems) {
- if (!isInbound && !hasCloudOrderRef(item)) {
+ if (!hasCloudOrderRef(item)) {
continue;
}
String orderNo = isInbound ? sourceToOrderNo.get(item.getSource()) : (item.getPlatOrderCode() != null ? item.getPlatOrderCode() : item.getPlatWorkCode());
--
Gitblit v1.9.1