From 8c8d8769f5e23439f7d44c300eba763ee64b2352 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 11 三月 2026 09:39:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 180 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 107 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index 94602ad..a432f40 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;
@@ -23,7 +24,7 @@
public class ProductionPlan {
/**
- * 鑷涓婚敭
+ * 涓婚敭
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -31,141 +32,174 @@
/**
* 琛ㄥ崟瀹炰緥ID
*/
+ @ApiModelProperty("琛ㄥ崟瀹炰緥ID")
private String formInstanceId;
/**
- * 鍗曟嵁娴佹按鍙�
+ * 娴佹按鍙�
*/
+ @ApiModelProperty("娴佹按鍙�")
private String serialNo;
/**
- * 鍗曟嵁鏍囬
+ * 鐢宠鍗曠紪鍙�
*/
- private String title;
+ @ApiModelProperty("鐢宠鍗曠紪鍙�")
+ private String applyNo;
/**
- * 鍙戣捣浜篒D
+ * 瀹㈡埛鍚嶇О
*/
- private String originatorUserId;
-
- /**
- * 鍙戣捣浜哄鍚�
- */
- private String originatorName;
-
- /**
- * 鍗曟嵁鍒涘缓鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime bizCreateTime;
-
- /**
- * 椤圭洰鍚嶇О
- */
- private String projectName;
-
- /**
- * 鎵规鍙�
- */
- private String batchNo;
-
- /**
- * 鑱旂郴浜�
- */
- private String contactPerson;
-
- /**
- * 棰勭暀1
- */
- private String extText1;
-
- /**
- * 棰勭暀2
- */
- private String extText2;
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ private String customerName;
/**
* 鐗╂枡缂栫爜
*/
+ @ApiModelProperty("鐗╂枡缂栫爜")
private String materialCode;
/**
- * 鐗╂枡鍒嗙被
+ * 浜у搧鍚嶇О
*/
- private String materialCategory;
+ @ApiModelProperty("浜у搧鍚嶇О")
+ private String productName;
/**
- * 瑙勬牸鎻忚堪
+ * 浜у搧瑙勬牸
*/
- private String specDesc;
+ @ApiModelProperty("浜у搧瑙勬牸")
+ private String productSpec;
/**
- * 绛夌骇
+ * 闀�
*/
- private String gradeType;
+ @ApiModelProperty("闀�")
+ private Integer length;
/**
- * 闀垮害
+ * 瀹�
*/
- private BigDecimal length;
+ @ApiModelProperty("瀹�")
+ private Integer width;
/**
- * 瀹藉害
+ * 楂�
*/
- private BigDecimal width;
+ @ApiModelProperty("楂�")
+ private Integer height;
/**
- * 鍘氬害
+ * 鍧楁暟
*/
- private BigDecimal thickness;
-
- /**
- * 鏁伴噺
- */
+ @ApiModelProperty("鍧楁暟")
private Integer quantity;
/**
- * 鎬讳綋绉�
+ * 鏂规暟
*/
+ @ApiModelProperty("鏂规暟")
private BigDecimal volume;
/**
- * 寮�濮嬫椂闂�
+ * 寮哄害
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime dateStart;
+ @ApiModelProperty("寮哄害")
+ private String strength;
/**
- * 缁撴潫鏃堕棿
+ * 寮�濮嬫棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime dateEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @ApiModelProperty("寮�濮嬫棩鏈�")
+ private LocalDateTime startDate;
/**
- * 鍏宠仈鍗曟嵁
+ * 缁撴潫鏃ユ湡
*/
- private String associationReceipt;
+ @ApiModelProperty("缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime endDate;
/**
- * 鏁版嵁鏂瑰紡: 1=鎵嬪姩 2=瀹氭椂
+ * 鎻愪氦浜�
*/
+ @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;
/**
- * 鍒涘缓鏃堕棿
+ * 鏁版嵁搴撳垱寤烘椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鏁版嵁搴撳垱寤烘椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
/**
- * 鏇存柊鏃堕棿
+ * 鏁版嵁搴撴洿鏂版椂闂�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鏁版嵁搴撴洿鏂版椂闂�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime updateTime;
+ /**
+ * 褰撳墠鏇存柊鏁伴噺
+ */
+ @ApiModelProperty("totalCount")
+ private Integer totalCount;
}
\ No newline at end of file
--
Gitblit v1.9.3