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 | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 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 cbe2bd8..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;
@@ -123,6 +124,10 @@
private TaskService taskService;
@Autowired
private CusBarcodeSyncMatnrService cusBarcodeSyncMatnrService;
+ @Autowired
+ private ScheduleJobs scheduleJobs;
+ @Autowired
+ private OutStockService outStockService;
/**
* 浜戜粨鏀瑰崟/鍙栨秷鍓嶏細浠诲姟鏄庣粏宸插叧鑱旇鍗曟嵁涓斾富浠诲姟鏈�昏緫鍒犻櫎鍒欎笉鍏佽
@@ -630,9 +635,66 @@
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 */
private String computeWkOrderModifyChangeSummaryOrNull(WkOrder order, SyncOrderParams syncOrder,
String resolvedOrderType, String typeCode, boolean mergeStyleAllowEmptyItems) {
--
Gitblit v1.9.1