|
@@ -787,7 +787,7 @@ public class SettlementManagementServiceImpl extends ServiceImpl<SettlementBasic
|
|
if(CollectionUtil.isNotEmpty(cAcceptanceGoodsInfos)){
|
|
if(CollectionUtil.isNotEmpty(cAcceptanceGoodsInfos)){
|
|
List<SettlementGoodsInfo> settlementGoodsInfos1 = acceptanceGoodsNumbers.get(id);
|
|
List<SettlementGoodsInfo> settlementGoodsInfos1 = acceptanceGoodsNumbers.get(id);
|
|
if(CollectionUtil.isNotEmpty(settlementGoodsInfos1) && settlementGoodsInfos1.size() != cAcceptanceGoodsInfos.size()){
|
|
if(CollectionUtil.isNotEmpty(settlementGoodsInfos1) && settlementGoodsInfos1.size() != cAcceptanceGoodsInfos.size()){
|
|
- throw new BusinessException(CodeUtil.FAIL, "验收单编号:"+basicInfo.getAcceptanceNumber()+"存在货物未选中结算,请新选择结算货物");
|
|
|
|
|
|
+ throw new BusinessException(CodeUtil.FAIL, "验收单编号:"+basicInfo.getAcceptanceNumber()+",存在货物未选中结算,请重新选择结算货物");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (basicInfo.getSettlement()) {
|
|
if (basicInfo.getSettlement()) {
|
|
@@ -1080,7 +1080,7 @@ public class SettlementManagementServiceImpl extends ServiceImpl<SettlementBasic
|
|
if(CollectionUtil.isNotEmpty(cAcceptanceGoodsInfos)){
|
|
if(CollectionUtil.isNotEmpty(cAcceptanceGoodsInfos)){
|
|
List<SettlementGoodsInfo> settlementGoodsInfos1 = acceptanceGoodsNumbers.get(id);
|
|
List<SettlementGoodsInfo> settlementGoodsInfos1 = acceptanceGoodsNumbers.get(id);
|
|
if(CollectionUtil.isNotEmpty(settlementGoodsInfos1) && settlementGoodsInfos1.size() != cAcceptanceGoodsInfos.size()){
|
|
if(CollectionUtil.isNotEmpty(settlementGoodsInfos1) && settlementGoodsInfos1.size() != cAcceptanceGoodsInfos.size()){
|
|
- throw new BusinessException(CodeUtil.FAIL, "验收单编号:"+basicInfo.getAcceptanceNumber()+"存在货物未选中结算,请新选择结算货物");
|
|
|
|
|
|
+ throw new BusinessException(CodeUtil.FAIL, "验收单编号:"+basicInfo.getAcceptanceNumber()+",存在货物未选中结算,请重新选择结算货物");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (basicInfo.getSettlement()) {
|
|
if (basicInfo.getSettlement()) {
|