From a8df4c4a80781c02815021a840971ce4b15419f5 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 09:38:24 +0800
Subject: [PATCH] refactor: batch fill page operator names
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java | 75 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 18 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 0c62bc5..47d931c 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,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.*;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -197,6 +198,9 @@
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+ @TableField(exist = false)
+ private String createBy$;
+
/**
* 娣诲姞鏃堕棿
*/
@@ -210,6 +214,9 @@
*/
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+
+ @TableField(exist = false)
+ private String updateBy$;
@ApiModelProperty("鏄惁鍚堟牸")
private Short flagNorm;
@@ -235,6 +242,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 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,Long splrId,Double weight,String prodTime,String splrBtch,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -291,6 +340,14 @@
// 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);
@@ -321,29 +378,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 getIsptResult$(){
--
Gitblit v1.9.1