app-退料接收

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

@@ -21,19 +21,14 @@ import java.util.List;
 
 /**
  * 退料接收
+ * @author bns_han
  */
 @RestController
 @RequestMapping("/backReceive")
 public class BackReceiveController extends BaseController {
 
     @Resource
-    private BackReceiveService backReceiveService;  // 任务表Service
-
-    /**
-     * 服务对象
-     */
-    @Resource
-    private TmTaskService tmTaskService;  // 任务表Service
+    private BackReceiveService backReceiveService;
 
     /**
      * 退料接收列表

sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml

@@ -603,7 +603,7 @@
       mt.type_id as typeId,
       mt.type_name typeCode,
       mt2.type_name AS typeName,
-      bad.audit_num as num,
+      IFNULL(bad.audit_num,0)-(IFNULL(aa.back_num,0)) as num,
       mt.manage_type as manageType
     FROM
       back_apply_details bad
@@ -612,6 +612,16 @@
         LEFT JOIN ma_type mt on mt.type_id=bad.type_id
         LEFT JOIN ma_type mt1 ON mt1.type_id=bad.type_id
         LEFT JOIN ma_type mt2 ON mt2.type_id=mt1.parent_id
+        LEFT JOIN (
+        SELECT
+          type_id as typeId,
+          SUM(IFNULL(back_num,0)) as back_num
+        FROM
+          back_check_details
+        WHERE
+          parent_id=#{id}
+        GROUP BY type_id
+      ) aa on aa.typeId=bad.type_id
     WHERE
       bai.id=#{id}
   </select>