Merge remote-tracking branch 'origin/dev-nx' into dev-nx

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

@@ -82,6 +82,7 @@ public class RepairServiceImpl implements RepairService {
         List<RepairPartDetails> partList = bean.getPartList();
         BigDecimal sfCosts = new BigDecimal("0");
         BigDecimal bsfCosts = new BigDecimal("0");
+        Integer partNum = 0;
         String nbType = "1";  // 内部维修
         String fcType = "2";  //返厂维修
         String sfPart = "1";  //收费
@@ -135,11 +136,12 @@ public class RepairServiceImpl implements RepairService {
                         partDetails.setCompanyId(bean.getCompanyId());
                         mapper.addPart(partDetails);
                         bean.setPartPrice(partDetails.getPartCost());
-                        bean.setPartNum(partDetails.getPartNum());
+                        partNum += partDetails.getPartNum();
                         bean.setRepairContent(partDetails.getRepairContent());
                         bean.setPartType(partDetails.getPartType());
                     }
                 }
+                bean.setPartNum(partNum);
             }
             if (fcType.equals(bean.getRepairType())) {
                 bean.setPartName(partList.get(0).getPartName());