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/api/service/impl/ReceiveMsgServiceImpl.java | 61 ++++++++++++++++++++++--------
1 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 4474458..cbe2bd8 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -345,7 +345,9 @@
public R syncLocsDetl(PageParam<Loc, BaseParam> pageParam, QueryWrapper<Loc> wrapper) {
Page<Object> page = new Page<>();
page.setCurrent(pageParam.getCurrent()).setSize(pageParam.getSize());
- IPage<LocStockDto> locStocks = locService.getLocDetls(page);
+ BaseParam bp = pageParam.getWhere();
+ Map<String, Object> conds = bp != null && bp.getMap() != null ? bp.getMap() : Collections.emptyMap();
+ IPage<LocStockDto> locStocks = locService.getLocDetls(page, conds);
return R.ok().add(locStocks);
}
@@ -549,10 +551,11 @@
.eq(WkOrder::getPoCode, syncOrder.getOrderInternalCode()));
if (!Objects.isNull(order)) {
assertWkOrderNoLinkedTask(order.getId());
- assertWkOrderExceStatusUnexecuted(order, "淇敼");
long pakinCount = waitPakinItemService.count(new LambdaQueryWrapper<WaitPakinItem>()
.eq(WaitPakinItem::getAsnId, order.getId()).eq(WaitPakinItem::getDeleted, 0));
if (pakinCount > 0) {
+ // 宸茬粍鎵樻椂浠嶆寜鍘熻鍒欓檺鍒讹細浠呮湭鎵ц鐘舵�佸彲鏀瑰崟
+ assertWkOrderExceStatusUnexecuted(order, "淇敼");
String changeSummary = computeWkOrderModifyChangeSummaryOrNull(order, syncOrder, resolvedOrderType, typeCode, true);
if (changeSummary == null) {
return "淇敼鏃犲彉鍖�";
@@ -567,7 +570,9 @@
if (changeSummary == null) {
return "淇敼鏃犲彉鍖�";
}
- updateOrderNoPakin(order, syncOrder, loginUserId);
+ // 鏈粍鎵樻椂鍏佽宸叉敹璐ф敼鍗曪紱鑷姩鏀惰揣鍦烘櫙涓嬪悓姝ヨ瀹屾垚鏁伴噺璺熻鍒掓暟閲忎竴鑷�
+ boolean alignQtyWithPlan = Objects.equals(order.getExceStatus(), AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val);
+ updateOrderNoPakin(order, syncOrder, loginUserId, alignQtyWithPlan);
if (isDirectWaitPakin()) {
syncReceiptAreaByOrder(order.getId());
}
@@ -881,7 +886,7 @@
/**
* 鏈粍鎵樺崟鎹殑淇敼锛氬湪鍘熷崟涓婃洿鏂颁富鍗�+鏄庣粏锛堟寜 lineId 鍖归厤锛夛紝淇濈暀 exceStatus銆乹ty銆亀orkQty锛岄伩鍏嶅垹鍗曢噸寤哄鑷村畾鏃朵换鍔″啀娆℃墽琛屻��
*/
- private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId) {
+ private void updateOrderNoPakin(WkOrder order, SyncOrderParams syncOrder, Long loginUserId, boolean alignQtyWithPlan) {
if (syncOrder.getOrderItems() == null || syncOrder.getOrderItems().isEmpty()) {
throw new CoolException("淇敼鏃舵槑缁嗕笉鑳戒负绌猴紒锛�");
}
@@ -921,7 +926,9 @@
SyncOrdersItem inc = incomingByLineId.get(lineId);
Double newAnfme = QuantityUtils.roundToScale(inc.getAnfme() != null ? inc.getAnfme() : existing.getAnfme());
existing.setAnfme(newAnfme);
- if (inc.getQty() != null) {
+ if (alignQtyWithPlan) {
+ existing.setQty(newAnfme);
+ } else if (inc.getQty() != null) {
existing.setQty(QuantityUtils.roundToScale(inc.getQty()));
} else {
Double curQty = existing.getQty() != null ? existing.getQty() : 0.0;
@@ -952,6 +959,9 @@
map.put("order_code", order.getCode());
map.put("matnrCode", e.getValue().getMatnr());
map.put("platItemId", e.getKey());
+ if (alignQtyWithPlan) {
+ map.put("qty", e.getValue().getAnfme());
+ }
if (!asnOrderItemService.fieldsSave(map, loginUserId)) {
throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
@@ -960,9 +970,13 @@
Double sum = QuantityUtils.roundToScale(asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()))
.stream().mapToDouble(WkOrderItem::getAnfme).sum());
order.setAnfme(sum);
- List<WkOrderItem> afterItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
- double qtySum = afterItems.stream().mapToDouble(oi -> oi.getQty() != null ? oi.getQty() : 0.0).sum();
- order.setQty(QuantityUtils.roundToScale(qtySum));
+ if (alignQtyWithPlan) {
+ order.setQty(sum);
+ } else {
+ List<WkOrderItem> afterItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
+ double qtySum = afterItems.stream().mapToDouble(oi -> oi.getQty() != null ? oi.getQty() : 0.0).sum();
+ order.setQty(QuantityUtils.roundToScale(qtySum));
+ }
asnOrderService.updateById(order);
}
@@ -1404,18 +1418,32 @@
if (!Cools.isEmpty(param.getPlanNo())) {
wrapper.eq(LocItem::getPlatWorkCode, param.getPlanNo());
}
+ // 浠撳簱銆佹枡绠辩爜鎸夊簱浣� id 浜ら泦杩囨护
+ List<Long> allowedLocIds = null;
if (!Cools.isEmpty(param.getWareHouseId())) {
Warehouse wh = warehouseService.getOne(new LambdaQueryWrapper<Warehouse>().eq(Warehouse::getCode, param.getWareHouseId()));
- if (wh != null) {
- List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
- if (!locs.isEmpty()) {
- wrapper.in(LocItem::getLocId, locs.stream().map(Loc::getId).collect(Collectors.toList()));
- } else {
- return R.ok().add(Collections.emptyList());
- }
- } else {
+ if (wh == null) {
return R.ok().add(Collections.emptyList());
}
+ List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, wh.getId()));
+ if (locs.isEmpty()) {
+ return R.ok().add(Collections.emptyList());
+ }
+ allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
+ }
+ if (!Cools.isEmpty(param.getBarcode())) {
+ LambdaQueryWrapper<Loc> lw = new LambdaQueryWrapper<Loc>().eq(Loc::getBarcode, param.getBarcode());
+ if (allowedLocIds != null) {
+ lw.in(Loc::getId, allowedLocIds);
+ }
+ List<Loc> locs = locService.list(lw);
+ if (locs.isEmpty()) {
+ return R.ok().add(Collections.emptyList());
+ }
+ allowedLocIds = locs.stream().map(Loc::getId).collect(Collectors.toList());
+ }
+ if (allowedLocIds != null) {
+ wrapper.in(LocItem::getLocId, allowedLocIds);
}
List<LocItem> list = locItemService.list(wrapper);
List<Map<String, Object>> result = new ArrayList<>();
@@ -1431,6 +1459,7 @@
row.put("wareHouseId", null);
row.put("wareHouseName", null);
}
+ row.put("barcode", loc != null ? loc.getBarcode() : null);
row.put("palletId", item.getTrackCode());
row.put("matNr", item.getMatnrCode());
row.put("makTx", item.getMaktx());
--
Gitblit v1.9.1