From 89255f6e9692026ffe4ce20bf4454c963a35ad69 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 26 五月 2025 12:56:30 +0800
Subject: [PATCH] 移库任务优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/BasStation.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 c5ddc4b..003b0c4 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
@@ -4,6 +4,7 @@
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;
@@ -117,6 +118,10 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
+ private Integer deleted;
+
/**
* 鍒涘缓浜�
*/
@@ -150,10 +155,10 @@
private Long tenantId;
@TableField(exist = false)
- private Long[] areaIds;
+ private List<Long> areaIds;
@TableField(exist = false)
- private Long[] containerTypes;
+ private List<Long> containerTypes;
public BasStation() {}
@@ -185,16 +190,11 @@
}
DictDataService service = SpringUtils.getBean(DictDataService.class);
-
- String content = this.getContainerType().substring(1, this.getContainerType().length() - 1);
- String[] parts = content.split(",");
- Long[] longArray = new Long[parts.length];
- for (int i = 0; i < parts.length; i++) {
- longArray[i] = Long.parseLong(parts[i].trim());
- }
+ 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, longArray)
+ .in(DictData::getValue, longs1)
);
List<Long> longs = dictData.stream().map(DictData::getId).collect(Collectors.toList());
return longs;
--
Gitblit v1.9.1