From aeacc7f80e3ae74cc56be90bb761e9a6b935f643 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 13 五月 2025 14:49:31 +0800
Subject: [PATCH] 收货流程修改 质检流程修改

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/QlyIsptItem.java |   27 +++++++++++++++++++++------
 1 files changed, 21 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 f2a782a..ff43690 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
@@ -1,6 +1,7 @@
 package com.vincent.rsf.server.manager.entity;
 
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -9,12 +10,10 @@
 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 io.swagger.annotations.Api;
 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.ApiModelProperty;
 import lombok.Data;
 import com.vincent.rsf.framework.common.Cools;
@@ -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
@@ -47,6 +47,9 @@
 
     @ApiModelProperty("鍗曟嵁鏄庣粏ID")
     private Long asnItemId;
+
+    @ApiModelProperty("鏀惰揣鏄庣粏ID")
+    private Long rcptId;
     /**
      * 缂栧彿
      */
@@ -84,22 +87,34 @@
     @ApiModelProperty(value= "鏀惰揣鏁伴噺")
     private Double rcptQty;
 
+    @ApiModelProperty("璐ㄦ鏁伴噺")
+    private Double anfme;
+
     /**
      * 閫佽揣鏁伴噺
      */
     @ApiModelProperty(value= "閫佽揣鏁伴噺")
     private Double dlyQty;
 
+    @ApiModelProperty("鎵╁睍瀛楁")
+    private String fieldsIndex;
+
+    @ApiModelProperty("鎵╁睍瀛楁")
+    @TableField(exist = false)
+    private Map<String, String> extendFields;
+
     /**
      * 涓嶅悎鏁伴噺
      */
     @ApiModelProperty(value= "涓嶅悎鏁伴噺")
+    @TableField(exist = false)
     private Double disQty;
 
     /**
      * 鍚堟牸鏁伴噺
      */
     @ApiModelProperty(value= "鍚堟牸鏁伴噺")
+    @TableField(exist = false)
     private Double safeQty;
 
     /**
@@ -175,8 +190,8 @@
         this.stockBatch = stockBatch;
         this.rcptQty = rcptQty;
         this.dlyQty = dlyQty;
-        this.disQty = disQty;
-        this.safeQty = safeQty;
+//        this.disQty = disQty;
+//        this.safeQty = safeQty;
         this.picPath = picPath;
         this.status = status;
         this.deleted = deleted;

--
Gitblit v1.9.1