From e23efd75ca74df6b35a0c03b8e8fc0712c9d4544 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 01 五月 2026 15:30:54 +0800
Subject: [PATCH] 多加入参数和修改规则
---
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java | 38 +++++++++++++-------------------------
1 files changed, 13 insertions(+), 25 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 3adaa1b..fa6f91e 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
@@ -44,7 +44,7 @@
public Map<String, Object> syncMatnrsToCloud(Object body) {
if (!isCloudWmsConfigured()) {
log.warn("ErpApi(浜戜粨WMS) 鏈厤缃� host/base-url锛岃烦杩囩墿鏂欏熀纭�淇℃伅鍚屾");
- return stubSuccess("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呭悓姝�");
+ return stubWithoutUpstream("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呭悓姝�");
}
return cloudWmsErpFeignClient.syncMatnrs(body != null ? body : new HashMap<>());
}
@@ -56,11 +56,7 @@
}
if (!isCloudWmsConfigured()) {
log.warn("ErpApi(浜戜粨WMS) 鏈厤缃� host/base-url锛岃烦杩� 9.1 鍏�/鍑哄簱缁撴灉涓婃姤锛岃鍗曪細{}", param.getOrderNo());
- return stubSuccess("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呬笂鎶�");
- }
- String err = validateDapBaseForInOut(param);
- if (err != null) {
- return resultMap(400, err, null);
+ return stubWithoutUpstream("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呬笂鎶�");
}
boolean inbound = param.getInbound() == null || Boolean.TRUE.equals(param.getInbound());
DapIlcwmsCompletionRequest req = new DapIlcwmsCompletionRequest()
@@ -79,15 +75,11 @@
}
if (!isCloudWmsConfigured()) {
log.warn("ErpApi(浜戜粨WMS) 鏈厤缃� host/base-url锛岃烦杩� 9.1 鍏ュ嚭搴撳悎骞朵笂鎶�");
- return stubSuccess("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呬笂鎶�");
+ return stubWithoutUpstream("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呬笂鎶�");
}
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);
@@ -112,7 +104,7 @@
}
if (!isCloudWmsConfigured()) {
log.warn("ErpApi(浜戜粨WMS) 鏈厤缃� host/base-url锛岃烦杩� 9.2 搴撳瓨璋冩暣涓婃姤锛岀墿鏂欙細{}", param.getMatNr());
- return stubSuccess("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呬笂鎶�");
+ return stubWithoutUpstream("浜戜粨鍦板潃鏈厤缃紝鏈疄闄呬笂鎶�");
}
Integer changeType = param.getChangeType();
if (changeType == 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;
@@ -171,9 +156,11 @@
.setCombinationLotNo(matnrParts.getCombinationLotNo())
.setBarcode(matnrParts.getBarcode());
if (inbound) {
- line.setInWarehouseNo(inWhLine).setInCellNo(param.getLocId());
+ line.setInWarehouseNo(inWhLine).setInCellNo(inWhLine);
+ // line.setInWarehouseNo(inWhLine).setInCellNo(param.getLocId());
} else {
- line.setOutWarehouseNo(outWhLine).setOutCellNo(param.getLocId());
+ line.setOutWarehouseNo(outWhLine).setOutCellNo(outWhLine);
+ // line.setOutWarehouseNo(outWhLine).setOutCellNo(param.getLocId());
}
return line;
}
@@ -307,10 +294,11 @@
return baseUrl != null && !baseUrl.trim().isEmpty();
}
- private Map<String, Object> stubSuccess(String msg) {
+ /** 鏈蛋浜戜粨 HTTP锛宑ode 闈� 200锛岄伩鍏嶈皟搴﹁鍒ゆ垚鍔� */
+ private Map<String, Object> stubWithoutUpstream(String msg) {
Map<String, Object> data = new HashMap<>();
- data.put("result", "SUCCESS");
- return resultMap(200, msg, data);
+ data.put("result", "SKIPPED");
+ return resultMap(503, msg, data);
}
private Map<String, Object> resultMap(int code, String msg, Map<String, Object> data) {
--
Gitblit v1.9.1