From 0e19bbb301fd4efdcbf3285ade2a149db7d0a613 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期五, 15 八月 2025 18:34:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java b/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java index 1e9224f..0152089 100644 --- a/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java +++ b/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java @@ -15,6 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -59,11 +60,11 @@ /**闇�姹傛暟閲�*/ @Excel(name = "闇�姹傛暟閲�", width = 15) @ApiModelProperty(value = "闇�姹傛暟閲�") - private Double requiredQuantity; + private BigDecimal requiredQuantity; /**瀹為檯鏁伴噺*/ @Excel(name = "瀹為檯鏁伴噺", width = 15) @ApiModelProperty(value = "瀹為檯鏁伴噺") - private Double actualQuantity; + private BigDecimal actualQuantity; /**鏄惁榻愬*/ @Excel(name = "鏄惁榻愬", width = 15) @ApiModelProperty(value = "鏄惁榻愬") @@ -71,4 +72,7 @@ @TableField(exist = false) @ApiModelProperty(value = "宸ュ崟鍙�") private String workOrderCode; + @TableField(exist = false) + @ApiModelProperty(value = "鍩烘湰鍗曚綅") + private String productionUnit; } -- Gitblit v1.9.3