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 | 52 +++++++++++++++++++++-------------------------------
1 files changed, 21 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 5e0074f..c4363a8 100644
--- a/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
+++ b/src/main/java/com/ruoyi/production/bean/dto/ProductionPlanDto.java
@@ -3,7 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.production.pojo.ProductionPlan;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,53 +16,43 @@
@Data
public class ProductionPlanDto extends ProductionPlan {
- /**
- * 鐗╂枡缂栫爜
- */
- @ApiModelProperty("鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
-
- /**
- * 浜у搧鍚嶇О
- */
- @ApiModelProperty("浜у搧鍚嶇О")
+ @Schema(description = "浜у搧鍚嶇О")
@Excel(name = "浜у搧鍚嶇О")
private String productName;
- /**
- * 浜у搧瑙勬牸
- */
- @ApiModelProperty("浜у搧瑙勬牸")
+ @Schema(description = "浜у搧瑙勬牸")
@Excel(name = "浜у搧瑙勬牸")
private String model;
- @ApiModelProperty("浜у搧鍗曚綅")
+ @Schema(description = "浜у搧鍗曚綅")
@Excel(name = "浜у搧鍗曚綅")
private String unit;
- @ApiModelProperty(value = "鐢熶骇璁″垝id闆嗗悎")
+ @Schema(description = "鐢熶骇璁″垝id闆嗗悎")
private List<Long> ids;
- @ApiModelProperty(value = "涓嬪彂鏁伴噺")
+ @Schema(description = "涓嬪彂鏁伴噺")
private BigDecimal totalAssignedQuantity;
- @ApiModelProperty(value = "璁″垝瀹屾垚鏃堕棿")
+ @Schema(description = "璁″垝瀹屾垚鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planCompleteTime;
- /**
- * 鍏宠仈鐗╂枡淇℃伅琛�
- */
- @ApiModelProperty("鍏宠仈鐗╂枡淇℃伅琛↖D")
- private Long productMaterialId;
+ @Schema(description = "浜у搧ID")
+ private Long productId;
- /**
- * 寮哄害
- */
- @ApiModelProperty("寮哄害")
- @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