2025-04-27

点检工单和计划增加取消人，取消时间

src/main/java/com/xujie/sys/modules/part/entity/CopyTempBomTree.java

@@ -44,6 +44,9 @@ public class CopyTempBomTree {
     @TableField(exist = false)
     private String partDesc;
 
+    @TableField(exist = false)
+    private String noteText;
+
     /**
      * 递归方法生成树结构
      */

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

@@ -2232,6 +2232,7 @@ public class EamServiceImpl implements EamService {
     }
 
     @Override
+
     @Transactional
     public void changeOrderOperator (List<EamWorkOrderInData> inList) {
         EamAdminData inData = new EamAdminData();

src/main/resources/mapper/part/BomSearch3Mapper.xml

@@ -363,7 +363,8 @@
             prh.part_no,
             prh.routing_revision,
             prh.routing_type,
-            p.part_desc
+            p.part_desc,
+            prh.note_text
         from plm_routing_header prh
         left join part p on prh.part_no = p.part_no and prh.site = p.site
         where prh.site = #{site} and prh.bu_no = #{buNo} and prh.part_no = #{partNo}
@@ -395,7 +396,8 @@
         bom.part_no,
         bom.eng_chg_level,
         bom.bom_type,
-        p.part_desc
+        p.part_desc,
+        bom.note_text
         from plm_bom_header bom
         left join part p on bom.part_no = p.part_no and bom.site = p.site
         where bom.site = #{site} and bom.part_no = #{partNo}

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

@@ -1389,19 +1389,25 @@
 
     <update id="cancelOrder" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         update eam_workOrder
-        set Status = '已取消'
+        set Status = '已取消',
+            cancel_date = getDate(),
+            cancel_by = #{userId}
         where site = #{site} and orderNo = #{orderNo} and FunctionType = #{functionType} and bu_no = #{buNo}
     </update>
 
     <update id="cancelOrderAll" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         update eam_workOrder
-        set Status = '已取消'
+        set Status = '已取消',
+            cancel_date = getDate(),
+            cancel_by = #{userId}
         where site = #{site} and PlanID = #{planID} and FunctionType = #{functionType} and ObjectID = #{objectID} and Status = #{status} and bu_no = #{buNo}
     </update>
 
     <update id="updateWorkPlanStatus2" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         update eam_workPlan
-        set Status = '已取消'
+        set Status = '已取消',
+            cancel_date = getDate(),
+            cancel_by = #{userId}
         where site = #{site} and PlanID = #{planID} and FunctionType = #{functionType} and ObjectID = #{objectID} and bu_no = #{buNo}
     </update>
 
@@ -1421,24 +1427,29 @@
         where site = #{site} and PlanID = #{planID} and deleteFlag = 'N' and bu_no = #{buNo}
     </update>
 
-
     <update id="cancelPlan">
         update eam_workPlan_overview
         set status = '已取消',
-            next_work_date = null
+            next_work_date = null,
+            cancel_date = getDate(),
+            cancel_by = #{userId}
         where site = #{site} and plan_id = #{planID} and delete_flag = 'N' and bu_no = #{buNo}
     </update>
 
     <update id="updateWorkPlanStatus">
         update eam_workPlan
         set Status = '已取消',
-            NextWorkDate = null
+            NextWorkDate = null,
+            cancel_date = getDate(),
+            cancel_by = #{userId}
         where Site = #{site} and PlanID = #{planID} and deleteFlag = 'N' and bu_no = #{buNo}
     </update>
 
     <update id="cancelOrderWithPlanID">
         update eam_workOrder
-        set Status = '已取消'
+        set Status = '已取消',
+            cancel_date = getDate(),
+            cancel_by = #{userId}
         where site = #{site} and PlanID = #{planID} and status = '未开工' and bu_no = #{buNo}
     </update>
 
@@ -1755,7 +1766,7 @@
         delete from sys_oss where id = #{id}
     </delete>
 
-    <select id="checkSparPartImage" resultType="SysOssEntity" parameterType="EamWorkOrderInData">
+    <select id="checkSparPartImage" resultType="SysOssEntity" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         SELECT
             id,
             url,
@@ -1772,7 +1783,7 @@
     </select>
 
     <!-- 获取机修人员列表 -->
-    <select id="getOperatorList" resultType="EamAdminData" parameterType="EamAdminData">
+    <select id="getOperatorList" resultType="com.xujie.sys.modules.pms.data.EamAdminData" parameterType="com.xujie.sys.modules.pms.data.EamAdminData">
         SELECT
             ea.AdminID,
             ea.AdminName,
@@ -1800,7 +1811,7 @@
     </select>
 
     <!-- 获取审核人员列表 -->
-    <select id="getCheckerList" resultType="EamAdminData" parameterType="EamAdminData">
+    <select id="getCheckerList" resultType="com.xujie.sys.modules.pms.data.EamAdminData" parameterType="com.xujie.sys.modules.pms.data.EamAdminData">
         SELECT
             a.user_id,
             a.username as adminID,
@@ -1833,20 +1844,20 @@
     </select>
 
     <!-- 点检工单审核 -->
-    <update id="checkWorkOrder" parameterType="EamWorkOrderInData">
+    <update id="checkWorkOrder" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         UPDATE eam_workOrder
         SET Status = '已完工'
         WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
     </update>
 
-    <update id="cancelCheckWorkOrder" parameterType="EamWorkOrderInData">
+    <update id="cancelCheckWorkOrder" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         UPDATE eam_workOrder
         SET Status = '待审核'
         WHERE Site = #{site} AND OrderNo = #{orderNo} and bu_no = #{buNo}
     </update>
 
     <!-- 查看点检工单状态 -->
-    <select id="checkWorkOrderStatus" resultType="EamWorkOrderInData" parameterType="EamWorkOrderInData">
+    <select id="checkWorkOrderStatus" resultType="com.xujie.sys.modules.pms.data.EamWorkOrderInData" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         SELECT
             OrderNo
         FROM eam_workOrder
@@ -1854,14 +1865,14 @@
     </select>
 
     <!-- 点检工单审核 -->
-    <update id="updateWorkPlanOverviewStatus" parameterType="EamWorkOrderInData">
+    <update id="updateWorkPlanOverviewStatus" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         UPDATE eam_workPlan_overview
         SET status = '已结束'
         WHERE site = #{site} AND plan_id = #{planID} and bu_no = #{buNo}
     </update>
 
     <!-- 新增点检计划 -->
-    <insert id="saveWorkPlan" parameterType="EamWorkPlanInData">
+    <insert id="saveWorkPlan" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanInData">
         INSERT INTO eam_workPlan_overview
         (site, plan_id, plan_desc, status, plan_start_date, plan_end_date, created_date, created_by, update_date, update_by,
          remark, delete_flag, operator, operator_name, checker, checker_name, function_type, properties_code, plan_period,
@@ -1873,7 +1884,7 @@
     </insert>
 
     <!-- 生成工单ID -->
-    <select id="selectOrderId" resultType="string" parameterType="EamWorkPlanInData">
+    <select id="selectOrderId" resultType="string" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanInData">
         SELECT
             Right('0000000000'+ convert(VARCHAR(10), isnull(max(convert(INT,SUBSTRING(PlanID,3,10))),0)+1),8)
         FROM eam_workPlan
@@ -1881,7 +1892,7 @@
     </select>
 
     <!-- 查询计划中的设备列表 -->
-    <select id="getPlanDetailList" resultType="WorkPlanDetailData" parameterType="WorkPlanDetailData">
+    <select id="getPlanDetailList" resultType="com.xujie.sys.modules.pms.data.WorkPlanDetailData" parameterType="com.xujie.sys.modules.pms.data.WorkPlanDetailData">
         SELECT
             ewp.PlanID,
             ewp.PlanDesc,
@@ -1908,7 +1919,7 @@
     </select>
 
     <!-- 删除计划中的设备 -->
-    <delete id="delPlanDetail" parameterType="WorkPlanDetailData">
+    <delete id="delPlanDetail" parameterType="com.xujie.sys.modules.pms.data.WorkPlanDetailData">
         DELETE FROM eam_workPlan
         WHERE Site = #{site}
         AND PlanID = #{planID}
@@ -1916,7 +1927,7 @@
     </delete>
 
     <!-- 获取当前计划不包含的设备 -->
-    <select id="getObjList1" resultType="WorkPlanDetailData" parameterType="WorkPlanDetailData">
+    <select id="getObjList1" resultType="com.xujie.sys.modules.pms.data.WorkPlanDetailData" parameterType="com.xujie.sys.modules.pms.data.WorkPlanDetailData">
         SELECT
             a.ObjectID,
             a.ObjectDesc,
@@ -1932,7 +1943,7 @@
     </select>
 
     <!-- 获取当前计划包含的设备 -->
-    <select id="getObjList2" resultType="WorkPlanDetailData" parameterType="WorkPlanDetailData">
+    <select id="getObjList2" resultType="com.xujie.sys.modules.pms.data.WorkPlanDetailData" parameterType="com.xujie.sys.modules.pms.data.WorkPlanDetailData">
         SELECT
             a.ObjectID,
             b.ObjectDesc,
@@ -1948,14 +1959,14 @@
     </select>
 
     <!-- 添加计划设备 -->
-    <insert id="addObject" parameterType="EamWorkPlanInData">
+    <insert id="addObject" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanInData">
         INSERT INTO eam_workPlan
             (Site,PlanID,PlanDesc,ObjectID,FunctionType,PropertiesCode,Operator,OperatorName,checker,checkerName,PlanPeriod,Status,PlanStartDate,PlanEndDate,CreatedDate,CreatedBy,Version,Remark,DeleteFlag)
         values (#{site},#{planID},#{planDesc},#{objectID},#{functionType},#{propertiesCode},#{operator},#{operatorName},#{checker},#{checkerName},#{planPeriod},#{status},#{planStartDate},#{planEndDate},GetDate(),#{createdBy},0,#{remark},'N')
     </insert>
 
     <!-- 修改工单计划 -->
-    <update id="updateWorkPlan" parameterType="EamWorkPlanInData">
+    <update id="updateWorkPlan" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanInData">
         UPDATE eam_workPlan_overview
         SET plan_desc = #{planDesc},
             properties_code = #{propertiesCode},
@@ -1976,13 +1987,13 @@
     </update>
 
     <!-- 删除该计划的旧设备 -->
-    <delete id="delWorkPlanObject" parameterType="EamWorkPlanInData">
+    <delete id="delWorkPlanObject" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanInData">
         DELETE FROM eam_workPlan
         WHERE Site = #{site} AND PlanID = #{planID} and bu_no = #{buNo}
     </delete>
 
     <!-- 删除该计划的旧设备item -->
-    <delete id="delWorkPlanItem" parameterType="EamWorkPlanInData">
+    <delete id="delWorkPlanItem" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanInData">
         DELETE FROM eam_workPlan_item
         WHERE Site = #{site} AND PlanID = #{planID} and bu_no = #{buNo}
     </delete>
@@ -1996,7 +2007,7 @@
     </delete>
 
     <!-- 查询该计划的设备 -->
-    <select id="planObjectSearch" resultType="EamWorkPlanItemData" parameterType="EamWorkPlanItemData">
+    <select id="planObjectSearch" resultType="com.xujie.sys.modules.pms.data.EamWorkPlanItemData" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanItemData">
         SELECT DISTINCT
             a.ObjectID,
             b.ObjectDesc
@@ -2006,7 +2017,7 @@
     </select>
 
     <!-- 修改该计划状态 -->
-    <update id="updateOverviewStatus" parameterType="EamWorkPlanInData">
+    <update id="updateOverviewStatus" parameterType="com.xujie.sys.modules.pms.data.EamWorkPlanInData">
         UPDATE eam_workPlan_overview
         SET status = '进行中',
             next_work_date = plan_start_date
@@ -2014,7 +2025,7 @@
     </update>
 
     <!-- 查询文件路径 -->
-    <select id="searchFileUrl" resultType="SysOssEntity" parameterType="EamWorkOrderInData">
+    <select id="searchFileUrl" resultType="SysOssEntity" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         SELECT
             id,
             url,
@@ -2034,7 +2045,7 @@
     </select>
 
     <!-- 新增子明细信息 -->
-    <insert id="saveOperator" parameterType="EamWorkOrderInData">
+    <insert id="saveOperator" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         INSERT INTO eam_actual_operator
         (site, order_no, function_type, operator, bu_no)
         VALUES (#{site}, #{orderNo}, #{functionType}, #{operator}, #{buNo})
@@ -2043,7 +2054,7 @@
 <!--    AND Status = '已完工' AND PlanOperator is not null-->
 
     <!-- 查询实际维修人员 -->
-    <select id="getActualOperatorList2" resultType="EamAdminData">
+    <select id="getActualOperatorList2" resultType="com.xujie.sys.modules.pms.data.EamAdminData">
         SELECT
             ea.AdminID,
             ea.AdminName
@@ -2054,7 +2065,7 @@
     </select>
 
     <!-- 查询实际维修人员 -->
-    <select id="getActualOperatorList" resultType="EamAdminData">
+    <select id="getActualOperatorList" resultType="com.xujie.sys.modules.pms.data.EamAdminData">
         SELECT
             ea.username as adminID,
             ea.user_display as AdminName
@@ -2102,7 +2113,7 @@
     </select>
 
     <!-- 生成新的维修工单 -->
-    <insert id="saveDefectWorkOrder" parameterType="EamWorkOrderInData">
+    <insert id="saveDefectWorkOrder" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         INSERT INTO eam_workOrder
         (Site, bu_no, OrderNo, PlanID, PropertiesCode, ObjectID, Status, PlanDate, FunctionType, CreateDate, CreateBy, check_work_plan_id, check_item_no, document_source, repair_reporting_type, repair_type, PlanOperator)
         VALUES
@@ -2110,7 +2121,7 @@
     </insert>
 
     <!-- 获取旧工单的基础信息 -->
-    <select id="queryOldWorkOrderMessage" resultType="EamWorkOrderInData" parameterType="EamWorkOrderInData">
+    <select id="queryOldWorkOrderMessage" resultType="com.xujie.sys.modules.pms.data.EamWorkOrderInData" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         select
             PlanOperator,
             PlanOperatorName,
@@ -2120,14 +2131,14 @@
     </select>
 
     <!-- 生成新的维保工单 -->
-    <insert id="saveMaintenanceWorkOrder" parameterType="EamWorkOrderInData">
+    <insert id="saveMaintenanceWorkOrder" parameterType="com.xujie.sys.modules.pms.data.EamWorkOrderInData">
         INSERT INTO eam_workOrder
         (Site, bu_no, OrderNo, PlanID, PlanDesc, PropertiesCode, ObjectID, Status, PlanOperator, PlanDate, FunctionType, CreateDate, CreateBy, checker, PlanOperatorName, checkerName)
         VALUES (#{site}, #{buNo}, #{orderNo}, #{planID}, #{planDesc}, #{propertiesCode}, #{objectID}, '未开工', #{planOperator}, Dateadd(dd, Datediff(dd,0,Getdate()), 0), #{functionType}, getDate(), #{createBy}, #{checker}, #{planOperatorName}, #{checkerName})
     </insert>
 
     <!-- 检查系统操作人和审核人员是否一致 -->
-    <select id="selectNameByMes" resultType="EamAdminData" parameterType="EamAdminData">
+    <select id="selectNameByMes" resultType="com.xujie.sys.modules.pms.data.EamAdminData" parameterType="com.xujie.sys.modules.pms.data.EamAdminData">
         SELECT AdminName
         FROM eam_admin
         WHERE site = #{site}

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

@@ -3041,7 +3041,7 @@
     </insert>
 
     <!-- 检查动控是否开启 -->
-    <select id="queryController" parameterType="SysSceneDynamicControlModelEntity" resultType="SysSceneDynamicControlModelEntity">
+    <select id="queryController" parameterType="com.xujie.sys.modules.sys.entity.SysSceneDynamicControlModelEntity" resultType="com.xujie.sys.modules.sys.entity.SysSceneDynamicControlModelEntity">
         SELECT
             type,
             base_data,
@@ -3080,7 +3080,7 @@
     </select>
 
     <!-- 查询检验模板列表 -->
-    <select id="getPartInformation" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
+    <select id="getPartInformation" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
         select
             part_no,
             part_desc,
@@ -3093,7 +3093,7 @@
     </select>
 
     <!-- 获取特殊工序列表 -->
-    <select id="getSpecialOperationList" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
+    <select id="getSpecialOperationList" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
         select
             site,
             operation_no,
@@ -3103,7 +3103,7 @@
     </select>
 
     <!-- 获取处置措施列表 -->
-    <select id="disposalMeasuresSearch" resultType="QcFAIRecordData" parameterType="QcFAIRecordData">
+    <select id="disposalMeasuresSearch" resultType="com.xujie.sys.modules.pms.data.QcFAIRecordData" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
         SELECT
             id,
             disposal_measures
@@ -3116,7 +3116,7 @@
     </select>
 
     <!-- 查询文件路径 -->
-    <select id="searchItemFileUrl" resultType="SysOssEntity" parameterType="QcFAIRecordData">
+    <select id="searchItemFileUrl" resultType="SysOssEntity" parameterType="com.xujie.sys.modules.pms.data.QcFAIRecordData">
         SELECT
             id,
             url,