From bea350838adf7b79f69f0bc8bb652f4b40ae55f0 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 7 Aug 2024 14:45:40 +0800
Subject: [PATCH] =?UTF-8?q?2024-08-07=20=E4=BA=A7=E5=93=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=863?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PartInformationServiceImpl.java      | 28 +++++++------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java b/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
index 5dcc8f46..ebc017d3 100644
--- a/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/part/service/impl/PartInformationServiceImpl.java
@@ -609,33 +609,25 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
     @Transactional
     public void copyPart(PartInformationVo inData) {
         // 校验该物料是否存在
-        PartInformationEntity partInformationEntity = partInformationMapper.selectOne(new QueryWrapper<PartInformationEntity>().eq("site", inData.getSite()).eq("part_no", inData.getPartNo()));
+        PartInformationEntity partInformationEntity = partInformationMapper.selectOne(new QueryWrapper<PartInformationEntity>().eq("site", inData.getSite()).eq("sourceBu", inData.getBuNo()).eq("part_no", inData.getPartNo()));
         if (partInformationEntity != null) {
             throw new RuntimeException("物料已存在！");
         }
-        PartInformationEntity fromPart = partInformationMapper.selectOne(new QueryWrapper<PartInformationEntity>().eq("site", inData.getPreviousVersion().getSite()).eq("part_no", inData.getPreviousVersion().getPartNo()));
+        PartInformationEntity fromPart = partInformationMapper.selectOne(new QueryWrapper<PartInformationEntity>().eq("site", inData.getPreviousVersion().getSite()).eq("sourceBu", inData.getPreviousVersion().getBuNo()).eq("part_no", inData.getPreviousVersion().getPartNo()));
         PartInformationEntity toPart = new PartInformationEntity();
+        BeanUtils.copyProperties(fromPart, toPart);
+//        if ("Y".equals(inData.getCopyGeneral())) {
+//            toPart.setPartType(fromPart.getPartType()); // 零件类型
+//            toPart.setUmId(fromPart.getUmId()); // 库存计量单位
+//            toPart.setCodeNo(fromPart.getCodeNo()); // 属性模板
+//            toPart.setCreateBy(inData.getCreateBy()); // 备注
+//        }
         toPart.setSite(inData.getSite());
+        toPart.setBuNo(inData.getBuNo());
         toPart.setPartNo(inData.getPartNo());
         toPart.setPartDesc(inData.getPartDesc());
-        if ("Y".equals(inData.getCopyGeneral())) {
-            toPart.setPartType(fromPart.getPartType()); // 零件类型
-            toPart.setUmId(fromPart.getUmId()); // 库存计量单位
-            toPart.setCodeNo(fromPart.getCodeNo()); // 属性模板
-            toPart.setCreateBy(inData.getCreateBy()); // 备注
-        }
         // 新增
         partInformationMapper.insert(toPart);
-        if ("Y".equals(inData.getCopyDefaultLocation())) { // 新增物料默认库位
-            List<LocationInformationVo> fromLocationList = partInformationMapper.getFromPartLocation(fromPart);
-            if (!fromLocationList.isEmpty()) {
-                List<LocationInformationVo> ifsDefaultLocations = fromLocationList.stream().map(a -> {
-                    a.setPartNo(toPart.getPartNo());
-                    return a;
-                }).collect(Collectors.toList());
-                partInformationMapper.savePartDefaultLocation(ifsDefaultLocations);
-            }
-        }
     }
 
     /**