From 34503a2e9a29418346a4ac8f84170ab8f4321d6e Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 19 三月 2026 15:19:05 +0800
Subject: [PATCH] lsh#行号适配
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
index 9b41edc..31dd316 100644
--- a/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
+++ b/rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/ERPController.java
@@ -41,7 +41,6 @@
@Autowired(required = false)
private WmsServerFeignClient wmsServerFeignClient;
-
@ApiOperation("浠撳簱淇℃伅鍚屾")
@PostMapping("/wareHouse/sync")
public CommonResponse syncWareHouse(@RequestBody Object objParams) {
@@ -98,7 +97,11 @@
JSONArray params = paramsFormat(objParams);
List<Customer> customerList = JSON.parseArray(params.toJSONString(), Customer.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
- return CommonResponse.ok();
+ String resultMsg = erpReportService.syncCustomer(customerList);
+ if ("200".equals(resultMsg)){
+ return CommonResponse.ok(resultMsg);
+ }
+ return CommonResponse.error(resultMsg);
}
@ApiOperation("渚涘簲鍟嗕俊鎭悓姝�")
@@ -115,7 +118,11 @@
JSONArray params = paramsFormat(objParams);
List<Supplier> supplierList = JSON.parseArray(params.toJSONString(), Supplier.class);
// 鏁版嵁澶勭悊锛岃浆鍙憇erver
- return CommonResponse.ok();
+ String resultMsg = erpReportService.syncSupplier(supplierList);
+ if ("200".equals(resultMsg)){
+ return CommonResponse.ok(resultMsg);
+ }
+ return CommonResponse.error(resultMsg);
}
@ApiOperation("鍏�/鍑哄簱浠诲姟閫氱煡鍗�")
@@ -137,6 +144,9 @@
String i = erpReportService.addOrderToServer(order);
if (i.equals("200")){
errorMsg.append(order.getOrderNo()+"涓嬪彂鎴愬姛;");
+ if (orderList.size()==1){
+ return CommonResponse.ok(errorMsg.toString());
+ }
} else {
errorMsg.append(order.getOrderNo()+"涓嬪彂澶辫触,鍘熷洜锛�"+i+";");
if (orderList.size()==1){
@@ -147,6 +157,44 @@
return CommonResponse.ok(errorMsg.toString());
}
+ @ApiOperation("鍏�/鍑哄簱浠诲姟閫氱煡鍗曪紙鏂伴摼璺級")
+ @PostMapping("/order/add/new")
+ public CommonResponse addOrderNew(@RequestBody Object objParams) {
+ if (Objects.isNull(objParams)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (SIMULATED_DATA_ENABLE.equals("1")) {
+ return CommonResponse.ok();
+ }
+
+ JSONArray params = paramsFormat(objParams);
+ List<Order> orderList = JSON.parseArray(params.toJSONString(), Order.class);
+ StringBuffer msg = new StringBuffer();
+ boolean allSuccess = true;
+ for (Order order : orderList) {
+ String result = erpReportService.addOrderToServerNew(order);
+ if ("200".equals(result)) {
+ msg.append(order.getOrderNo()).append("涓嬪彂鎴愬姛;");
+ } else {
+ allSuccess = false;
+ msg.append(order.getOrderNo()).append("涓嬪彂澶辫触,鍘熷洜锛�").append(result).append(";");
+ }
+ }
+ return allSuccess ? CommonResponse.ok(msg.toString()) : CommonResponse.error(msg.toString());
+ }
+
+ @ApiOperation("璁㈠崟淇℃伅涓婃姤锛堟柊閾捐矾锛�")
+ @PostMapping("/report/order/new")
+ public CommonResponse reportOrderNew(@RequestBody Object objParams) {
+ if (Objects.isNull(objParams)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (SIMULATED_DATA_ENABLE.equals("1")) {
+ return CommonResponse.ok();
+ }
+ return erpReportService.reportOrderNew(objParams);
+ }
+
@ApiOperation("鍏�/鍑哄簱浠诲姟閫氱煡鍗曞彇娑�")
@PostMapping("/order/cancel")
public CommonResponse cancelOrder(@RequestBody Object objParams) {
--
Gitblit v1.9.1