Commit bcf1787a authored by zhengyi's avatar zhengyi

费用修改申请审批通过后未更新应收单的bug修复

parent 04f924c3
-- 补充入仓记录出货添加新品名字段
alter table ecw_order_warehouse_in
add COLUMN `is_shipment_new_in` bit(1) DEFAULT 0 COMMENT '出货后新添加的商品';
\ No newline at end of file
add COLUMN `is_shipment_new_in` bit(1) DEFAULT 0 COMMENT '出货后新添加的商品';
-- 修改费用申请记录表批量审批流程id字段类型
alter table ecw_order_fee_application
modify COLUMN `batch_bpm_business_id` varchar(64) DEFAULT NULL COMMENT '批量费用审核时流程ID';
\ No newline at end of file
......@@ -393,6 +393,10 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
List<FeeDto> feeDtos = new ArrayList<>();
if (result == 2) {
// 审批通过,更新状态与修改后的数据到数据库
if (Objects.nonNull(orderFeeApplicationDO.getId())){
OrderFeeApplicationDO orgFeeApplicationDO = feeApplicationMapper.selectById(orderFeeApplicationDO.getId());
orderFeeApplicationDO.setReceivableId(orgFeeApplicationDO.getReceivableId());
}
orderFeeApplicationDO.setStatus(result);
feeApplicationMapper.updateById(orderFeeApplicationDO);
OrderBackVO order = orderQueryService.getOrder(orderFeeApplicationDO.getOrderId());
......@@ -507,6 +511,10 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
batchFeeList = this.list(lambdaQueryWrapper);
}
for (OrderFeeApplicationDO feeApplicationDO : batchFeeList) {
if (Objects.nonNull(feeApplicationDO.getId())){
OrderFeeApplicationDO orgFeeApplicationDO = feeApplicationMapper.selectById(feeApplicationDO.getId());
feeApplicationDO.setReceivableId(orgFeeApplicationDO.getReceivableId());
}
//生成应收
DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(feeApplicationDO.getFeeType()));
if (feeApplicationDO.getReceivableId() != null && feeApplicationDO.getReceivableId() > 0) {
......
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