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/utils/VersionUtils.java |   59 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 53c008e..3734e81 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -1,39 +1,46 @@
 package com.zy.asrs.utils;
 
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
-import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.result.Pakin;
+import com.zy.common.model.LocTypeDto;
 
 /**
  * Created by vincent on 2020/7/14
  */
 public class VersionUtils {
 
-    public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
-        wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
-        wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
-        wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+    /**
+     * 搴撲綅绉昏浆鏃剁被鍨嬫娴�
+     * 鍏煎鐗�
+     **/
+    public static boolean locMoveCheckLocType(LocMast loc, LocTypeDto dto) {
+        // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+        if (dto.getLocType1() == 2 && loc.getLocType1() == 1) {
+            return false;
+        }
+        return true;
     }
 
-    public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
-        wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
-        wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
-        wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
-        wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉$爜
-    }
-
-    public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
-        locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
-        locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
-        locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
-    }
-
-    public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
-        locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
-        locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
-        locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
-        locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
-        locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉$爜
+    /**
+     * 绫诲瀷妫�娴�
+     * 瀹屽叏妫�娴�
+     **/
+    public static boolean locMoveCheckLocTypeComplete(LocMast loc, LocTypeDto dto) {
+        // 濡傛灉婧愬簱浣嶆槸楂樺簱浣嶏紝鐩爣搴撲綅鏄綆搴撲綅
+        if (dto == null || loc == null) {
+            return false;
+        }
+        if (dto.getLocType1() != null && dto.getLocType1() > 0 && !dto.getLocType1().equals(loc.getLocType1())) {
+            return false;
+        }
+        if (dto.getLocType2() != null && dto.getLocType2() > 0 && !dto.getLocType2().equals(loc.getLocType2())) {
+            return false;
+        }
+        if (dto.getLocType3() != null && dto.getLocType3() > 0 && !dto.getLocType3().equals(loc.getLocType3())) {
+            return false;
+        }
+        return true;
     }
 
 }

--
Gitblit v1.9.1