|
|
|
@ -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, "已下达") |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 打样单收货。 |
|
|
|
* |
|
|
|
|