From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案, 如何实现,对现有找库位规则进行整改,数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位,离线设备不分配 3、库位分配要均衡到每一个设备  4、库位高度需要匹配到对应库位信息,低库位能向上兼容  5、空托盘优先放在locType2库位=1的库位,没有这种库位了,允许放到其他库位 6、给入库站点设置有限去那些堆垛机,其次去那些堆垛机,弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置,当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频,如果是高频则从前往后找库位,如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用

---
 src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java |   57 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
index d5fc975..0814073 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasCrnpServiceImpl.java
@@ -4,12 +4,13 @@
 import com.core.common.Cools;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasDevp;
 import com.zy.asrs.mapper.BasCrnpMapper;
 import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.service.BasDevpService;
 import com.zy.asrs.service.WrkMastService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 @Slf4j
@@ -18,10 +19,12 @@
 
     @Autowired
     private WrkMastService wrkMastService;
+    @Autowired
+    private BasDevpService basDevpService;
 
-    @Value("${store.bufferCount}")
-    private int bufferCount;
-
+    /**
+     * 妫�鏌ュ爢鍨涙満鍩虹鍙敤鐘舵�侊紝涓嶆弧瓒虫椂鐩存帴鎶涘嚭涓氬姟寮傚父銆�
+     */
     @Override
     public BasCrnp checkSiteStatus(Integer crnId) {
         BasCrnp crnp = this.selectById(crnId);
@@ -37,25 +40,34 @@
         return crnp;
     }
 
+    /**
+     * 缁熶竴鏍¢獙鍫嗗灈鏈烘槸鍚﹀彲鍙備笌鍏ュ簱/鍑哄簱鍒嗛厤銆�
+     */
     @Override
     public boolean checkSiteError(Integer crnNo, boolean pakin) {
         BasCrnp crnp = this.selectById(crnNo);
         if (Cools.isEmpty(crnp)) {
-            log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
+//            log.error("{}鍙峰爢鍨涙満涓嶅瓨鍦�", crnNo);
             return false;
         }
-        if (pakin) {
-            //TODO鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-5-24 ADD
-            int storeCount = wrkMastService.getStoreCount(crnNo);
-            int maxCount = bufferCount;
-            if(crnNo==1){
-                maxCount = 3;
-            }
+        if (crnp.getCrnSts() == null || crnp.getCrnSts() != 3) {
+            log.error("{}鍙峰爢鍨涙満闈炶嚜鍔ㄨ繛绾跨姸鎬侊紝鏃犳硶浣滀笟!", crnNo);
+            return false;
+        }
+        if (crnp.getCrnErr() != null && crnp.getCrnErr() != 0) {
+            log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
+            return false;
+        }
 
-            if(storeCount >= maxCount){
-                log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
-                return false;
-            }
+        if (pakin) {
+            //鎺у埗鍏ュ簱鏆傚瓨鏁帮紝闃叉涓诲共閬撳牭濉烇紝2022-10-23 ADD  鏈疄瑁�
+//            int maxCount = 2;
+//            int storeCount = wrkMastService.getStoreCount(crnNo);
+//
+//            if(storeCount >= maxCount){
+//                log.error("{}鍙峰爢鍨涙満鏆傚瓨鏁板凡婊�!", crnNo);
+//                return false;
+//            }
 
             if ("N".equals(crnp.getInEnable())) {
                 log.error("{}鍙峰爢鍨涙満涓嶅彲鍏�", crnNo);
@@ -67,18 +79,7 @@
                 return false;
             }
         }
-//        if (crnp.getCrnSts() != null) {
-//            if (crnp.getCrnSts() == 10) {
-//                log.error("{}鍙峰爢鍨涙満鐘舵�佷负10.閿欒", crnNo);
-//                return false;
-//            }
-//        }
-        if (crnp.getCrnErr() != null) {
-            if (crnp.getCrnErr() != 0) {
-                log.error("{}鍙峰爢鍨涙満寮傚父锛屽紓甯哥爜{}", crnNo, crnp.getCrnErr());
-                return false;
-            }
-        }
+
         return true;
     }
 }

--
Gitblit v1.9.1