查询列表中查询条件优化

2d9846e8 · zhangqiliang · 5aa1de15 · 2d9846e8
--- a/src/main/java/com/starcharge/wios/controller/DeliveryController.java
+++ b/src/main/java/com/starcharge/wios/controller/DeliveryController.java
@@ -135,9 +135,9 @@ public class DeliveryController {
                                if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){
                                    delivery.setMaterialName(jsonObjectDataArrival.getString("materialsName"));
                                }
-                            }
+                                if (wallboxApply.getReceiverWarehouseId().equals(da.getWarehouseId())){
-                            if (wallboxApply.getReceiverWarehouseId().equals(da.getWarehouseId())){
+                                    throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!");
-                                throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!");
+                                }
                            }
                        }
                        //申请团队