一个申请单号下的多个物流单号不能重复

src/main/java/com/starcharge/wios/controller/DeliveryController.java

@@ -77,12 +77,6 @@ public class DeliveryController {
         //String orderid= snowFlakeService.getNextId(0,0)+"";
         return new BaseResponse(deliveryAddVoList.stream()
                 .map(da->{
-                    List<String> list=new ArrayList<>();
-                    if (list.contains(da.getInstallOrder())){
-                        throw new ServiceException("400","不能发重复的订单号!");
-                    }else {
-                        list.add(da.getInstallOrder());
-                    }
                     //SN号不能重复
                     if (!StringUtils.isEmpty(da.getMaterialSn())){
                         Delivery delivery=this.deliveryMapper.selectByMaterialSn(da.getMaterialSn());
@@ -93,9 +87,15 @@ public class DeliveryController {
                     //辅材发货的时候校验一个申请单号下面的多个申请数量不能大于审批数量
                     Tauxiliarymaterials tauxiliarymaterials = tauxiliarymaterialsMapper.selectByApplyOrder(da.getInstallOrder());
                     if (ProductType.辅材.name().equals(da.getIsproduct())){
+                        List<String> list=new ArrayList<>();
                         Integer quantity=0;
                         for (DeliveryAddVo deliveryAddVo:deliveryAddVoList){
                             quantity=quantity+deliveryAddVo.getQuantity();
+                            if (list.contains(da.getInstallOrder())){
+                                throw new ServiceException("400","一个申请单号下的多个物流单号不能重复!");
+                            }else {
+                                list.add(da.getInstallOrder());
+                            }
                         }
                         if (!StringUtils.isEmpty(tauxiliarymaterials) && !StringUtils.isEmpty(tauxiliarymaterials.getApprovedQuantity())){
                             if (quantity.compareTo(Integer.parseInt(tauxiliarymaterials.getApprovedQuantity())) > 0){