From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java | 138 ++++++++++++++++++++++++++++++++-------------
1 files changed, 97 insertions(+), 41 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
index 9ebe1a3..7e08525 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/TaskItem.java
@@ -1,8 +1,10 @@
package com.vincent.rsf.server.manager.entity;
+import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.system.constant.DictTypeCode;
@@ -11,9 +13,6 @@
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -22,6 +21,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;
import java.util.Objects;
@Data
@@ -65,6 +65,18 @@
@ApiModelProperty("鍗曟嵁ID")
private Long orderId;
+
+ @ApiModelProperty("琛屽彿")
+ private String platItemId;
+
+ @ApiModelProperty("瀹㈡埛璁㈠崟鍙�")
+ private String platOrderCode;
+
+ @ApiModelProperty("宸ュ崟鍙�")
+ private String platWorkCode;
+
+ @ApiModelProperty("椤圭洰鍙�")
+ private String projectCode;
@ApiModelProperty("鍗曟嵁绫诲瀷")
private String orderType;
@@ -139,6 +151,10 @@
@ApiModelProperty(value= "瀛楁绱㈠紩")
private String fieldsIndex;
+ @ApiModelProperty("鎵╁睍瀛楁")
+ @TableField(exist = false)
+ private Map<String, String> extendFields;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -149,6 +165,7 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
+ @TableLogic
private Integer deleted;
/**
@@ -162,6 +179,9 @@
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
private Long createBy;
+
+ @TableField(exist = false)
+ private String createBy$;
/**
* 娣诲姞鏃堕棿
@@ -177,6 +197,9 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @TableField(exist = false)
+ private String updateBy$;
+
/**
* 淇敼鏃堕棿
*/
@@ -190,6 +213,61 @@
*/
@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 BigDecimal inputQty = BigDecimal.ZERO;
+ @TableField(exist = false)
+ private String orderType$;
+
+ @TableField(exist = false)
+ private String wkType$;
+
+ @TableField(exist = false)
+ private String isptResult$;
+
public TaskItem() {}
@@ -236,29 +314,16 @@
// );
public String getOrderType$(){
- if (null == this.orderType) {return null;}
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE)
- .eq(DictData::getValue, this.orderType));
- if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
- return null;
- }
- return dictDatas.getLabel();
+ return this.orderType$;
}
+ public String getWkType$(){
+ return this.wkType$;
+ }
+
+
public String getIsptResult$(){
- if (Cools.isEmpty(this.isptResult)){
- return null;
- }
- DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
- DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
- .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
- .eq(DictData::getValue, this.isptResult));
- if (Objects.isNull(dictData)) {
- return null;
- }
- return dictData.getLabel();
+ return this.isptResult$;
}
public String getStatus$(){
@@ -273,29 +338,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$(){
@@ -319,4 +366,13 @@
}
}
+ public BigDecimal getAbleQty() {
+ if (anfme == null) { anfme = 0.0;}
+ if (workQty == null) { workQty = 0.0;}
+ BigDecimal anfmeDec = new BigDecimal(anfme.toString());
+ BigDecimal qtyDec = new BigDecimal(workQty.toString());
+
+ return anfmeDec.subtract(qtyDec);
+ }
+
}
--
Gitblit v1.9.1