更新报表查询

mes/src/main/java/com/ximai/mes/pro/mapper/ProFeedbackMapper.java

@@ -143,6 +143,6 @@ public interface ProFeedbackMapper {
 
     int selectCount(@Param("taskIds")List<Long> taskIds);
 
-    List<WorkOrderProgressFeedbackListResponse> getFeedbackList(@Param("workorderCode")String workorderCode,@Param("taskId") Long taskId);
+    List<WorkOrderProgressFeedbackListResponse> getFeedbackList(@Param("workorderCode")String workorderCode,@Param("taskId") Long taskId,@Param("taskWorkunitId") Long taskWorkunitId);
 
 }

mes/src/main/java/com/ximai/mes/report/controller/WorkOrderProgressController.java

@@ -51,8 +51,8 @@ public class WorkOrderProgressController  extends BaseController {
     @PreAuthorize("@ss.hasPermi('mes:pro:feedback:get')")
     @Log(title = "生产进度:报工明细", businessType = BusinessType.QUERY)
     @GetMapping("/getFeedbackList")
-    public TableDataInfo<WorkOrderProgressFeedbackListResponse> getFeedbackList( Long taskId,@RequestParam("workorderCode") String workorderCode) {
-        List<WorkOrderProgressFeedbackListResponse> workOrderProgressFeedbackListResponses = workOrderProgressService.getFeedbackList(workorderCode,taskId);
+    public TableDataInfo<WorkOrderProgressFeedbackListResponse> getFeedbackList(@RequestParam("taskWorkunitId")Long taskWorkunitId,@RequestParam("taskId") Long taskId,@RequestParam("workorderCode") String workorderCode) {
+        List<WorkOrderProgressFeedbackListResponse> workOrderProgressFeedbackListResponses = workOrderProgressService.getFeedbackList(workorderCode,taskId,taskWorkunitId);
         return getDataTable(workOrderProgressFeedbackListResponses);
     }
 }

mes/src/main/java/com/ximai/mes/report/response/WorkOrderProgressProcessListResponse.java

@@ -23,4 +23,5 @@ public class WorkOrderProgressProcessListResponse {
     @ApiModelProperty("合格率")
     private BigDecimal passRate;
     private Long taskId;
+    private Long taskWorkunitId;
 }

mes/src/main/java/com/ximai/mes/report/service/WorkOrderProgressService.java

@@ -12,5 +12,5 @@ public interface WorkOrderProgressService {
 
     List<WorkOrderProgressProcessListResponse> getProcessList(String workorderCode);
 
-    List<WorkOrderProgressFeedbackListResponse> getFeedbackList(String workorderCode,Long taskId);
+    List<WorkOrderProgressFeedbackListResponse> getFeedbackList(String workorderCode,Long taskId,Long taskWorkunitId);
 }

mes/src/main/java/com/ximai/mes/report/service/impl/WorkOrderProgressServiceImp.java

@@ -56,11 +56,14 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
                 workOrderProgressProcessListResponse.setStatus("加工中");
             }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.FINISHED.getStatus())){
                 workOrderProgressProcessListResponse.setStatus("已完工");
-            }else{
+            }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.PAUSE.getStatus())){
+                workOrderProgressProcessListResponse.setStatus("暂停");
+            }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.PREPARE.getStatus())){
                 workOrderProgressProcessListResponse.setStatus("未开工");
+            }else if(workOrderProgressProcessListResponse.equals(TaskStatusEnum.ERROR_STOP.getStatus())){
+                workOrderProgressProcessListResponse.setStatus("故障停工");
             }
             if(workOrderProgressProcessListResponse.getQuantityProduced() != null && workOrderProgressProcessListResponse.getQuantityProduced().compareTo(BigDecimal.ZERO) > 0){
-
                 workOrderProgressProcessListResponse.setPassRate(workOrderProgressProcessListResponse.getQuantityQualify().multiply(new BigDecimal(100)).
                         divide(workOrderProgressProcessListResponse.getQuantityProduced(),2, RoundingMode.HALF_UP));
             }else{
@@ -72,8 +75,8 @@ public class WorkOrderProgressServiceImp implements WorkOrderProgressService {
     }
 
     @Override
-    public List<WorkOrderProgressFeedbackListResponse> getFeedbackList(String workorderCode,Long taskId) {
-        List<WorkOrderProgressFeedbackListResponse>  workOrderProgressFeedbackListResponses = proFeedbackMapper.getFeedbackList( workorderCode,taskId);
+    public List<WorkOrderProgressFeedbackListResponse> getFeedbackList(String workorderCode,Long taskId,Long taskWorkunitId) {
+        List<WorkOrderProgressFeedbackListResponse>  workOrderProgressFeedbackListResponses = proFeedbackMapper.getFeedbackList( workorderCode,taskId,taskWorkunitId);
         return workOrderProgressFeedbackListResponses;
     }
 }

mes/src/main/resources/mapper/pro/ProFeedbackMapper.xml

@@ -521,6 +521,7 @@
         <where>
             workorder_code = #{workorderCode}
             <if test="taskId != null">and feedback.task_id = #{taskId}</if>
+            <if test="taskWorkunitId != null">and feedback.task_workunit_id = #{taskWorkunitId}</if>
         </where>
     </select>
     <select id="getListByDefect" resultType="com.ximai.mes.report.response.FeedbackResponse">

mes/src/main/resources/mapper/pro/task/ProTaskMapper.xml

@@ -407,7 +407,15 @@
     </select>
     <select id="getProcessList"
             resultType="com.ximai.mes.report.response.WorkOrderProgressProcessListResponse">
-        select * from pro_task where arrange_code = #{workorderCode} order by task_id
+        SELECT
+            workunit.* ,
+            task.process_code,
+            task.process_name
+        FROM
+            pro_task task
+                JOIN pro_task_workunit workunit ON workunit.task_id = task.task_id
+        where arrange_code = #{workorderCode}
+        order by task.task_id
     </select>
 
     <insert id="insertProTask" parameterType="ProTask" useGeneratedKeys="true" keyProperty="taskId">