From 0bc2c552b180afa16e4aae3c8c12746b15ba6fc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 02 四月 2026 17:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材

---
 src/main/java/com/ruoyi/production/dto/DrawMaterialDto.java |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/DrawMaterialDto.java b/src/main/java/com/ruoyi/production/dto/DrawMaterialDto.java
index d45c3a4..05416e1 100644
--- a/src/main/java/com/ruoyi/production/dto/DrawMaterialDto.java
+++ b/src/main/java/com/ruoyi/production/dto/DrawMaterialDto.java
@@ -1,17 +1,48 @@
 package com.ruoyi.production.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
 import java.math.BigDecimal;
+import java.time.LocalDate;
 
 @Data
+@ApiModel("棰嗘枡鍗旸TO")
 public class DrawMaterialDto {
 
+    @ApiModelProperty("璁㈠崟ID")
     private Long id;
+
+    @ApiModelProperty("鍨嬪彿ID")
     private Long productModelId;
+
+    @ApiModelProperty("搴撳瓨鏁伴噺")
     private BigDecimal qualitity;
+
+    @ApiModelProperty("棰嗙敤鏁伴噺")
     private BigDecimal requisitionQty;
+
+    @ApiModelProperty("浜у搧鍚嶇О")
     private String productName;
+
+    @ApiModelProperty("浜у搧鍨嬪彿")
     private String model;
+
+    @ApiModelProperty("浜у搧鍗曚綅")
     private String unit;
-}
+
+    @ApiModelProperty("鎶ュ伐棰嗙敤鏁伴噺")
+    private BigDecimal reportQty;
+
+    @ApiModelProperty("澶囨敞")
+    private String remark;
+
+    @ApiModelProperty("鎵瑰彿")
+    private String batchNo;
+
+    @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+    private String customer;
+
+    @ApiModelProperty("鏈夋晥鏈�")
+    private LocalDate productionDate;
+}
\ No newline at end of file

--
Gitblit v1.9.3