From ccc5defb8924d04abe55301937d1650a51da593f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 26 三月 2025 15:28:39 +0800
Subject: [PATCH] 仓库树状图添加Index属性，适配前端
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java | 10 ++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 5 +++++
rsf-server/src/main/resources/application.yml | 4 ++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java | 3 +++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseServiceImpl.java | 5 +++++
5 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
index ba4840f..7f678d1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Warehouse.java
@@ -150,6 +150,9 @@
@TableField(exist = false)
private Integer flagWare;
+ @TableField(exist = false)
+ @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+ private Long index;
public Warehouse() {}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index 9707aaa..bacd303 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -9,6 +9,7 @@
import com.vincent.rsf.server.manager.service.CompanysService;
import com.vincent.rsf.server.manager.service.ShipperService;
import com.vincent.rsf.server.manager.service.WarehouseService;
+import io.swagger.annotations.Api;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -143,6 +144,10 @@
@TableField(exist = false)
@ApiModelProperty("鏄惁浠撳簱")
private Integer flagWare;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+ private Long index;
/**
* 澶囨敞
*/
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
index bc36c4b..259612b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocServiceImpl.java
@@ -77,8 +77,14 @@
@Transactional(rollbackFor = Exception.class)
public R initLocs(LocMastInitParam param, Long loginUserId) {
//娓呯┖琛�
- this.baseMapper.deleteAll();
-
+// this.baseMapper.deleteAll();
+ //娓呯┖褰撳墠搴撳尯搴撲綅
+ List<Loc> locs = this.list(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, param.getWarehouseId()).eq(Loc::getAreaId, param.getAreaId()));
+ if (!locs.isEmpty()) {
+ if (!this.remove(new LambdaQueryWrapper<Loc>().eq(Loc::getWarehouseId, param.getWarehouseId()).eq(Loc::getAreaId, param.getAreaId()))) {
+ throw new CoolException("鍒濆鍖栧け璐ワ細鏁版嵁鍒犻櫎澶辫触锛侊紒");
+ }
+ }
WarehouseAreas warehouseAreas = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
.eq(WarehouseAreas::getWarehouseId, param.getWarehouseId())
.eq(WarehouseAreas::getId, param.getAreaId()));
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseServiceImpl.java
index e9edfaa..8c9d9f2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WarehouseServiceImpl.java
@@ -49,10 +49,15 @@
}
warehouses.forEach(warehouse -> {
warehouse.setFlagWare(1);
+ //浠撳簱ID鍜屽簱鍖篒D鏈夊彲鑳介噸澶嶏紝鎷兼帴浠撳簱ID锛岀粍鎴愬敮涓�绱㈠紩
+ warehouse.setIndex(warehouse.getId());
List<WarehouseAreas> areas = new ArrayList<>();
warehouseAreas.forEach(warehouseAreas1 -> {
if (warehouse.getId().equals(warehouseAreas1.getWarehouseId())) {
warehouseAreas1.setFlagWare(0);
+ //浠撳簱ID鍜屽簱鍖篒D鏈夊彲鑳介噸澶嶏紝鎷兼帴浠撳簱ID锛岀粍鎴愬敮涓�绱㈠紩
+ String s = warehouseAreas1.getId() + "" + warehouseAreas1.getWarehouseId();
+ warehouseAreas1.setIndex(Long.parseLong(s));
areas.add(warehouseAreas1);
}
});
diff --git a/rsf-server/src/main/resources/application.yml b/rsf-server/src/main/resources/application.yml
index b6c0ce1..4a03079 100644
--- a/rsf-server/src/main/resources/application.yml
+++ b/rsf-server/src/main/resources/application.yml
@@ -29,8 +29,8 @@
call-setters-on-nulls: true
global-config:
:banner: false
- db-config:
- id-type: auto
+# db-config:
+# id-type: auto
# logic-delete-value: 1
# logic-not-delete-value: 0
--
Gitblit v1.9.1