|
|
@ -773,15 +773,18 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i |
|
|
)); |
|
|
)); |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 拆分任务:同一 order_no 下复制当前行生成新行(item_no = 最大值+1 自动生成)。 |
|
|
|
|
|
|
|
|
* 拆分任务:拆出的批次生成一张全新 PO(新 order_no + 新 POHeader + 新单 item_no=1 的新行), |
|
|
|
|
|
* 其余属性复制原行/原头,po_no 沿用原值(允许重复),只按拆分数量派生新行。 |
|
|
* A_Qty 口径:拆出的批次行 P_Qty=0、只记 A_Qty;原行 P_Qty 冻结不变,仅 A_Qty 减量, |
|
|
* A_Qty 口径:拆出的批次行 P_Qty=0、只记 A_Qty;原行 P_Qty 冻结不变,仅 A_Qty 减量, |
|
|
* 保证未拆分前 P_Qty 始终记录订单最初数量用于追溯;其余数量列(检验/发货)两行合计不变。 |
|
|
|
|
|
|
|
|
* 保证未拆分前 P_Qty 始终记录订单最初数量用于追溯;其余数量列(检验/发货)原行减量、新行承接,合计不变。 |
|
|
* 执行步骤: |
|
|
* 执行步骤: |
|
|
* 1) 校验入参,行锁读取原行数量快照,防止并发重复拆分; |
|
|
* 1) 校验入参,行锁读取原行数量快照,防止并发重复拆分; |
|
|
* 2) 拆分数量上界校验(订单数量按原行 A_Qty),检验相关数量按 r = 拆分检验申请数量 ÷ 原检验申请数量 比例拆; |
|
|
* 2) 拆分数量上界校验(订单数量按原行 A_Qty),检验相关数量按 r = 拆分检验申请数量 ÷ 原检验申请数量 比例拆; |
|
|
* 3) 验货申请子表口径校验并逐条拆分(尾差调整保和,支持多条); |
|
|
* 3) 验货申请子表口径校验并逐条拆分(尾差调整保和,支持多条); |
|
|
* 4) 复制原行生成新行(先套用可编辑字段覆盖,再统一赋拆分数量/金额),原行 A_Qty 减量重算发货金额; |
|
|
|
|
|
* 5) 两行状态沿用原行,不动 POHeader。 |
|
|
|
|
|
|
|
|
* 4) 生成新 order_no(TransNoControl),复制原 POHeader 建新单头(po_no 沿用原值); |
|
|
|
|
|
* 5) 复制原行生成新单新行(order_no=新号、item_no=1、先套用可编辑字段覆盖再统一赋拆分数量/金额、order_ref2 重新分配保证唯一), |
|
|
|
|
|
* 原行 A_Qty 减量重算发货金额;验货子表逐条重挂到新 order_no/po_item_no=1; |
|
|
|
|
|
* 6) 状态沿用原行,原 POHeader 不动。 |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
@Transactional |
|
|
@Transactional |
|
|
@ -870,21 +873,39 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 4) 新行号(UPDLOCK 防并发重号) |
|
|
|
|
|
Integer maxItemNo = baseMapper.selectMaxItemNoForUpdate(site, orderNo); |
|
|
|
|
|
int newItemNo = (maxItemNo == null ? 0 : maxItemNo) + 1; |
|
|
|
|
|
|
|
|
// 4) 生成新 order_no(复用 TransNoControl PO 类型),复制原 POHeader 建新单头(po_no 沿用原值,允许重复) |
|
|
|
|
|
POHeader origHeader = poHeaderMapper.selectById(orderNo); |
|
|
|
|
|
if (origHeader == null) { |
|
|
|
|
|
throw new RuntimeException("未找到原订单头信息,请刷新后重试"); |
|
|
|
|
|
} |
|
|
|
|
|
srmSupplierMapper.updateTransNo(site, "PO"); |
|
|
|
|
|
String newOrderNo = srmSupplierMapper.getTransNo(site, "PO"); |
|
|
|
|
|
String currentUserName = currentUserName(); |
|
|
|
|
|
String currentTimeStr = formatNowDateTime(); |
|
|
|
|
|
|
|
|
// 5) 复制原行构造新行:先套用字段覆盖,再统一赋拆分数量/金额,保证拆分口径不被覆盖 |
|
|
|
|
|
|
|
|
POHeader newHeader = new POHeader(); |
|
|
|
|
|
BeanUtils.copyProperties(origHeader, newHeader); |
|
|
|
|
|
newHeader.setOrderNo(newOrderNo); |
|
|
|
|
|
newHeader.setStatus(currentStatus); |
|
|
|
|
|
newHeader.setId(null); |
|
|
|
|
|
poHeaderMapper.insert(newHeader); |
|
|
|
|
|
Integer newHeaderId = resolveInsertedHeaderId(newHeader, site); |
|
|
|
|
|
if (newHeaderId == null) { |
|
|
|
|
|
throw new RuntimeException("拆分失败:未能获取新 POHeader.id"); |
|
|
|
|
|
} |
|
|
|
|
|
newHeader.setId(newHeaderId); |
|
|
|
|
|
|
|
|
|
|
|
// 5) 复制原行构造新单新行(order_no=新号、item_no=1):先套用字段覆盖,再统一赋拆分数量/金额,保证拆分口径不被覆盖 |
|
|
PODetail existing = baseMapper.selectByPK(orderNo, site, itemNo); |
|
|
PODetail existing = baseMapper.selectByPK(orderNo, site, itemNo); |
|
|
if (existing == null) { |
|
|
if (existing == null) { |
|
|
throw new RuntimeException("未找到订单明细,请刷新后重试"); |
|
|
throw new RuntimeException("未找到订单明细,请刷新后重试"); |
|
|
} |
|
|
} |
|
|
String currentUserName = currentUserName(); |
|
|
|
|
|
String currentTimeStr = formatNowDateTime(); |
|
|
|
|
|
PODetail splitDetail = new PODetail(); |
|
|
PODetail splitDetail = new PODetail(); |
|
|
BeanUtils.copyProperties(existing, splitDetail); |
|
|
BeanUtils.copyProperties(existing, splitDetail); |
|
|
splitDetail.setId(null); |
|
|
splitDetail.setId(null); |
|
|
splitDetail.setItemNo(newItemNo); |
|
|
|
|
|
|
|
|
splitDetail.setOrderNo(newOrderNo); |
|
|
|
|
|
splitDetail.setPoHeaderId(newHeaderId); |
|
|
|
|
|
splitDetail.setItemNo(1); |
|
|
applySplitOverrides(splitDetail, model.getOverrideFields(), site); |
|
|
applySplitOverrides(splitDetail, model.getOverrideFields(), site); |
|
|
Double price = splitDetail.getPrice(); |
|
|
Double price = splitDetail.getPrice(); |
|
|
// 拆分批次行:P_Qty 记 0,实际批次数量只记在 A_Qty;金额维持现行公式 price×qty。 |
|
|
// 拆分批次行:P_Qty 记 0,实际批次数量只记在 A_Qty;金额维持现行公式 price×qty。 |
|
|
@ -896,7 +917,13 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i |
|
|
splitDetail.setInspectApproveQty(newApprove); |
|
|
splitDetail.setInspectApproveQty(newApprove); |
|
|
splitDetail.setValue(calculatePoValue(price, 0.0)); |
|
|
splitDetail.setValue(calculatePoValue(price, 0.0)); |
|
|
splitDetail.setSumPrice(calculateSumPrice(price, splitQty.doubleValue())); |
|
|
splitDetail.setSumPrice(calculateSumPrice(price, splitQty.doubleValue())); |
|
|
splitDetail.setStatus(existing.getStatus()); |
|
|
|
|
|
|
|
|
splitDetail.setStatus(currentStatus); |
|
|
|
|
|
splitDetail.setSourceOrderNo(orderNo); |
|
|
|
|
|
splitDetail.setSourceItemNo(itemNo); |
|
|
|
|
|
// po_no 复制原值 → order_ref1 沿用,order_ref2 需在新单下重新分配以保证外部订单行号唯一 |
|
|
|
|
|
String newRef2 = allocateNextOrderRef2(site, splitDetail.getOrderRef1()); |
|
|
|
|
|
validateOrderRefUnique(site, splitDetail.getOrderRef1(), newRef2, null, null); |
|
|
|
|
|
splitDetail.setOrderRef2(newRef2); |
|
|
splitDetail.setCreateTime(new Date()); |
|
|
splitDetail.setCreateTime(new Date()); |
|
|
splitDetail.setEdit(currentTimeStr); |
|
|
splitDetail.setEdit(currentTimeStr); |
|
|
splitDetail.setEndPlanner(currentUserName); |
|
|
splitDetail.setEndPlanner(currentUserName); |
|
|
@ -935,7 +962,10 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i |
|
|
BigDecimal moveApprove = moveApproves.get(i); |
|
|
BigDecimal moveApprove = moveApproves.get(i); |
|
|
InspectionRequestDetailSub splitSub = new InspectionRequestDetailSub(); |
|
|
InspectionRequestDetailSub splitSub = new InspectionRequestDetailSub(); |
|
|
BeanUtils.copyProperties(sub, splitSub); |
|
|
BeanUtils.copyProperties(sub, splitSub); |
|
|
splitSub.setPoItemNo(newItemNo); |
|
|
|
|
|
|
|
|
// 重挂到拆分生成的新 PO:po_no(实为 order_no)=新单号、po_item_no=1、order_ref2 用新行分配值 |
|
|
|
|
|
splitSub.setPoNo(newOrderNo); |
|
|
|
|
|
splitSub.setPoItemNo(1); |
|
|
|
|
|
splitSub.setOrderRef2(newRef2); |
|
|
splitSub.setQty(moveQty); |
|
|
splitSub.setQty(moveQty); |
|
|
splitSub.setApproveQty(sub.getApproveQty() == null && moveApprove.signum() == 0 |
|
|
splitSub.setApproveQty(sub.getApproveQty() == null && moveApprove.signum() == 0 |
|
|
? null : moveApprove); |
|
|
? null : moveApprove); |
|
|
@ -956,8 +986,8 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
// 8) 扩展字段同步:覆盖字段含 extValues 时优先生效,否则整体复制原行扩展字段到新行 |
|
|
|
|
|
upsertSplitExtValues(site, orderNo, itemNo, newItemNo, model.getOverrideFields(), currentUserName); |
|
|
|
|
|
|
|
|
// 8) 扩展字段同步:源取原行,目标写入拆分生成的新单新行;override 含 extValues 时优先生效 |
|
|
|
|
|
upsertSplitExtValues(site, orderNo, itemNo, newOrderNo, 1, model.getOverrideFields(), currentUserName); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
@ -1207,15 +1237,17 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
* 拆分扩展字段处理:override 携带 extValues 时优先生效,否则整体复制原行扩展字段到新行。 |
|
|
|
|
|
|
|
|
* 拆分扩展字段处理:override 携带 extValues 时优先生效,否则整体复制原行扩展字段到新单新行。 |
|
|
|
|
|
* 源坐标为原行(srcOrderNo/srcItemNo),目标坐标为拆分生成的新单新行(targetOrderNo/targetItemNo)。 |
|
|
*/ |
|
|
*/ |
|
|
private void upsertSplitExtValues(String site, String orderNo, Integer origItemNo, Integer newItemNo, |
|
|
|
|
|
|
|
|
private void upsertSplitExtValues(String site, String srcOrderNo, Integer srcItemNo, |
|
|
|
|
|
String targetOrderNo, Integer targetItemNo, |
|
|
PODetailVo override, String operator) { |
|
|
PODetailVo override, String operator) { |
|
|
Map<String, Object> mergedValues = new LinkedHashMap<String, Object>(); |
|
|
Map<String, Object> mergedValues = new LinkedHashMap<String, Object>(); |
|
|
PODetailVo loader = new PODetailVo(); |
|
|
PODetailVo loader = new PODetailVo(); |
|
|
loader.setSite(site); |
|
|
loader.setSite(site); |
|
|
loader.setOrderNo(orderNo); |
|
|
|
|
|
loader.setItemNo(origItemNo); |
|
|
|
|
|
|
|
|
loader.setOrderNo(srcOrderNo); |
|
|
|
|
|
loader.setItemNo(srcItemNo); |
|
|
poOrderExtValueSupport.attachExtValues(site, Collections.singletonList(loader)); |
|
|
poOrderExtValueSupport.attachExtValues(site, Collections.singletonList(loader)); |
|
|
if (loader.getExtValues() != null && !loader.getExtValues().isEmpty()) { |
|
|
if (loader.getExtValues() != null && !loader.getExtValues().isEmpty()) { |
|
|
mergedValues.putAll(loader.getExtValues()); |
|
|
mergedValues.putAll(loader.getExtValues()); |
|
|
@ -1228,8 +1260,8 @@ public class PODetailServiceImpl extends ServiceImpl<PODetailMapper, PODetail> i |
|
|
} |
|
|
} |
|
|
PODetailVo target = new PODetailVo(); |
|
|
PODetailVo target = new PODetailVo(); |
|
|
target.setSite(site); |
|
|
target.setSite(site); |
|
|
target.setOrderNo(orderNo); |
|
|
|
|
|
target.setItemNo(newItemNo); |
|
|
|
|
|
|
|
|
target.setOrderNo(targetOrderNo); |
|
|
|
|
|
target.setItemNo(targetItemNo); |
|
|
target.setExtValues(mergedValues); |
|
|
target.setExtValues(mergedValues); |
|
|
poOrderExtValueSupport.upsertFromVo(target, operator); |
|
|
poOrderExtValueSupport.upsertFromVo(target, operator); |
|
|
} |
|
|
} |
|
|
|