Browse Source

订单新增回滚状态功能

master
qiankanghui 1 week ago
parent
commit
f976277e26
  1. 14
      src/main/java/com/xujie/modules/order/controller/PODetailController.java
  2. 6
      src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java
  3. 70
      src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java
  4. 4
      src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml

14
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());
}
}
/**
* 打样单收货:回写收货日期并自动生成已排程验货申请
*/

6
src/main/java/com/xujie/modules/order/service/Iface/IPODetailService.java

@ -74,6 +74,12 @@ public interface IPODetailService extends IService<PODetail> {
*/
void rollbackPoDetail(PODetail model);
/**
* 回滚订单状态(SRM0007):无验货申请明细时,将订单行回滚为已下达(Confirm),
* 并清空已申请验货(to_inspect_qty)、已验货(inspect_qty)、验货成功(inspect_approve_qty)数量 - rqrq
*/
void rollbackStatusPoDetail(PODetail model);
/**
* 查询发货弹窗预览数据(订单数量、可发货数量、默认本次发货数量)。
*/

70
src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java

@ -608,6 +608,76 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> 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<InspectionRequestDetailSub> 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<PODetail> updateWrapper = new LambdaUpdateWrapper<PODetail>()
.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<PODetail> allDetails = baseMapper.selectList(
new LambdaQueryWrapper<PODetail>()
.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<POHeader>()
.eq(POHeader::getOrderNo, orderNo)
.eq(POHeader::getSite, site)
.set(POHeader::getStatus, "已下达")
);
}
}
/**
* 打样单收货。
*

4
src/main/resources/mapper/inspection/InspectionRequestHeaderMapper.xml

@ -47,7 +47,9 @@
<if test="query.supplierNo != null and query.supplierNo != '' "> and h.supplier_no like '%${query.supplierNo}%'</if>
<if test="query.supplierName != null and query.supplierName != '' "> and s.supplier_name like '%${query.supplierName}%'</if>
<if test="query.plannerAccount != null and query.plannerAccount != '' ">
and h.planner = #{query.plannerAccount}
<!-- 导入等历史链路 planner 可能存显示名(如 钱康辉)而非账号(如 qkh),叠加登录账号对应显示名兑底匹配 - rqrq -->
and (h.planner = #{query.plannerAccount}
or h.planner = dbo.plm_get_user_display(#{query.site}, #{query.plannerAccount}))
</if>
<if test="query.planner != null and query.planner != '' ">
and (h.planner like '%${query.planner}%'

Loading…
Cancel
Save