异常签收语音提示、异常签收商配取消商场限制

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -1325,5 +1325,4 @@
         WHERE
         ldla.package_code = #{orderPackageCode} AND ldpl.warehouse_id = #{warehouseId} AND ldla.auditing_status = 2
     </select>
-
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1670,7 +1670,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							return R.fail(3006, null);
 						}
 					} else {
-						return Resp.scanFail("不满足签收条件", "不满足签收条件");
+						return Resp.scanFail("不属于当前签收客户", "不属于当前签收客户");
 					}
 				}
 			} else {
@@ -1877,7 +1877,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			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.getMallName().equals(distributionReservationEntity.getMallName())) {
+				if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit())) {
 					return true;
 				} else {
 					return false;