From 031e36213941ad3430da2b0429701e742f09f5d8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 18 三月 2025 11:14:20 +0800
Subject: [PATCH] Merge branch 'front' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Loc.java | 84 ++++++++++++++++++++++++++++++------------
1 files changed, 60 insertions(+), 24 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 017072c..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,17 +1,13 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
-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 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;
@@ -19,10 +15,10 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
-import java.util.Date;
@Data
@TableName("man_loc")
+@Accessors(chain = true)
public class Loc implements Serializable {
private static final long serialVersionUID = 1L;
@@ -34,6 +30,11 @@
@TableId(value = "id", type = IdType.AUTO)
private Long id;
+ /**
+ * 浠撳簱鏍囪瘑
+ */
+ @ApiModelProperty(value = "浠撳簱鏍囪瘑")
+ private Long warehouseId;
/**
* 搴撳尯鏍囪瘑
*/
@@ -52,11 +53,6 @@
@ApiModelProperty(value= "搴撲綅绫诲瀷")
private String type;
- /**
- * 鍚嶇О
- */
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
/**
* 铏氭嫙搴撲綅
@@ -86,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;
/**
* 鍒�
@@ -109,8 +120,13 @@
/**
* 閫氶亾
*/
- @ApiModelProperty(value= "閫氶亾")
+ @ApiModelProperty(value= "宸烽亾")
private Integer channel;
+
+ /**
+ * 搴撲綅浣跨敤鐘舵��
+ */
+ private String useStatus;
/**
* 鏈�澶ч浂浠舵暟
@@ -189,17 +205,19 @@
public Loc() {}
- public Loc(Long areaId,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;
@@ -245,6 +263,24 @@
// 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());
+ }
+ 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());
+ }
+ return null;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
--
Gitblit v1.9.1