|
|
@ -1213,7 +1213,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution |
|
|
|
//判断客户
|
|
|
|
//判断客户
|
|
|
|
boolean flag = judgmentClient(distributionReservationEntity, parcelListEntity.getStockArticleId()); |
|
|
|
boolean flag = judgmentClient(distributionReservationEntity, parcelListEntity.getStockArticleId()); |
|
|
|
if (flag) { |
|
|
|
if (flag) { |
|
|
|
return R.fail(3006, "异常签收"); |
|
|
|
if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){ |
|
|
|
|
|
|
|
return Resp.scanFail("包件已签收", "包件已签收"); |
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return R.fail(3006, "异常签收"); |
|
|
|
|
|
|
|
} |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
return Resp.scanFail("不满足签收条件", "不满足签收条件"); |
|
|
|
return Resp.scanFail("不满足签收条件", "不满足签收条件"); |
|
|
|
} |
|
|
|
} |
|
|
|