From 1dcfa3702505f0c431757312b5304531029f90f6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 18:57:38 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java | 145 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 111 insertions(+), 34 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
index a152659..3e81bb9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java
@@ -2,10 +2,16 @@
import com.baomidou.mybatisplus.annotation.*;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.CompanysService;
+import com.vincent.rsf.server.system.constant.DictTypeCode;
+import com.vincent.rsf.server.system.entity.DictData;
+import com.vincent.rsf.server.system.service.DictDataService;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
@@ -21,7 +27,6 @@
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
import java.util.Date;
-import java.util.Map;
@Data
@Accessors(chain = true)
@@ -53,6 +58,19 @@
@ApiModelProperty("鍗曟嵁鏄庣粏ID")
private Long asnItemId;
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
+ @ApiModelProperty("璐ㄦ缁撴灉")
+ private Short isptResult;
+
+ @ApiModelProperty("宸叉敹璐ф暟閲�")
+ private Double qty;
+
+ @ApiModelProperty("鎵ц鏁伴噺")
+ private Double workQty;
+
+
/**
* 鍖哄煙鍚嶇О
*/
@@ -68,11 +86,20 @@
@ApiModelProperty(value = "鎵╁睍瀛楁鍞竴鏍囪瘑")
private String fieldsIndex;
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
+
/**
* 鐗╂枡鍚嶇О
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
- private String matnrName;
+ private String maktx;
/**
* 鐗╂枡缂栫爜
@@ -126,7 +153,7 @@
* 渚涘簲鍟嗘爣璇�
*/
@ApiModelProperty(value= "渚涘簲鍟嗘爣璇�")
- private String splrId;
+ private Long splrId;
/**
* 鏀惰揣閲嶉噺
@@ -171,11 +198,15 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -184,11 +215,21 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
+ @ApiModelProperty("鏄惁鍚堟牸")
+ private Short flagNorm;
+
+ @ApiModelProperty("璐ㄦ鏁伴噺")
+ private Double isptQty;
+
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
@ApiModelProperty("鎵╁睍瀛楁")
@@ -201,13 +242,65 @@
@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;
+ @TableField(exist = false)
+ private String shipperId$;
+
+ @TableField(exist = false)
+ private String splrId$;
+
+ @TableField(exist = false)
+ private String isptResult$;
+
+
public WarehouseAreasItem() {}
- public WarehouseAreasItem(Long areaId,String areaName,Long matnrId,String matnrName,String matnrCode,String trackCode,Double anfme,String batch,String unit,String stockUnit,String brand,Long shipperId,String splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public WarehouseAreasItem(Long areaId,String areaName,Long matnrId,String matnrName,String matnrCode,String trackCode,Double anfme,String batch,String unit,String stockUnit,String brand,Long shipperId,Long splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.areaId = areaId;
this.areaName = areaName;
this.matnrId = matnrId;
- this.matnrName = matnrName;
+ this.maktx = matnrName;
this.matnrCode = matnrCode;
this.trackCode = trackCode;
this.anfme = anfme;
@@ -257,22 +350,20 @@
// null // 澶囨敞
// );
+ public BigDecimal getAbleQty(){
+ BigDecimal anfmeDec = this.anfme != null ? new BigDecimal(this.anfme.toString()) : BigDecimal.ZERO;
+ BigDecimal workQtyDec = this.workQty != null ? new BigDecimal(this.workQty.toString()) : BigDecimal.ZERO;
+ BigDecimal qtyDec = this.qty != null ? new BigDecimal(this.qty.toString()) : BigDecimal.ZERO;
+
+ return anfmeDec.subtract(workQtyDec).subtract(qtyDec);
+ }
+
public String getShipperId$(){
- CompanysService service = SpringUtils.getBean(CompanysService.class);
- Companys companys = service.getById(this.shipperId);
- if (!Cools.isEmpty(companys)){
- return String.valueOf(companys.getName());
- }
- return null;
+ return this.shipperId$;
}
public String getSplrId$(){
- CompanysService service = SpringUtils.getBean(CompanysService.class);
- Companys companys = service.getById(this.splrId);
- if (!Cools.isEmpty(companys)){
- return String.valueOf(companys.getName());
- }
- return null;
+ return this.splrId$;
}
public String getStatus$(){
@@ -287,15 +378,6 @@
}
}
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
public String getCreateTime$(){
if (Cools.isEmpty(this.createTime)){
return "";
@@ -303,13 +385,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
}
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.getById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
+ public String getIsptResult$(){
+ return this.isptResult$;
}
public String getUpdateTime$(){
--
Gitblit v1.9.1