From fe0c2392123c13a50a773e503cfce6528374271d Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期四, 20 十一月 2025 16:00:44 +0800
Subject: [PATCH] 入庫功能優化
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReportMsgServiceImpl.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 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 c723680..4db0ee7 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
@@ -317,6 +317,7 @@
.setItemCode(orderItem.getMatnrCode())
.setEditUser(nickName)
.setEditDate(order.getUpdateTime())
+ .setZone(stocks.getLocCode())
.setGoodsNO(fields.get("crushNo"))
.setMemoDtl(order.getMemo());
@@ -363,7 +364,6 @@
param.setOutQty(orderItem.getQty());
}
reportData.add(param);
-
params.setData(reportData);
try {
@@ -415,11 +415,11 @@
//閲囪喘鍏ュ簱鍗�
params.setOrderType("PO_Instock").setAction("Update");
//鑾峰彇鎸囧畾鏌ヨ瀛楁CrushNo 绁ㄥ彿
- param.setInQty(orderItem.getQty());
+ param.setInQty(items.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type)) {
//閲囪喘閫�璐�
params.setOrderType("PR_Outstock").setAction("Update");
- param.setOutQty(orderItem.getQty());
+ param.setOutQty(items.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
//璋冩嫈鍏ュ簱鍗�
params.setOrderType("Mv_Instock").setAction("Update");
@@ -429,27 +429,27 @@
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PURCHASE.type)) {
//鐢熶骇閫�鏂�
params.setOrderType("WR_Instock").setAction("Update");
- param.setInQty(orderItem.getQty());
+ param.setInQty(items.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_RETURN_ORDER.type)) {
//鐢熶骇棰嗘枡
params.setOrderType("WO_Outstock").setAction("Update");
- param.setOutQty(orderItem.getQty());
+ param.setOutQty(items.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD_ADDITION.type)) {
//鐢熶骇琛ユ枡
params.setOrderType("WR_Instock_BL").setAction("Update");
- param.setOutQty(orderItem.getQty());
+ param.setOutQty(items.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_FIX_OUT.type)) {
params.setOrderType("WO_Outstock_WR").setAction("Update");
- param.setOutQty(orderItem.getQty());
+ param.setOutQty(items.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type)) {
//鍏跺畠鍏ュ簱鍗�/鎵嬪姩鍏ュ簱鍗�
params.setOrderType("In_Instock").setAction("Update");
- param.setInQty(orderItem.getQty());
+ param.setInQty(items.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) {
//鍏跺畠鍑哄簱鍗�/鎵嬪姩鍑哄簱鍗�
params.setOrderType("Io_Outstock").setAction("Update");
- param.setOutQty(orderItem.getQty());
+ param.setOutQty(items.getQty());
}
dataParams.add(param);
@@ -485,14 +485,11 @@
@Override
public void reportOrderItem(WkOrderItem orderItem) {
ReportParams params = new ReportParams();
-
WkOrder order = asnOrderService.getById(orderItem.getOrderId());
if (Objects.isNull(order)) {
throw new RuntimeException("鍗曟嵁涓嶅瓨鍦ㄦ垨宸插畬鎴愶紒锛�");
}
-
List<ReportDataParam> reportData = new ArrayList<>();
-
ReportDataParam param = new ReportDataParam();
User user = userService.getById(orderItem.getUpdateBy());
String nickName = null;
@@ -541,7 +538,7 @@
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_OTHER_TERANSFER_IN.type)) {
//璋冩嫈鍏ュ簱鍗�
params.setOrderType("Mv_Instock").setAction("Update");
-
+ param.setInQty(orderItem.getQty());
} else if (order.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_PROD.type)) {
//鐢熶骇鍏ュ簱鍗�
// params.setOrderType("WO_Outstock").setAction("Update");
--
Gitblit v1.9.1