From da8559d4b6abaefabf394d1d2174b3bf4a545a89 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期三, 21 五月 2025 11:10:54 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java
index 552aee3..598d689 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlate/ApsPlateProcessShopPlanStat.java
@@ -84,9 +84,9 @@
private String documentStatus;
/** 宸ュ崟瀹℃牳鏃堕棿 */
- @Schema(description = "宸ュ崟瀹℃牳鏃堕棿", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Schema(description = "瀹℃牳鏃堕棿", type = "String")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date approveOn;
/** 宸ュ簭鍙� */
@@ -102,7 +102,7 @@
@Excel(name = "褰撳墠宸ュ簭璐ｄ换浜�")
private String department;
- /** 褰撳墠宸ュ簭鐘舵�� */
+ /** 鐘舵�� */
@Excel(name = "鐘舵��")
private String opStatus;
@@ -110,16 +110,23 @@
@Excel(name = "涓嬩竴閬撳伐搴�")
private String nextOpName;
+ /** 绯荤粺瀹屽伐鏃堕棿 */
+ @Schema(description = "绯荤粺瀹屽伐鏃堕棿", type = "String")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Excel(name = "绯荤粺瀹屽伐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date planEndDay;
+
+
/** 宸ュ崟鍒涘缓鏃堕棿 */
@Schema(description = "宸ュ崟鍒涘缓鏃堕棿", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date orderCreateTime;
/** 宸ュ崟寮�宸ユ椂闂� */
@Schema(description = "宸ュ崟寮�宸ユ椂闂�", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startWorkDate;
@@ -130,7 +137,7 @@
/** 鍐嶆纭瀹屽伐鏃堕棿 */
@Schema(description = "鍐嶆纭瀹屽伐鏃堕棿", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "鍐嶆纭瀹屽伐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date workOrderConfirmTime;
@@ -147,7 +154,7 @@
/** 璁″垝榻愬鏃堕棿 */
@Schema(description = "璁″垝榻愬鏃堕棿", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Excel(name = "璁″垝榻愬鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planKittingTime;
@@ -158,11 +165,6 @@
private BigInteger mainOrderDelivery;
- /** 璁″垝瀹屽伐鏃� */
- @Schema(description = "璁″垝瀹屽伐鏃�", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date planEndDay;
/** 涓嬮亾宸ュ簭鎵�灞為儴闂� */
--
Gitblit v1.9.3