From 1a11bfbc0fbd9b777807a623b2aacac7b4e7b5b3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 19 三月 2025 20:35:14 +0800
Subject: [PATCH] #优化 物料,库位类型添加空管

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
index 83cadf6..7600aae 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocController.java
@@ -1,5 +1,6 @@
 package com.vincent.rsf.server.manager.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.vincent.rsf.framework.common.Cools;
@@ -18,6 +19,7 @@
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -65,10 +67,26 @@
     @OperationLog("Create 搴撲綅淇℃伅琛�")
     @PostMapping("/loc/save")
     public R save(@RequestBody Loc loc) {
+        if (Objects.isNull(loc.getWarehouseId())) {
+            throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(loc.getAreaId())) {
+            throw new CoolException("浠撳簱ID涓嶈兘涓虹┖锛侊紒");
+        }
+        if (Objects.isNull(loc.getTypeIds())) {
+            throw new CoolException("搴撲綅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+        }
+        String join = StringUtils.join(loc.getTypeIds(), ",");
+        loc.setType(join);
+
         loc.setCreateBy(getLoginUserId());
         loc.setUpdateBy(getLoginUserId());
         if (!locService.save(loc)) {
             return R.error("Save Fail");
+        }
+
+        if (!locService.saveType(loc)) {
+            throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇濆瓨澶辫触锛侊紒");
         }
         return R.ok("Save Success").add(loc);
     }
@@ -78,10 +96,17 @@
     @PostMapping("/loc/update")
     public R update(@RequestBody Loc loc) {
         loc.setUpdateBy(getLoginUserId());
-        loc.setUpdateTime(new Date());
+
+        String join = StringUtils.join(loc.getTypeIds(), ",");
+        loc.setType(join);
+
         if (!locService.updateById(loc)) {
             return R.error("Update Fail");
         }
+
+        if (!locService.updateLoc(loc)) {
+            throw new CoolException("搴撲綅绫诲瀷鍏宠仈鍏崇郴淇敼澶辫触锛侊紒");
+        }
         return R.ok("Update Success").add(loc);
     }
 

--
Gitblit v1.9.1