From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对(未明确) 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检,抽检的话是抽多少百分比 6.供应商管理东西太少了,没有资质文件啊这些东西(是不是可以参考pro) 7.采购审批把人从李莹莹改成龙红星

---
 src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java |   45 ++++++++++++++-------------------------------
 1 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
index 3f6ef76..c4363a8 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -16,30 +16,10 @@
 @Data
 public class ProductionPlanDto extends ProductionPlan {
 
-    /**
-     * 鐗╂枡缂栫爜
-     */
-    @Schema(description = "鐗╂枡缂栫爜")
-    @Excel(name = "鐗╂枡缂栫爜")
-    private String materialCode;
-
-    /**
-     * 浜у搧鍚嶇О
-     */
     @Schema(description = "浜у搧鍚嶇О")
     @Excel(name = "浜у搧鍚嶇О")
     private String productName;
 
-    /**
-     * 瀹㈡埛鍚嶇О
-     */
-    @Schema(description = "瀹㈡埛鍚嶇О")
-    @Excel(name = "瀹㈡埛鍚嶇О")
-    private String customerName;
-
-    /**
-     * 浜у搧瑙勬牸
-     */
     @Schema(description = "浜у搧瑙勬牸")
     @Excel(name = "浜у搧瑙勬牸")
     private String model;
@@ -59,17 +39,20 @@
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate planCompleteTime;
 
-    /**
-     * 鍏宠仈鐗╂枡淇℃伅琛�
-     */
-    @Schema(description = "鍏宠仈鐗╂枡淇℃伅琛↖D")
-    private Long productMaterialId;
+    @Schema(description = "浜у搧ID")
+    private Long productId;
 
-    /**
-     * 寮哄害
-     */
-    @Schema(description = "寮哄害")
-    @Excel(name = "寮哄害")
-    private String strength;
+    @Schema(description = "绛涢�夊紑濮嬫棩鏈�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate requiredDateStart;
+
+    @Schema(description = "绛涢�夌粨鏉熸棩鏈�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate requiredDateEnd;
+
+    @Schema(description = "閿�鍞悎鍚屽彿")
+    private String salesContractNo;
 
 }

--
Gitblit v1.9.3