Merge remote-tracking branch 'origin/master'

src/main/java/com/spring/modules/change/vo/ProcessFormVo.java

@@ -27,4 +27,6 @@ public class ProcessFormVo extends ProcessFormEntity {
     private String processFlag;
 
     private List<ProcessFormVo> informationList;
+
+    private String documentStatus;
 }

src/main/java/com/spring/modules/part/controller/RoutingManagementController.java

@@ -2,6 +2,7 @@ package com.spring.modules.part.controller;
 
 import com.spring.common.utils.PageUtils;
 import com.spring.common.utils.R;
+import com.spring.modules.base.entity.PersonnelLevel;
 import com.spring.modules.part.entity.*;
 import com.spring.modules.part.service.BomManagementService;
 import com.spring.modules.part.service.RoutingManagementService;
@@ -408,4 +409,14 @@ public class RoutingManagementController {
         PageUtils page  = routingManagementService.queryToolList(data);
         return R.ok().put("page", page);
     }
+
+    /**
+     * 通过加工中心查人员等级
+     */
+    @PostMapping(value="/queryLaborClassByWorkCenterNo")
+    @ResponseBody
+    public R queryLaborClassByWorkCenterNo(@RequestBody PersonnelLevel data) {
+        List<PersonnelLevel> rows = routingManagementService.queryLaborClassByWorkCenterNo(data);
+        return R.ok().put("rows", rows);
+    }
 }

src/main/java/com/spring/modules/part/mapper/RoutingManagementMapper.java

@@ -217,4 +217,6 @@ public interface RoutingManagementMapper extends BaseMapper<RoutingHeaderEntity>
     void syncUpdateWorkCenterCost(List<WorkCenterCost> subList);
 
     void deleteWorkCenterCostAll();
+
+    List<PersonnelLevel> queryLaborClassByWorkCenterNo(PersonnelLevel data);
 }

src/main/java/com/spring/modules/part/service/RoutingManagementService.java

@@ -1,6 +1,7 @@
 package com.spring.modules.part.service;
 
 import com.spring.common.utils.PageUtils;
+import com.spring.modules.base.entity.PersonnelLevel;
 import com.spring.modules.base.vo.PersonnelLevelVo;
 import com.spring.modules.base.vo.WorkCenterCostVo;
 import com.spring.modules.part.entity.*;
@@ -80,4 +81,6 @@ public interface RoutingManagementService {
     PageUtils queryToolList(ToolHeader data);
 
     void syncWorkCenterCostToPLM(WorkCenterCostVo workCenterCostVo);
+
+    List<PersonnelLevel> queryLaborClassByWorkCenterNo(PersonnelLevel data);
 }

src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java

@@ -1668,4 +1668,13 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
         return new PageUtils(resultList);
     }
 
+    /**
+     * 通过加工中心查人员等级
+     */
+    @Override
+    public List<PersonnelLevel> queryLaborClassByWorkCenterNo(PersonnelLevel data) {
+        List<PersonnelLevel> list = routingManagementMapper.queryLaborClassByWorkCenterNo(data);
+        return list;
+    }
+
 }

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

@@ -1822,4 +1822,14 @@
     <delete id="deleteWorkCenterCostAll">
         TRUNCATE TABLE work_center_cost
     </delete>
+
+    <!-- 通过加工中心查人员等级 -->
+    <select id="queryLaborClassByWorkCenterNo" resultType="com.spring.modules.base.entity.PersonnelLevel">
+        select
+            site,
+            level_id,
+            level_desc
+        from labor_class
+        where site = #{site} and level_id = #{levelId}
+    </select>
 </mapper>

src/main/resources/mapper/request/RequestManageMapper.xml

@@ -335,15 +335,27 @@
     </update>
 
     <select id="getProcessControlList" resultType="PlmProcessControllBaseData">
-        select role_id,workflow_id,remark,#{nodeId} as node_id ,#{site} as site
-        from plm_process_controll_base where workflow_id=#{workflowId}
+        select
+            role_id,
+            workflow_id,
+            remark,
+            #{nodeId} as node_id,
+            #{site} as site
+        from plm_process_controll_base
+        where workflow_id = #{workflowId}
     </select>
 
-        <select id="getProcessSelect" resultType="PlmProcessControllBaseData">
-       select a.site,a.workflow_id,a.node_id,a.role_id,b.remark
-        from plm_process_controll_value a left join plm_process_controll_base b on
-        a.role_id=b.role_id and a.workflow_id=b.workflow_id
-        where b.remark is not null and a.site=#{site} and a.workflow_id=#{workflowId} and a.node_id=#{nodeId}
+    <select id="getProcessSelect" resultType="PlmProcessControllBaseData">
+       select
+           a.site,
+           a.workflow_id,
+           a.node_id,
+           a.role_id,
+           b.remark
+        from plm_process_controll_value a
+        left join plm_process_controll_base b on a.role_id = b.role_id and a.workflow_id = b.workflow_id
+        where b.remark is not null
+          and a.site = #{site} and a.workflow_id = #{workflowId} and a.node_id = #{nodeId}
     </select>
 
     <delete id="deleteProcessControlList">
@@ -410,24 +422,12 @@
         a.classification_no,
         a.step_id,
         a.menu_id,
-        a.reject_opinion
+        a.reject_opinion,
+        dbo.get_document_status(a.site, a.document_no, a.document_type) as documentStatus
         FROM plm_process_form as a
         LEFT JOIN [VIEW_Process_management_OA_PLM] as b ON a.workflow_id = b.workflowid AND a.node_id = b.nodeid
         LEFT JOIN sys_user as d ON a.domain_control_account = d.domain_control_account
         <where>
-<!--            EXISTS (SELECT 1-->
-<!--                        FROM (-->
-<!--                            SELECT site, bu, document_no, MAX(id) AS max_id-->
-<!--                            FROM plm_process_form-->
-<!--                            GROUP BY site, bu, document_no-->
-<!--                        ) AS subquery-->
-<!--                        WHERE subquery.site = a.site AND subquery.bu = a.bu AND subquery.document_no = a.document_no AND subquery.max_id = a.id-->
-<!--            )-->
-<!--            and a.node_id not in (-->
-<!--                SELECT MAX(nodeid)-->
-<!--                FROM VIEW_Process_management_OA_PLM-->
-<!--                GROUP BY workflowid-->
-<!--            )-->
             a.site = #{query.site} and a.is_remark = 0 and isnull(a.process_intervention_flag, ' ') <![CDATA[<>]]> 'Y'
             <if test = "query.documentNo != null and query.documentNo != ''">
                 AND a.document_no like #{query.documentNo}
@@ -450,6 +450,9 @@
             <if test = "query.updateBy != null and query.updateBy != ''">
                 AND d.username like #{query.updateBy}
             </if>
+            <if test = "query.documentStatus != null and query.documentStatus != ''">
+                and dbo.get_document_status(a.site, a.document_no, a.document_type) = #{query.documentStatus}
+            </if>
         </where>
     </select>