From e353fd90f07aa7ab5320e24f9f8c9368510bde05 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 25 三月 2025 18:04:00 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index eb7a072..c0ae701 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -1,6 +1,5 @@
 package com.vincent.rsf.server.manager.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.vincent.rsf.framework.common.R;
@@ -12,16 +11,14 @@
 import com.vincent.rsf.server.manager.mapper.LocTypeRelaMapper;
 import com.vincent.rsf.server.manager.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 @Service("locService")
 public class LocServiceImpl extends ServiceImpl<LocMapper, Loc> implements LocService {
@@ -74,7 +71,7 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public R initLocs(LocMastInitParam param) {
+    public R initLocs(LocMastInitParam param, Long loginUserId) {
         //娓呯┖琛�
         this.baseMapper.deleteAll();
 
@@ -84,6 +81,8 @@
         if (Objects.isNull(warehouseAreas)) {
             throw new CoolException("搴撳尯涓嶅瓨鍦紒锛�");
         }
+        String join = StringUtils.join(param.getTypeIds(), ",");
+
         List<Loc> list = new ArrayList<>();
         for (int r = param.getStartRow(); r <= param.getEndRow(); r++) {
             for (int b = param.getStartBay(); b <= param.getEndBay(); b++) {
@@ -96,9 +95,11 @@
                             .setRow(r)
                             .setCol(b)
                             .setLev(l)
+                            .setType(join)
                             .setAreaId(param.getAreaId())
-                            .setWarehouseId(warehouseAreas.getWarehouseId())
-                            .setType(param.getType());
+                            .setUpdateBy(loginUserId)
+                            .setCreateBy(loginUserId)
+                            .setWarehouseId(warehouseAreas.getWarehouseId());
                     list.add(loc);
                 }
             }

--
Gitblit v1.9.1