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/entity/BasDevp.java |   43 ++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 42 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index 78ca14c..7be3d1c 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -8,12 +8,15 @@
 import com.zy.system.service.UserService;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.utils.Utils;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
+import java.util.Locale;
 
 @Data
 @TableName("asr_bas_devp")
@@ -140,8 +143,24 @@
     @TableField("io_time")
     private Date ioTime;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "缁戝畾搴撳尯锛堜粎绠$悊鐢ㄩ�旓級")
     private String area;
+
+    @ApiModelProperty(value= "鍏ュ簱绗竴浼樺厛鍫嗗灈鏈猴紝CSV")
+    @TableField("in_first_crn_csv")
+    private String inFirstCrnCsv;
+
+    @ApiModelProperty(value= "鍏ュ簱绗簩浼樺厛鍫嗗灈鏈猴紝CSV")
+    @TableField("in_second_crn_csv")
+    private String inSecondCrnCsv;
+
+    @ApiModelProperty(value= "鍏ュ簱绗竴浼樺厛姹犲綋鍓嶅爢鍨涙満鍙�")
+    @TableField("in_first_crn_current_no")
+    private Integer inFirstCrnCurrentNo;
+
+    @ApiModelProperty(value= "鍏ュ簱绗簩浼樺厛姹犲綋鍓嶅爢鍨涙満鍙�")
+    @TableField("in_second_crn_current_no")
+    private Integer inSecondCrnCurrentNo;
 
     @ApiModelProperty(value= "")
     @TableField("in_ok")
@@ -214,6 +233,10 @@
     @TableField("cart_pos")
     private Integer cartPos;
 
+    @ApiModelProperty(value = "1妤兼媶鍨涗笂浼犲彔鐩樺洖搴撴爣璁�")
+    @TableField("report_sign")
+    private Integer reportSign;
+
 
     public String getIoTime$(){
         if (Cools.isEmpty(this.ioTime)){
@@ -222,6 +245,23 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
     }
 
+    public String getArea$() {
+        if (Cools.isEmpty(this.area)) {
+            return "";
+        }
+        List<Integer> areas = Utils.parseStorageAreas(this.area);
+        if (!Cools.isEmpty(areas)) {
+            StringBuilder builder = new StringBuilder();
+            for (Integer areaNo : areas) {
+                if (builder.length() > 0) {
+                    builder.append("銆�");
+                }
+                builder.append(Utils.formatStorageArea(areaNo));
+            }
+            return builder.toString();
+        }
+        return this.area.trim();
+    }
     public String getLocType1$() {
         if (null == this.locType1){ return null; }
         switch (this.locType1){
@@ -297,3 +337,4 @@
     }
 
 }
+

--
Gitblit v1.9.1