From 659c74e7aaf751cc10ac47b7e0939f235a17d873 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 06 九月 2025 10:12:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
index 252384d..9806cd4 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
@@ -101,21 +101,25 @@
@Excel(name = "鏄惁閫氳繃榻愬鎬ф鏌�", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "鏄惁閫氳繃榻愬鎬ф鏌�")
- private String completenessCheckFlag = CommonConstant.DEFAULT_0;
+ private String completenessCheckFlag;
/**鏄惁閫氳繃璁惧鐐规*/
@Excel(name = "鏄惁閫氳繃璁惧鐐规", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "鏄惁閫氳繃璁惧鐐规")
- private String equipmentInspectionFlag = CommonConstant.DEFAULT_0;
+ private String equipmentInspectionFlag;
/**鏄惁閫氳繃宸ヨ壓鐐规*/
@Excel(name = "鏄惁閫氳繃宸ヨ壓鐐规", width = 15, dicCode = "yn")
@Dict(dicCode = "yn")
@ApiModelProperty(value = "鏄惁閫氳繃宸ヨ壓鐐规")
- private String processInspectionFlag = CommonConstant.DEFAULT_0;
+ private String processInspectionFlag;
/**瀹為檯鎶ュ伐鏁伴噺*/
@Excel(name = "瀹為檯鎶ュ伐鏁伴噺", width = 15)
@ApiModelProperty(value = "瀹為檯鎶ュ伐鏁伴噺")
private BigDecimal actualQuantity;
+ /**宸茬敓浜ф墭鏁帮紙褰撳墠鐝宸茬敓浜х殑鎵樻暟閲忥紝姣忔鎶ュ伐鏃舵洿鏂帮級*/
+ @Excel(name = "宸茬敓浜ф墭鏁�", width = 15)
+ @ApiModelProperty(value = "宸茬敓浜ф墭鏁�")
+ private Integer finishedPallets;
/**鍙戝竷浜�*/
@Excel(name = "鍙戝竷浜�", width = 15)
@ApiModelProperty(value = "鍙戝竷浜�")
--
Gitblit v1.9.3