From 1a7a40cde5018124cac598f4a8db0cbcbeba386b Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 15:25:32 +0800
Subject: [PATCH] #上报1
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 2 ++
rsf-server/src/main/resources/application-prod.yml | 6 +-----
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java | 20 ++++++++++++--------
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InOutResultReportParam.java | 6 ++++++
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InventoryAdjustReportParam.java | 4 ++--
5 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InOutResultReportParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InOutResultReportParam.java
index 4941d95..a2e6059 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InOutResultReportParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InOutResultReportParam.java
@@ -19,6 +19,12 @@
@ApiModelProperty("璁″垝璺熻釜鍙�")
private String planNo;
+ @ApiModelProperty("宸ヤ綔绫诲瀷锛坵k_type锛夛紝鐢ㄤ簬浜戜粨 docType")
+ private String wkType;
+
+ @ApiModelProperty("鍗曚綅缂栫爜")
+ private String unitNo;
+
@ApiModelProperty("琛屽唴鐮�")
private String lineId;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InventoryAdjustReportParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InventoryAdjustReportParam.java
index 10d6b64..5bcba79 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InventoryAdjustReportParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InventoryAdjustReportParam.java
@@ -41,7 +41,7 @@
@ApiModelProperty("椤规")
private String docSeqNo;
- @ApiModelProperty("鍗曟嵁绫诲埆锛堢┖鍒欐寜 changeType 鍙栭厤缃� dap.doc-type-in/out/adj锛�")
+ @ApiModelProperty("鍗曟嵁绫诲埆")
private String docType;
@ApiModelProperty("鎵规")
@@ -50,6 +50,6 @@
@ApiModelProperty("鏉＄爜锛堜簯浠撳繀濉級")
private String barcode;
- @ApiModelProperty("鍗曚綅缂栫爜锛堢┖鍒欏彇閰嶇疆 dap.unit-no锛�")
+ @ApiModelProperty("鍗曚綅缂栫爜")
private String unitNo;
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java
index 45960c9..8fd8bab 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java
@@ -105,15 +105,19 @@
private DapIlcwmsCompletionLine buildInOutLine(InOutResultReportParam param, boolean inbound) {
RemotesInfoProperties.Dap dap = erpApi.getDap();
CloudMatnrParts matnrParts = parseCloudMatnr(param.getMatNr());
+ String docType = StringUtils.isNotBlank(param.getWkType())
+ ? param.getWkType()
+ : (inbound ? "IN" : "OUT");
+ String unitNo = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo() : "PCS";
DapIlcwmsCompletionLine line = new DapIlcwmsCompletionLine()
.setOrgNo(dap.getOrgNo())
- .setDocType(inbound ? dap.getDocTypeIn() : dap.getDocTypeOut())
+ .setDocType(docType)
.setDocNo(param.getOrderNo())
.setDocSeqNo(StringUtils.isNotBlank(param.getLineId()) ? param.getLineId() : "1")
// 鎸変簯浠撹鍒欐媶鍒嗙墿鏂欑紪鐮�
.setItemNo(matnrParts.getItemNo())
.setQty(parseQty(param.getQty()))
- .setUnitNo(dap.getUnitNo())
+ .setUnitNo(unitNo)
.setCombinationLotNo(matnrParts.getCombinationLotNo())
.setBarcode(matnrParts.getBarcode());
if (inbound) {
@@ -131,11 +135,11 @@
*/
private DapIlcwmsCompletionLine buildAdjustLine(InventoryAdjustReportParam param, boolean fillIn, boolean fillOut, String docSeqOverride) {
RemotesInfoProperties.Dap dap = erpApi.getDap();
- String docType = resolveAdjustDocType(param, dap);
+ String docType = resolveAdjustDocType(param);
String docNo = StringUtils.isNotBlank(param.getDocNo()) ? param.getDocNo() : "ADJ";
String docSeq = docSeqOverride != null ? docSeqOverride
: (StringUtils.isNotBlank(param.getDocSeqNo()) ? param.getDocSeqNo() : "1");
- String unit = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo() : dap.getUnitNo();
+ String unit = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo() : "PCS";
CloudMatnrParts matnrParts = parseCloudMatnr(param.getMatNr());
DapIlcwmsCompletionLine line = new DapIlcwmsCompletionLine()
.setOrgNo(dap.getOrgNo())
@@ -159,18 +163,18 @@
return line;
}
- private static String resolveAdjustDocType(InventoryAdjustReportParam param, RemotesInfoProperties.Dap dap) {
+ private static String resolveAdjustDocType(InventoryAdjustReportParam param) {
if (StringUtils.isNotBlank(param.getDocType())) {
return param.getDocType();
}
Integer ct = param.getChangeType();
if (ct != null && ct == 2) {
- return dap.getDocTypeOut();
+ return "OUT";
}
if (ct != null && ct == 3) {
- return dap.getDocTypeAdj();
+ return "ADJ";
}
- return dap.getDocTypeIn();
+ return "IN";
}
// private static String resolveBarcode(InOutResultReportParam param) {
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 2f33095..ed0ac6b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -2910,6 +2910,8 @@
InOutResultReportParam param = new InOutResultReportParam()
.setOrderNo(orderNo)
.setPlanNo(item.getPlatWorkCode())
+ .setWkType(item.getWkType())
+ .setUnitNo(item.getUnit())
.setLineId(item.getPlatItemId())
.setWareHouseId(wareHouseId)
.setLocId(locId)
diff --git a/rsf-server/src/main/resources/application-prod.yml b/rsf-server/src/main/resources/application-prod.yml
index 090c1c6..a76f49f 100644
--- a/rsf-server/src/main/resources/application-prod.yml
+++ b/rsf-server/src/main/resources/application-prod.yml
@@ -103,11 +103,7 @@
base-url: http://192.168.10.108:8180
# 榧庢嵎 DAP ilcwmsplus 瀹屾垚鍙嶉锛�9.1/9.2 缁勫寘鐢級
dap:
- org-no: ""
- doc-type-in: ""
- doc-type-out: ""
- doc-type-adj: ""
- unit-no: PCS
+ org-no: "1"
#鎺ュ彛鏄庣粏锛堣川妫�绛夛紱涓嬫柟 stock-in/out-completed-path 涓� CloudWmsErpFeignClient 涓�鑷达紱璋冩嫧 changeType=3 涓� stockTransferCompleted锛�
api:
notify-inspect: /report/inspect
--
Gitblit v1.9.1