From c9de8ae615cb9dc002ffe0eff40032000649ccff Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 28 十月 2025 13:10:39 +0800
Subject: [PATCH] ERP单据下发功能优化 参数优化
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java | 13 +++---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 5 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java | 2
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportParams.java | 25 ++++++++++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java | 62 +++++++++++++++++++++++++++++++
rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java | 3 +
6 files changed, 100 insertions(+), 10 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
index 1ef929f..abb02fc 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java
@@ -6,6 +6,7 @@
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
+import com.vincent.rsf.openApi.entity.params.ReportParams;
import com.vincent.rsf.openApi.service.WmsErpService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -96,9 +97,9 @@
}
- @ApiOperation("鐗╂枡淇℃伅涓婃姤")
+ @ApiOperation("璁㈠崟淇℃伅涓婃姤")
@PostMapping("/report/order")
- public CommonResponse reportOrders(@RequestBody Map<String, Object> params) {
+ public CommonResponse reportOrders(@RequestBody ReportParams params) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java
new file mode 100644
index 0000000..ef04b90
--- /dev/null
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportDataParam.java
@@ -0,0 +1,62 @@
+package com.vincent.rsf.openApi.entity.params;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ReportDataParam", description = "涓婃姤鍙傛暟璇︽儏")
+public class ReportDataParam {
+
+ @ApiModelProperty("WMS鍗曞彿")
+ private String WMSNO;
+
+ @ApiModelProperty("閲囪喘鍗曞彿")
+ private String PONO;
+
+ @ApiModelProperty("鍏ュ簱鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date OrderDate;
+
+ @ApiModelProperty("閲囪喘閫�璐у崟鍙�/鐢熶骇鍗曞彿/")
+ private String OrderNO;
+
+ @ApiModelProperty("鐜板搧绁ㄥ彿")
+ private String GoodsNO;
+
+ @ApiModelProperty("鐩樼偣鏁伴噺")
+ private Double PDQty;
+
+ @ApiModelProperty("鏄惁涓嶈壇锛�1 鏄紝 0鍚�")
+ private String IsBad;
+
+ @ApiModelProperty("鐩樼偣鍘熷洜")
+ private String Reason;
+
+ @ApiModelProperty("鍝佺鍙风爜")
+ private String ItemCode;
+
+ @ApiModelProperty("鍏ュ簱鏁伴噺")
+ private Double InQty;
+
+ @ApiModelProperty("鍑哄簱鏁伴噺")
+ private Double OutQty;
+
+ @ApiModelProperty("缂栬緫鐢ㄦ埛")
+ private String EditUser;
+
+ @ApiModelProperty("缂栬緫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date EditDate;
+
+ @ApiModelProperty("澶囨敞璇存槑")
+ private String MemoDtl;
+}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportParams.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportParams.java
new file mode 100644
index 0000000..ed961ab
--- /dev/null
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/ReportParams.java
@@ -0,0 +1,25 @@
+package com.vincent.rsf.openApi.entity.params;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@Accessors(chain = true)
+@ApiModel(value = "ReportParams", description = "甯屾棩ERP涓婃姤鍙傛暟")
+public class ReportParams implements Serializable {
+
+ @ApiModelProperty("璁㈠崟绫诲瀷")
+ private String OrderType;
+
+ @ApiModelProperty("鍔ㄤ綔绫诲瀷")
+ private String Action = "Update";
+
+ @ApiModelProperty("鏁版嵁")
+ private List<ReportDataParam> Data;
+
+}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java
index fc3653a..6337f6f 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/WmsErpService.java
@@ -3,6 +3,7 @@
import com.vincent.rsf.openApi.entity.dto.CommonResponse;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
+import com.vincent.rsf.openApi.entity.params.ReportParams;
import java.util.Map;
@@ -16,7 +17,7 @@
CommonResponse syncMatnrs(ErpMatnrParms parms);
- CommonResponse reportOrders(Map<String, Object> params);
+ CommonResponse reportOrders(ReportParams params);
CommonResponse reportCheck(Map<String, Object> params);
}
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
index 01f8aef..298e948 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/impl/WmsErpServiceImpl.java
@@ -13,6 +13,7 @@
import com.vincent.rsf.openApi.entity.dto.OrderDto;
import com.vincent.rsf.openApi.entity.params.ErpMatnrParms;
import com.vincent.rsf.openApi.entity.params.ErpOpParams;
+import com.vincent.rsf.openApi.entity.params.ReportParams;
import com.vincent.rsf.openApi.service.WmsErpService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -215,22 +216,22 @@
* @version 1.0
*/
@Override
- public CommonResponse reportOrders(Map<String, Object> params) {
+ public CommonResponse reportOrders(ReportParams params) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
/**WMS鍩虹閰嶇疆閾炬帴*/
String rcsUrl = erpApi.getHost() + ":" + erpApi.getPort() + WmsConstant.REPORT_ORDER_CALLBACK;
- log.info("鐗╂枡淇敼锛歿}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, JSONObject.toJSONString(params));
HttpHeaders headers = new HttpHeaders();
headers.add("Content-Type", "application/json");
headers.add("api-version", "v2.0");
-
HttpEntity httpEntity = new HttpEntity(params, headers);
+ log.info("宸插畬鎴愯鍗曚笂浼狅細{}锛� 璇锋眰鍙傛暟锛� {}", rcsUrl, httpEntity.getBody());
+
ResponseEntity<String> exchange = restTemplate.exchange(rcsUrl, HttpMethod.POST, httpEntity, String.class);
- log.info("淇敼缁撴灉锛� {}", exchange);
+ log.info("宸插畬鎴愯鍗曚笂浼狅紝璇锋眰缁撴灉锛� {}", exchange);
if (Objects.isNull(exchange.getBody())) {
- throw new CoolException("淇敼澶辫触锛侊紒");
+ throw new CoolException("涓婁紶澶辫触锛侊紒");
} else {
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.coercionConfigDefaults().setCoercion(CoercionInputShape.EmptyString, CoercionAction.AsEmpty);
@@ -239,7 +240,7 @@
if (result.getCode() == 200) {
return result;
} else {
- throw new CoolException("淇敼澶辫触锛侊紒");
+ throw new CoolException("涓婁紶澶辫触锛侊紒");
}
} catch (JsonProcessingException e) {
throw new CoolException(e.getMessage());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
index 17b9672..f62dff9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/constant/RcsConstant.java
@@ -9,5 +9,5 @@
public static String syncLocs = "/rsf-open-api/rcs/sync/locs";
//涓婃姤璁㈠崟淇℃伅
- public static String REPORT_ORDERS = "/rsf-open-api/report/complete/orders";
+ public static String REPORT_ORDERS = "/rsf-open-api/erp/report/order";
}
--
Gitblit v1.9.1