增加废弃功能

src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@@ -2471,4 +2471,13 @@ public class EamController {
         return R.ok().put("data", itemNo).put("length", itemNo.length());
     }
 
+    /**
+     * 废弃工单
+     **/
+    @PostMapping("/abandonedEamWorkOrder")
+    public R abandonedEamWorkOrder(@RequestBody EamWorkOrderData data){
+        eamService.abandonedEamWorkOrder(data);
+        return R.ok();
+    }
+
 }

src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderData.java

@@ -128,6 +128,18 @@ public class EamWorkOrderData extends QueryPage {
     private String checkNotes;
 
     private String checkType;
+    /**
+     * 废弃原因
+     */
+    private String abandonedReason;
+
+    public String getAbandonedReason() {
+        return abandonedReason;
+    }
+
+    public void setAbandonedReason(String abandonedReason) {
+        this.abandonedReason = abandonedReason;
+    }
 
     public String getCheckType() {
         return checkType;

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -514,4 +514,6 @@ public interface EamMapper {
     String queryItemNo(EamPropertiesItemData data);
 
     List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
+
+    void abandonedEamWorkOrder(EamWorkOrderData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@@ -1212,4 +1212,6 @@ public interface EamService {
     void returnWorkOrder(EamWorkOrderInData data);
 
     List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
+
+    void abandonedEamWorkOrder(EamWorkOrderData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -4012,6 +4012,11 @@ public class EamServiceImpl implements EamService {
         return eamMapper.getAllCoreComponents(data);
     }
 
+    @Override
+    public void abandonedEamWorkOrder(EamWorkOrderData data) {
+        eamMapper.abandonedEamWorkOrder(data);
+    }
+
     /**
      * 员工考勤vs报工工时
      */

src/main/resources/mapper/pms/EamMapper.xml

@@ -1049,7 +1049,7 @@
                 a.reach_date,
                 a.reach_operator,
                 a.reach_operator_name,
-                b.CreatedDate,
+                case when a.status = '已废弃' then null else b.CreatedDate end as CreatedDate,
                 a.handling_method,
                 dbo.eam_Get_eamResourceDesc(a.Site, a.ObjectID) as resourceDesc,
                 CASE WHEN (DATEDIFF(SECOND, a.CreateDate, a.reach_date) <![CDATA[<]]> 60)  THEN DATEDIFF(SECOND, a.CreateDate, a.reach_date) / 60.0
@@ -3972,6 +3972,11 @@
             is_return = 'Y'
         WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
     </update>
+    <update id="abandonedEamWorkOrder">
+        update eam_workOrder
+        set Status = '已废弃' , abandoned_reason = #{abandonedReason} , update_by = #{updateBy} , update_date = getDate()
+        where Site = #{site} and bu_no = #{buNo} and OrderNo = #{orderNo}
+    </update>
     <select id="getUpItemdataEam" resultType="com.xujie.sys.modules.pms.data.EamPropertiesModelDetailData">
         select
             top 1