From 7c266bff815ebed897e51f401ef5987629d77c44 Mon Sep 17 00:00:00 2001 From: sfd <sun.sunshine@163.com> Date: 星期三, 21 五月 2025 11:08:29 +0800 Subject: [PATCH] 修改管路预测与物料产品组导入功能 根据工厂及料号更新与插入 --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java index abe1a53..a803376 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingRouteStat.java @@ -61,8 +61,8 @@ private BigDecimal processTotalTime; /** 璁″垝寮�宸ユ棩 */ - @Excel(name = "璁″垝寮�宸ユ棩") - @Schema(description = "璁″垝寮�宸ユ棩", type = "Date") + @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date processPlanStartDay; /** 璁捐宸ユ椂 */ @@ -123,6 +123,9 @@ @Excel(name = "鎵规鍙�") private String batchNumber; + /** 宸ュ巶 */ + private String plant; + @Transient private String searchStartDate; @@ -134,7 +137,8 @@ private Boolean warning; private Integer num; - + private BigDecimal routeProcessNumber; + private Date orderPlanEndDay; /** 璁″垝瀹屾垚鏃� */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") -- Gitblit v1.9.3