From 2fa1c824c63048b49e45d867191ab3645aeaf3a4 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 09:54:40 +0800
Subject: [PATCH] 补充收货
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 131 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 115 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 db3b68b..87f6f43 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
@@ -24,6 +24,7 @@
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.schedules.ScheduleJobs;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.GlobalConfigCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
@@ -121,6 +122,12 @@
private TaskItemService taskItemService;
@Autowired
private TaskService taskService;
+ @Autowired
+ private CusBarcodeSyncMatnrService cusBarcodeSyncMatnrService;
+ @Autowired
+ private ScheduleJobs scheduleJobs;
+ @Autowired
+ private OutStockService outStockService;
/**
* 浜戜粨鏀瑰崟/鍙栨秷鍓嶏細浠诲姟鏄庣粏宸插叧鑱旇鍗曟嵁涓斾富浠诲姟鏈�昏緫鍒犻櫎鍒欎笉鍏佽
@@ -164,6 +171,10 @@
return;
}
assertWkOrderExceStatusUnexecuted(order, "鍙栨秷");
+ }
+
+ private void syncMatnrFromCusItemSyncViewByConfig(List<SyncOrdersItem> orderItems, Long loginUserId) {
+ cusBarcodeSyncMatnrService.syncFromOrderItems(orderItems, loginUserId);
}
/**
@@ -339,7 +350,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);
}
@@ -515,6 +528,8 @@
}
}
}
+ // 鎸夐厤缃悓姝ョ墿鏂欎富鏁版嵁锛坣one 鏃朵笉褰卞搷閫氱煡妗ｅ啓鍏ヤ富娴佺▼锛�
+ syncMatnrFromCusItemSyncViewByConfig(syncOrder.getOrderItems(), loginUserId);
WkOrder wkOrder = new WkOrder();
String wkTypeInput = syncOrder.getWkType();
String typeCode = StringUtils.isBlank(wkTypeInput) ? null : orderWorkTypeService.getTypeByLabel(wkTypeInput);
@@ -541,10 +556,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 "淇敼鏃犲彉鍖�";
@@ -559,7 +575,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());
}
@@ -617,7 +635,64 @@
if (!asnOrderService.updateById(wkOrder)) {
throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒");
}
+ directReceiptInboundAfterCloudSync(wkOrder, loginUserId);
return "Success";
+ }
+
+ /**
+ * DirectWaitPakin 寮�鍚椂锛屼簯浠撴柊澧炲叆搴撻�氱煡鍗曟垚鍔熷悗绔嬪嵆鍐欏叆鏀惰揣鍖猴紝骞跺皢瀹屾垚鏁伴噺涓庤鍒掓暟瀵归綈锛堜笌 {@link ScheduleJobs#IgnoreReceipt} 涓�鑷达紝閬垮厤浠呬緷璧栧畾鏃朵换鍔″欢杩燂級銆�
+ */
+ private void directReceiptInboundAfterCloudSync(WkOrder wkOrder, Long loginUserId) {
+ if (!isDirectWaitPakin() || wkOrder == null || wkOrder.getId() == null) {
+ return;
+ }
+ if (!OrderType.ORDER_IN.type.equals(wkOrder.getType())) {
+ return;
+ }
+ if (OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type.equals(wkOrder.getWkType())) {
+ WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
+ .eq(WkOrder::getPoId, wkOrder.getPoId())
+ .eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type));
+ if (one == null || !Objects.equals(AsnExceStatus.OUT_STOCK_STATUS_TASK_DONE.val, one.getExceStatus())) {
+ return;
+ }
+ }
+ WarehouseAreas receiptArea = warehouseAreasService.getOne(
+ new LambdaQueryWrapper<WarehouseAreas>()
+ .eq(WarehouseAreas::getType, WarehouseAreasType.WAREHOUSE_AREAS_TYPE_RECEIPT.type), false);
+ if (receiptArea == null) {
+ log.warn("directReceiptInboundAfterCloudSync: 鏈厤缃敹璐у尯锛岃烦杩� orderId={}", wkOrder.getId());
+ return;
+ }
+ List<WkOrderItem> orderItems = asnOrderItemService.list(
+ new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, wkOrder.getId()));
+ if (orderItems.isEmpty()) {
+ return;
+ }
+ for (WkOrderItem item : orderItems) {
+ Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getId, item.getMatnrId()));
+ if (matnr == null) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦細" + item.getMatnrCode());
+ }
+ try {
+ scheduleJobs.updateReceipt(receiptArea, item, wkOrder, matnr);
+ } catch (Exception e) {
+ throw new CoolException(e.getMessage());
+ }
+ if (!asnOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .set(WkOrderItem::getQty, item.getAnfme())
+ .eq(WkOrderItem::getId, item.getId()))) {
+ throw new CoolException("鏀惰揣鍗曟槑缁嗗畬鎴愭暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ if (!asnOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .set(WkOrder::getQty, wkOrder.getAnfme())
+ .set(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_RECEIPT_DONE.val)
+ .set(WkOrder::getUpdateBy, loginUserId)
+ .set(WkOrder::getUpdateTime, new Date())
+ .eq(WkOrder::getId, wkOrder.getId()))) {
+ throw new CoolException("鏀惰揣鍗曠姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
}
/** 涓� updateOrderNoPakin / mergeOrderWithPakin 鍐欏叆瑙勫垯涓�鑷达紱鏃犳湁鏁堝彉鏇存椂杩斿洖 null */
@@ -873,7 +948,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("淇敼鏃舵槑缁嗕笉鑳戒负绌猴紒锛�");
}
@@ -913,7 +988,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;
@@ -944,6 +1021,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("鏄庣粏淇濆瓨澶辫触锛侊紒");
}
@@ -952,9 +1032,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);
}
@@ -1396,18 +1480,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<>();
@@ -1423,6 +1521,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