From c3ddb43c8afb079aa7eb5e57a2e6e4169725f048 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 31 七月 2025 09:51:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java |    6 ++
 src/main/resources/mapper/asrs/ConfigMapper.xml                 |    4 ++
 src/main/java/com/zy/system/mapper/ConfigMapper.java            |    2 +
 src/main/java/com/zy/system/service/ConfigService.java          |    3 +
 src/main/java/com/zy/common/service/CommonService.java          |   52 +++++++++++++++++++++++---
 5 files changed, 60 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 87de7d8..aa8979c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -3,27 +3,23 @@
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
-import com.core.common.Arith;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.entity.result.FindLocNoAttributeVo;
-import com.zy.asrs.entity.result.KeyValueVo;
 import com.zy.asrs.service.*;
 import com.zy.asrs.utils.Utils;
 import com.zy.asrs.utils.VersionUtils;
 import com.zy.common.model.LocTypeDto;
-import com.zy.common.model.Shelves;
 import com.zy.common.model.StartupDto;
 import com.zy.common.properties.SlaveProperties;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -57,6 +53,8 @@
     private SlaveProperties slaveProperties;
     @Autowired
     private WrkDetlService wrkDetlService;
+    @Autowired
+    private ConfigService configService;
 
     /**
      * 鐢熸垚宸ヤ綔鍙�
@@ -204,6 +202,10 @@
             }
         }
 
+
+        Config crnSearchListConfig = configService.selectConfigByCode("123CrnSearchList");
+        int crnSearchList = Integer.parseInt(crnSearchListConfig.getValue());
+
         //姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
         for (int i = times; i < crnNumber * 2; i++) {
             int[] locNecessaryParameters = Utils.LocNecessaryParameters(rowLastno, curRow, crnNumber);
@@ -226,6 +228,34 @@
                 times++;
             }
         }
+
+        //浼樺寲绯荤粺锛屾彁楂樻悳绱�1鍙峰爢鍨涙満娆℃暟
+        if (crnNo == 2 || crnNo == 3) {
+            if (crnSearchList >= 2) {
+                //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
+                crnNo = 1;
+                if (basCrnpService.checkSiteError(crnNo, true)) {
+                    List<Integer> nearRowList = new ArrayList<Integer>(){{add(4);add(6);add(3);add(1);}};
+                    for (Integer near : nearRowList) {
+                        List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                                .eq("row1", near)
+                                .eq("loc_sts", "O")
+                                .eq("whs_type", rowLastnoType.getType().longValue())
+                                .eq("loc_type1", locTypeDto.getLocType1())
+                                .eq("loc_type2", locTypeDto.getLocType2())
+                        );
+                        int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type", 100));
+                        if (locMasts.size() - crnCountO <= 2) {
+                            log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
+                        }else {
+                            nearRow = near;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
         if (nearRow == 0) {
             if (locTypeDto.getLocType2() == 2) {
                 //灏濊瘯鎵�1鍙峰集杞ㄥ爢鍨涙満搴撲綅
@@ -515,6 +545,16 @@
             log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
             throw new CoolException("娌℃湁绌哄簱浣�");
         }
+
+        if (crnNo == 2 || crnNo == 3) {
+            crnSearchList++;
+            configService.updateValue("123CrnSearchList", String.valueOf(crnSearchList));
+        }
+
+        if (crnNo == 1) {
+            configService.updateValue("123CrnSearchList", String.valueOf(0));
+        }
+
         String locNo = locMast.getLocNo();
 
         // 鐢熸垚宸ヤ綔鍙�
diff --git a/src/main/java/com/zy/system/mapper/ConfigMapper.java b/src/main/java/com/zy/system/mapper/ConfigMapper.java
index 1ec2693..c5cecd2 100644
--- a/src/main/java/com/zy/system/mapper/ConfigMapper.java
+++ b/src/main/java/com/zy/system/mapper/ConfigMapper.java
@@ -12,4 +12,6 @@
 
     Config selectConfigByCode(@Param("code") String code);
 
+    int updateValue(@Param("code") String code, @Param("value") String value);
+
 }
diff --git a/src/main/java/com/zy/system/service/ConfigService.java b/src/main/java/com/zy/system/service/ConfigService.java
index 6100b23..81486f1 100644
--- a/src/main/java/com/zy/system/service/ConfigService.java
+++ b/src/main/java/com/zy/system/service/ConfigService.java
@@ -6,4 +6,7 @@
 public interface ConfigService extends IService<Config> {
 
     Config selectConfigByCode(String code);
+
+    boolean updateValue(String code, String value);
+
 }
diff --git a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
index dc9a0e0..530598e 100644
--- a/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
+++ b/src/main/java/com/zy/system/service/impl/ConfigServiceImpl.java
@@ -12,6 +12,10 @@
     @Override
     public Config selectConfigByCode(String code){
         return this.baseMapper.selectConfigByCode(code);
-    };
+    }
 
+    @Override
+    public boolean updateValue(String code, String value) {
+        return this.baseMapper.updateValue(code, value) > 0;
+    }
 }
diff --git a/src/main/resources/mapper/asrs/ConfigMapper.xml b/src/main/resources/mapper/asrs/ConfigMapper.xml
index f5f269f..bad4f73 100644
--- a/src/main/resources/mapper/asrs/ConfigMapper.xml
+++ b/src/main/resources/mapper/asrs/ConfigMapper.xml
@@ -19,4 +19,8 @@
         and code=#{code}
     </select>
 
+    <update id="updateValue">
+        update sys_config set value = #{value} where code = #{code}
+    </update>
+
 </mapper>

--
Gitblit v1.9.1