From 41ee7170ba0d269028e737d2021ed0565022f737 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 22 八月 2025 10:00:08 +0800
Subject: [PATCH] 差异单同步 调整单接口同步
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 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..3ea5771 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,11 +2,9 @@
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.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;
@@ -40,7 +38,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 +60,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 +78,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);
@@ -94,6 +96,7 @@
* @version 1.0
*/
@ApiOperation("鍚屾鍗曟嵁")
+ @OperationLog("鍗曟嵁鍚屾")
@PostMapping("/sync/checks")
public R syncCheckResult(@RequestBody SyncOrderParams syncOrders) {
if (Objects.isNull(syncOrders)) {
@@ -109,6 +112,7 @@
* @version 1.0
*/
@ApiOperation("璋冩嫈鍗曞悓姝�")
+ @OperationLog("璋冩嫈鍗曞悓姝�")
@PostMapping("/sync/transfers")
public R syncTransfer(@RequestBody SyncTransferParams transferParams) {
if (Objects.isNull(transferParams)) {
@@ -125,6 +129,7 @@
* @version 1.0
*/
@ApiOperation("搴撳瓨璋冩暣鍗曞悓姝�")
+ @OperationLog("搴撳瓨璋冩暣鍗曞悓姝�")
@PostMapping("/sync/revises")
public R syncRevise(@RequestBody SyncLocReviseParams reviseParams) {
if (Objects.isNull(reviseParams)) {
@@ -140,6 +145,7 @@
* @version 1.0
*/
@ApiOperation("璐ㄦ鍗曚笂鎶�")
+ @OperationLog("璐ㄦ鍗曚笂鎶�")
@PostMapping("/sync/qlyInspect")
public R syncQlyReport(@RequestBody List<OrderParams> orders) {
@@ -153,10 +159,13 @@
* @version 1.0
*/
@ApiOperation("鍗曟嵁淇敼")
+ @OperationLog("鍗曟嵁淇敼")
@PostMapping("/sync/orders/update")
- public R syncOrderUpdate(@RequestBody List<OrderParams> orders) {
-
- return R.ok();
+ public R syncOrderUpdate(@RequestBody SyncOrderParams orders) {
+ if (Objects.isNull(orders)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return receiveMsgService.syncOrderUpdate(orders);
}
@@ -167,13 +176,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