From a96948456e0a21ab33deeb2edfdd7ef343aec5bf Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 16:20:34 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 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 b7adae6..60ab542 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -16,23 +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 model;
@@ -52,17 +39,17 @@
@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;
}
--
Gitblit v1.9.3