From d2cb36959b65ece32cec7e2db4d6764f5c788b1d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 08:33:24 +0800
Subject: [PATCH] 1. 波次删除判断是否有子任务列表 2. 任务明细添加字段:执行数量,完成数量, 源单据号,源单据ID
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 5cb74ab..5b1f707 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -63,7 +63,7 @@
@ApiModelProperty("搴撲綅绫诲瀷(*)[man_loc_type]")
@TableField(exist = false)
- private String typeIds;
+ private List<Long> typeIds;
/**
* 铏氭嫙搴撲綅
@@ -107,13 +107,18 @@
*/
@ApiModelProperty(value= "瀹�")
private Double width;
-
/**
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
@TableField("`row`")
private Integer row;
+
+ /**
+ * 璁惧鍙�
+ */
+ @ApiModelProperty(value= "璁惧鍙�")
+ private Integer deviceNo;
/**
* 鍒�
@@ -280,9 +285,10 @@
// null // 澶囨敞
// );
- public String getType$(){
+ public String getTypeIds$(){
if (null == this.type){ return null; }
- List<String> asList = Arrays.asList(this.type);
+ String[] split = this.type.split(",");
+ List<String> asList = Arrays.asList(split);
if (asList.isEmpty()) {
return null;
}
--
Gitblit v1.9.1