From f41c5fb9fffd73f2c39cd9280d72ff89c5e4ee02 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 10 五月 2025 12:46:00 +0800
Subject: [PATCH] 质检修改数据来源
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreasItem.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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 5527dbe..48a67c1 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
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.annotation.*;
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;
@@ -22,7 +26,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)
@@ -198,6 +201,12 @@
@ApiModelProperty(value= "淇敼浜哄憳")
private Long updateBy;
+ @ApiModelProperty("鏄惁鍚堟牸")
+ private Short flagNorm;
+
+ @ApiModelProperty("璐ㄦ鏁伴噺")
+ private Double isptQty;
+
/**
* 淇敼鏃堕棿
*/
@@ -327,6 +336,20 @@
return null;
}
+ 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();
+ }
+
public String getUpdateTime$(){
if (Cools.isEmpty(this.updateTime)){
return "";
--
Gitblit v1.9.1