From d51f64c1f0105d4b18aa8344c11e47827730a40c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 10:42:39 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 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 754ed9c..38ae934 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,9 @@
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;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -94,6 +97,14 @@
@ApiModelProperty("椤圭洰鍙�")
private String projectCode;
+ @ApiModelProperty("鍑哄簱鏁伴噺")
+ @TableField(exist = false)
+ private Double outQty;
+
+ @ApiModelProperty("宸烽亾")
+ @TableField(exist = false)
+ private Integer channel;
+
/**
* 鐗╂枡鍚嶇О
*/
@@ -166,6 +177,10 @@
@TableField(exist = false)
private Map<String, String> extendFields;
+ @ApiModelProperty("鎵樼洏鐮�")
+ @TableField(exist = false)
+ private String barcode;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -176,6 +191,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
@@ -204,6 +220,9 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @ApiModelProperty("渚涘簲鍟咺D")
+ private Long splrId;
+
/**
* 淇敼鏃堕棿
*/
@@ -213,14 +232,17 @@
private Date updateTime;
@TableField(exist = false)
- private Long waveId;
+ private Long sourceId;
@TableField(exist = false)
- private Long waveItemId;
+ private Long source;
@TableField(exist = false)
- private String waveCode;
+ private String sourceCode;
+ @ApiModelProperty("鍑虹珯鍙�")
+ @TableField(exist = false)
+ private String site;
/**
@@ -285,6 +307,18 @@
// null // 澶囨敞
// );
+ public String getWareArea(){
+ if (Cools.isEmpty(this.locId)){
+ return "";
+ }
+ LocService locService = SpringUtils.getBean(LocService.class);
+ Loc loc = locService.getById(this.locId);
+ if (Objects.isNull(loc)) {
+ return null;
+ }
+ return loc.getAreaId$();
+ }
+
public String getType$(){
if (Cools.isEmpty(this.type)){
return "";
@@ -309,6 +343,10 @@
return dictData.getLabel();
}
+ public Double getReviseQty() {
+ return this.anfme;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -319,6 +357,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$(){
@@ -352,8 +395,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