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 | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 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 87f6f43..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
@@ -607,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);
@@ -781,6 +794,26 @@
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;
+ }
+ }
return false;
}
@@ -887,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);
@@ -972,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