From 92a30abbdc9f65cb1a45a65e39cbfd3f6b52461e Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 14:06:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 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 bfa10a0..c204d8b 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
@@ -1,10 +1,10 @@
package com.vincent.rsf.server.manager.entity;
import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
+import java.util.*;
import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
@@ -24,6 +24,7 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.stream.Collectors;
@Data
@TableName("man_bas_station")
@@ -96,7 +97,7 @@
* 瀹瑰櫒绫诲瀷
*/
@ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
- private Integer containerType;
+ private String containerType;
/**
* 鏉＄爜
@@ -150,7 +151,10 @@
private Long tenantId;
@TableField(exist = false)
- private Long[] areaIds;
+ private List<Long> areaIds;
+
+ @TableField(exist = false)
+ private List<Long> containerTypes;
public BasStation() {}
@@ -175,6 +179,22 @@
// null, // 鏇存柊浜�
// null // 鏇存柊鏃堕棿
// );
+
+ public List<Long> getContainerTypes$(){
+ if (Cools.isEmpty(this.containerType)){
+ return new ArrayList<>();
+ }
+ DictDataService service = SpringUtils.getBean(DictDataService.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)
+ );
+ List<Long> longs = dictData.stream().map(DictData::getId).collect(Collectors.toList());
+ return longs;
+ }
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
@@ -205,20 +225,7 @@
return "";
}
- public String getContainerType$(){
- if (Cools.isEmpty(this.useStatus)){
- return "";
- }
- DictDataService service = SpringUtils.getBean(DictDataService.class);
- DictData dictData = service.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, "sys_container_type")
- .eq(DictData::getValue, this.containerType)
- );
- if (!Cools.isEmpty(dictData)){
- return String.valueOf(dictData.getLabel());
- }
- return "";
- }
+
public String getArea$(){
if (null == this.area){ return null; }
--
Gitblit v1.9.1