退料完成问题提交

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/BackReceiveController.java

@@ -122,6 +122,7 @@ public class BackReceiveController extends BaseController {
         String[] split = record.getTypeId().split(",");
         for (String s : split) {
             record.setModelId(s);
+            record.setTypeId(null);
             List<BackApplyInfo> list = backReceiveService.receiveView(record);
             for (BackApplyInfo backApplyInfo : list) {
                 if (Double.valueOf(backApplyInfo.getNum()).intValue() != 0) {

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java

@@ -200,6 +200,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     }
 
                 }
+
                 //维修的创建维修任务，插入任务协议表
                 List<BackApplyInfo> wxList = backReceiveMapper.getWxList(record);
                 if (wxList != null && wxList.size() > 0) {
@@ -210,8 +211,8 @@ public class BackReceiveServiceImpl implements BackReceiveService {
                     //插入维修记录表repair_apply_details
                     res = insertRad(newTaskId, wxList);
                 }
-                //待报废的创建报废任务，插入任务协议表
 
+                //待报废的创建报废任务，插入任务协议表
                 List<BackApplyInfo> bfList = backReceiveMapper.getBfList(record);
                 if (bfList != null && bfList.size() > 0) {
                     //插入任务表tm_task

sgzb-modules/sgzb-material/src/main/resources/mapper/material/ScrapApplyDetailsMapper.xml

@@ -1078,6 +1078,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     scrap_check_details scd1
                         LEFT JOIN scrap_apply_details sad1 ON scd1.parent_id = sad1.parent_id
                         AND scd1.type_id = sad1.type_id
+                WHERE sad1.task_id = #{taskId}
                 GROUP BY
                     scd1.parent_id,
                     sad1.type_id