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 |   48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 43 insertions(+), 5 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..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,9 +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;
@@ -21,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)
@@ -53,6 +57,19 @@
     @ApiModelProperty("鍗曟嵁鏄庣粏ID")
     private Long asnItemId;
 
+    @ApiModelProperty("琛屽彿")
+    private String platItemId;
+
+    @ApiModelProperty("璐ㄦ缁撴灉")
+    private Short isptResult;
+
+    @ApiModelProperty("宸叉敹璐ф暟閲�")
+    private Double qty;
+
+    @ApiModelProperty("鎵ц鏁伴噺")
+    private Double workQty;
+
+
     /**
      * 鍖哄煙鍚嶇О
      */
@@ -72,7 +89,7 @@
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    private String matnrName;
+    private String maktx;
 
     /**
      * 鐗╂枡缂栫爜
@@ -156,7 +173,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -176,6 +192,7 @@
      */
     @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 +201,18 @@
     @ApiModelProperty(value= "淇敼浜哄憳")
     private Long 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("鎵╁睍瀛楁")
@@ -207,7 +231,7 @@
         this.areaId = areaId;
         this.areaName = areaName;
         this.matnrId = matnrId;
-        this.matnrName = matnrName;
+        this.maktx = matnrName;
         this.matnrCode = matnrCode;
         this.trackCode = trackCode;
         this.anfme = anfme;
@@ -312,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