From 7ec8be59ff96eacbd2b218ea39897563da919dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 10 Jun 2026 17:54:38 +0800 Subject: [PATCH] =?UTF-8?q?W=E5=87=BA=E5=8F=A3=E8=AE=A2=E5=8D=95=E8=A1=8C?= =?UTF-8?q?=E5=8F=B7=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReservationStockInOrderApplicationService.java | 10 +++++++--- .../ReservationStockOutOrderApplicationService.java | 9 +++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java index c7ac8c157..174306ab5 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java @@ -1967,14 +1967,18 @@ public class ReservationStockInOrderApplicationService { List reservationInMaterialDetails = reservationInMaterialDetailMapper.selectList(new LambdaQueryWrapper().eq(ReservationInMaterialDetail::getInOrderNumber, reservationStockInOrder.getInOrderNumber())); - Integer lineNum = 1; List orderList = new LinkedList<>(); for (ReservationInMaterialDetail reservationInMaterialDetail : reservationInMaterialDetails) { GwInDetail gwInDetail = new GwInDetail(); Long materialBaseInfoId = reservationInMaterialDetail.getMaterialBaseInfoId(); gwInDetail.setBill_no(gwStockInOrder.getBill_no()); - gwInDetail.setLine_num(lineNum); - lineNum++; + String lotNo = reservationInMaterialDetail.getLotNo(); + if (lotNo != null) { + String[] split = lotNo.split("-"); + if (split.length == 2) { + gwInDetail.setLine_num(split[1]); + } + } gwInDetail.setItem_no(materialBaseInfoId.toString()); gwInDetail.setItem_name(reservationInMaterialDetail.getMaterialName()); MaterialBaseInfoPO materialBaseInfoPO = reservationStockInOrderMapper.getinfo(materialBaseInfoId); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java index eb13f07b2..b2a9d5ab0 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java @@ -1134,11 +1134,16 @@ public class ReservationStockOutOrderApplicationService { // 构建明细List List> orderList = new ArrayList<>(); - int lineNum = 1; for (ReservationOutMaterialDetail detail : reservationOutMaterialDetails) { Map item = new HashMap<>(); item.put("billNo", reservationStockOutOrder.getOutOrderNumber()); - item.put("lineNum", lineNum++); + String lotNo = detail.getLotNo(); + if (lotNo != null) { + String[] split = lotNo.split("-"); + if (split.length == 2) { + item.put("lineNum", split[1]); + } + } item.put("itemNo", detail.getMaterialBaseInfoId() != null ? detail.getMaterialBaseInfoId().toString() : ""); item.put("itemName", detail.getMaterialName() != null ? detail.getMaterialName() : ""); item.put("spec", detail.getSpecificationModel() != null ? detail.getSpecificationModel() : "");