From 8caf5f04be94d8f52fb291dd045663079d681c19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 11:43:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java | 12 ++++++++++--
1 files changed, 10 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 bc702fe..0152089 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesKittingCompletenessCheck.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mes.entity;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,6 +15,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -58,13 +60,19 @@
/**闇�姹傛暟閲�*/
@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 = "鏄惁榻愬")
private String checkFlag;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸ュ崟鍙�")
+ private String workOrderCode;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+ private String productionUnit;
}
--
Gitblit v1.9.3