From cd55f83ee6fe0e3002df2018f50f4ca8d066b1e6 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期六, 24 一月 2026 14:16:18 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 76 ++++++++++++++++++++++++++++++++------
1 files changed, 64 insertions(+), 12 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 8a88226..6228fea 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;
@@ -47,6 +48,7 @@
*/
@ApiModelProperty(value= "涓诲崟ID")
private Long locId;
+
@ApiModelProperty("搴撲綅缂栫爜")
private String locCode;
@@ -99,6 +101,10 @@
@ApiModelProperty("鍑哄簱鏁伴噺")
@TableField(exist = false)
private Double outQty;
+
+ @ApiModelProperty("宸烽亾")
+ @TableField(exist = false)
+ private Integer channel;
/**
* 鐗╂枡鍚嶇О
@@ -215,6 +221,9 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @ApiModelProperty("渚涘簲鍟咺D")
+ private Long splrId;
+
/**
* 淇敼鏃堕棿
*/
@@ -222,15 +231,6 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
-
-// @TableField(exist = false)
-// private Long waveId;
-//
-// @TableField(exist = false)
-// private Long waveItemId;
-//
-// @TableField(exist = false)
-// private String waveCode;
@TableField(exist = false)
private Long sourceId;
@@ -241,6 +241,9 @@
@TableField(exist = false)
private String sourceCode;
+ @ApiModelProperty("鍑虹珯鍙�")
+ @TableField(exist = false)
+ private String siteNo;
/**
@@ -249,6 +252,48 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+ @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+ private String baseUnit;
+
+ @ApiModelProperty(value = "浣跨敤缁勭粐")
+ private String useOrgId;
+
+ @ApiModelProperty(value = "浣跨敤鑰呭悕绉�")
+ private String useOrgName;
+
+ @ApiModelProperty(value = "鏁伴噺灞炴�э紝澶栬喘绛�")
+ private String erpClsId;
+
+ @ApiModelProperty(value = "璁′环鍗曚綅")
+ private String priceUnitId;
+
+ @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+ private String inStockType;
+
+ @ApiModelProperty(value = "璐т富绫诲瀷")
+ private String ownerTypeId;
+
+ @ApiModelProperty(value = "璐т富")
+ private String ownerId;
+
+ @ApiModelProperty(value = "璐т富鍚嶇О")
+ private String ownerName;
+
+ @ApiModelProperty(value = "淇濈鑰呯被鍨�")
+ private String keeperTypeId;
+
+ @ApiModelProperty(value = "淇濈鑰�")
+ private String keeperId;
+
+ @ApiModelProperty(value = "淇濈鑰呭悕绉�")
+ private String keeperName;
+
+ @ApiModelProperty(value = "寤鸿鐩爣浠擄紝鍏ュ簱")
+ private String targetWarehouseId;
+
+ @ApiModelProperty(value = "寤鸿璋冨嚭浠擄紝鍑轰粨")
+ private String sourceWarehouseId;
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) {
@@ -279,7 +324,7 @@
}
// LocItem locItem = new LocItem(
-// null, // 涓诲崟ID
+// null, // 涓诲崟IDs
// null, // 鍗曟嵁ID
// null, // 鍗曟嵁绫诲瀷
// null, // 璁㈠崟鏄庣粏id
@@ -341,6 +386,10 @@
return dictData.getLabel();
}
+ public Double getReviseQty() {
+ return this.anfme;
+ }
+
public String getStatus$(){
if (null == this.status){ return null; }
switch (this.status){
@@ -351,6 +400,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$(){
@@ -384,8 +438,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