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/AsnOrderItemServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
index c3fc7aa..5473012 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/AsnOrderItemServiceImpl.java
@@ -10,6 +10,8 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.common.utils.QuantityUtils;
+import com.vincent.rsf.server.manager.entity.WaitPakinItem;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
@@ -27,6 +29,7 @@
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.server.manager.service.AsnOrderService;
+import com.vincent.rsf.server.manager.service.WaitPakinItemService;
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.MatnrService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -70,6 +73,9 @@
private DictDataService dictDataService;
@Autowired
private AsnOrderService asnOrderService;
+
+ @Autowired
+ private WaitPakinItemService waitPakinItemService;
@Override
public R generateBarcode(List<Long> orders) {
@@ -247,8 +253,12 @@
if (Objects.isNull(matnr)) {
throw new CoolException("鏁版嵁閿欒锛氱墿鏂�" + wkOrderItem.getMatnrCode() + "涓嶅瓨鍦紒锛�");
}
- BeanUtils.copyProperties(matnr, wkOrderItem);
- wkOrderItem.setMatnrCode(matnr.getCode()).setMatnrId(matnr.getId()).setMaktx(matnr.getName());
+ // 澶嶅埗鏃舵帓闄� id锛岄伩鍏嶇墿鏂� id 瑕嗙洊鍗曟嵁鏄庣粏 id锛屽鑷� saveOrUpdate 璇垽涓烘柊澧炶�岄噸澶嶆彃鍏ワ紙鍑哄簱鍗曠紪杈戜繚瀛樺悗 1 鏉″彉 2 鏉★級
+ BeanUtils.copyProperties(matnr, wkOrderItem, "id");
+ wkOrderItem.setMatnrCode(matnr.getCode())
+ .setSplrBatch(!Objects.isNull(wkOrderItem.getBatch()) ? wkOrderItem.getBatch() : null)
+ .setMatnrId(matnr.getId())
+ .setMaktx(matnr.getName());
WkOrder wkOrder = asnOrderService.getById(Long.parseLong(params.get("orderId").toString()));
if (Objects.isNull(wkOrder)) {
@@ -267,7 +277,8 @@
//瀛楁鎷兼帴
sb.append(params.get(field.getFields()));
}
- sb.append(wkOrderItem.getMatnrId() + wkOrderItem.getSplrBatch());
+ sb.append(wkOrderItem.getMatnrId() + "null");
+ log.error("=======================>娣诲姞鎵瑰彿瀛楃涓�" + sb.toString());
//鑾峰彇16浣島uid
String uuid16 = Cools.md5Chinese(sb.toString());
wkOrderItem.setFieldsIndex(uuid16);
@@ -296,4 +307,26 @@
return hsahMap;
}
+ @Override
+ public void fillPalletQty(List<WkOrderItem> items) {
+ if (items == null || items.isEmpty()) {
+ return;
+ }
+ List<Long> itemIds = items.stream().map(WkOrderItem::getId).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+ if (itemIds.isEmpty()) {
+ return;
+ }
+ List<WaitPakinItem> allItems = waitPakinItemService.list(
+ new LambdaQueryWrapper<WaitPakinItem>().in(WaitPakinItem::getAsnItemId, itemIds).eq(WaitPakinItem::getDeleted, 0));
+ Map<Long, Double> sumByAsnItemId = allItems.stream()
+ .collect(Collectors.groupingBy(WaitPakinItem::getAsnItemId,
+ Collectors.summingDouble(w -> w.getAnfme() != null ? w.getAnfme() : 0.0)));
+ sumByAsnItemId.replaceAll((k, v) -> QuantityUtils.roundToScale(v));
+ for (WkOrderItem item : items) {
+ if (item.getId() != null) {
+ item.setPalletQty(sumByAsnItemId.getOrDefault(item.getId(), 0.0));
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1