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 | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index b4f54f2..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,14 @@
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
@@ -141,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")
@@ -231,18 +249,18 @@
if (Cools.isEmpty(this.area)) {
return "";
}
- String normalized = this.area.trim();
- String upper = normalized.toUpperCase(Locale.ROOT);
- if ("1".equals(normalized) || "A".equals(upper) || "A鍖�".equals(upper) || "A搴�".equals(upper) || "A搴撳尯".equals(upper)) {
- return "A搴撳尯";
+ 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();
}
- if ("2".equals(normalized) || "B".equals(upper) || "B鍖�".equals(upper) || "B搴�".equals(upper) || "B搴撳尯".equals(upper)) {
- return "B搴撳尯";
- }
- if ("3".equals(normalized) || "C".equals(upper) || "C鍖�".equals(upper) || "C搴�".equals(upper) || "C搴撳尯".equals(upper)) {
- return "C搴撳尯";
- }
- return normalized;
+ return this.area.trim();
}
public String getLocType1$() {
if (null == this.locType1){ return null; }
--
Gitblit v1.9.1