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/BasDevpErrorLog.java | 214 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 206 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java b/src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java
index a5719a7..7bf40e9 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevpErrorLog.java
@@ -1,11 +1,11 @@
package com.zy.asrs.entity;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,9 +17,7 @@
public class BasDevpErrorLog implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+
/**
* 杈撻�佺紪鍙�
*/
@@ -152,13 +150,169 @@
@TableField("out_enable")
private String outEnable;
- @ApiModelProperty(value= "")
+ /**
+ * 鏁版嵁閿欒
+ */
+ @ApiModelProperty(value= "鏁版嵁閿欒")
@TableField("data_error")
private String dataError;
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ /**
+ * 鐩寸嚎鍏夌數
+ */
+ @ApiModelProperty(value= "鐩寸嚎鍏夌數")
+ @TableField("sensorG_arrive")
+ private String sensorGArrive;
+
+ /**
+ * 鍑忛�熷厜鐢�
+ */
+ @ApiModelProperty(value= "鍑忛�熷厜鐢�")
+ @TableField("sensorG_dec")
+ private String sensorGDec;
+
+ /**
+ * 鐩寸嚎鍑稿嚭
+ */
+ @ApiModelProperty(value= "鐩寸嚎鍑稿嚭")
+ @TableField("sensorG_arrive2")
+ private String sensorGArrive2;
+
+ /**
+ * 闄愪綅淇濇姢鍏夌數
+ */
+ @ApiModelProperty(value= "闄愪綅淇濇姢鍏夌數")
+ @TableField("sensor_limit")
+ private String sensorLimit;
+
+ /**
+ * 鎬ュ仠
+ */
+ @ApiModelProperty(value= "鎬ュ仠")
+ private String emergency;
+
+ /**
+ * 鍏夌數绂诲紑1
+ */
+ @ApiModelProperty(value= "鍏夌數绂诲紑1")
+ @TableField("sensorG_leave")
+ private String sensorGLeave;
+
+ /**
+ * 鍏夌數绂诲紑2
+ */
+ @ApiModelProperty(value= "鍏夌數绂诲紑2")
+ @TableField("sensorG_leave2")
+ private String sensorGLeave2;
+
+ /**
+ * 椤跺崌涓婂崌
+ */
+ @ApiModelProperty(value= "椤跺崌涓婂崌")
+ @TableField("sensorC_up")
+ private String sensorCUp;
+
+ /**
+ * 椤跺崌涓嬮檷
+ */
+ @ApiModelProperty(value= "椤跺崌涓嬮檷")
+ @TableField("sensorC_down")
+ private String sensorCDown;
+
+ /**
+ * 椤跺崌鐑户
+ */
+ @ApiModelProperty(value= "椤跺崌鐑户")
+ @TableField("lift_motor_fr")
+ private String liftMotorFr;
+
+ /**
+ * 鐩寸嚎鐑户
+ */
+ @ApiModelProperty(value= "鐩寸嚎鐑户")
+ @TableField("line_motor_fr")
+ private String lineMotorFr;
+
+ /**
+ * 绉绘牻鐑户
+ */
+ @ApiModelProperty(value= "绉绘牻鐑户")
+ @TableField("tran_motor_fr")
+ private String tranMotorFr;
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String rst1;
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String rst2;
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private String rst3;
+
+ /**
+ * 澶囩敤4
+ */
+ @ApiModelProperty(value= "澶囩敤4")
+ private String rst4;
+
+ /**
+ * 鐩磋鏂瑰悜鍒颁綅
+ */
+ @ApiModelProperty(value= "鐩磋鏂瑰悜鍒颁綅")
+ @TableField("sensor_arrive_d")
+ private String sensorArriveD;
+
+ /**
+ * 鐩磋鏂瑰悜鍑忛��
+ */
+ @ApiModelProperty(value= "鐩磋鏂瑰悜鍑忛��")
+ @TableField("sensor_dec_d")
+ private String sensorDecD;
+
+ /**
+ * 宸︾Щ鏂瑰悜鍒颁綅
+ */
+ @ApiModelProperty(value= "宸︾Щ鏂瑰悜鍒颁綅")
+ @TableField("sensor_arrive_l")
+ private String sensorArriveL;
+
+ /**
+ * 宸︾Щ鏂瑰悜鍑忛��
+ */
+ @ApiModelProperty(value= "宸︾Щ鏂瑰悜鍑忛��")
+ @TableField("sensor_dec_l")
+ private String sensorDecL;
+
+ /**
+ * 鍙崇Щ鏂瑰悜鍒颁綅
+ */
+ @ApiModelProperty(value= "鍙崇Щ鏂瑰悜鍒颁綅")
+ @TableField("sensor_arrive_r")
+ private String sensorArriveR;
+
+ /**
+ * 鍙崇Щ鏂瑰悜鍑忛��
+ */
+ @ApiModelProperty(value= "鍙崇Щ鏂瑰悜鍑忛��")
+ @TableField("sensor_dec_r")
+ private String sensorDecR;
+
public BasDevpErrorLog() {}
- public BasDevpErrorLog(Integer devNo,String passTimeOut,String objectNoIdError,String idNoObjectError,String lmfrError,String liftError,String dlfrError,String dmfrError,String vfdError,String srvError,String res1,String res2,String res3,String communicationTimeOut,String parameterIncompleteError,String dataNotClear,String setParameterError,Date createTime,String inEnable,String outEnable,String dataError) {
+ public BasDevpErrorLog(Integer devNo,String passTimeOut,String objectNoIdError,String idNoObjectError,String lmfrError,String liftError,String dlfrError,String dmfrError,String vfdError,String srvError,String res1,String res2,String res3,String communicationTimeOut,String parameterIncompleteError,String dataNotClear,String setParameterError,Date createTime,String inEnable,String outEnable,String dataError,String sensorGArrive,String sensorGDec,String sensorGArrive2,String sensorLimit,String emergency,String sensorGLeave,String sensorGLeave2,String sensorCUp,String sensorCDown,String liftMotorFr,String lineMotorFr,String tranMotorFr,String rst1,String rst2,String rst3,String rst4,String sensorArriveD,String sensorDecD,String sensorArriveL,String sensorDecL,String sensorArriveR,String sensorDecR) {
this.devNo = devNo;
this.passTimeOut = passTimeOut;
this.objectNoIdError = objectNoIdError;
@@ -180,6 +334,28 @@
this.inEnable = inEnable;
this.outEnable = outEnable;
this.dataError = dataError;
+ this.sensorGArrive = sensorGArrive;
+ this.sensorGDec = sensorGDec;
+ this.sensorGArrive2 = sensorGArrive2;
+ this.sensorLimit = sensorLimit;
+ this.emergency = emergency;
+ this.sensorGLeave = sensorGLeave;
+ this.sensorGLeave2 = sensorGLeave2;
+ this.sensorCUp = sensorCUp;
+ this.sensorCDown = sensorCDown;
+ this.liftMotorFr = liftMotorFr;
+ this.lineMotorFr = lineMotorFr;
+ this.tranMotorFr = tranMotorFr;
+ this.rst1 = rst1;
+ this.rst2 = rst2;
+ this.rst3 = rst3;
+ this.rst4 = rst4;
+ this.sensorArriveD = sensorArriveD;
+ this.sensorDecD = sensorDecD;
+ this.sensorArriveL = sensorArriveL;
+ this.sensorDecL = sensorDecL;
+ this.sensorArriveR = sensorArriveR;
+ this.sensorDecR = sensorDecR;
}
// BasDevpErrorLog basDevpErrorLog = new BasDevpErrorLog(
@@ -203,7 +379,29 @@
// null, // 鍒涘缓鏃堕棿
// null, //
// null, //
-// null //
+// null, // 鏁版嵁閿欒
+// null, // 鐩寸嚎鍏夌數
+// null, // 鍑忛�熷厜鐢�
+// null, // 鐩寸嚎鍑稿嚭
+// null, // 闄愪綅淇濇姢鍏夌數
+// null, // 鎬ュ仠
+// null, // 鍏夌數绂诲紑1
+// null, // 鍏夌數绂诲紑2
+// null, // 椤跺崌涓婂崌
+// null, // 椤跺崌涓嬮檷
+// null, // 椤跺崌鐑户
+// null, // 鐩寸嚎鐑户
+// null, // 绉绘牻鐑户
+// null, // 澶囩敤1
+// null, // 澶囩敤2
+// null, // 澶囩敤3
+// null, // 澶囩敤4
+// null, // 鐩磋鏂瑰悜鍒颁綅
+// null, // 鐩磋鏂瑰悜鍑忛��
+// null, // 宸︾Щ鏂瑰悜鍒颁綅
+// null, // 宸︾Щ鏂瑰悜鍑忛��
+// null, // 鍙崇Щ鏂瑰悜鍒颁綅
+// null // 鍙崇Щ鏂瑰悜鍑忛��
// );
public String getCreateTime$(){
--
Gitblit v1.9.1