From 08001726c8b946ff4e9ac0a74f933197ad3c4fe2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 13 三月 2026 10:25:16 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
index bca6e46..fa7c613 100644
--- a/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
+++ b/src/main/java/com/ruoyi/productionPlan/pojo/ProductionPlan.java
@@ -59,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,6 +105,10 @@
@ApiModelProperty("寮哄害")
@Excel(name = "寮哄害")
private String strength;
+
+ @ApiModelProperty("鐘舵�� 0鏈笅鍙� 1宸蹭笅鍙�")
+ @Excel(name = "鐘舵��", readConverterExp = "0=鏈笅鍙�,1=宸蹭笅鍙�")
+ private Integer status;
/**
* 寮�濮嬫棩鏈�
@@ -230,4 +219,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