优化

platform-dao/src/main/java/com/platform/dao/dto/store/OutStoreDetailDTO.java

@@ -23,6 +23,9 @@ import java.time.LocalDate;
 @Accessors(chain = true)
 @EqualsAndHashCode(callSuper = true)
 public class OutStoreDetailDTO extends BaseDTO implements Serializable {
+    private Boolean addBom;
+
+
     private String repairUserId;
 
     private String repairFormId;//关联维修工单

platform-service/src/main/java/com/platform/service/store/impl/OutStoreFormServiceImpl.java

@@ -359,32 +359,34 @@ public class OutStoreFormServiceImpl extends BaseServiceImpl<OutStoreFormMapper,
                 List<SbModelSpareBomVO> bomVOS = sbModelSpareBomMapper.selectVOList(sbModelSpareBomDTO);
                 boolean flag = false;
                 for (OutStoreDetailDTO detailDTO : detailList) {
-                    flag = false;
-                    if (bomVOS != null) {
-                        for (SbModelSpareBomVO vo : bomVOS) {
-                            if (vo.getSpareId().equals(detailDTO.getSpareId())) {
-                                flag = true;
-                                break;
+                    if (detailDTO.getAddBom() != null && detailDTO.getAddBom()) {
+                        flag = false;
+                        if (bomVOS != null) {
+                            for (SbModelSpareBomVO vo : bomVOS) {
+                                if (vo.getSpareId().equals(detailDTO.getSpareId())) {
+                                    flag = true;
+                                    break;
+                                }
                             }
+                            if (!flag) {
+                                packageBom(boms, detailDTO, form.getSbId());
+                            }
+                        } else {
+                            packageBom(boms, detailDTO, form.getSbId());
                         }
-                        if (!flag) {
-                            packageBom(boms,detailDTO,form.getSbId());
-                        }
-                    }else {
-                        packageBom(boms,detailDTO,form.getSbId());
-                    }
 
-                }
-                if (boms!=null && boms.size()>0) {
-                    sbModelSpareBomMapper.insertListforComplex(boms);
+                    }
+                    if (boms != null && boms.size() > 0) {
+                        sbModelSpareBomMapper.insertListforComplex(boms);
+                    }
                 }
 //                sbModelSpareBomMapper.insertList(boms);
 
-                // mapper.updateByPrimaryKey(outStoreForm);
+                    // mapper.updateByPrimaryKey(outStoreForm);
 
-            }else {
-                throw new BusinessException("系统出错，请联系管理员！");
-            }
+                }else{
+                    throw new BusinessException("系统出错，请联系管理员！");
+                }
         }
         return outStoreForm;
     }