From 341916f13aa98ed5829f1ac960cf04a97c9c00e4 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 13 Mar 2026 14:01:05 +0800 Subject: [PATCH] =?UTF-8?q?2026-03-13=20=E3=80=90Copy=20Part=E3=80=91?= =?UTF-8?q?=E4=B8=8D=E6=8C=89=E7=85=A7=E5=8E=9F=E6=96=99=E5=8F=B7=E7=9A=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BF=A1=E6=81=AF=E5=B0=86=E6=96=B0=E6=96=99?= =?UTF-8?q?=E5=8F=B7=E4=BF=9D=E5=AD=98=E5=88=B0=E9=A1=B9=E7=9B=AE=E6=96=99?= =?UTF-8?q?=E5=8F=B7=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartInformationServiceImpl.java | 81 ++++++++++--------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java index bc6989b3..40acec41 100644 --- a/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java +++ b/src/main/java/com/spring/modules/part/service/impl/PartInformationServiceImpl.java @@ -2134,47 +2134,48 @@ public class PartInformationServiceImpl extends ServiceImpl projectParts = partInformationMapper.getProjectPartByPartNo(inData.getSite(), fromPart.getPartNo()); - if (!projectParts.isEmpty()) { - // 判断是不是临时物料 如果是临时物料 则给BaseNo 和 RevNo赋值 - String baseNo; - String revNo; - if (!"Y".equals(fromPart.getStatus())) { - TransNoControlData noData = partInformationMapper.getTranNoData(inData.getSite(), "project_part_no"); - int a = noData.getTransNo().length() + noData.getLength(); - baseNo = toPart.getPartNo().substring(0, a); - revNo = toPart.getPartNo().substring(a); - } else { - baseNo = ""; - revNo = ""; - } - List projectPartList = projectParts.stream().map(a -> { - a.setPartNo(toPart.getPartNo()); - a.setBaseNo(baseNo); - a.setRevNo(revNo); - a.setPartNoSource("料号导入"); - a.setVirtualPartNo(toPart.getPartNo()); - a.setCreateBy(inData.getCreateBy()); - a.setFinalPartNo(toPart.getPartNo()); - return a; - }).collect(Collectors.toList()); - // 新增项目物料 - partInformationMapper.batchSaveProjectPart(projectPartList); - -// List projectCustomers = partInformationMapper.getProjectCustomerPartByPartNo(inData.getSite(), fromPart.getPartNo()); -// if (!projectCustomers.isEmpty()) { -// List customerPartList = projectCustomers.stream().map(a -> { -// a.setPartNo(toPart.getPartNo()); -// a.setCreateBy(inData.getCreateBy()); -// return a; -// }).collect(Collectors.toList()); -// // 新增客户物料 -// partInformationMapper.batchSaveCustomerPart(customerPartList); + // 2026-03-13 不按照原料号的项目信息将新料号保存到项目料号中 +// if (!"Y".equals(inData.getCopyFlag())) { // 不是转正页面 +// // 校验原物料有没有项目 +// List projectParts = partInformationMapper.getProjectPartByPartNo(inData.getSite(), fromPart.getPartNo()); +// if (!projectParts.isEmpty()) { +// // 判断是不是临时物料 如果是临时物料 则给BaseNo 和 RevNo赋值 +// String baseNo; +// String revNo; +// if (!"Y".equals(fromPart.getStatus())) { +// TransNoControlData noData = partInformationMapper.getTranNoData(inData.getSite(), "project_part_no"); +// int a = noData.getTransNo().length() + noData.getLength(); +// baseNo = toPart.getPartNo().substring(0, a); +// revNo = toPart.getPartNo().substring(a); +// } else { +// baseNo = ""; +// revNo = ""; // } - } - } +// List projectPartList = projectParts.stream().map(a -> { +// a.setPartNo(toPart.getPartNo()); +// a.setBaseNo(baseNo); +// a.setRevNo(revNo); +// a.setPartNoSource("料号导入"); +// a.setVirtualPartNo(toPart.getPartNo()); +// a.setCreateBy(inData.getCreateBy()); +// a.setFinalPartNo(toPart.getPartNo()); +// return a; +// }).collect(Collectors.toList()); +// // 新增项目物料 +// partInformationMapper.batchSaveProjectPart(projectPartList); +// +//// List projectCustomers = partInformationMapper.getProjectCustomerPartByPartNo(inData.getSite(), fromPart.getPartNo()); +//// if (!projectCustomers.isEmpty()) { +//// List customerPartList = projectCustomers.stream().map(a -> { +//// a.setPartNo(toPart.getPartNo()); +//// a.setCreateBy(inData.getCreateBy()); +//// return a; +//// }).collect(Collectors.toList()); +//// // 新增客户物料 +//// partInformationMapper.batchSaveCustomerPart(customerPartList); +//// } +// } +// } } public PartInformationEntity createCopyToPart(PartInformationVo inData, PartInformationEntity fromPart) {