From 5c1e5f8ce5e53c187f100f5d786a77991198960a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 15:23:44 +0800
Subject: [PATCH] 修改 # 物料导入导出添加动态扩展字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 143 +++++++++++++++++++++++++++--------------------
1 files changed, 82 insertions(+), 61 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
index 24a47ed..8781760 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java
@@ -1,24 +1,22 @@
package com.vincent.rsf.server.manager.entity;
import com.baomidou.mybatisplus.annotation.*;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.vincent.rsf.server.manager.service.WarehouseAreasService;
-import com.vincent.rsf.server.manager.service.WarehouseService;
-import lombok.experimental.Accessors;
-import org.springframework.format.annotation.DateTimeFormat;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.SpringUtils;
-import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
+import com.vincent.rsf.server.system.service.UserService;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
@Data
-@TableName("man_loc")
@Accessors(chain = true)
+@TableName("man_loc")
public class Loc implements Serializable {
private static final long serialVersionUID = 1L;
@@ -31,28 +29,29 @@
private Long id;
/**
- * 浠撳簱鏍囪瘑
- */
- @ApiModelProperty(value = "浠撳簱鏍囪瘑")
- private Long warehouseId;
- /**
* 搴撳尯鏍囪瘑
*/
@ApiModelProperty(value= "搴撳尯鏍囪瘑")
private Long areaId;
/**
- * 缂栧彿
+ * 搴撲綅鍙�
*/
- @ApiModelProperty(value= "缂栧彿")
+ @ApiModelProperty(value= "搴撲綅鍙�")
private String code;
/**
- * 搴撲綅绫诲瀷
+ * 浠撳簱鏍囪瘑
*/
- @ApiModelProperty(value= "搴撲綅绫诲瀷")
- private String type;
+ @ApiModelProperty(value= "浠撳簱鏍囪瘑")
+ private Long warehouseId;
+ /**
+ * 搴撲綅绫诲瀷(*) H: 楂樺簱浣� M: 涓簱浣� L: 浣庡簱浣�
+ */
+ @ApiModelProperty(value= "搴撲綅绫诲瀷(*) H: 楂樺簱浣� M: 涓簱浣� L: 浣庡簱浣� ")
+ @TableField("`type`")
+ private String type;
/**
* 铏氭嫙搴撲綅
@@ -79,24 +78,23 @@
private String unit;
/**
- * 闀�/瀹�/楂�
+ * 闀�
*/
- @ApiModelProperty(value= "闀�/瀹�/楂�")
+ @ApiModelProperty(value= "闀�")
@TableField("`length`")
private Double length;
/**
- * 瀹�
- */
- @ApiModelProperty("瀹�")
- @TableField("`width`")
- private Double width;
-
- /**
* 楂�
*/
- @ApiModelProperty("楂�")
+ @ApiModelProperty(value= "楂�")
private Double height;
+
+ /**
+ * 瀹�
+ */
+ @ApiModelProperty(value= "瀹�")
+ private Double width;
/**
* 鎺�
@@ -118,15 +116,11 @@
private Integer lev;
/**
- * 閫氶亾
+ * 宸烽亾
*/
@ApiModelProperty(value= "宸烽亾")
+ @TableField("`channel`")
private Integer channel;
-
- /**
- * 搴撲綅浣跨敤鐘舵��
- */
- private String useStatus;
/**
* 鏈�澶ч浂浠舵暟
@@ -139,6 +133,12 @@
*/
@ApiModelProperty(value= "鏈�澶у寘瑁呮暟")
private Integer maxPack;
+
+ /**
+ * 搴撲綅浣跨敤鐘舵�� O: 绌哄簱 D: 绌烘澘 R: 棰勭害鍑哄簱 S: 棰勭害鍏ュ簱 X: 绂佺敤 聽 F: 鍦ㄥ簱
+ */
+ @ApiModelProperty(value= "搴撲綅浣跨敤鐘舵�� O: 绌哄簱 D: 绌烘澘 R: 棰勭害鍑哄簱 S: 棰勭害鍏ュ簱 X: 绂佺敤 聽 F: 鍦ㄥ簱 ")
+ private String useStatus;
/**
* 鏄惁鏍囩绠＄悊
@@ -156,6 +156,7 @@
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
+ @TableField("`status`")
private Integer status;
/**
@@ -205,24 +206,25 @@
public Loc() {}
- public Loc(Long areaId, Long warehouseId, String code,String type,Short flagLogic,String fucAtrrs,String barcode,String unit,Double size, Double width, Double height,Integer lrow,Integer col,Integer lev,Integer channel,Integer maxParts,Integer maxPack,Short flagLabelMange,String locAttrs,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.warehouseId = warehouseId;
+ public Loc(Long areaId, String code, Long warehouseId, String type, Short flagLogic, String fucAtrrs, String barcode, String unit, Double length, Double height, Double width, Integer row, Integer col, Integer lev, Integer channel, Integer maxParts, Integer maxPack, String useStatus, Short flagLabelMange, String locAttrs, Integer status, Integer deleted, Integer tenantId, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo) {
this.areaId = areaId;
this.code = code;
+ this.warehouseId = warehouseId;
this.type = type;
- this.width = width;
- this.height = height;
this.flagLogic = flagLogic;
this.fucAtrrs = fucAtrrs;
this.barcode = barcode;
this.unit = unit;
- this.length = size;
- this.row = lrow;
+ this.length = length;
+ this.height = height;
+ this.width = width;
+ this.row = row;
this.col = col;
this.lev = lev;
this.channel = channel;
this.maxParts = maxParts;
this.maxPack = maxPack;
+ this.useStatus = useStatus;
this.flagLabelMange = flagLabelMange;
this.locAttrs = locAttrs;
this.status = status;
@@ -237,22 +239,25 @@
// Loc loc = new Loc(
// null, // 搴撳尯鏍囪瘑[闈炵┖]
-// null, // 缂栧彿[闈炵┖]
-// null, // 搴撲綅绫诲瀷[闈炵┖]
-// null, // 鍚嶇О
+// null, // 搴撲綅鍙�
+// null, // 浠撳簱鏍囪瘑[闈炵┖]
+// null, // 搴撲綅绫诲瀷(*)[闈炵┖]
// null, // 铏氭嫙搴撲綅
// null, // 鍔熻兘灞炴��
// null, // 瀹瑰櫒缂栫爜
// null, // 瀛樻斁鍗曚綅
-// null, // 闀�/瀹�/楂�
+// null, // 闀�
+// null, // 楂�
+// null, // 瀹�
// null, // 鎺抂闈炵┖]
// null, // 鍒梉闈炵┖]
// null, // 灞俒闈炵┖]
-// null, // 閫氶亾[闈炵┖]
+// null, // 宸烽亾
// null, // 鏈�澶ч浂浠舵暟
// null, // 鏈�澶у寘瑁呮暟
+// null, // 搴撲綅浣跨敤鐘舵�乕闈炵┖]
// null, // 鏄惁鏍囩绠＄悊
-// null, // 灞炴�闈炵┖]
+// null, // 灞炴��
// null, // 鐘舵�乕闈炵┖]
// null, // 鏄惁鍒犻櫎[闈炵┖]
// null, // 绉熸埛
@@ -263,22 +268,38 @@
// null // 澶囨敞
// );
- public String getWarehouseId$() {
- WarehouseService service = SpringUtils.getBean(WarehouseService.class);
- Warehouse warehouse = service.getById(this.warehouseId);
- if (!Cools.isEmpty(warehouse)) {
- return String.valueOf(warehouse.getName());
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case "H":
+ return " 楂樺簱浣�";
+ case "M":
+ return " 涓簱浣�";
+ case "L":
+ return " 浣庡簱浣�";
+ default:
+ return String.valueOf(this.type);
}
- return null;
}
- public String gerAreaId$() {
- WarehouseAreasService service = SpringUtils.getBean(WarehouseAreasService.class);
- WarehouseAreas areas = service.getById(this.areaId);
- if (!Cools.isEmpty(areas)) {
- return String.valueOf(areas.getName());
+ public String getUseStatus$(){
+ if (null == this.useStatus){ return null; }
+ switch (this.useStatus){
+ case "O":
+ return " 绌哄簱";
+ case "D":
+ return " 绌烘澘";
+ case "R":
+ return " 棰勭害鍑哄簱";
+ case "S":
+ return " 棰勭害鍏ュ簱";
+ case "X":
+ return " 绂佺敤";
+ case "F":
+ return " 鍦ㄥ簱";
+ default:
+ return String.valueOf(this.useStatus);
}
- return null;
}
public String getStatus$(){
--
Gitblit v1.9.1