From 7885e0cb06992d03da37105c0a9f56ced99b338d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 19 七月 2025 10:27:05 +0800
Subject: [PATCH] 盘点差异单优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java |   41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
index 3cfe075..505177f 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
@@ -3,6 +3,12 @@
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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;
 import java.util.Date;
@@ -20,8 +26,10 @@
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 
 @Data
+@Accessors(chain = true)
 @TableName("man_check_diff_item")
 public class CheckDiffItem implements Serializable {
 
@@ -39,6 +47,12 @@
      */
     @ApiModelProperty(value= "鐩樼偣ID")
     private Long checkId;
+
+    @ApiModelProperty("浠诲姟ID")
+    private Long taskId;
+
+    @ApiModelProperty("浠诲姟鏄庣粏ID")
+    private Long taskItemId;
 
     /**
      * 鐩樼偣鍗�
@@ -95,16 +109,13 @@
     private Double checkQty;
 
     /**
-     * 鎵ц鐘舵��
-     */
-    @ApiModelProperty(value= "鎵ц鐘舵��")
-    private Integer exceStatus;
-
-    /**
      * 宸紓鍘熷洜
      */
     @ApiModelProperty(value= "宸紓鍘熷洜")
     private String reason;
+
+    @ApiModelProperty("鎵ц鐘舵��")
+    private Integer exceStatus;
 
     /**
      * 鐘舵�� 1: 姝e父  0: 鍐荤粨  
@@ -159,7 +170,7 @@
 
     public CheckDiffItem() {}
 
-    public CheckDiffItem(Long checkId,String orderCode,String maktx,String matnrCode,String spec,String model,String barcode,String batch,Double anfme,Double checkQty,Integer exceStatus,String reason,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+    public CheckDiffItem(Long checkId,String orderCode,String maktx,String matnrCode,String spec,String model,String barcode,String batch,Double anfme,Double checkQty,String reason,Integer status,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
         this.checkId = checkId;
         this.orderCode = orderCode;
         this.maktx = maktx;
@@ -170,7 +181,6 @@
         this.batch = batch;
         this.anfme = anfme;
         this.checkQty = checkQty;
-        this.exceStatus = exceStatus;
         this.reason = reason;
         this.status = status;
         this.deleted = deleted;
@@ -217,6 +227,21 @@
         }
     }
 
+    public String getExceStatus$() {
+        if (Cools.isEmpty(this.exceStatus)) {
+            return "";
+        }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_DIFF_EXCE_STATUS)
+                .eq(DictData::getValue, this.exceStatus));
+        if (Objects.isNull(dictData)) {
+            return null;
+        }
+        return dictData.getLabel();
+    }
+
+
     public String getCreateBy$(){
         UserService service = SpringUtils.getBean(UserService.class);
         User user = service.getById(this.createBy);

--
Gitblit v1.9.1