退料接收时,检查结算表拿到待退料数量,防止多退

sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/BackApplyInfo.java

@@ -286,6 +286,11 @@ public class BackApplyInfo extends BaseEntity {
      */
     private String finishedBackNum;
 
+    /**
+     * 未完成的退料数量
+     */
+    private String inCompletedBackNum;
+
     /**
      * 此协议号最大剩余退料数
      */

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

@@ -673,7 +673,7 @@
       bad.audit_num as auditNum,
       bad.status as status,
       IFNULL(sai.num, 0) as max_back_num,
-      IFNULL(bad.audit_num,0)-IFNULL(aa.back_num,0) as num,
+      IFNULL(aa.back_num,0) as in_completed_back_num,
       IFNULL(bb.finished_back_num, 0) as finished_back_num,
       mt.manage_type as manageType,
       mtk.user_id,
@@ -694,7 +694,7 @@
         FROM
           back_check_details
         WHERE
-          parent_id=#{id}
+          parent_id=#{id} and is_finished is null
         GROUP BY type_id
       ) aa on aa.typeId=bad.type_id
         LEFT JOIN (