Skip to content

C
clx-performance
提交 b5f97b9c authored 作者: 艾庆国's avatar 艾庆国
浏览文件
操作

Merge branch 'refs/heads/v20.9_settlement_20240805' into test

Former-commit-id: 11ad7a47
上级 5ec82393 c71f5fa4
隐藏空白字符变更
内嵌 并排
正在显示 包含 3 行增加 和 2 行删除
performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java
浏览文件 @ b5f97b9c
...@@ -771,8 +771,9 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService { ...@@ -771,8 +771,9 @@ public class SettlementOwnerServiceImpl implements SettlementOwnerService {
log.warn("货主结算单号:{} 结算单不允许二次合并",item.getSettlementNo()); log.warn("货主结算单号:{} 结算单不允许二次合并",item.getSettlementNo());
throw new ServiceSystemException(PerformanceResultEnum.DATA_REPEAT,"结算单不允许二次合并"); throw new ServiceSystemException(PerformanceResultEnum.DATA_REPEAT,"结算单不允许二次合并");
} }
if(!Objects.equals(SettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode(),item.getStatus())){ if(!Objects.equals(SettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode(),item.getStatus())
log.warn("货主结算单号:{} 的结算状态非待货主确认",item.getSettlementNo()); && !Objects.equals(SettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode(),item.getStatus())){
log.warn("货主结算单号:{} 的结算状态非待对账或待货主确认",item.getSettlementNo());
throw new ServiceSystemException(PerformanceResultEnum.DATA_REPEAT,tip); throw new ServiceSystemException(PerformanceResultEnum.DATA_REPEAT,tip);
} }
if(Objects.nonNull(ownerUserNo) && !Objects.equals(ownerUserNo,item.getOwnerUserNo())){ if(Objects.nonNull(ownerUserNo) && !Objects.equals(ownerUserNo,item.getOwnerUserNo())){
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论