From f05fd2a067d751333f00a81dad095a7650900c95 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 三月 2026 13:16:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index 8839bd6..72866c7 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -7,6 +7,7 @@
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;
@@ -58,25 +59,10 @@
private String customerName;
/**
- * 鐗╂枡缂栫爜
+ * 鍏宠仈鐗╂枡淇℃伅琛↖D
*/
- @ApiModelProperty("鐗╂枡缂栫爜")
- @Excel(name = "鐗╂枡缂栫爜")
- private String materialCode;
-
- /**
- * 浜у搧鍚嶇О
- */
- @ApiModelProperty("浜у搧鍚嶇О")
- @Excel(name = "浜у搧鍚嶇О")
- private String productName;
-
- /**
- * 浜у搧瑙勬牸
- */
- @ApiModelProperty("浜у搧瑙勬牸")
- @Excel(name = "浜у搧瑙勬牸")
- private String productSpec;
+ @ApiModelProperty("鍏宠仈鐗╂枡淇℃伅琛↖D")
+ private Long productMaterialSkuId;
/**
* 闀�
@@ -120,12 +106,17 @@
@Excel(name = "寮哄害")
private String strength;
+ @ApiModelProperty("鐘舵�� 0鏈笅鍙� 1閮ㄥ垎涓嬪彂 2宸蹭笅鍙�")
+ @Excel(name = "鐘舵��", readConverterExp = "0=鏈笅鍙�,1=閮ㄥ垎涓嬪彂,2=宸蹭笅鍙�")
+ private Integer status;
+
/**
* 寮�濮嬫棩鏈�
*/
@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;
/**
@@ -134,6 +125,7 @@
@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;
/**
@@ -192,16 +184,11 @@
@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=鏂板")
+ @ApiModelProperty("鏁版嵁鏉ユ簮绫诲瀷锛�1=閽夐拤鍚屾 2=鎵嬪姩鏂板")
private Integer dataSourceType;
/**
@@ -227,4 +214,20 @@
@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