From 9f1c36a2ba4e13f9592bbf2e49afd95fd77cadfb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 01 四月 2026 13:29:55 +0800
Subject: [PATCH] fix:1.仓储物流区分原材料/成品 2.生产订单/报工领料优化

---
 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java |   69 ++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 495f298..590affb 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -6,10 +6,12 @@
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -39,11 +41,16 @@
      * 妫�娴嬫棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
     private Date checkTime;
 
-
-
+    /**
+     * 鐢熶骇鏃ユ湡
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鐢熶骇鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalDate productionDate;
 
     /**
      * 渚涘簲鍟嗗悕绉�(鍘熸潗鏂欐楠�)
@@ -87,6 +94,10 @@
     @Excel(name = "瑙勬牸鍨嬪彿")
     private String model;
 
+    @TableField(exist = false)
+    @Excel(name = "UID鐮�")
+    private String uidNo;
+
     /**
      * 鍗曚綅
      */
@@ -94,10 +105,29 @@
     private String unit;
 
     /**
-     * 鏁伴噺
+     * 鎬绘暟閲�
      */
-    @Excel(name = "鏁伴噺")
+    @Excel(name = "鎬绘暟閲�")
     private BigDecimal quantity;
+
+    /**
+     * 妫�鍝佹暟閲�
+     */
+    @Excel(name = "妫�鍝佹暟閲�")
+    private BigDecimal inspectedQuantity;
+
+    /**
+     * 妫�楠岀敤绮夊墏/娑叉儏鍐�
+     */
+    @Excel(name = "妫�楠岀敤绮夊墏/娑叉儏鍐�")
+    private String inspectMaterialCondition;
+
+    /**
+     * 鏈夋晥鏈燂紙璁＄畻瀛楁锛氱敓浜ф棩鏈�+鏈夋晥鏈燂級
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "鏈夋晥鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+    private LocalDate validityDate;
 
     /**
      * 妫�娴嬪崟浣�
@@ -159,6 +189,35 @@
     private String purchaseContractNo;
 
     private String BatchNo;
-    private BigDecimal inspectedQuantity;
     private String manufacturingTeam;
+
+    /**
+     * 妫�娴嬫棩鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+     */
+    @TableField(exist = false)
+    private String checkTimeStr;
+
+    /**
+     * 鐢熶骇鏃ユ湡锛堟牸寮忓寲瀛楃涓诧紝鐢ㄤ簬Word瀵煎嚭锛�
+     */
+    @TableField(exist = false)
+    private String productionDateStr;
+
+    /**
+     * 鏈夋晥鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+     */
+    @TableField(exist = false)
+    private String validityDateStr;
+
+    /**
+     * 鏈夋晥鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+     */
+    @TableField(exist = false)
+    private String inspectMaterialConditionA;
+
+    /**
+     * 鏈夋晥鏈燂紙鏍煎紡鍖栧瓧绗︿覆锛岀敤浜嶹ord瀵煎嚭锛�
+     */
+    @TableField(exist = false)
+    private String inspectMaterialConditionB;
 }

--
Gitblit v1.9.3