From 57e23c353a177b9c003a2f524a2adeaf641e2e4c Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 16 八月 2024 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wms-dev' into wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java
index 4e2412c..2939aae 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java
@@ -1,5 +1,6 @@
package com.zy.asrs.wms.asrs.entity;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableLogic;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -25,6 +26,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
@Data
@TableName("strategy_laneway_rule")
@@ -33,11 +35,17 @@
private static final long serialVersionUID = 1L;
/**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
* 宸烽亾鍙�
*/
@ApiModelProperty(value= "宸烽亾鍙�")
- @TableId(value = "id", type = IdType.INPUT)
- private Long id;
+ private Integer laneNo;
/**
* X鍚�
@@ -130,6 +138,24 @@
// null // 澶囨敞
// );
+ public List<Integer> getLaneX$() {
+ if (null == this.laneX){ return null; }
+ List<Integer> list = JSON.parseArray(this.laneX, Integer.class);
+ if (list.isEmpty()) {
+ return null;
+ }
+ return list;
+ }
+
+ public List<Integer> getLaneY$() {
+ if (null == this.laneY){ return null; }
+ List<Integer> list = JSON.parseArray(this.laneY, Integer.class);
+ if (list.isEmpty()) {
+ return null;
+ }
+ return list;
+ }
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
--
Gitblit v1.9.1