From beb66826d7ca7faae90d03b5e0d21c882f5c9750 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 11 三月 2026 13:03:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

---
 src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index 45bbda3..1bd9b0c 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -4,6 +4,7 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -31,146 +32,177 @@
     /**
      * 琛ㄥ崟瀹炰緥ID
      */
+    @ApiModelProperty("琛ㄥ崟瀹炰緥ID")
     private String formInstanceId;
 
     /**
      * 娴佹按鍙�
      */
+    @ApiModelProperty("娴佹按鍙�")
     private String serialNo;
 
     /**
      * 鐢宠鍗曠紪鍙�
      */
+    @ApiModelProperty("鐢宠鍗曠紪鍙�")
     private String applyNo;
 
     /**
      * 瀹㈡埛鍚嶇О
      */
+    @ApiModelProperty("瀹㈡埛鍚嶇О")
     private String customerName;
 
     /**
      * 鐗╂枡缂栫爜
      */
+    @ApiModelProperty("鐗╂枡缂栫爜")
     private String materialCode;
 
     /**
      * 浜у搧鍚嶇О
      */
+    @ApiModelProperty("浜у搧鍚嶇О")
     private String productName;
 
     /**
      * 浜у搧瑙勬牸
      */
+    @ApiModelProperty("浜у搧瑙勬牸")
     private String productSpec;
 
     /**
      * 闀�
      */
+    @ApiModelProperty("闀�")
     private Integer length;
 
     /**
      * 瀹�
      */
+    @ApiModelProperty("瀹�")
     private Integer width;
 
     /**
      * 楂�
      */
+    @ApiModelProperty("楂�")
     private Integer height;
 
     /**
      * 鍧楁暟
      */
+    @ApiModelProperty("鍧楁暟")
     private Integer quantity;
 
     /**
      * 鏂规暟
      */
+    @ApiModelProperty("鏂规暟")
     private BigDecimal volume;
 
     /**
      * 寮哄害
      */
+    @ApiModelProperty("寮哄害")
     private String strength;
 
     /**
      * 寮�濮嬫棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty("寮�濮嬫棩鏈�")
     private LocalDateTime startDate;
 
     /**
      * 缁撴潫鏃ユ湡
      */
+    @ApiModelProperty("缁撴潫鏃ユ湡")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endDate;
 
     /**
      * 鎻愪氦浜�
      */
+    @ApiModelProperty("鎻愪氦浜�")
     private String submitter;
 
     /**
      * 鎻愪氦浜虹粍缁�
      */
+    @ApiModelProperty("鎻愪氦浜虹粍缁�")
     private String submitOrg;
 
     /**
      * 澶囨敞1
      */
+    @ApiModelProperty("澶囨敞1")
     private String remarkOne;
 
     /**
      * 澶囨敞2
      */
+    @ApiModelProperty("澶囨敞2")
     private String remarkTwo;
 
     /**
      * 鍒涘缓浜�
      */
+    @ApiModelProperty("鍒涘缓浜�")
     private String creatorName;
 
     /**
      * 淇敼浜�
      */
+    @ApiModelProperty("淇敼浜�")
     private String modifierName;
 
     /**
      * 琛ㄥ崟鍒涘缓鏃堕棿
      */
+    @ApiModelProperty("琛ㄥ崟鍒涘缓鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime formCreatedTime;
 
     /**
      * 琛ㄥ崟淇敼鏃堕棿
      */
+    @ApiModelProperty("琛ㄥ崟淇敼鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime formModifiedTime;
 
     /**
      * 鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟
      */
+    @ApiModelProperty("鏁版嵁鍚屾绫诲瀷锛�1=鎵嬪姩 2=瀹氭椂浠诲姟")
     private Integer dataSyncType;
 
     /**
-     * 鏁版嵁鏉ユ簮绫诲瀷锛�1=閿�鍞鍗� 2=閿�鍞娴�
+     * 鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板
      */
+    @ApiModelProperty("鏁版嵁鏉ユ簮绫诲瀷锛�1=鍚屾 2=鏂板")
     private Integer dataSourceType;
 
     /**
      * 鏁版嵁搴撳垱寤烘椂闂�
      */
+    @ApiModelProperty("鏁版嵁搴撳垱寤烘椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime createTime;
 
     /**
      * 鏁版嵁搴撴洿鏂版椂闂�
      */
+    @ApiModelProperty("鏁版嵁搴撴洿鏂版椂闂�")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime updateTime;
 
     /**
      * 褰撳墠鏇存柊鏁伴噺
      */
+    @ApiModelProperty("totalCount")
     private Integer totalCount;
+
+    @ApiModelProperty(value = "涓嬪彂鏁伴噺")
+    private BigDecimal assignedQuantity;
 }
\ No newline at end of file

--
Gitblit v1.9.3