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 | 431 +++++++++++------------------------------------------
1 files changed, 91 insertions(+), 340 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index f4952b8..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,17 @@
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")
public class BasDevp implements Serializable {
@@ -138,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")
@@ -148,6 +169,18 @@
@ApiModelProperty(value= "")
@TableField("out_ok")
private String outOk;
+
+ @ApiModelProperty(value= "楂樹綆绫诲瀷{0:鏈煡,1:浣庡簱浣�,2:楂樺簱浣峿")
+ @TableField("loc_type1")
+ private Short locType1;
+
+ @ApiModelProperty(value= "瀹界獎绫诲瀷{0:鏈煡,1:绐勫簱浣�,2:瀹藉簱浣峿")
+ @TableField("loc_type2")
+ private Short locType2;
+
+ @ApiModelProperty(value= "杞婚噸绫诲瀷{0:鏈煡,1:杞诲簱浣�,2:閲嶅簱浣峿")
+ @TableField("loc_type3")
+ private Short locType3;
/**
* 淇敼浜哄憳
@@ -200,251 +233,10 @@
@TableField("cart_pos")
private Integer cartPos;
- public BasDevp() {}
+ @ApiModelProperty(value = "1妤兼媶鍨涗笂浼犲彔鐩樺洖搴撴爣璁�")
+ @TableField("report_sign")
+ private Integer reportSign;
- public BasDevp(String decDesc,String devMk,String inEnable,String outEnable,String autoing,String loading,String canining,String canouting,String fronting,String rearing,String uping,String downing,String inreq1,String inreq2,Integer wrkNo,Integer wrkNo1,Integer ctnType,String barcode,Integer inQty,Integer row1,Date ioTime,String area,String inOk,String outOk,Long modiUser,Date modiTime,Long appeUser,Date appeTime,Double stdQty,Double minWt,Double maxWt,Double grossWt,Integer cartPos) {
- this.decDesc = decDesc;
- this.devMk = devMk;
- this.inEnable = inEnable;
- this.outEnable = outEnable;
- this.autoing = autoing;
- this.loading = loading;
- this.canining = canining;
- this.canouting = canouting;
- this.fronting = fronting;
- this.rearing = rearing;
- this.uping = uping;
- this.downing = downing;
- this.inreq1 = inreq1;
- this.inreq2 = inreq2;
- this.wrkNo = wrkNo;
- this.wrkNo1 = wrkNo1;
- this.ctnType = ctnType;
- this.barcode = barcode;
- this.inQty = inQty;
- this.row1 = row1;
- this.ioTime = ioTime;
- this.area = area;
- this.inOk = inOk;
- this.outOk = outOk;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.stdQty = stdQty;
- this.minWt = minWt;
- this.maxWt = maxWt;
- this.grossWt = grossWt;
- this.cartPos = cartPos;
- }
-
-// BasDevp basDevp = new BasDevp(
-// null, // 璁惧鎻忚堪
-// null, // 澶囨敞
-// null, // 鍙叆
-// null, // 鍙嚭
-// null, // 鑷姩
-// null, // 鏈夌墿
-// null, // 鑳藉叆
-// null, // 鑳藉嚭
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 闇�姹�1
-// null, // 闇�姹�2
-// null, // 宸ヤ綔鍙�
-// null, //
-// null, // 瀹瑰櫒绫诲瀷
-// null, // 鏉″舰鐮�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, // 閲嶉噺
-// null //
-// );
-
- public Integer getDevNo() {
- return devNo;
- }
-
- public void setDevNo(Integer devNo) {
- this.devNo = devNo;
- }
-
- public String getDecDesc() {
- return decDesc;
- }
-
- public void setDecDesc(String decDesc) {
- this.decDesc = decDesc;
- }
-
- public String getDevMk() {
- return devMk;
- }
-
- public void setDevMk(String devMk) {
- this.devMk = devMk;
- }
-
- public String getInEnable() {
- return inEnable;
- }
-
- public void setInEnable(String inEnable) {
- this.inEnable = inEnable;
- }
-
- public String getOutEnable() {
- return outEnable;
- }
-
- public void setOutEnable(String outEnable) {
- this.outEnable = outEnable;
- }
-
- public String getAutoing() {
- return autoing;
- }
-
- public void setAutoing(String autoing) {
- this.autoing = autoing;
- }
-
- public String getLoading() {
- return loading;
- }
-
- public void setLoading(String loading) {
- this.loading = loading;
- }
-
- public String getCanining() {
- return canining;
- }
-
- public void setCanining(String canining) {
- this.canining = canining;
- }
-
- public String getCanouting() {
- return canouting;
- }
-
- public void setCanouting(String canouting) {
- this.canouting = canouting;
- }
-
- public String getFronting() {
- return fronting;
- }
-
- public void setFronting(String fronting) {
- this.fronting = fronting;
- }
-
- public String getRearing() {
- return rearing;
- }
-
- public void setRearing(String rearing) {
- this.rearing = rearing;
- }
-
- public String getUping() {
- return uping;
- }
-
- public void setUping(String uping) {
- this.uping = uping;
- }
-
- public String getDowning() {
- return downing;
- }
-
- public void setDowning(String downing) {
- this.downing = downing;
- }
-
- public String getInreq1() {
- return inreq1;
- }
-
- public void setInreq1(String inreq1) {
- this.inreq1 = inreq1;
- }
-
- public String getInreq2() {
- return inreq2;
- }
-
- public void setInreq2(String inreq2) {
- this.inreq2 = inreq2;
- }
-
- public Integer getWrkNo() {
- return wrkNo;
- }
-
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public Integer getWrkNo1() {
- return wrkNo1;
- }
-
- public void setWrkNo1(Integer wrkNo1) {
- this.wrkNo1 = wrkNo1;
- }
-
- public Integer getCtnType() {
- return ctnType;
- }
-
- public void setCtnType(Integer ctnType) {
- this.ctnType = ctnType;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public Integer getInQty() {
- return inQty;
- }
-
- public void setInQty(Integer inQty) {
- this.inQty = inQty;
- }
-
- public Integer getRow1() {
- return row1;
- }
-
- public void setRow1(Integer row1) {
- this.row1 = row1;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
@@ -453,36 +245,63 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public void setIoTime(Date ioTime) {
- this.ioTime = 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){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "浣庡簱浣�";
+ case 2:
+ return "楂樺簱浣�";
+ default:
+ return String.valueOf(this.locType1);
+ }
}
- public String getArea() {
- return area;
+ public String getLocType2$() {
+ if (null == this.locType2){ return null; }
+ switch (this.locType2){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "绐勫簱浣�";
+ case 2:
+ return "瀹藉簱浣�";
+ default:
+ return String.valueOf(this.locType2);
+ }
}
- public void setArea(String area) {
- this.area = area;
- }
-
- public String getInOk() {
- return inOk;
- }
-
- public void setInOk(String inOk) {
- this.inOk = inOk;
- }
-
- public String getOutOk() {
- return outOk;
- }
-
- public void setOutOk(String outOk) {
- this.outOk = outOk;
- }
-
- public Long getModiUser() {
- return modiUser;
+ public String getLocType3$() {
+ if (null == this.locType3){ return null; }
+ switch (this.locType3){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "杞诲簱浣�";
+ case 2:
+ return "閲嶅簱浣�";
+ default:
+ return String.valueOf(this.locType3);
+ }
}
public String getModiUser$(){
@@ -494,27 +313,11 @@
return null;
}
- public void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
public String getModiTime$(){
if (Cools.isEmpty(this.modiTime)){
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
- }
-
- public void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
}
public String getAppeUser$(){
@@ -526,14 +329,6 @@
return null;
}
- public void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
- }
-
- public Date getAppeTime() {
- return appeTime;
- }
-
public String getAppeTime$(){
if (Cools.isEmpty(this.appeTime)){
return "";
@@ -541,49 +336,5 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
- public void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public Double getStdQty() {
- return stdQty;
- }
-
- public void setStdQty(Double stdQty) {
- this.stdQty = stdQty;
- }
-
- public Double getMinWt() {
- return minWt;
- }
-
- public void setMinWt(Double minWt) {
- this.minWt = minWt;
- }
-
- public Double getMaxWt() {
- return maxWt;
- }
-
- public void setMaxWt(Double maxWt) {
- this.maxWt = maxWt;
- }
-
- public Double getGrossWt() {
- return grossWt;
- }
-
- public void setGrossWt(Double grossWt) {
- this.grossWt = grossWt;
- }
-
- public Integer getCartPos() {
- return cartPos;
- }
-
- public void setCartPos(Integer cartPos) {
- this.cartPos = cartPos;
- }
-
-
}
+
--
Gitblit v1.9.1