From 82065a03737fa1370eb9f4f01ab5332933baf08a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 09:23:37 +0800
Subject: [PATCH] 云仓WMS+RCS+自动入库临时方法配置
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java | 67 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
index d0f6cab..1eb0a76 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderServiceImpl.java
@@ -17,6 +17,7 @@
import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
+import com.vincent.rsf.server.common.utils.QuantityUtils;
import com.vincent.rsf.server.manager.mapper.AsnOrderMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -69,6 +70,8 @@
private AsnOrderService asnOrderService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
@Override
public boolean notifyInspect(List<WkOrder> orders) {
@@ -379,6 +382,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R removeOrders(List<Long> ids) {
+ // 宸茬粍鎵樹笉鍙垹闄わ紝闇�鍏堣В闄ょ粍鎵�
+ long palletizedCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
+ .in(WaitPakinItem::getAsnId, ids).eq(WaitPakinItem::getDeleted, 0));
+ if (palletizedCount > 0) {
+ throw new CoolException("鍗曟嵁宸茬粍鎵橈紝璇峰厛瑙ｉ櫎缁勬墭鍚庡啀鍒犻櫎锛侊紒");
+ }
for (Long id : ids) {
List<WkOrderItem> list = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
.eq(WkOrderItem::getOrderId, id));
@@ -510,30 +519,38 @@
// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒");
// }
WkOrder order = this.getById(asrder.getId());
- AsnOrderLog orderLog = new AsnOrderLog();
-// order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val);
- BeanUtils.copyProperties(order, orderLog);
- orderLog.setId(null);
- orderLog.setAsnId(order.getId());
-
-// if (!this.saveOrUpdate(order)) {
-// throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�");
-// }
-// orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val);
- if (!asnOrderLogService.save(orderLog)) {
- throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
+ AsnOrderLog one = asnOrderLogService.getOne(new LambdaQueryWrapper<AsnOrderLog>().eq(AsnOrderLog::getCode, order.getCode()), false);
+ AsnOrderLog orderLog;
+ if (Objects.isNull(one)) {
+ orderLog = new AsnOrderLog();
+ BeanUtils.copyProperties(order, orderLog);
+ orderLog.setId(null);
+ orderLog.setAsnId(order.getId());
+ if (!asnOrderLogService.save(orderLog)) {
+ throw new CoolException("涓诲崟鍘嗗彶妗ｆ坊鍔犲け璐ワ紒锛�");
+ }
+ } else {
+ long existingLogId = one.getId();
+ BeanUtils.copyProperties(order, one);
+ one.setId(existingLogId);
+ one.setAsnId(order.getId());
+ if (!asnOrderLogService.updateById(one)) {
+ throw new CoolException("涓诲崟鍘嗗彶妗ｆ洿鏂板け璐ワ紒锛�");
+ }
+ orderLog = one;
+ asnOrderItemLogService.remove(new LambdaQueryWrapper<AsnOrderItemLog>().eq(AsnOrderItemLog::getLogId, existingLogId));
}
List<AsnOrderItemLog> logs = new ArrayList<>();
List<WkOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
items.forEach(item -> {
AsnOrderItemLog itemLog = new AsnOrderItemLog();
BeanUtils.copyProperties(item, itemLog);
- itemLog.setAsnItemId(itemLog.getId())
+ itemLog.setAsnItemId(item.getId())
+ .setId(null)
.setLogId(orderLog.getId())
.setAsnId(item.getOrderId());
logs.add(itemLog);
});
-
if (!asnOrderItemLogService.saveBatch(logs)) {
throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒");
}
@@ -544,4 +561,26 @@
throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�");
}
}
+
+ @Override
+ public void fillPalletQty(List<WkOrder> orders) {
+ if (orders == null || orders.isEmpty()) {
+ return;
+ }
+ List<Long> orderIds = orders.stream().map(WkOrder::getId).filter(Objects::nonNull).collect(Collectors.toList());
+ if (orderIds.isEmpty()) {
+ return;
+ }
+ List<WaitPakinItem> allItems = waitPakinItemService.list(
+ new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getAsnId, orderIds).eq(WaitPakinItem::getDeleted, 0));
+ Map<Long, Double> sumByAsnId = allItems.stream()
+ .collect(Collectors.groupingBy(WaitPakinItem::getAsnId,
+ Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
+ sumByAsnId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
+ for (WkOrder order : orders) {
+ if (order.getId() != null) {
+ order.setPalletQty(sumByAsnId.getOrDefault(order.getId(), 0.0));
+ }
+ }
+ }
}
--
Gitblit v1.9.1