From 313a6b128a78173c1c1ae1791abf2aa60284e664 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 14 五月 2025 13:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java   |    3 +
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java          |   56 ++++++++++++++--------------
 aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml |    4 +
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 1f6ffea..8f203a0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -29,16 +29,16 @@
     private Long id;
 
     /** 涓昏鍒掑憳 */
-    @Excel(name = "涓昏鍒�")
+//    @Excel(name = "涓昏鍒�")
     private String masterPlanner;
 
     /** 鍛ㄦ棩 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
     private Date weekDay;
 
     /** 鍛ㄥ害 */
-    @Excel(name = "鍛ㄥ害")
+//    @Excel(name = "鍛ㄥ害")
     private String weekCycle;
 
     /** 涓讳欢鏂欏彿 */
@@ -46,7 +46,7 @@
     private String mainPartNumber;
 
     /** 涓讳欢鍥惧彿 */
-    @Excel(name = "涓讳欢鍥惧彿")
+//    @Excel(name = "涓讳欢鍥惧彿")
     private String mainPartDrawingNumber;
 
     /** 瀹㈡埛鍚嶇О */
@@ -78,7 +78,7 @@
     private String drawingNo;
 
     /** 鐗堟湰鍙� */
-    @Excel(name = "鐗堟湰鍙�")
+//    @Excel(name = "鐗堟湰鍙�")
     private String versionNumber;
 
     /** 鐢熶骇鏁伴噺 */
@@ -86,7 +86,7 @@
     private BigDecimal productionQuantity;
 
     /** 鑹搧鏁伴噺 */
-    @Excel(name = "鑹搧鏁伴噺")
+//    @Excel(name = "鑹搧鏁伴噺")
     private BigDecimal goodProductsQuantity;
 
     /** 宸ュ簭鍙� */
@@ -98,12 +98,12 @@
     private String workCenter;
 
     /** 鎵�灞為儴闂� */
-    @Excel(name = "鎵�灞為儴闂�")
+//    @Excel(name = "鎵�灞為儴闂�")
     private String department;
 
     /** 璁″垝寮�宸ユ棩 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd")
     private Date planStartDay;
 
     /** 璁″垝瀹屽伐鏃� */
@@ -112,27 +112,27 @@
     private Date planEndDay;
 
     /** 澶囨枡鏂欏彿 */
-    @Excel(name = "澶囨枡鏂欏彿")
+//    @Excel(name = "澶囨枡鏂欏彿")
     private String standbyNumber;
 
     /** 澶囨枡鍚嶇О */
-    @Excel(name = "澶囨枡鍚嶇О")
+//    @Excel(name = "澶囨枡鍚嶇О")
     private String standbyName;
 
     /** 澶囨枡搴撳瓨 */
-    @Excel(name = "澶囨枡搴撳瓨")
+//    @Excel(name = "澶囨枡搴撳瓨")
     private Integer standbyStock;
 
     /** 涓嬮亾宸ュ簭鎵�灞為儴闂� */
-    @Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
+//    @Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
     private String nextProcessDeparment;
 
     /** 鏄惁鎸傝捣 */
-    @Excel(name = "鏄惁鎸傝捣")
+//    @Excel(name = "鏄惁鎸傝捣")
     private String isSuspended;
 
     /** 澶栧崗鏍囪瘑 */
-    @Excel(name = "澶栧崗鏍囪瘑")
+//    @Excel(name = "澶栧崗鏍囪瘑")
     private String isOutsourcing;
 
     /** 璐﹀ */
@@ -140,36 +140,36 @@
     private String account;
 
     /** 涓婇樁鐗╂枡 */
-    @Excel(name = "涓婇樁鐗╂枡")
+//    @Excel(name = "涓婇樁鐗╂枡")
     private String advancedMaterials;
 
     /** 涓婇樁鍗曟嵁鍙� */
-    @Excel(name = "涓婇樁鍗曟嵁鍙�")
+//    @Excel(name = "涓婇樁鍗曟嵁鍙�")
     private String advancedDocumentNumber;
 
     /** 涓婇樁闇�姹傛棩鏈� */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "涓婇樁闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "涓婇樁闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
     private Date advancedRequirementDay;
 
     /** 璁″垝榻愬 */
-    @Excel(name = "璁″垝榻愬")
+//    @Excel(name = "璁″垝榻愬")
     private Integer isPlanComplete;
 
     /** 搴撳瓨榻愬 */
-    @Excel(name = "搴撳瓨榻愬")
+//    @Excel(name = "搴撳瓨榻愬")
     private Integer isStockComplete;
 
     /** 鏄惁鏈夋姌杩斿伐搴� */
-    @Excel(name = "鏄惁鏈夋姌杩斿伐搴�")
+//    @Excel(name = "鏄惁鏈夋姌杩斿伐搴�")
     private Integer hasTurnback;
 
     /** 椋庨櫓鏍囪瘑 */
-    @Excel(name = "椋庨櫓鏍囪瘑")
+//    @Excel(name = "椋庨櫓鏍囪瘑")
     private Integer hasRisk;
 
     /** 浣滀笟锛堝伐搴忓悕绉帮級 */
-    @Excel(name = "浣滀笟")
+//    @Excel(name = "浣滀笟")
     private String stdOp;
 
     /** 宸ュ巶 */
@@ -177,16 +177,16 @@
     private String plant;
 
     /** 褰撳墠宸ュ簭鐘舵�� */
-    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+//    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
     private String opStatus;
 
     /** 涓嬩竴宸ュ簭鍚嶇О */
-    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+//    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
     private String nextOpName;
 
     /** 宸ュ崟鍒涘缓鏃堕棿 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderCreateTime;
 
     /** 鑷畾涔夋椂闂� */
@@ -195,17 +195,17 @@
 //    private Date customTime;
 
     /** 鐢熶骇鍩哄湴 */
-    @Excel(name = "鐢熶骇鍩哄湴")
+//    @Excel(name = "鐢熶骇鍩哄湴")
     private String productionBase;
 
     /** 宸ュ崟瀹℃牳鏃堕棿 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date approveOn;
 
     /** 宸ュ崟寮�宸ユ椂闂� */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date startWorkDate;
 
     /** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
index 7190995..9f72691 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java
@@ -71,6 +71,9 @@
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date computePlanEndDay;
 
+    @Excel(name = "寮傚父鐘舵��", width = 50)
+    private String exceptionStatus;
+
     /** 璁捐宸ユ椂 */
 
     private Long designTimes;
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
index 9f9a7ca..cb97682 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlateProcessStatMapper.xml
@@ -23,12 +23,14 @@
         <result property="createBy"    column="create_by"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="warning"    column="warning"    />
+        <result property="exceptionStatus"    column="exception_status"    />
     </resultMap>
 
     <sql id="selectApsPlateProcessStatVo">
         select id, work_order_no, process_name, num, route_process_number, current_process_number, production_quantity,
                standard_time, process_total_time, process_plan_end_day,process_plan_start_day, order_plan_end_day, design_times,
-               batch_number, create_by, del_flag, warning
+               batch_number, create_by, del_flag, warning,
+               CASE WHEN <![CDATA[ process_plan_start_day <= NOW() OR process_plan_end_day <= NOW() ]]> THEN '鏄�' ELSE '鍚�' END as exception_status
         from aps_plate_process_stat
     </sql>
 

--
Gitblit v1.9.3