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/StockItem.java | 157 ++++++++++++++++++++++++++++------------------------
1 files changed, 84 insertions(+), 73 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
index 48363f4..265176a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockItem.java
@@ -4,6 +4,7 @@
import java.util.Date;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.service.*;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,6 +22,7 @@
import com.vincent.rsf.server.system.service.UserService;
import com.vincent.rsf.server.system.entity.User;
import java.io.Serializable;
+import java.util.Map;
@Data
@Accessors(chain = true)
@@ -114,6 +116,23 @@
@ApiModelProperty(value= "渚涘簲鍟嗙紪鐮�")
private String splrCode;
+ @ApiModelProperty("渚涘簲鍟咺D")
+ private Long splrId;
+
+ /**
+ * 骞冲彴鏍囪瘑锛堣鍙凤級
+ */
+ @ApiModelProperty(value = "骞冲彴鏍囪瘑锛堣鍙凤級")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
/**
* 搴撳瓨鎵规
*/
@@ -138,6 +157,8 @@
@ApiModelProperty(value= "璺熻釜鐮�")
private String trackCode;
+ @ApiModelProperty("瀛楁绱㈠紩")
+ private String fieldsIndex;
/**
* 鏉″舰鐮�
*/
@@ -155,6 +176,10 @@
*/
@ApiModelProperty(value= "鍖呰鍚嶇О")
private String packName;
+
+ @ApiModelProperty("姹囨�荤被鍨�")
+ @TableField(exist = false)
+ private String aggType;
/**
* 鐘舵�� 1: 姝e父 0: 鍐荤粨
@@ -181,11 +206,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;
/**
@@ -194,11 +223,15 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -206,6 +239,56 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+
+
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
+ @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 matnrId$;
+
public StockItem() {}
@@ -278,66 +361,12 @@
// null // 澶囨敞
// );
-// public String getStockId$(){
-// StockService service = SpringUtils.getBean(StockService.class);
-// Stock stock = service.getById(this.stockId);
-// if (!Cools.isEmpty(stock)){
-// return String.valueOf(stock.getId());
-// }
-// return null;
-// }
public String getMatnrId$(){
- MatnrService service = SpringUtils.getBean(MatnrService.class);
- Matnr matnr = service.getById(this.matnrId);
- if (!Cools.isEmpty(matnr)){
- return String.valueOf(matnr.getUnit());
- }
- return null;
+ return this.matnrId$;
}
-// public String getShipperId$(){
-// CompanysService service = SpringUtils.getBean(CompanysService.class);
-// Companys shipper = service.getById(this.shipperId);
-// if (!Cools.isEmpty(shipper)){
-// return String.valueOf(shipper.getName());
-// }
-// return null;
-// }
-// public String getSplrId$(){
-// SupplierService service = SpringUtils.getBean(SupplierService.class);
-// Supplier supplier = service.getById(this.splrId);
-// if (!Cools.isEmpty(supplier)){
-// return String.valueOf(supplier.getnull());
-// }
-// return null;
-// }
-//
-// public String getInspectId$(){
-// QlyInspectService service = SpringUtils.getBean(QlyInspectService.class);
-// QlyInspect qlyInspect = service.getById(this.inspectId);
-// if (!Cools.isEmpty(qlyInspect)){
-// return String.valueOf(qlyInspect.getCode());
-// }
-// return null;
-// }
-//
-// public String getLocId$(){
-// LocService service = SpringUtils.getBean(LocService.class);
-// Loc loc = service.getById(this.locId);
-// if (!Cools.isEmpty(loc)){
-// return String.valueOf(loc.getCode());
-// }
-// return null;
-// }
-//
-// public String getLockedTime$(){
-// if (Cools.isEmpty(this.lockedTime)){
-// return "";
-// }
-// return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.lockedTime);
-// }
public String getStatus$(){
if (null == this.status){ return null; }
@@ -351,29 +380,11 @@
}
}
- 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 "";
}
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 getUpdateTime$(){
--
Gitblit v1.9.1