From 42c4d4f7fafed636859978db35de5ff7ff4d964b Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 27 一月 2026 09:50:43 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 73 ++++++++++++++++++++++++++++--------
1 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
index 3f6da6a..fc23911 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java
@@ -2,15 +2,15 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.erp.params.OrderParams;
-import com.vincent.rsf.server.api.controller.erp.params.SyncLocReviseParams;
-import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams;
-import com.vincent.rsf.server.api.controller.erp.params.SyncTransferParams;
+import com.vincent.rsf.server.api.controller.erp.params.*;
+import com.vincent.rsf.server.api.entity.validator.SyncOrderValidator;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
+import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
-import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.entity.User;
+import com.vincent.rsf.server.system.service.impl.UserServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +32,8 @@
@Autowired
private ReceiveMsgService receiveMsgService;
+ @Autowired
+ private UserServiceImpl userService;
/**
* @author Ryan
@@ -40,7 +42,9 @@
* @return
* @time 2025/3/4 13:57
*/
+
@ApiOperation(value = "鎺ユ敹鍚屾ERP閲囪喘鍗�")
+ @OperationLog("閲囪喘鍗曞悓姝�")
@PostMapping("/sync/purchase")
public R syncPurchases(@RequestBody List<OrderParams> orders) {
if (orders.isEmpty()) {
@@ -60,6 +64,7 @@
* @version 1.0
*/
@ApiOperation(value = "鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)")
+ @OperationLog("鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)")
@PostMapping("/sync/delivery")
public R syncDelivery(@RequestBody List<OrderParams> orders) {
if (!receiveMsgService.syncPurchasee(orders)) {
@@ -77,6 +82,7 @@
* @time 2025/3/12 16:56
*/
@ApiOperation(value = "璐ㄦ缁撴灉鍚屾")
+ @OperationLog("璐ㄦ缁撴灉鍚屾")
@PostMapping("/sync/inspect")
public void syncQlyInspect(HttpServletRequest request, HttpServletResponse response) {
AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
@@ -90,13 +96,14 @@
/**
* @author Ryan
* @date 2025/8/19
- * @description: 鍚屾鐩樼偣鍗曟嵁
+ * @description: 鏀惰揣閫氱煡鍗曞悓姝�
* @version 1.0
*/
@ApiOperation("鍚屾鍗曟嵁")
+ @OperationLog("鍗曟嵁鍚屾")
@PostMapping("/sync/checks")
- public R syncCheckResult(@RequestBody SyncOrderParams syncOrders) {
- if (Objects.isNull(syncOrders)) {
+ public R syncCheckResult(@RequestBody List<SyncOrderParams> syncOrders) {
+ if (Objects.isNull(syncOrders) || syncOrders.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return receiveMsgService.syncCheckOrder(syncOrders, getLoginUserId());
@@ -109,12 +116,13 @@
* @version 1.0
*/
@ApiOperation("璋冩嫈鍗曞悓姝�")
+ @OperationLog("璋冩嫈鍗曞悓姝�")
@PostMapping("/sync/transfers")
public R syncTransfer(@RequestBody SyncTransferParams transferParams) {
if (Objects.isNull(transferParams)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return receiveMsgService.syncTransfer(transferParams);
+ return receiveMsgService.syncTransfer(transferParams, getLoginUserId());
}
@@ -125,12 +133,13 @@
* @version 1.0
*/
@ApiOperation("搴撳瓨璋冩暣鍗曞悓姝�")
+ @OperationLog("搴撳瓨璋冩暣鍗曞悓姝�")
@PostMapping("/sync/revises")
public R syncRevise(@RequestBody SyncLocReviseParams reviseParams) {
if (Objects.isNull(reviseParams)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return receiveMsgService.syncLocRevise(reviseParams);
+ return receiveMsgService.syncLocRevise(reviseParams, getLoginUserId());
}
/**
@@ -140,6 +149,7 @@
* @version 1.0
*/
@ApiOperation("璐ㄦ鍗曚笂鎶�")
+ @OperationLog("璐ㄦ鍗曚笂鎶�")
@PostMapping("/sync/qlyInspect")
public R syncQlyReport(@RequestBody List<OrderParams> orders) {
@@ -153,10 +163,24 @@
* @version 1.0
*/
@ApiOperation("鍗曟嵁淇敼")
+ @OperationLog("鍗曟嵁淇敼")
@PostMapping("/sync/orders/update")
- public R syncOrderUpdate(@RequestBody List<OrderParams> orders) {
+ public R syncOrderUpdate(@RequestBody List<SyncOrderParams> orders) {
+ if (Objects.isNull(orders) || orders.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ try {
+ // 涓氬姟楠岃瘉
+ new SyncOrderValidator().validateBatchOrders(orders);
- return R.ok();
+ User erp = userService.getByUsername("erp", 1L);
+ // 澶勭悊涓氬姟
+ return receiveMsgService.syncCheckOrder(orders, erp.getId());
+ } catch (IllegalArgumentException e) {
+ return R.error(e.getMessage());
+ } catch (Exception e) {
+ return R.error(e.getMessage());
+ }
}
@@ -167,13 +191,30 @@
* @version 1.0
*/
@ApiOperation("鍗曟嵁鍒犻櫎")
+ @OperationLog("鍗曟嵁鍒犻櫎")
@PostMapping("/sync/orders/delete")
- public R syncOrderDel(@RequestBody List<OrderParams> orders) {
-
- return R.ok();
+ public R syncOrderDel(@RequestBody List<SyncOrderParams> orders) {
+ if (Objects.isNull(orders)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return receiveMsgService.syncOrderDelete(orders);
}
-
+ /**
+ * @author Ryan
+ * @date 2025/8/22
+ * @description: 鐩樼偣宸紓鍗曞悓姝�
+ * @version 1.0
+ */
+ @PostMapping("/sync/check/result")
+ @ApiOperation("鐩樼偣宸紓鍗曞悓姝�")
+ @OperationLog("鐩樼偣宸紓鍗�")
+ public R checkResult(@RequestBody SyncCheckDiffParams syncParams) {
+ if (Objects.isNull(syncParams)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return receiveMsgService.syncCheckDiffs(syncParams);
+ }
}
--
Gitblit v1.9.1