From 0b3cdb1e0c2f495edb971c585bd6b4b0456bf93a Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期二, 14 四月 2026 14:55:34 +0800
Subject: [PATCH] 字段变更 增加类型
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index b88a12b..395562e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.vincent.rsf.framework.common.DateUtils;
import com.vincent.rsf.server.manager.service.LocService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -48,6 +49,7 @@
@ApiModelProperty(value= "涓诲崟ID")
private Long locId;
+
@ApiModelProperty("搴撲綅缂栫爜")
private String locCode;
@@ -73,7 +75,7 @@
* 涓氬姟绫诲瀷
*/
@ApiModelProperty(value= "涓氬姟绫诲瀷")
- private Short wkType;
+ private String wkType;
/**
* 鐗╂枡ID
@@ -103,6 +105,20 @@
@ApiModelProperty("宸烽亾")
@TableField(exist = false)
private Integer channel;
+
+ /**
+ * 搴撲綅鐘舵�侊紙鏉ヨ嚜鍏宠仈搴撲綅锛岄潪琛ㄥ瓧娈碉級
+ */
+ @ApiModelProperty("搴撲綅鐘舵��")
+ @TableField(exist = false)
+ private String locUseStatus;
+
+ /**
+ * 搴撲綅鐘舵�佹樉绀哄�硷紙鏉ヨ嚜鍏宠仈搴撲綅锛岄潪琛ㄥ瓧娈碉級
+ */
+ @ApiModelProperty("搴撲綅鐘舵�佹樉绀�")
+ @TableField(exist = false)
+ private String locUseStatus$;
/**
* 鐗╂枡鍚嶇О
@@ -176,7 +192,7 @@
@TableField(exist = false)
private Map<String, String> extendFields;
- @ApiModelProperty("鎵樼洏鐮�")
+ @ApiModelProperty("鏂欑鐮�")
@TableField(exist = false)
private String barcode;
@@ -219,6 +235,9 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @ApiModelProperty("渚涘簲鍟咺D")
+ private Long splrId;
+
/**
* 淇敼鏃堕棿
*/
@@ -249,7 +268,7 @@
public LocItem() {}
- public LocItem(Long locId,Long orderId,String type,Long orderItemId,Short wkType,Long matnrId,String maktx,String matnrCode,String trackCode,String unit,Double anfme,String batch,String splrBatch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public LocItem(Long locId,Long orderId,String type,Long orderItemId,String wkType,Long matnrId,String maktx,String matnrCode,String trackCode,String unit,Double anfme,String batch,String splrBatch,String spec,String model,String fieldsIndex,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.locId = locId;
this.orderId = orderId;
this.type = type;
@@ -277,7 +296,7 @@
}
// LocItem locItem = new LocItem(
-// null, // 涓诲崟ID
+// null, // 涓诲崟IDs
// null, // 鍗曟嵁ID
// null, // 鍗曟嵁绫诲瀷
// null, // 璁㈠崟鏄庣粏id
@@ -339,6 +358,10 @@
return dictData.getLabel();
}
+ public Double getReviseQty() {
+ return this.anfme;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -349,6 +372,11 @@
default:
return String.valueOf(this.status);
}
+ }
+
+ public Integer getDeadTime() {
+ if (null == this.createTime){ return null; }
+ return DateUtils.diff(createTime, new Date());
}
public String getCreateBy$(){
@@ -382,8 +410,6 @@
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
}
-
-
public Boolean getStatusBool(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1