From a049f128c141e87e1e7857d1b40d35bcfeaa7eeb Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Fri, 14 Nov 2025 23:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IssureNotifyServiceImpl.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java index e4eb729..daf8f60 100644 --- a/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/gaotao/modules/notify/service/impl/IssureNotifyServiceImpl.java @@ -871,21 +871,21 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { // 用于存储最终结果：父集合和子集合 List parentList = new ArrayList<>(); List childList = new ArrayList<>(); - int num = 0; BigDecimal nextItem=BigDecimal.ZERO; // 步骤2：遍历每个分组，生成父对象和子对象 List groupDtos = data.getMaterialList(); // 2.1 生成父对象的唯一 itemNo（确保全局唯一，这里用 UUID 简化） - if(num == 0){ - SOIssueNotifyOrderList parentData = new SOIssueNotifyOrderList(); - parentData.setSite(data.getSite()); - parentData.setNotifyNo(data.getNotifyNo()); - nextItem = issureNotifyMapper.getNextItemForSOIssueNotifyOrderList(parentData); - }else{ + + SOIssueNotifyOrderList parentData = new SOIssueNotifyOrderList(); + parentData.setSite(data.getSite()); + parentData.setNotifyNo(data.getNotifyNo()); + nextItem = issureNotifyMapper.getNextItemForSOIssueNotifyOrderList(parentData); + if(nextItem == null) { nextItem = nextItem.add(BigDecimal.ONE); } + String transType = Consts.VR; // 获取流水号,出错不回滚 TransNoControl transNo = transNoService.getTransNo(data.getSite(),transType,8); @@ -893,6 +893,7 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { // 2.2 构建SOIssueNotifyOrderList SOIssueNotifyOrderList parent = buildOnOrderParent(data.getNotifyNo(),data.getSite(),newOrderNo, data.getOrderType(), nextItem); + parentList.add(parent); if("shoporder".equals(parent.getOrderType())){ parent.setProductionArea("Z301"); }else if ("shipment".equals(parent.getOrderType())){