From 1c6f5702f4a1860d7a20eb6ad81c7c87246c833d Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 01 五月 2026 15:25:35 +0800
Subject: [PATCH] 多加入参数和修改规则
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java | 17 +----------------
1 files changed, 1 insertions(+), 16 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 0fa07e3..6b3c6c1 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
@@ -58,10 +58,6 @@
log.warn("ErpApi(浜戜粨WMS) 鏈厤缃� host/base-url锛岃烦杩� 9.1 鍏�/鍑哄簱缁撴灉涓婃姤锛岃鍗曪細{}", param.getOrderNo());
return stubWithoutUpstream("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呬笂鎶�");
}
- String err = validateDapBaseForInOut(param);
- if (err != null) {
- return resultMap(400, err, null);
- }
boolean inbound = param.getInbound() == null || Boolean.TRUE.equals(param.getInbound());
DapIlcwmsCompletionRequest req = new DapIlcwmsCompletionRequest()
.setData(Collections.singletonList(buildInOutLine(param, inbound)));
@@ -84,10 +80,6 @@
InOutResultReportParam first = lines.get(0);
boolean inbound = first.getInbound() == null || Boolean.TRUE.equals(first.getInbound());
for (InOutResultReportParam param : lines) {
- String err = validateDapBaseForInOut(param);
- if (err != null) {
- return resultMap(400, err, null);
- }
boolean rowIn = param.getInbound() == null || Boolean.TRUE.equals(param.getInbound());
if (rowIn != inbound) {
return resultMap(400, "鍚堝苟涓婃姤椤诲悓涓哄叆搴撴垨鍚屼负鍑哄簱", null);
@@ -141,19 +133,12 @@
: DapIlcwmsResponseNormalizer.toNotifyFormatFlexible(raw);
}
- private String validateDapBaseForInOut(InOutResultReportParam param) {
- if (param != null && StringUtils.isBlank(param.getUnitNo())) {
- return "unitNo 涓嶈兘涓虹┖";
- }
- return null;
- }
-
private DapIlcwmsCompletionLine buildInOutLine(InOutResultReportParam param, boolean inbound) {
CloudMatnrParts matnrParts = parseCloudMatnr(param.getMatNr());
String docType = StringUtils.isNotBlank(param.getWkType())
? param.getWkType()
: (inbound ? "IN" : "OUT");
- String unitNo = StringUtils.trimToEmpty(param.getUnitNo());
+ String unitNo = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo().trim() : "PCS";
String orgNoLine = StringUtils.isNotBlank(param.getOrgNo()) ? param.getOrgNo().trim() : DEFAULT_CLOUD_ORG_NO;
String docWh = StringUtils.trimToNull(param.getDocWarehouseNo());
String inWhLine = StringUtils.isNotBlank(param.getInWarehouseNo()) ? param.getInWarehouseNo().trim() : DEFAULT_CLOUD_WH_NO;
--
Gitblit v1.9.1