Showing
4 changed files
with
44 additions
and
4 deletions
| @@ -651,6 +651,35 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | @@ -651,6 +651,35 @@ public class ProcurementWarehouseReceiveOrderServiceImpl | ||
| 651 | } | 651 | } |
| 652 | } | 652 | } |
| 653 | 653 | ||
| 654 | + @Override | ||
| 655 | + @Transactional(rollbackFor = Exception.class) | ||
| 656 | + public void deleteByWeighingTicketId(String weighingTicketId) { | ||
| 657 | + if (StringUtil.isBlank(weighingTicketId)) { | ||
| 658 | + return; | ||
| 659 | + } | ||
| 660 | + | ||
| 661 | + // 该码单下所有未作废的仓库收料单,联动作废 | ||
| 662 | + List<ProcurementWarehouseReceiveOrder> orders = this.list( | ||
| 663 | + Wrappers.lambdaQuery(ProcurementWarehouseReceiveOrder.class) | ||
| 664 | + .eq(ProcurementWarehouseReceiveOrder::getWeighingTicketId, weighingTicketId) | ||
| 665 | + .eq(ProcurementWarehouseReceiveOrder::getDeleted, false)); | ||
| 666 | + if (CollectionUtil.isEmpty(orders)) { | ||
| 667 | + return; | ||
| 668 | + } | ||
| 669 | + | ||
| 670 | + for (ProcurementWarehouseReceiveOrder order : orders) { | ||
| 671 | + // 审核中的先终止流程,再作废 | ||
| 672 | + if (STATUS_AUDIT.equals(order.getApprovalStatus())) { | ||
| 673 | + terminateRunningFlow(order.getId()); | ||
| 674 | + } | ||
| 675 | + this.update(Wrappers.lambdaUpdate(ProcurementWarehouseReceiveOrder.class) | ||
| 676 | + .set(ProcurementWarehouseReceiveOrder::getDeleted, true) | ||
| 677 | + .set(STATUS_AUDIT.equals(order.getApprovalStatus()), | ||
| 678 | + ProcurementWarehouseReceiveOrder::getApprovalStatus, STATUS_REFUSE) | ||
| 679 | + .eq(ProcurementWarehouseReceiveOrder::getId, order.getId())); | ||
| 680 | + } | ||
| 681 | + } | ||
| 682 | + | ||
| 654 | /** | 683 | /** |
| 655 | * 码单下是否存在有效仓库收料单(非已取消、非已作废;结算详情单退回校验/可制单校验用) | 684 | * 码单下是否存在有效仓库收料单(非已取消、非已作废;结算详情单退回校验/可制单校验用) |
| 656 | */ | 685 | */ |
| @@ -404,7 +404,7 @@ public class ProcurementMaterialSettleDetailServiceImpl | @@ -404,7 +404,7 @@ public class ProcurementMaterialSettleDetailServiceImpl | ||
| 404 | if (!STATUS_PASS.equals(entity.getApprovalStatus())) { | 404 | if (!STATUS_PASS.equals(entity.getApprovalStatus())) { |
| 405 | throw new DefaultClientException("仅审核通过的原料结算详情单可退回!"); | 405 | throw new DefaultClientException("仅审核通过的原料结算详情单可退回!"); |
| 406 | } | 406 | } |
| 407 | - // 已生成仓库收料单或买断入库核算单的不可以退回(两个模块尚未上线,上线后补充校验) | 407 | + // 已生成有效仓库收料单(非已取消、非已作废)的不可以退回;买断入库核算单模块尚未上线,上线后补充校验 |
| 408 | assertNotReferenced(id); | 408 | assertNotReferenced(id); |
| 409 | 409 | ||
| 410 | this.update(Wrappers.lambdaUpdate(ProcurementMaterialSettleDetail.class) | 410 | this.update(Wrappers.lambdaUpdate(ProcurementMaterialSettleDetail.class) |
| @@ -695,11 +695,11 @@ public class ProcurementMaterialSettleDetailServiceImpl | @@ -695,11 +695,11 @@ public class ProcurementMaterialSettleDetailServiceImpl | ||
| 695 | } | 695 | } |
| 696 | 696 | ||
| 697 | /** | 697 | /** |
| 698 | - * 退回校验:已生成仓库收料单或买断入库核算单的不可以退回 | ||
| 699 | - * (仓库收料单、买断入库核算单模块尚未上线,上线后在此补充查询校验) | 698 | + * 退回校验:已生成有效仓库收料单(非已取消、非已作废)的不可以退回 |
| 699 | + * (买断入库核算单模块尚未上线,上线后在此补充查询校验) | ||
| 700 | */ | 700 | */ |
| 701 | private void assertNotReferenced(String settleDetailId) { | 701 | private void assertNotReferenced(String settleDetailId) { |
| 702 | - // 已生成仓库收料单的不可以退回 | 702 | + // 已生成有效仓库收料单的不可以退回 |
| 703 | if (warehouseReceiveOrderService.existsBySettleDetailId(settleDetailId)) { | 703 | if (warehouseReceiveOrderService.existsBySettleDetailId(settleDetailId)) { |
| 704 | throw new DefaultClientException("已生成仓库收料单,不可以退回!"); | 704 | throw new DefaultClientException("已生成仓库收料单,不可以退回!"); |
| 705 | } | 705 | } |
| @@ -39,6 +39,7 @@ import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementWeighin | @@ -39,6 +39,7 @@ import com.lframework.xingyun.sc.procurement.mappers.weighing.ProcurementWeighin | ||
| 39 | import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanLineService; | 39 | import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanLineService; |
| 40 | import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService; | 40 | import com.lframework.xingyun.sc.procurement.service.plan.ProcurementPlanService; |
| 41 | import com.lframework.xingyun.sc.procurement.service.settle.ProcurementMaterialSettleDetailService; | 41 | import com.lframework.xingyun.sc.procurement.service.settle.ProcurementMaterialSettleDetailService; |
| 42 | +import com.lframework.xingyun.sc.procurement.service.receive.ProcurementWarehouseReceiveOrderService; | ||
| 42 | import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayApplyService; | 43 | import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayApplyService; |
| 43 | import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayReportService; | 44 | import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementAssayReportService; |
| 44 | import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementWeighingTicketApplyLineService; | 45 | import com.lframework.xingyun.sc.procurement.service.weighing.ProcurementWeighingTicketApplyLineService; |
| @@ -120,6 +121,8 @@ public class ProcurementWeighingTicketServiceImpl | @@ -120,6 +121,8 @@ public class ProcurementWeighingTicketServiceImpl | ||
| 120 | private ProcurementAssayReportService assayReportService; | 121 | private ProcurementAssayReportService assayReportService; |
| 121 | @Resource | 122 | @Resource |
| 122 | private ProcurementMaterialSettleDetailService materialSettleDetailService; | 123 | private ProcurementMaterialSettleDetailService materialSettleDetailService; |
| 124 | + @Resource | ||
| 125 | + private ProcurementWarehouseReceiveOrderService warehouseReceiveOrderService; | ||
| 123 | 126 | ||
| 124 | @Override | 127 | @Override |
| 125 | public PageResult<ProcurementWeighingTicket> query(Integer pageIndex, Integer pageSize, | 128 | public PageResult<ProcurementWeighingTicket> query(Integer pageIndex, Integer pageSize, |
| @@ -570,6 +573,9 @@ public class ProcurementWeighingTicketServiceImpl | @@ -570,6 +573,9 @@ public class ProcurementWeighingTicketServiceImpl | ||
| 570 | // 联动作废该码单关联的原料结算详情单(审核中的先终止流程再作废) | 573 | // 联动作废该码单关联的原料结算详情单(审核中的先终止流程再作废) |
| 571 | materialSettleDetailService.deleteByWeighingTicketId(id); | 574 | materialSettleDetailService.deleteByWeighingTicketId(id); |
| 572 | 575 | ||
| 576 | + // 联动作废该码单关联的仓库收料单(审核中的先终止流程再作废) | ||
| 577 | + warehouseReceiveOrderService.deleteByWeighingTicketId(id); | ||
| 578 | + | ||
| 573 | OpLogUtil.setVariable("id", id); | 579 | OpLogUtil.setVariable("id", id); |
| 574 | OpLogUtil.setExtra(entity); | 580 | OpLogUtil.setExtra(entity); |
| 575 | } | 581 | } |
| @@ -79,6 +79,11 @@ public interface ProcurementWarehouseReceiveOrderService | @@ -79,6 +79,11 @@ public interface ProcurementWarehouseReceiveOrderService | ||
| 79 | void deleteBySettleDetailId(String settleDetailId); | 79 | void deleteBySettleDetailId(String settleDetailId); |
| 80 | 80 | ||
| 81 | /** | 81 | /** |
| 82 | + * 按过磅码单作废仓库收料单(码单作废联动,审核中的先终止流程) | ||
| 83 | + */ | ||
| 84 | + void deleteByWeighingTicketId(String weighingTicketId); | ||
| 85 | + | ||
| 86 | + /** | ||
| 82 | * 是否存在有效仓库收料单(非已取消、非已作废;结算详情单退回校验/可制单校验用) | 87 | * 是否存在有效仓库收料单(非已取消、非已作废;结算详情单退回校验/可制单校验用) |
| 83 | */ | 88 | */ |
| 84 | boolean existsBySettleDetailId(String settleDetailId); | 89 | boolean existsBySettleDetailId(String settleDetailId); |