From 43a8037b60150b65651c03fd654621d37075d051 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 18:00:26 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java |   45 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
index 9b75cc9..1fef763 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.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 com.baomidou.mybatisplus.annotation.IdType;
@@ -15,8 +21,10 @@
 import com.vincent.rsf.server.system.service.UserService;
 import com.vincent.rsf.server.system.entity.User;
 import java.io.Serializable;
+import java.util.Objects;
 
 @Data
+@Accessors(chain = true)
 @TableName("man_qly_ispt_item")
 public class QlyIsptItem implements Serializable {
 
@@ -28,43 +36,41 @@
     @ApiModelProperty(value= "ID")
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-
     /**
      * 涓诲崟ID
      */
     @ApiModelProperty(value= "涓诲崟ID")
     private Long ispectId;
+    @ApiModelProperty("璐ㄦ鍗曠姸鎬�")
+    private String isptStatus;
 
+    @ApiModelProperty("鍗曟嵁鏄庣粏ID")
+    private Long asnItemId;
     /**
      * 缂栧彿
      */
     @ApiModelProperty(value= "缂栧彿")
     private String matnrCode;
-
     /**
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
     private String maktx;
-
     /**
      * 鏍囩
      */
     @ApiModelProperty(value= "鏍囩")
     private String label;
-
     /**鈭�
      * 渚涘簲鍟嗗悕绉�
      */
     @ApiModelProperty(value= "渚涘簲鍟嗗悕绉�")
     private String splrName;
-
     /**
      * 渚涘簲鍟嗘壒娆�
      */
     @ApiModelProperty(value= "渚涘簲鍟嗘壒娆�")
     private String splrBatch;
-
     /**
      * 搴撳瓨鎵规
      */
@@ -100,6 +106,9 @@
      */
     @ApiModelProperty(value= "鍥剧墖璺緞")
     private String picPath;
+
+    @ApiModelProperty("璐ㄦ缁撹")
+    private Short isptResult;
 
     /**
      * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
@@ -200,6 +209,30 @@
 //            null    // 澶囨敞
 //    );
 
+    public String getIsptStatus$() {
+        if (null == this.isptStatus) {return null; }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_QLY_INSPECT_STATUS)
+                .eq(DictData::getValue, this.isptStatus));
+        if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+            return null;
+        }
+        return dictDatas.getLabel();
+    }
+
+    public String getIsptResult$() {
+        if (null == this.isptResult) {return null; }
+        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
+        DictData dictDatas = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
+                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_INSPECT_RESULT)
+                .eq(DictData::getValue, this.isptResult));
+        if (Objects.isNull(dictDatas) || Objects.isNull(dictDatas.getLabel())) {
+            return null;
+        }
+        return dictDatas.getLabel();
+    }
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){

--
Gitblit v1.9.1