From c94101e403cdaf332e0b80cbedab747a03a5df93 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 16 四月 2026 16:57:29 +0800
Subject: [PATCH] 定时任务开启

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 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 0e59c09..55201bd 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
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.vincent.rsf.common.utils.Utils;
 import com.vincent.rsf.framework.common.Cools;
 import com.vincent.rsf.framework.common.R;
 import com.vincent.rsf.framework.exception.CoolException;
@@ -49,13 +50,24 @@
 
     @Override
     public R modifyLocs(LocModifyParams locs) {
-        if (locs.getId().isEmpty()) {
+        if (Objects.isNull(locs.getId()) || locs.getId().isEmpty()) {
             throw new CoolException("搴撲綅ID涓嶈兘涓虹┖锛侊紒");
         }
         Loc loc = locs.getLoc();
 
         if (Objects.isNull(loc)) {
             throw new CoolException("淇敼搴撲綅淇℃伅涓嶈兘涓虹┖锛侊紒");
+        }
+        // 鍏煎鏃ц姹備腑鐨勭姸鎬佺鐢ㄥ弬鏁�
+        if (Objects.equals(loc.getStatus(), 0) && Objects.isNull(loc.getUseStatus())) {
+            loc.setUseStatus("X");
+            // loc.setStatus(0);
+            loc.setStatus(null);
+        }
+
+        List<Loc> exists = this.list(new LambdaQueryWrapper<Loc>().in(Loc::getId, locs.getId()));
+        if (exists.isEmpty()) {
+            throw new CoolException("鏈壘鍒板彲淇敼鐨勫簱浣嶄俊鎭紒锛�");
         }
 
         String join = loc.getType();
@@ -64,7 +76,7 @@
         }
         boolean update = this.update(new LambdaUpdateWrapper<Loc>()
                 .in(Loc::getId, locs.getId())
-                .eq(Loc::getStatus, 1)
+                // .eq(Loc::getStatus, 1)
                 .set(!Objects.isNull(loc.getAreaId()), Loc::getAreaId, loc.getAreaId())
                 .set(!Objects.isNull(loc.getWarehouseId()), Loc::getWarehouseId, loc.getWarehouseId())
                 .set(!Objects.isNull(loc.getUseStatus()), Loc::getUseStatus, loc.getUseStatus())
@@ -76,7 +88,8 @@
                 .set(!Objects.isNull(loc.getFlagLabelMange()), Loc::getFlagLabelMange, loc.getFlagLabelMange())
                 .set(!Objects.isNull(loc.getStatus()), Loc::getStatus, loc.getStatus()));
         if (!update) {
-            throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
+            // 鏃犳暟鎹彉鏇存椂鎸夋垚鍔熻繑鍥烇紝閬垮厤閲嶅鎿嶄綔鎶ラ敊
+            return R.ok(loc);
         }
 
         return R.ok(loc);
@@ -133,6 +146,7 @@
                 for (int l = param.getStartLev(); l <= param.getEndLev(); l++) {
                     // 鑾峰彇搴撲綅鍙�
                     String locNo = locStar +  String.format("%d", r) + String.format("-%d", b) + String.format("-%d", l);
+//                    String locNo = Utils.zeroFill("A1", 2) + String.format("%03d", r) + String.format("%03d", b) + String.format("%02d", l);
                     Loc loc = new Loc();
                     loc.setCode(locNo)
                             .setUseStatus("O")

--
Gitblit v1.9.1