From a18b8e051947411bab76769efc20b4814d7e0674 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期二, 20 五月 2025 16:26:56 +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 | 145 ++++++++++++++++++++++++++----------------------
1 files changed, 79 insertions(+), 66 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 eb5d194..552aee3 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
@@ -29,44 +29,24 @@
private String mainPartNumber;
/** 涓讳欢瀹㈡埛 */
- @Schema(description = "涓讳欢瀹㈡埛锛屾潵鑷狤RP", type = "String")
+ @Schema(description = "涓讳欢瀹㈡埛", type = "String")
@Excel(name = "涓讳欢瀹㈡埛")
private String customer;
- /** 涓讳欢璁㈠崟浜ゆ湡 */
- @Schema(description = "涓讳欢璁㈠崟浜ゆ湡锛屾潵鑷狤RP", type = "String")
- @Excel(name = "涓讳欢璁㈠崟浜ゆ湡")
- private BigInteger mainOrderDelivery;
+ @Schema(description = "寤烘爲琛�", type = "String")
+ @Excel(name = "寤烘爲琛�")
+ private String requireTrackId;;
/** 涓氬姟绫诲瀷 */
@Schema(description = "涓氬姟绫诲瀷", type = "String")
@Excel(name = "涓氬姟绫诲瀷")
private String businessType;
- /** 鐣彿 */
- @Schema(description = "闇�姹傝拷婧彿锛岀敱APS浜х敓", type = "String")
- @Excel(name = "鐣彿")
- private String designation;
/** 鍗曟嵁鍙� */
@Schema(description = "鍗曟嵁鍙�", type = "String")
@Excel(name = "鍗曟嵁鍙�")
private String documentNumber;
-
- /** 闇�姹傚垎绫� */
- @Schema(description = "闇�姹傚垎绫�", type = "String")
- @Excel(name = "闇�姹傚垎绫�")
- private String requirementType;
-
- /** 鍗曟嵁鐘舵�� */
- @Schema(description = "鍗曟嵁鐘舵��", type = "String")
- @Excel(name = "鍗曟嵁鐘舵��")
- private String documentStatus;
-
- /** 褰撳墠宸ュ簭 */
- @Schema(description = "褰撳墠宸ュ簭", type = "String")
- @Excel(name = "褰撳墠宸ュ簭")
- private String workCenter;
/** 鏂欏彿 */
@@ -84,34 +64,99 @@
@Excel(name = "鐗堟湰鍙�")
private String versionNumber;
+ /** 浣庨樁鐮�*/
+ @Excel(name = "浣庨樁鐮�")
+ private String lowOrderCode;
+
/** 鐢熶骇鏁伴噺 */
@Schema(description = "鐢熶骇鏁伴噺", type = "String")
@Excel(name = "鐢熶骇鏁伴噺")
private BigDecimal productionQuantity;
- /** 宸ュ崟鍒涘缓鏃堕棿 */
- @Schema(description = "宸ュ崟鍒涘缓鏃堕棿锛屾潵鑷狤RP", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date orderCreateTime;
+ /** 闇�姹傚垎绫� */
+ @Schema(description = "闇�姹傚垎绫�", type = "String")
+ @Excel(name = "闇�姹傚垎绫�")
+ private String requirementType;
+
+ /** 鍗曟嵁鐘舵�� */
+ @Schema(description = "鍗曟嵁鐘舵��", type = "String")
+ @Excel(name = "鍗曟嵁鐘舵��")
+ private String documentStatus;
/** 宸ュ崟瀹℃牳鏃堕棿 */
- @Schema(description = "宸ュ崟瀹℃牳鏃堕棿锛屾潵鑷狤RP", type = "String")
+ @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 approveOn;
+ /** 宸ュ簭鍙� */
+ @Excel(name = "宸ュ簭鍙�")
+ private String processNumber;
+
+ /** 褰撳墠宸ュ簭 */
+ @Schema(description = "褰撳墠宸ュ簭", type = "String")
+ @Excel(name = "褰撳墠宸ュ簭")
+ private String workCenter;
+
+ /** 褰撳墠宸ュ簭璐ｄ换浜� */
+ @Excel(name = "褰撳墠宸ュ簭璐ｄ换浜�")
+ private String department;
+
+ /** 褰撳墠宸ュ簭鐘舵�� */
+ @Excel(name = "鐘舵��")
+ private String opStatus;
+
+ /** 涓嬩竴閬撳伐搴� */
+ @Excel(name = "涓嬩竴閬撳伐搴�")
+ private String nextOpName;
+
+ /** 宸ュ崟鍒涘缓鏃堕棿 */
+ @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 orderCreateTime;
+
+
/** 宸ュ崟寮�宸ユ椂闂� */
- @Schema(description = "宸ュ崟寮�宸ユ椂闂达紝鏉ヨ嚜ERP", type = "String")
+ @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 startWorkDate;
+ @Schema(description = "鍓╀綑宸ュ簭", type = "String")
+ private String remainedProcess;
+
+ /*--------*/
+
/** 鍐嶆纭瀹屽伐鏃堕棿 */
- @Schema(description = "鍐嶆纭瀹屽伐鏃堕棿锛屾潵鑷狝PS", type = "String")
+ @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 workOrderConfirmTime;
+
+ /** 鐢熶骇宸ュ巶 */
+ @Schema(description = "鐢熶骇宸ュ巶", type = "String")
+ @Excel(name = "鐢熶骇宸ュ巶")
+ private String productionBase;
+
+ /** 榻愬鐘跺喌 */
+ @Schema(description = "榻愬鐘跺喌", type = "String")
+ @Excel(name = "榻愬鐘跺喌")
+ private String kittingCondition;
+
+
+ /** 璁″垝榻愬鏃堕棿 */
+ @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 planKittingTime;
+
+
+ /** 涓讳欢璁㈠崟浜ゆ湡 */
+ @Schema(description = "涓讳欢璁㈠崟浜ゆ湡", type = "String")
+ @Excel(name = "涓讳欢璁㈠崟浜ゆ湡")
+ private BigInteger mainOrderDelivery;
+
/** 璁″垝瀹屽伐鏃� */
@Schema(description = "璁″垝瀹屽伐鏃�", type = "String")
@@ -119,44 +164,12 @@
@Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date planEndDay;
- /** 鐗堟湰鍙� */
- @Schema(description = "鐢熶骇宸ュ巶锛屾潵鑷狤RP", type = "String")
- @Excel(name = "鐢熶骇宸ュ巶")
- private String productionBase;
- /** 鐗堟湰鍙� */
- @Schema(description = "榻愬鐘跺喌锛屾潵鑷狤RP", type = "String")
- @Excel(name = "榻愬鐘跺喌")
- private String kittingCondition;
-
- /** 璁″垝榻愬鏃堕棿 */
- @Schema(description = "璁″垝榻愬鏃堕棿锛屾潵鑷狤RP", type = "String")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "璁″垝榻愬鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- private Date planKittingTime;
-
- /** 宸ュ簭鍙� */
- @Excel(name = "宸ュ簭鍙�")
- private String processNumber;
-
- /** 鎵�灞為儴闂� */
- @Excel(name = "鎵�灞為儴闂�")
- private String department;
/** 涓嬮亾宸ュ簭鎵�灞為儴闂� */
@Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
private String nextProcessDeparment;
- /** 褰撳墠宸ュ簭鐘舵�� */
- @Excel(name = "褰撳墠宸ュ簭鐘舵��")
- private String opStatus;
-
- /** 涓嬩竴宸ュ簭鍚嶇О */
- @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
- private String nextOpName;
-
- /** 浣庨樁鐮�*/
- @Excel(name = "浣庨樁鐮�")
- private String lowOrderCode;
-
+ /** 杞﹂棿宸ュ簭淇℃伅 */
private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
+
}
--
Gitblit v1.9.3