From 28b4c9e4e1855e61b9abea4c591e95094e1afd18 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期二, 24 三月 2026 11:02:43 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
index ba9ec94..34cd75c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java
@@ -88,7 +88,8 @@
* 鍙法鍖哄尯鍩焛d
*/
@ApiModelProperty(value = "鍙法鍖哄尯鍩焛d")
- private String crossZoneArea;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<Integer> crossZoneArea;
/**
* 鏄惁wcs绔欑偣
@@ -106,13 +107,14 @@
* 瀹瑰櫒绫诲瀷
*/
@ApiModelProperty(value = "瀹瑰櫒绫诲瀷")
- private String containerType;
+ @TableField(typeHandler = JacksonTypeHandler.class)
+ private List<Integer> containerType;
/**
* 鏉＄爜
*/
@ApiModelProperty(value = "鏉＄爜")
- @TableField(updateStrategy = FieldStrategy.IGNORED)
+ @TableField(updateStrategy = FieldStrategy.ALWAYS)
private String barcode;
/**
@@ -179,6 +181,18 @@
@TableField(typeHandler = JacksonTypeHandler.class)
private List<String> stationAlias;
+ /**
+ * 浠撳簱缂栫爜
+ */
+ @ApiModelProperty(value = "浠撳簱缂栫爜")
+ private String productionLineCode;
+
+ /**
+ * 浠撳簱鍚嶇О
+ */
+ @ApiModelProperty(value = "浠撳簱鍚嶇О")
+ private String productionLineName;
+
public BasStation() {
}
@@ -194,11 +208,11 @@
}
DictDataService service = SpringUtils.getBean(DictDataService.class);
- Object parse = JSONArray.parse(this.getContainerType());
- List<Long> longs1 = JSONObject.parseArray(parse.toString(), Long.class);
+// Object parse = JSONArray.parse(this.getContainerType());
+// List<Long> longs1 = JSONObject.parseArray(parse.toString(), Long.class);
List<DictData> dictData = service.list(new LambdaQueryWrapper<DictData>()
.eq(DictData::getDictTypeCode, "sys_container_type")
- .in(DictData::getValue, longs1));
+ .in(DictData::getValue, this.getContainerType()));
List<Long> longs = dictData.stream().map(DictData::getId).collect(Collectors.toList());
return longs;
}
@@ -274,4 +288,6 @@
return null;
}
}
+
+
}
--
Gitblit v1.9.1