From 2495a8e1f71b6a0908a423765aaafd9ae0140d0c Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 11 三月 2026 15:21:53 +0800
Subject: [PATCH] 生成生产订单与生产计划关联表
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 64 +++++++++++++++++++++++++++++--
1 files changed, 59 insertions(+), 5 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..8839bd6 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -4,10 +4,13 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <br>
@@ -31,146 +34,197 @@
/**
* 琛ㄥ崟瀹炰緥ID
*/
+ @ApiModelProperty("琛ㄥ崟瀹炰緥ID")
private String formInstanceId;
/**
* 娴佹按鍙�
*/
+ @ApiModelProperty("娴佹按鍙�")
private String serialNo;
/**
* 鐢宠鍗曠紪鍙�
*/
+ @ApiModelProperty("鐢宠鍗曠紪鍙�")
+ @Excel(name = "鐢宠鍗曠紪鍙�")
private String applyNo;
/**
* 瀹㈡埛鍚嶇О
*/
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
/**
* 鐗╂枡缂栫爜
*/
+ @ApiModelProperty("鐗╂枡缂栫爜")
+ @Excel(name = "鐗╂枡缂栫爜")
private String materialCode;
/**
* 浜у搧鍚嶇О
*/
+ @ApiModelProperty("浜у搧鍚嶇О")
+ @Excel(name = "浜у搧鍚嶇О")
private String productName;
/**
* 浜у搧瑙勬牸
*/
+ @ApiModelProperty("浜у搧瑙勬牸")
+ @Excel(name = "浜у搧瑙勬牸")
private String productSpec;
/**
* 闀�
*/
+ @ApiModelProperty("闀�")
+ @Excel(name = "闀�")
private Integer length;
/**
* 瀹�
*/
+ @ApiModelProperty("瀹�")
+ @Excel(name = "瀹�")
private Integer width;
/**
* 楂�
*/
+ @ApiModelProperty("楂�")
+ @Excel(name = "楂�")
private Integer height;
/**
* 鍧楁暟
*/
+ @ApiModelProperty("鍧楁暟")
+ @Excel(name = "鍧楁暟")
private Integer quantity;
/**
* 鏂规暟
*/
+ @ApiModelProperty("鏂规暟")
+ @Excel(name = "鏂规暟")
private BigDecimal volume;
/**
* 寮哄害
*/
+ @ApiModelProperty("寮哄害")
+ @Excel(name = "寮哄害")
private String strength;
/**
* 寮�濮嬫棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime startDate;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd")
+ private Date startDate;
/**
* 缁撴潫鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime endDate;
+ @ApiModelProperty("缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd")
+ private Date endDate;
/**
* 鎻愪氦浜�
*/
+ @ApiModelProperty("鎻愪氦浜�")
+ @Excel(name = "鎻愪氦浜�")
private String submitter;
/**
* 鎻愪氦浜虹粍缁�
*/
+ @ApiModelProperty("鎻愪氦浜虹粍缁�")
+ @Excel(name = "鎻愪氦浜虹粍缁�")
private String submitOrg;
/**
* 澶囨敞1
*/
+ @ApiModelProperty("澶囨敞1")
+ @Excel(name = "澶囨敞1")
private String remarkOne;
/**
* 澶囨敞2
*/
+ @ApiModelProperty("澶囨敞2")
+ @Excel(name = "澶囨敞2")
private String remarkTwo;
/**
* 鍒涘缓浜�
*/
+ @ApiModelProperty("鍒涘缓浜�")
+ @Excel(name = "鍒涘缓浜�")
private String creatorName;
/**
* 淇敼浜�
*/
+ @ApiModelProperty("淇敼浜�")
+ @Excel(name = "淇敼浜�")
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 = "涓嬪彂鏁伴噺")
+ @Excel(name = "涓嬪彂鏁伴噺")
+ private BigDecimal assignedQuantity;
}
\ No newline at end of file
--
Gitblit v1.9.3