From 46ba954e2b86a7e5f3f8b6624bc800a0a5cef844 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 04 九月 2025 16:55:03 +0800
Subject: [PATCH] 波次任务功能优化 不同站点类型状态变更优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 53 insertions(+), 38 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 206ebef..6481ea9 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,12 +1,13 @@
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.enums.StationTypeEnum;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -24,6 +25,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")
@@ -43,6 +45,9 @@
*/
@ApiModelProperty(value= "绔欑偣鍚嶇О")
private String stationName;
+
+ @ApiModelProperty("绔欑偣绫诲瀷: {0:鍏夌數锛� 1:鏃犲厜鐢祡")
+ private Integer type;
/**
* 鍙叆
@@ -66,7 +71,7 @@
* 鎵�灞炲簱鍖篿d
*/
@ApiModelProperty(value= "鎵�灞炲簱鍖篿d")
- private Integer area;
+ private Long area;
/**
* 鏄惁鍙法鍖�
@@ -96,12 +101,13 @@
* 瀹瑰櫒绫诲瀷
*/
@ApiModelProperty(value= "瀹瑰櫒绫诲瀷")
- private Integer containerType;
+ private String containerType;
/**
* 鏉＄爜
*/
@ApiModelProperty(value= "鏉＄爜")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private String barcode;
/**
@@ -115,6 +121,10 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
/**
* 鍒涘缓浜�
@@ -142,6 +152,9 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+ @ApiModelProperty(value= "鐘舵��")
+ private Integer status;
+
/**
* 鎵�灞炴満鏋�
*/
@@ -149,31 +162,33 @@
private Long tenantId;
@TableField(exist = false)
- private Long[] areaIds;
+ private List<Long> areaIds;
+
+ @TableField(exist = false)
+ private List<Long> containerTypes;
public BasStation() {}
+ public String getType$() {
+ if (this.type == null) return null;
+ return StationTypeEnum.getStationDesc(this.type);
+ }
+ public List<Long> getContainerTypes$(){
+ if (Cools.isEmpty(this.containerType)){
+ return new ArrayList<>();
+ }
+ DictDataService service = SpringUtils.getBean(DictDataService.class);
-// BasStation basStation = new BasStation(
-// null, // 绔欑偣鍚嶇О
-// null, // 鍙叆
-// null, // 鍙嚭
-// null, // 鐘舵��
-// null, // 鎵�灞炲簱鍖篿d
-// null, // 鏄惁鍙法鍖�
-// null, // 鍙法鍖哄尯鍩焛d
-// null, // 鏄惁wcs绔欑偣
-// null, // wcs绔欑偣淇℃伅
-// null, // 瀹瑰櫒绫诲瀷
-// null, // 鏉＄爜
-// null, // 鏄惁鑷姩璋冩嫧
-// null, // 澶囨敞
-// null, // 鍒涘缓浜�
-// null, // 鍒涘缓鏃堕棿
-// null, // 鏇存柊浜�
-// null // 鏇存柊鏃堕棿
-// );
+ 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)){
@@ -204,20 +219,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; }
@@ -228,4 +230,17 @@
}
return null;
}
+
+
+ public Boolean getStatusBool(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return true;
+ case 0:
+ return false;
+ default:
+ return null;
+ }
+ }
}
--
Gitblit v1.9.1