From 46b2ee5f0d9fc6ffaffee1f9de3f4f56d63355b4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 13 三月 2026 13:31:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 226 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 144 insertions(+), 82 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..72866c7 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -4,10 +4,14 @@
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 org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.Date;
/**
* <br>
@@ -23,7 +27,7 @@
public class ProductionPlan {
/**
- * 鑷涓婚敭
+ * 涓婚敭
*/
@TableId(type = IdType.AUTO)
private Long id;
@@ -31,141 +35,199 @@
/**
* 琛ㄥ崟瀹炰緥ID
*/
+ @ApiModelProperty("琛ㄥ崟瀹炰緥ID")
private String formInstanceId;
/**
- * 鍗曟嵁娴佹按鍙�
+ * 娴佹按鍙�
*/
+ @ApiModelProperty("娴佹按鍙�")
private String serialNo;
/**
- * 鍗曟嵁鏍囬
+ * 鐢宠鍗曠紪鍙�
*/
- private String title;
+ @ApiModelProperty("鐢宠鍗曠紪鍙�")
+ @Excel(name = "鐢宠鍗曠紪鍙�")
+ private String applyNo;
/**
- * 鍙戣捣浜篒D
+ * 瀹㈡埛鍚嶇О
*/
- private String originatorUserId;
+ @ApiModelProperty("瀹㈡埛鍚嶇О")
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
/**
- * 鍙戣捣浜哄鍚�
+ * 鍏宠仈鐗╂枡淇℃伅琛↖D
*/
- private String originatorName;
+ @ApiModelProperty("鍏宠仈鐗╂枡淇℃伅琛↖D")
+ private Long productMaterialSkuId;
/**
- * 鍗曟嵁鍒涘缓鏃堕棿
+ * 闀�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime bizCreateTime;
+ @ApiModelProperty("闀�")
+ @Excel(name = "闀�")
+ private Integer length;
/**
- * 椤圭洰鍚嶇О
+ * 瀹�
*/
- private String projectName;
+ @ApiModelProperty("瀹�")
+ @Excel(name = "瀹�")
+ private Integer width;
/**
- * 鎵规鍙�
+ * 楂�
*/
- private String batchNo;
+ @ApiModelProperty("楂�")
+ @Excel(name = "楂�")
+ private Integer height;
/**
- * 鑱旂郴浜�
+ * 鍧楁暟
*/
- private String contactPerson;
-
- /**
- * 棰勭暀1
- */
- private String extText1;
-
- /**
- * 棰勭暀2
- */
- private String extText2;
-
- /**
- * 鐗╂枡缂栫爜
- */
- private String materialCode;
-
- /**
- * 鐗╂枡鍒嗙被
- */
- private String materialCategory;
-
- /**
- * 瑙勬牸鎻忚堪
- */
- private String specDesc;
-
- /**
- * 绛夌骇
- */
- private String gradeType;
-
- /**
- * 闀垮害
- */
- private BigDecimal length;
-
- /**
- * 瀹藉害
- */
- private BigDecimal width;
-
- /**
- * 鍘氬害
- */
- private BigDecimal thickness;
-
- /**
- * 鏁伴噺
- */
+ @ApiModelProperty("鍧楁暟")
+ @Excel(name = "鍧楁暟")
private Integer quantity;
/**
- * 鎬讳綋绉�
+ * 鏂规暟
*/
+ @ApiModelProperty("鏂规暟")
+ @Excel(name = "鏂规暟")
private BigDecimal volume;
/**
- * 寮�濮嬫椂闂�
+ * 寮哄害
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime dateStart;
+ @ApiModelProperty("寮哄害")
+ @Excel(name = "寮哄害")
+ private String strength;
+
+ @ApiModelProperty("鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
+ @Excel(name = "鐘舵��", readConverterExp = "0=鏈笅鍙�,1=閮ㄥ垎涓嬪彂,2=宸蹭笅鍙�")
+ private Integer status;
/**
- * 缁撴潫鏃堕棿
+ * 寮�濮嬫棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime dateEnd;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @ApiModelProperty("寮�濮嬫棩鏈�")
+ @Excel(name = "寮�濮嬫棩鏈�", width = 20, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date startDate;
/**
- * 鍏宠仈鍗曟嵁
+ * 缁撴潫鏃ユ湡
*/
- private String associationReceipt;
+ @ApiModelProperty("缁撴潫鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "缁撴潫鏃ユ湡", width = 20, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date endDate;
/**
- * 鏁版嵁鏂瑰紡: 1=鎵嬪姩 2=瀹氭椂
+ * 鎻愪氦浜�
*/
- private Integer dataSyncType;
+ @ApiModelProperty("鎻愪氦浜�")
+ @Excel(name = "鎻愪氦浜�")
+ private String submitter;
/**
- * 鏁版嵁鏉ユ簮: 1=閿�鍞鍗� 2=鐢熶骇棰勬祴
+ * 鎻愪氦浜虹粍缁�
*/
+ @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 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;
+
+ @ApiModelProperty(value = "涓嬪彂鏁伴噺")
+ @Excel(name = "涓嬪彂鏁伴噺")
+ private BigDecimal assignedQuantity;
+
+ /**
+ * 璁＄畻鍓╀綑鏂规暟
+ *
+ * @return 鍓╀綑鏂规暟
+ */
+ @ApiModelProperty(value = "鍓╀綑鏂规暟")
+ public BigDecimal getRemainingVolume() {
+ if (volume == null) {
+ return BigDecimal.ZERO;
+ }
+ if (assignedQuantity == null) {
+ return volume;
+ }
+ return volume.subtract(assignedQuantity);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3