From 91d0af7ca0bb326e4cd68b085e7df0ffa073c986 Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期五, 07 十一月 2025 13:17:01 +0800
Subject: [PATCH] 兼容C3调拔入库功能
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java | 7 ++++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
index 1415e42..4fcbe3a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java
@@ -332,7 +332,7 @@
//閲囪喘閫�璐�
params.setOrderType("PR_Outstock").setAction("Update");
param.setOutQty(orderItem.getQty());
- } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
+ } else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
//璋冩嫈鍏ュ簱鍗�
params.setOrderType("Mv_Instock").setAction("Update");
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
index e68c8c7..8ccb1bf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java
@@ -14,7 +14,8 @@
ORDER_WORK_TYPE_PURCHASE("3", "棰嗘枡閫�鍥炲叆搴撳崟"),
ORDER_WORK_TYPE_SALE("4", "閿�鍞��鍥炲叆搴撳崟"),
ORDER_WORK_TYPE_OTHER_IN("5", "鍏跺畠鍏ュ簱鍗�"),
- ORDER_WORK_TYPE_OTHER_TERANSFER("6", "璋冩嫈鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_OTHER_TERANSFER_IN("6", "璋冩嫈鍏ュ簱鍗�"),
+ ORDER_WORK_TYPE_OTHER_TERANSFER("8", "璋冩嫈鍏ュ簱鍗�"),//甯屾棩椤圭洰涓存椂淇敼
ORDER_WORK_TYPE_STOCK_REVISE("7", "搴撳瓨璋冩暣鍗�"),
ORDER_WORK_TYPE_SUPPLIER("11", "閿�鍞嚭搴撳崟"),
ORDER_WORK_TYPE_RETURN_ORDER("12", "棰嗘枡鍑哄簱鍗�"),
@@ -58,6 +59,8 @@
return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.type;
+ } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.desc)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type;
} else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc)) {
@@ -132,6 +135,8 @@
return OrderWorkType.ORDER_WORK_TYPE_STOCK_CHECK.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type)) {
return OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.desc;
+ } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
+ return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
return OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.desc;
} else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_REVISE.type)) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
index e7fc0bb..35d85b4 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/ScheduleJobs.java
@@ -83,11 +83,11 @@
List<WkOrder> orders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()
.eq(WkOrder::getType, OrderType.ORDER_IN.type)
.eq(WkOrder::getExceStatus, AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val));
- if (!orders.isEmpty()) {
+ if (!orders.isEmpty()) {
for (WkOrder order : orders) {
if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER.type)) {
WkOrder one = outStockService.getOne(new LambdaQueryWrapper<WkOrder>()
- .eq(WkOrder::getPoId, order.getPoId())
+ .eq(WkOrder::getPoCode, order.getPoCode())
.eq(WkOrder::getWkType, OrderWorkType.ORDER_WORK_TYPE_STOCK_TERANSFER.type));
if (Objects.isNull(one)) {
throw new CoolException("鏁版嵁閿欒");
--
Gitblit v1.9.1