From 07279c5f219b3e5a864343850d6154241b126221 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Sat, 4 Oct 2025 20:45:19 +0800 Subject: [PATCH] =?UTF-8?q?MR=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issueAndReturnVo/MaterialRequisitionMaterialLineVo.java | 1 + .../java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java | 1 + .../com/gaotao/modules/mr/service/impl/MrServiceImpl.java | 5 +---- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/MaterialRequisitionMaterialLineVo.java b/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/MaterialRequisitionMaterialLineVo.java index 9c0ea13..192b27c 100644 --- a/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/MaterialRequisitionMaterialLineVo.java +++ b/src/main/java/com/gaotao/modules/api/entity/issueAndReturnVo/MaterialRequisitionMaterialLineVo.java @@ -23,4 +23,5 @@ public class MaterialRequisitionMaterialLineVo { private String lineNo; private String dueDate; private String site; + private String lineItemNo; } diff --git a/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java b/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java index 6333400..ddaac36 100644 --- a/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java +++ b/src/main/java/com/gaotao/modules/mr/entity/dto/MrIssueDto.java @@ -24,6 +24,7 @@ public class MrIssueDto { private String warehouseId; // 仓库 private String releaseNo; + private String lineItemNo; // 选择的材料行信息 private List selectedMaterials; diff --git a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java index 8f2d007..2767b5c 100644 --- a/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java +++ b/src/main/java/com/gaotao/modules/mr/service/impl/MrServiceImpl.java @@ -115,7 +115,6 @@ public class MrServiceImpl implements MrService { }*/ // 创建出库记录详情 TransCommonSubDto subDto = new TransCommonSubDto(); - subDto.setItemNo(Double.valueOf(mrIssueDto.getLineNo())); subDto.setPartNo(mrIssueDto.getPartNo()); subDto.setSubNo(material.getLabelCode()); subDto.setBatchNo(material.getBatchNo()); @@ -124,7 +123,6 @@ public class MrServiceImpl implements MrService { subDto.setTransQty(material.getIssueQty().toString()); subDto.setDirection("-"); subDto.setWdrNo(material.getWdrNo()==null?"*":material.getWdrNo()); - subDto.setSqeNo(material.getBomItemNo()); subDto.setSqeNo(seqNo); subList.add(subDto); seqNo++; @@ -138,7 +136,7 @@ public class MrServiceImpl implements MrService { materialRequisitionIssueDto.setIfsOrderNo(transCommonRequestDto.getWorkOrderNo()); materialRequisitionIssueDto.setIfsLineNo(mrIssueDto.getLineNo()); materialRequisitionIssueDto.setIfsReleaseNo(mrIssueDto.getReleaseNo()); - materialRequisitionIssueDto.setIfsLineItemNo("1"); + materialRequisitionIssueDto.setIfsLineItemNo(mrIssueDto.getLineItemNo()); materialRequisitionIssueDto.setIfsPartNo(issue.getPartNo()); materialRequisitionIssueDto.setIfsSiteID(transCommonRequestDto.getSite()); materialRequisitionIssueDto.setIfsLocationNo(issue.getLocationId()); @@ -241,7 +239,6 @@ public class MrServiceImpl implements MrService { }*/ // 创建出库记录详情 TransCommonSubDto subDto = new TransCommonSubDto(); - subDto.setItemNo(Double.valueOf(mrUnissueDto.getItemNo())); subDto.setPartNo(mrUnissueDto.getComponentPartNo()); subDto.setSubNo(material.getLabelCode()); subDto.setBatchNo(material.getBatchNo());