From 70ecc717c746eef0c4503a19031ada582f5e94d1 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期五, 09 一月 2026 15:47:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/WmsErpController.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 a8acd14..247afe5 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
@@ -1,10 +1,9 @@
package com.vincent.rsf.openApi.controller;
-
-
import com.vincent.rsf.framework.exception.CoolException;
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;
@@ -14,10 +13,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.Map;
import java.util.Objects;
@RestController
-@RequestMapping("/erp")
+@RequestMapping("/erp1")
@Api("ERP鎺ュ彛瀵规帴")
public class WmsErpController {
@@ -46,7 +46,7 @@
* @return
*/
@ApiOperation("鍗曟嵁淇敼")
- @PostMapping("/order/upadte")
+ @PostMapping("/order/update")
public CommonResponse modifyOrderDtel(@RequestBody ErpOpParams params) {
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -93,4 +93,20 @@
return wmsErpService.syncMatnrs(parms);
}
+
+ @ApiOperation("璁㈠崟淇℃伅涓婃姤")
+ @PostMapping("/report/order")
+ public CommonResponse reportOrders(@RequestBody ReportParams params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return wmsErpService.reportOrders(params);
+ }
+
+ @ApiOperation("鐩樼偣宸紓淇敼")
+ @PostMapping("/check/locitem/update")
+ public CommonResponse reportCheck(@RequestBody ReportParams params) {
+ return wmsErpService.reportOrders(params);
+ }
+
}
--
Gitblit v1.9.1