From c81fc5e2a4f4153be2bb8602ed14a0743e6ecd29 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 11:14:50 +0800
Subject: [PATCH] RCS对接优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 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 0bd3bb6..7c3e65e 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
@@ -1571,11 +1571,11 @@
if (Objects.isNull(waveItem)) {
throw new CoolException("娉㈡鏄庣粏涓嶅瓨鍦紒锛�");
}
-// try {
-// saveOutStockItem(maps.get(key), null, waveItem, null, loginUserId);
-// } catch (Exception e) {
-// throw new CoolException(e.getMessage());
-// }
+ try {
+ saveOutStockItem(maps.get(key), null, waveItem, null, loginUserId);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
} else if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val)) {
WkOrderItem orderItem = asnOrderItemService.getById(key);
if (Objects.isNull(orderItem)) {
@@ -1703,8 +1703,35 @@
.setUpdateTime(new Date())
.setAnfme(sum);
if (!Objects.isNull(waveItem)) {
- //TODO 鐢熸垚娉㈡鏃堕渶瑕佸皢娉㈡鍙峰啓鍏ュ崟鎹紝閫氳繃鐗╂枡锛屾壒娆★紝鍔ㄦ�佸瓧娈电瓑鍞竴鍊煎弽鏌ュ崟鎹俊鎭�
+ // 娉㈡鍑哄簱锛氭洿鏂板嚭搴撳崟瀹屾垚鏁伴噺鍙婂嚭搴撳崟鏄庣粏鎵ц鏁伴噺
stock.setSourceId(waveItem.getId()).setType(OrderType.ORDER_OUT.type);
+ Long orderId = waveItem.getOrderId();
+ if (orderId != null) {
+ WkOrder wkOrder = asnOrderService.getById(orderId);
+ if (wkOrder != null) {
+ Double curQty = wkOrder.getQty() != null ? wkOrder.getQty() : 0.0;
+ Double newQty = QuantityUtils.roundToScale(curQty + sum);
+ wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_WORKING.val).setQty(newQty);
+ if (!asnOrderService.updateById(wkOrder)) {
+ throw new CoolException("鍑哄簱鍗曞畬鎴愭暟閲忔洿鏂板け璐ワ紒锛�");
+ }
+ }
+ // 鎸夊嚭搴撳崟鏄庣粏姹囨�绘湰娆′换鍔℃暟閲忥紝鏇存柊鍚勬槑缁� workQty
+ Map<Long, Double> sumByOrderItemId = taskItems.stream()
+ .filter(ti -> ti.getOrderItemId() != null)
+ .collect(Collectors.groupingBy(TaskItem::getOrderItemId,
+ Collectors.summingDouble(ti -> ti.getAnfme() != null ? ti.getAnfme() : 0.0)));
+ for (Map.Entry<Long, Double> e : sumByOrderItemId.entrySet()) {
+ WkOrderItem oi = outStockItemService.getById(e.getKey());
+ if (oi != null) {
+ Double wq = oi.getWorkQty() != null ? oi.getWorkQty() : 0.0;
+ oi.setWorkQty(QuantityUtils.roundToScale(wq + e.getValue()));
+ if (!outStockItemService.updateById(oi)) {
+ throw new CoolException("鍑哄簱鍗曟槑缁嗘墽琛屾暟閲忔洿鏂板け璐ワ紒锛�");
+ }
+ }
+ }
+ }
} else if (!Objects.isNull(orderItem) && StringUtils.isNotBlank(orderItem.getId() + "")) {
WkOrder wkOrder = asnOrderService.getById(orderItem.getOrderId());
Double qty = Math.round((wkOrder.getQty() + sum) * 1000000) / 1000000.0;
@@ -2229,10 +2256,10 @@
List<TaskItem> items = orderMap.get(key);
//淇濆瓨鍏ュ嚭搴撴槑缁�
saveStockItems(items, task, pakinItem.getId(), pakinItem.getAsnCode(), pakinItem.getWkType(), pakinItem.getType(), loginUserId);
- // 鏀惰揣鍖哄凡鍋滅敤锛屼笉鍐嶇Щ鍑烘敹璐у尯搴撳瓨
- // if (Objects.nonNull(pakinItem.getSource())) {
- // removeReceiptStock(pakinItem, loginUserId);
- // }
+ // DirectWaitPakin 鍚敤鏃剁粍鎵樻潵鑷敹璐у尯锛屽叆搴撳畬鎴愬悗绉诲嚭鏀惰揣鍖哄簱瀛橈紱鏈惎鐢ㄦ椂 source 涓� null 涓嶆墽琛�
+ if (Objects.nonNull(pakinItem.getSource())) {
+ removeReceiptStock(pakinItem, loginUserId);
+ }
});
Set<Long> pkinItemIds = taskItems.stream().map(TaskItem::getSource).collect(Collectors.toSet());
@@ -2329,12 +2356,12 @@
locItemWrapper.and(wrapper -> wrapper.isNull(LocItem::getBatch).or().eq(LocItem::getBatch, ""));
}
- // 绁ㄥ彿鍖归厤锛氬鏋渢askItem鏈夌エ鍙凤紝鍒欏繀椤诲尮閰嶏紱濡傛灉taskItem娌℃湁绁ㄥ彿锛屽垯鏌ヨ绁ㄥ彿涓簄ull鎴栫┖瀛楃涓茬殑璁板綍
- if (StringUtils.isNotBlank(taskItem.getFieldsIndex())) {
- locItemWrapper.eq(LocItem::getFieldsIndex, taskItem.getFieldsIndex());
- } else {
- locItemWrapper.and(wrapper -> wrapper.isNull(LocItem::getFieldsIndex).or().eq(LocItem::getFieldsIndex, ""));
- }
+ // 绁ㄥ彿鏆備笉浣跨敤锛屼笉鎸夌エ鍙峰尮閰嶏紝鍙煡绁ㄥ彿涓� null 鎴栫┖鐨勫簱浣嶆槑缁�
+ // if (StringUtils.isNotBlank(taskItem.getFieldsIndex())) {
+ // locItemWrapper.eq(LocItem::getFieldsIndex, taskItem.getFieldsIndex());
+ // } else {
+ locItemWrapper.and(wrapper -> wrapper.isNull(LocItem::getFieldsIndex).or().eq(LocItem::getFieldsIndex, ""));
+ // }
LocItem locItem = locItemService.getOne(locItemWrapper);
if (Objects.isNull(locItem)) {
--
Gitblit v1.9.1