From 14779a9a602f7e3b2988c58a631f0293cf36e74c Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 27 一月 2026 09:47:04 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 3061e4b..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
@@ -3,11 +3,14 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
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.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;
@@ -29,6 +32,8 @@
@Autowired
private ReceiveMsgService receiveMsgService;
+ @Autowired
+ private UserServiceImpl userService;
/**
* @author Ryan
@@ -164,8 +169,18 @@
if (Objects.isNull(orders) || orders.isEmpty()) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-// return receiveMsgService.syncOrderUpdate(orders);
- return receiveMsgService.syncCheckOrder(orders, getLoginUserId());
+ try {
+ // 涓氬姟楠岃瘉
+ new SyncOrderValidator().validateBatchOrders(orders);
+
+ 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());
+ }
}
--
Gitblit v1.9.1