更新生产排产BUG

mes/src/main/java/com/ximai/mes/pro/domain/vo/task/ProTaskWorkunitQuery.java

@@ -93,4 +93,6 @@ public class ProTaskWorkunitQuery extends BaseEntity {
     @ApiModelProperty("是否委外,1:是，0:否")
     private Integer outsourced;
 
+
+    private String taskBatch;
 }

mes/src/main/java/com/ximai/mes/pro/service/impl/task/ProTaskWorkunitServiceImpl.java

@@ -450,6 +450,7 @@ public class ProTaskWorkunitServiceImpl implements IProTaskWorkunitService {
         query.eq(proTaskWorkunit.getOutsourced()!=null, "ptw.outsourced", proTaskWorkunit.getOutsourced());
         query.eq(StringUtils.isNotEmpty(proTaskWorkunit.getCustomerProjectNo()), "wo.customer_project_no", proTaskWorkunit.getCustomerProjectNo());
         query.eq(StringUtils.isNotEmpty(proTaskWorkunit.getOrderCode()), "wo.order_code", proTaskWorkunit.getOrderCode());
+        query.eq(StringUtils.isNotEmpty(proTaskWorkunit.getTaskBatch()), "SUBSTRING_INDEX(t.task_batch, '-', -1)", proTaskWorkunit.getTaskBatch());
         query.gt("ptw.quantity",0);
         query.orderByAsc("schedule_start_date");
         List<ProTaskWorkunit> list = proTaskWorkunitService.selectTaskWorkUnitJoinTask(query);

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

@@ -517,12 +517,32 @@
     </select>
     <select id="getFeedbackList"
             resultType="com.ximai.mes.report.response.WorkOrderProgressFeedbackListResponse">
-        select feedback.*,workunit.std_working_time from pro_task_workunit workunit join pro_feedback feedback on feedback.task_workunit_id = workunit.task_workunit_id
+        SELECT
+        feedback.user_name,
+        sum(feedback.quantity) quantity,
+        sum(feedback.quantity_feedback) quantity_feedback,
+        sum(feedback.quantity_qualify) quantity_qualify,
+        sum(feedback.quantity_unqualify) quantity_unqualify,
+        sum(feedback.quantity_uncheck) quantity_uncheck,
+        feedback.nick_name,
+        workunit.std_working_time ,
+        pro_task.idx
+        FROM
+        pro_task_workunit workunit
+        JOIN pro_feedback feedback ON feedback.task_workunit_id = workunit.task_workunit_id
+        join pro_task on pro_task.task_id = workunit.task_id
         <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>
+        group by
+            feedback.user_name,
+            feedback.nick_name,
+            workunit.std_working_time ,
+            pro_task.idx
+        order by
+            pro_task.idx
     </select>
     <select id="getListByDefect" resultType="com.ximai.mes.report.response.FeedbackResponse">
         select