From 1c38849eebe0179b7ebad1db30b3335a41cc47e9 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期六, 16 八月 2025 12:30:22 +0800 Subject: [PATCH] art: WebService服务端相关代码修改 --- src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 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 efccd0d..252384d 100644 --- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java +++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java @@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -69,7 +70,7 @@ /**璁″垝鐢熶骇鏁伴噺*/ @Excel(name = "璁″垝鐢熶骇鏁伴噺", width = 15) @ApiModelProperty(value = "璁″垝鐢熶骇鏁伴噺") - private Double planQuantity; + private BigDecimal planQuantity; /**浜х嚎ID(鍐椾綑)*/ @Excel(name = "浜х嚎ID(鍐椾綑)", width = 15) @Dict(dictTable = "base_factory", dicCode = "id", dicText = "factory_name") @@ -92,14 +93,29 @@ @ApiModelProperty(value = "鎺掍骇鏃ユ湡") private Date workOrderDate; /**宸ュ崟鐘舵��*/ - @Excel(name = "宸ュ崟鐘舵��", width = 15, dicCode = "mes_work_order_status") - @Dict(dicCode = "mes_work_order_status") + @Excel(name = "宸ュ崟鐘舵��", width = 15, dicCode = "work_order_status") + @Dict(dicCode = "work_order_status") @ApiModelProperty(value = "宸ュ崟鐘舵��") private String workOrderStatus; + /**鏄惁閫氳繃榻愬鎬ф鏌�*/ + @Excel(name = "鏄惁閫氳繃榻愬鎬ф鏌�", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "鏄惁閫氳繃榻愬鎬ф鏌�") + private String completenessCheckFlag = CommonConstant.DEFAULT_0; + /**鏄惁閫氳繃璁惧鐐规*/ + @Excel(name = "鏄惁閫氳繃璁惧鐐规", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "鏄惁閫氳繃璁惧鐐规") + private String equipmentInspectionFlag = CommonConstant.DEFAULT_0; + /**鏄惁閫氳繃宸ヨ壓鐐规*/ + @Excel(name = "鏄惁閫氳繃宸ヨ壓鐐规", width = 15, dicCode = "yn") + @Dict(dicCode = "yn") + @ApiModelProperty(value = "鏄惁閫氳繃宸ヨ壓鐐规") + private String processInspectionFlag = CommonConstant.DEFAULT_0; /**瀹為檯鎶ュ伐鏁伴噺*/ @Excel(name = "瀹為檯鎶ュ伐鏁伴噺", width = 15) @ApiModelProperty(value = "瀹為檯鎶ュ伐鏁伴噺") - private Double actualQuantity; + private BigDecimal actualQuantity; /**鍙戝竷浜�*/ @Excel(name = "鍙戝竷浜�", width = 15) @ApiModelProperty(value = "鍙戝竷浜�") -- Gitblit v1.9.3