From f976277e2621d64caecdb20dea8556ed4deda466 Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Mon, 9 Nov 2026 15:59:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E5=9B=9E?= =?UTF-8?q?=E6=BB=9A=E7=8A=B6=E6=80=81=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/controller/PODetailController.java | 14 ++++ .../order/service/Iface/IPODetailService.java | 6 ++ .../service/Impl/PODetailServiceImpl.java | 70 +++++++++++++++++++ .../InspectionRequestHeaderMapper.xml | 4 +- 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/xujie/modules/order/controller/PODetailController.java b/src/main/java/com/xujie/modules/order/controller/PODetailController.java index f0a5239..6008b20 100644 --- a/src/main/java/com/xujie/modules/order/controller/PODetailController.java +++ b/src/main/java/com/xujie/modules/order/controller/PODetailController.java @@ -268,6 +268,20 @@ public class PODetailController { } } + /** + * 回滚订单状态(SRM0007):无验货申请明细时回滚为已下达(Confirm)并清空验货过程数量 + */ + @PostMapping("/rollbackStatusPoDetail") + @ApiOperation("回滚PO订单状态为Confirm") + public R rollbackStatusPoDetail(@RequestBody PODetail data) { + try { + baseService.rollbackStatusPoDetail(data); + return R.ok(); + } catch (RuntimeException ex) { + return R.error(ex.getMessage()); + } + } + /** * 打样单收货:回写收货日期并自动生成已排程验货申请 */ diff --git a/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java b/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java index e9c1b51..37cf4f1 100644 --- a/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java +++ b/src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java @@ -74,6 +74,12 @@ public interface IPODetailService extends IService { */ void rollbackPoDetail(PODetail model); + /** + * 回滚订单状态(SRM0007):无验货申请明细时,将订单行回滚为已下达(Confirm), + * 并清空已申请验货(to_inspect_qty)、已验货(inspect_qty)、验货成功(inspect_approve_qty)数量 - rqrq + */ + void rollbackStatusPoDetail(PODetail model); + /** * 查询发货弹窗预览数据(订单数量、可发货数量、默认本次发货数量)。 */ diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java index 561f98e..110d691 100644 --- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java @@ -608,6 +608,76 @@ public class PODetailServiceImpl extends ServiceImpl i updatePoDetailStatus(existingDetail, "草稿"); } + /** + * 回滚订单状态(SRM0007):订单行无验货申请明细时,回滚为已下达(Confirm)并清空验货过程数量。 + * 校验:仅判断是否存在未取消的验货申请明细,不限制发货等其他状态(数量应通过验货流程回退) - rqrq + */ + @Override + @Transactional + public void rollbackStatusPoDetail(PODetail model) { + PODetail existingDetail = resolvePoDetail(model); + String site = existingDetail.getSite(); + String orderNo = existingDetail.getOrderNo(); + Integer itemNo = existingDetail.getItemNo(); + String currentStatus = existingDetail.getStatus(); + + // 已是 Confirm(已下达)无需回滚 + if ("已下达".equals(currentStatus)) { + throw new RuntimeException("该订单已是Confirm状态,无需回滚"); + } + // 草稿尚未下达,不支持本功能回滚(草稿→已下达请用「下达」) + if ("草稿".equals(currentStatus)) { + throw new RuntimeException("当前状态「草稿」不支持回滚状态"); + } + + // 核心前置(唯一业务校验):订单行下存在未取消的验货申请明细时禁止回滚,需先删除/驳回对应验货申请 + List subs = + inspectionRequestDetailSubMapper.selectListByPoItem(site, orderNo, itemNo); + if (subs != null && !subs.isEmpty()) { + throw new RuntimeException("该订单存在验货申请明细,无法回滚状态,请先处理关联验货申请"); + } + + SysUserEntity currentUser = + (SysUserEntity) SecurityUtils.getSubject().getPrincipal(); + String currentUserName = + currentUser != null ? currentUser.getUsername() : "system"; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + String currentTimeStr = sdf.format(new Date()); + + // 回滚为已下达并清空 已申请验货/已验货/验货成功 数量 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper() + .eq(PODetail::getSite, site) + .eq(PODetail::getOrderNo, orderNo) + .eq(PODetail::getItemNo, itemNo) + .set(PODetail::getStatus, "已下达") + .set(PODetail::getToInspectQty, BigDecimal.ZERO) + .set(PODetail::getInspectQty, 0d) + .set(PODetail::getInspectApproveQty, BigDecimal.ZERO) + .set(PODetail::getEdit, currentTimeStr) + .set(PODetail::getEndPlanner, currentUserName); + int updateCount = baseMapper.update(null, updateWrapper); + if (updateCount == 0) { + throw new RuntimeException("回滚状态失败,请刷新后重试"); + } + + // 同单所有行均为已下达时,头表状态同步回滚为已下达(镜像删除验货申请的回退逻辑) + List allDetails = baseMapper.selectList( + new LambdaQueryWrapper() + .eq(PODetail::getOrderNo, orderNo) + .eq(PODetail::getSite, site) + ); + boolean allReleased = allDetails != null && !allDetails.isEmpty() + && allDetails.stream().allMatch(d -> "已下达".equals(d.getStatus())); + if (allReleased) { + poHeaderMapper.update(null, + new LambdaUpdateWrapper() + .eq(POHeader::getOrderNo, orderNo) + .eq(POHeader::getSite, site) + .set(POHeader::getStatus, "已下达") + ); + } + } + /** * 打样单收货。 * diff --git a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml index 0a70731..139e652 100644 --- a/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml +++ b/src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml @@ -47,7 +47,9 @@ and h.supplier_no like '%${query.supplierNo}%' and s.supplier_name like '%${query.supplierName}%' - and h.planner = #{query.plannerAccount} + + and (h.planner = #{query.plannerAccount} + or h.planner = dbo.plm_get_user_display(#{query.site}, #{query.plannerAccount})) and (h.planner like '%${query.planner}%'