From e23efd75ca74df6b35a0c03b8e8fc0712c9d4544 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 01 五月 2026 15:30:54 +0800
Subject: [PATCH] 多加入参数和修改规则
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 119 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..80d02ec 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;
/**
* 浜戜粨鏀瑰崟/鍙栨秷鍓嶏細浠诲姟鏄庣粏宸插叧鑱旇鍗曟嵁涓斾富浠诲姟鏈�昏緫鍒犻櫎鍒欎笉鍏佽
@@ -602,6 +607,19 @@
.setUpdateTime(new Date())
.setCreateBy(loginUserId)
.setUpdateBy(loginUserId);
+ if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
+ wkOrder.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
+ }
+ if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
+ wkOrder.setDocOrgNo(syncOrder.getOrgNo().trim());
+ }
+ String effTypeForDoc = resolvedOrderType != null ? resolvedOrderType : StringUtils.trimToNull(syncOrder.getType());
+ if (OrderType.ORDER_IN.type.equals(effTypeForDoc) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
+ wkOrder.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
+ }
+ if (OrderType.ORDER_OUT.type.equals(effTypeForDoc) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
+ wkOrder.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
+ }
if (resolvedOrderType != null && resolvedOrderType.equals(OrderType.ORDER_OUT.type)) {
wkOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val);
@@ -630,7 +648,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 */
@@ -716,6 +791,26 @@
}
if (StringUtils.isNotBlank(syncOrder.getStationId())) {
if (!StringUtils.equals(StringUtils.trimToNull(syncOrder.getStationId()), StringUtils.trimToNull(order.getStationId()))) {
+ return true;
+ }
+ }
+ if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
+ if (!StringUtils.equals(syncOrder.getOrgNo().trim(), StringUtils.trimToNull(order.getDocOrgNo()))) {
+ return true;
+ }
+ }
+ if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
+ if (!StringUtils.equals(syncOrder.getDocTaskWarehouseNo().trim(), StringUtils.trimToNull(order.getDocTaskWarehouseNo()))) {
+ return true;
+ }
+ }
+ if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
+ if (!StringUtils.equals(syncOrder.getInWarehouseNo().trim(), StringUtils.trimToNull(order.getDocInWarehouseNo()))) {
+ return true;
+ }
+ }
+ if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
+ if (!StringUtils.equals(syncOrder.getOutWarehouseNo().trim(), StringUtils.trimToNull(order.getDocOutWarehouseNo()))) {
return true;
}
}
@@ -825,6 +920,18 @@
if (StringUtils.isNotBlank(syncOrder.getStationId())) {
order.setStationId(syncOrder.getStationId());
}
+ if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
+ order.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
+ }
+ if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
+ order.setDocOrgNo(syncOrder.getOrgNo().trim());
+ }
+ if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
+ order.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
+ }
+ if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
+ order.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
+ }
order.setUpdateBy(loginUserId);
order.setUpdateTime(new Date());
asnOrderService.updateById(order);
@@ -910,6 +1017,18 @@
if (StringUtils.isNotBlank(syncOrder.getStationId())) {
order.setStationId(syncOrder.getStationId());
}
+ if (StringUtils.isNotBlank(syncOrder.getDocTaskWarehouseNo())) {
+ order.setDocTaskWarehouseNo(syncOrder.getDocTaskWarehouseNo().trim());
+ }
+ if (StringUtils.isNotBlank(syncOrder.getOrgNo())) {
+ order.setDocOrgNo(syncOrder.getOrgNo().trim());
+ }
+ if (OrderType.ORDER_IN.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getInWarehouseNo())) {
+ order.setDocInWarehouseNo(syncOrder.getInWarehouseNo().trim());
+ }
+ if (OrderType.ORDER_OUT.type.equals(order.getType()) && StringUtils.isNotBlank(syncOrder.getOutWarehouseNo())) {
+ order.setDocOutWarehouseNo(syncOrder.getOutWarehouseNo().trim());
+ }
order.setUpdateBy(loginUserId);
order.setUpdateTime(new Date());
asnOrderService.updateById(order);
--
Gitblit v1.9.1