|
|
|
@ -833,7 +833,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
|
|
|
|
|
switch (distributionReservationEntity.getDeliveryType()){ |
|
|
|
|
case "1": |
|
|
|
|
//商配
|
|
|
|
|
if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit()) && stockArticleEntity.getConsigneePerson().equals(distributionReservationEntity.getConsignee()) && stockArticleEntity.getMallName().equals(distributionReservationEntity.getMallName())){ |
|
|
|
|
// if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit()) && stockArticleEntity.getConsigneePerson().equals(distributionReservationEntity.getConsignee()) && stockArticleEntity.getMallName().equals(distributionReservationEntity.getMallName())){
|
|
|
|
|
if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit()) && stockArticleEntity.getMallName().equals(distributionReservationEntity.getMallName())){ |
|
|
|
|
return true; |
|
|
|
|
}else { |
|
|
|
|
return false; |
|
|
|
|