Commit ee49523c authored by zhengyi's avatar zhengyi

订单入仓修改审批提交计算费用还是走的之前订单信息参数业务,如果有错误提示,那么捕获错误,允许提交审批

Signed-off-by: default avatarzhengyi <landuo321@aliyun.com>
parent a352b551
...@@ -2218,8 +2218,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -2218,8 +2218,13 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
orderDO.setNumber(updateObj.getNumber()); orderDO.setNumber(updateObj.getNumber());
orderDO.setPackageRemarks(updateObj.getPackageRemarks()); orderDO.setPackageRemarks(updateObj.getPackageRemarks());
orderDO.setPackageType(updateObj.getPackageType()); orderDO.setPackageType(updateObj.getPackageType());
orderBusinessService.costCalculation(updater, orderDO, orderConsignorBackVO.getCustomerId(), orderConsigneeBackVO.getCustomerId(), orderConsignorBackVO.getCustomerContactsId(), orderConsigneeBackVO.getCustomerContactsId(), // TODO 这里计算费用还是走的之前订单信息参数业务,如果有错误提示,那么捕获错误,允许提交审批
orderItemDOList, 8); try {
orderBusinessService.costCalculation(updater, orderDO, orderConsignorBackVO.getCustomerId(), orderConsigneeBackVO.getCustomerId(), orderConsignorBackVO.getCustomerContactsId(), orderConsigneeBackVO.getCustomerContactsId(),
orderItemDOList, 8);
} catch (Exception e) {
log.error(e.getMessage());
}
if (Objects.nonNull(updateReqVO.getDisplayBillLadingPrice()) && updateReqVO.getDisplayBillLadingPrice() != orderDO.getDisplayBillLadingPrice()) { if (Objects.nonNull(updateReqVO.getDisplayBillLadingPrice()) && updateReqVO.getDisplayBillLadingPrice() != orderDO.getDisplayBillLadingPrice()) {
// 是否显示提单价格的设置变动,添加变动日志 // 是否显示提单价格的设置变动,添加变动日志
// 记录货值变动日志 // 记录货值变动日志
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment