From b103e4b52215a8178adb05fe501a719ee4be235f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 19 八月 2025 08:28:29 +0800
Subject: [PATCH] 接口数据同步

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
index 303f02b..f8c7c5d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java
@@ -14,6 +14,7 @@
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.enums.OrderType;
 import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.LocAreaServiceImpl;
 import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
 import com.vincent.rsf.server.system.constant.SerialRuleCode;
 import com.vincent.rsf.server.system.entity.Fields;
@@ -64,6 +65,10 @@
     private LocService locService;
     @Autowired
     private LocItemService locItemService;
+    @Autowired
+    private WarehouseAreasService warehouseAreasService;
+    @Autowired
+    private WarehouseService warehouseService;
 
     /**
      * @author Ryan
@@ -222,7 +227,7 @@
      * @version 1.0
      */
     @Override
-    @Transactional(timeout = 30, rollbackFor = Exception.class)
+    @Transactional(timeout = 60, rollbackFor = Exception.class)
     public R syncLocs(List<SyncLocsParams> locs) {
         List<Loc> syncLocs = new ArrayList<>();
         locs.forEach(loc -> {
@@ -244,7 +249,7 @@
      * @version 1.0
      */
     @Override
-    @Transactional(timeout = 30, rollbackFor = Exception.class)
+    @Transactional(timeout = 60, rollbackFor = Exception.class)
     public R syncMatGroups(List<SyncMatGroupsParams> matGroupsParams) {
         List<MatnrGroup> syncMatGroups = new ArrayList<>();
         matGroupsParams.forEach(matGroupsParam -> {
@@ -266,4 +271,53 @@
         }
         return R.ok();
     }
+
+    /**
+     * @author Ryan
+     * @date 2025/8/18
+     * @description: 搴撳尯淇℃伅鍚屾
+     * @version 1.0
+     */
+    @Override
+    @Transactional(timeout = 60, rollbackFor = Exception.class)
+    public R syncWarehouseAreas(List<LocAreasParams> areasParams) {
+        areasParams.forEach(param -> {
+            WarehouseAreas locArea = new WarehouseAreas();
+            BeanUtils.copyProperties(param, locArea);
+            WarehouseAreas warehouseAreas = warehouseAreasService
+                    .getOne(new LambdaQueryWrapper<WarehouseAreas>()
+                    .eq(WarehouseAreas::getName, param.getName()));
+            if (!Objects.isNull(warehouseAreas)) {
+                locArea.setWarehouseId(warehouseAreas.getId());
+            }
+            locArea.setName(param.getName())
+                    .setCode(param.getCode())
+                    .setId(null);
+            if (!warehouseAreasService.save(locArea)) {
+                throw new CoolException("搴撳尯淇濆瓨澶辫触锛侊紒");
+            }
+        });
+        return R.ok();
+    }
+
+    /**
+     * @author Ryan
+     * @date 2025/8/18
+     * @description: 浠撳簱鍚屾
+     * @version 1.0
+     */
+    @Override
+    @Transactional(timeout = 60, rollbackFor = Exception.class)
+    public R syncWarehouse(List<WarehouseParams> warehouses) {
+        warehouses.forEach(warehouse -> {
+            Warehouse ware = new Warehouse();
+            BeanUtils.copyProperties(warehouse, ware);
+            ware.setId(null);
+            if (!warehouseService.save(ware)) {
+                throw new CoolException("浠撳簱鍚屾淇濆瓨澶辫触锛侊紒");
+            }
+        });
+        return R.ok();
+    }
+
 }

--
Gitblit v1.9.1