From a1a7c03eae40f4b0344fce652e1a240cf5283624 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 13 九月 2024 16:37:42 +0800
Subject: [PATCH] #合并订单出库，统一转波次出库前最新代码
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/LanewayRule.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 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..6b39ea5 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,8 +1,9 @@
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;
+import java.util.*;
import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
@@ -33,11 +34,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 +137,30 @@
// null // 澶囨敞
// );
+ public List<Integer> getLaneX$() {
+ if (null == this.laneX){ return new ArrayList<>(); }
+ if (Cools.isEmpty(this.laneX)) {
+ return new ArrayList<>();
+ }
+ List<Integer> list = JSON.parseArray(this.laneX, Integer.class);
+ if (list.isEmpty()) {
+ return new ArrayList<>();
+ }
+ return list;
+ }
+
+ public List<Integer> getLaneY$() {
+ if (null == this.laneY){ return new ArrayList<>(); }
+ if (Cools.isEmpty(this.laneY)) {
+ return new ArrayList<>();
+ }
+ List<Integer> list = JSON.parseArray(this.laneY, Integer.class);
+ if (list.isEmpty()) {
+ return new ArrayList<>();
+ }
+ return list;
+ }
+
public String getHostId$(){
HostService service = SpringUtils.getBean(HostService.class);
Host host = service.getById(this.hostId);
--
Gitblit v1.9.1