辅材发货不用考虑收货仓库

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

@@ -73,8 +73,10 @@ public class DeliveryController {
         //String orderid= snowFlakeService.getNextId(0,0)+"";
         //String orderid= snowFlakeService.getNextId(0,0)+"";
         return new BaseResponse(deliveryAddVoList.stream()
         return new BaseResponse(deliveryAddVoList.stream()
                 .map(da->{
                 .map(da->{
-                    if (da.getArrivalWarehouseId().equals(da.getWarehouseId())){
-                        throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!");
+                    if(!ProductType.辅材.name().equals(da.getIsproduct())){
+                        if (da.getArrivalWarehouseId().equals(da.getWarehouseId())){
+                            throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!");
+                        }
                     }
                     }
                     List<String> list=new ArrayList<>();
                     List<String> list=new ArrayList<>();
                     if (list.contains(da.getInstallOrder())){
                     if (list.contains(da.getInstallOrder())){