From 9fe1ec3afe8696c628d076d1f76686c4efc3012e Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期二, 21 十月 2025 10:49:55 +0800
Subject: [PATCH] 容器初始化功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 82 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 30 deletions(-)
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 8e5386f..de80a2d 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
@@ -1,19 +1,26 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
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 com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
+import io.swagger.annotations.Api;
+import lombok.experimental.Accessors;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,8 +30,10 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
+import java.util.stream.Collectors;
@Data
+@Accessors(chain = true)
@TableName("man_warehouse_areas")
public class WarehouseAreas implements Serializable {
@@ -41,12 +50,12 @@
* 浠撳簱ID
*/
@ApiModelProperty("浠撳簱ID")
- private Long wareId;
+ private Long warehouseId;
/**
* 缂栧彿
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value= "涓氬姟绫诲瀷")
private String type;
/**
@@ -120,6 +129,7 @@
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -133,9 +143,18 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鏄惁浠撳簱")
+ private Integer flagWare;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鐢ㄤ簬浠撳簱鏍戠姸鍥撅紝鍞竴绱㈠紩")
+ private Long index;
/**
* 澶囨敞
*/
@@ -144,8 +163,8 @@
public WarehouseAreas() {}
- public WarehouseAreas(String uuid,String name,String code,Long shipperId,Short supplierId,Short flagMinus,Short flagLabelMange,Short flagMix,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.type = uuid;
+ public WarehouseAreas(String type,String name,String code,Long shipperId,Short supplierId,Short flagMinus,Short flagLabelMange,Short flagMix,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.type = type;
this.name = name;
this.code = code;
this.shipperId = shipperId;
@@ -163,25 +182,6 @@
this.memo = memo;
}
-// WarehouseAreas warehouseAreas = new WarehouseAreas(
-// null, // 缂栧彿
-// null, // 鍚嶇О
-// null, // 缂栫爜
-// null, // 璐т富鏍囪瘑(*)
-// null, // 渚涘簲鍟嗘爣璇�
-// null, // 鍏佽璐熷簱瀛�(*)
-// null, // 鏄惁鏍囩绠＄悊(*)[闈炵┖]
-// null, // 鏀寔娣锋斁(*)[闈炵┖]
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
-
public String getShipperId$(){
CompanysService service = SpringUtils.getBean(CompanysService.class);
Companys shipper = service.getById(this.shipperId);
@@ -191,7 +191,29 @@
return null;
}
- public String getSupplier$() {
+ public String getWarehouseId$() {
+ if (this.warehouseId == null) { return null; }
+ WarehouseService warehouseService = SpringUtils.getBean(WarehouseService.class);
+ Warehouse warehouse = warehouseService.getById(this.warehouseId);
+ if (!Objects.isNull(warehouse)) {
+ return warehouse.getName();
+ }
+ return null;
+ }
+
+ public String getType$() {
+ if (Cools.isEmpty(this.type)){
+ return "";
+ }
+ DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+ DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_WARE_AREAS_TYPE).eq(DictData::getValue, this.type));
+ if (Objects.isNull(dictData)) {
+ return null;
+ }
+ return dictData.getLabel();
+ }
+
+ public String getSupplierId$() {
CompanysService service = SpringUtils.getBean(CompanysService.class);
Companys supplier = service.getById(this.supplierId);
if (!Cools.isEmpty(supplier)){
--
Gitblit v1.9.1