|
|
@ -10094,9 +10094,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib |
|
|
|
&& r.getConsignee().equals(stockArticleEntity.getCustomerName()) |
|
|
|
&& r.getConsignee().equals(stockArticleEntity.getCustomerName()) |
|
|
|
&& r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) |
|
|
|
&& r.getDeliveryAddress().equals(stockArticleEntity.getCustomerAddress()) |
|
|
|
&& r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) |
|
|
|
&& r.getDeliveryPhone().equals(stockArticleEntity.getCustomerTelephone()) |
|
|
|
&& r.getMallName().equals(stockArticleEntity.getMallName() |
|
|
|
&& r.getMallName().equals(stockArticleEntity.getMallName()) |
|
|
|
&& r.getId().equals(distrilbutionloadingscanDTO.getReservationId() |
|
|
|
&& r.getId().equals(distrilbutionloadingscanDTO.getReservationId()) |
|
|
|
) |
|
|
|
|
|
|
|
); |
|
|
|
); |
|
|
|
//存在多个,操作人指定具体客户即可
|
|
|
|
//存在多个,操作人指定具体客户即可
|
|
|
|
if (flag) { |
|
|
|
if (flag) { |
|
|
|