diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index bdcccede..d83012e2 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -1075,6 +1075,7 @@
     mt.type_id AS typeId,
     mm.ma_code AS maCode,
     mm.ma_id AS maId,
+    bad.remark AS remark,
     sd.NAME AS maStatus
     FROM
     ma_type mt
@@ -1084,9 +1085,11 @@
     LEFT JOIN sys_dic sd ON sd.id = mm.ma_status
     WHERE
     mm.ma_status = '16'
-    AND mt.type_id = #{typeId}
-    AND sai.`type_id` = #{typeId}
     AND sai.agreement_id = #{agreementId}
+    <if test="typeId != null and typeId !=''">
+      AND mt.type_id = #{typeId}
+      AND sai.`type_id` = #{typeId}
+    </if>
     <if test="maCode != null and maCode !=''">
       AND mm.ma_code like concat('%', #{maCode}, '%')
     </if>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java
index 19c8eeb5..db985384 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/BackApplyMapper.java
@@ -157,4 +157,6 @@ public interface BackApplyMapper {
     BackApplyDetailsPo getBackApplyDetailsByParentId(ScrapApplyDetails scrapApplyDetail);
 
     void insertBackApplyDetails(BackApplyDetailsPo backApplyDetailsPoNew);
+
+    void updateBackApplyDetailsByParentId(BackApplyDetailsPo backApplyDetailsPoNew);
 }
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
index 5de2ebf3..7227115e 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/ScrapApplyDetailsServiceImpl.java
@@ -270,8 +270,17 @@ public class ScrapApplyDetailsServiceImpl implements IScrapApplyDetailsService {
             backApplyDetailsPoNew.setCreateBy(backApplyDetailsPo.getCreateBy());
             backApplyDetailsPoNew.setCompanyId(backApplyDetailsPo.getCompanyId());
             backApplyDetailsPoNew.setRemark(scrapApplyDetail.getAuditRemark());
-            backApplyMapper.insertBackApplyDetails(backApplyDetailsPoNew);
-
+            //在存入的时候判断是否有同类型的机具，如果有数量加1,针对编码的机具
+            scrapApplyDetail.setParentId(backApplyInfoPo.getId());
+            scrapApplyDetail.setTypeId(Long.valueOf(backApplyDetailsPo.getTypeId()));
+            BackApplyDetailsPo backApplyDetailsPoResult = backApplyMapper.getBackApplyDetailsByParentId(scrapApplyDetail);
+            if (backApplyDetailsPoResult!=null){
+                backApplyDetailsPoNew.setPreNum(backApplyDetailsPoResult.getPreNum().add(BigDecimal.ONE));
+                backApplyDetailsPoNew.setAuditNum(backApplyDetailsPoResult.getAuditNum().add(BigDecimal.ONE));
+                backApplyMapper.updateBackApplyDetailsByParentId(backApplyDetailsPoNew);
+            }else {
+                backApplyMapper.insertBackApplyDetails(backApplyDetailsPoNew);
+            }
             //修改协议表的状态
             SltAgreementInfo sltAgreementInfo = new SltAgreementInfo();
             sltAgreementInfo.setAgreementId(agreementId.toString());
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index d9e6f05f..6bba77d0 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -521,6 +521,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE
             bai.id = #{id}
     </update>
+    <update id="updateBackApplyDetailsByParentId">
+        UPDATE back_apply_details set pre_num = #{preNum} ,audit_num = #{auditNum}
+        WHERE    parent_id = #{parentId} and type_id = #{typeId}
+    </update>
 
     <delete id="del">
         DELETE