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/api/service/impl/CloudWmsReportServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
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) {
--
Gitblit v1.9.1