From 1b602ba053af06651d5c8f50146866d98f82934c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:12:29 +0800
Subject: [PATCH] #修改 1.库位size字段，修改为长，宽， 高(完成 2.货架批量处理(完成 3.库位初始化功能(完成 4.筛选导出(完成 5.库位可绑定多种类型（中，高，低），可使用类型批量修改库位信息(完成 6.库位信息添加一个使用状态 （出库预约，入库预约，在库，空库，禁用, 空板)(完成 7.物料模板导出添加扩展字段
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 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 3bf2713..24a47ed 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,14 +1,13 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+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 com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.vincent.rsf.framework.common.Cools;
@@ -19,6 +18,7 @@
@Data
@TableName("man_loc")
+@Accessors(chain = true)
public class Loc implements Serializable {
private static final long serialVersionUID = 1L;
@@ -53,11 +53,6 @@
@ApiModelProperty(value= "搴撲綅绫诲瀷")
private String type;
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
/**
* 铏氭嫙搴撲綅
@@ -87,13 +82,28 @@
* 闀�/瀹�/楂�
*/
@ApiModelProperty(value= "闀�/瀹�/楂�")
- private String size;
+ @TableField("`length`")
+ private Double length;
+
+ /**
+ * 瀹�
+ */
+ @ApiModelProperty("瀹�")
+ @TableField("`width`")
+ private Double width;
+
+ /**
+ * 楂�
+ */
+ @ApiModelProperty("楂�")
+ private Double height;
/**
* 鎺�
*/
@ApiModelProperty(value= "鎺�")
- private Integer lrow;
+ @TableField("`row`")
+ private Integer row;
/**
* 鍒�
@@ -110,8 +120,13 @@
/**
* 閫氶亾
*/
- @ApiModelProperty(value= "閫氶亾")
+ @ApiModelProperty(value= "宸烽亾")
private Integer channel;
+
+ /**
+ * 搴撲綅浣跨敤鐘舵��
+ */
+ private String useStatus;
/**
* 鏈�澶ч浂浠舵暟
@@ -190,18 +205,19 @@
public Loc() {}
- public Loc(Long areaId, Long warehouseId, String code,String type,String name,Short flagLogic,String fucAtrrs,String barcode,String unit,String size,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) {
+ 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;
this.areaId = areaId;
this.code = code;
this.type = type;
- this.name = name;
+ this.width = width;
+ this.height = height;
this.flagLogic = flagLogic;
this.fucAtrrs = fucAtrrs;
this.barcode = barcode;
this.unit = unit;
- this.size = size;
- this.lrow = lrow;
+ this.length = size;
+ this.row = lrow;
this.col = col;
this.lev = lev;
this.channel = channel;
--
Gitblit v1.9.1