From a356e4d2423c0beb03e8097b0323043a990cae2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Thu, 10 Oct 2024 16:11:03 +0800
Subject: [PATCH 1/4] =?UTF-8?q?PBOM-=E8=8D=89=E7=A8=BF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9C=A8=E5=88=AB=E4=BA=BA=E7=9A=84=E7=89=A9=E6=96=99=E4=B8=8B?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/mapper/master/BomNewPbomParentMapper.java  | 4 ++--
 .../nflg/product/bomnew/service/BomNewPbomParentService.java  | 4 ++--
 .../main/resources/mapper/master/BomNewPbomParentMapper.xml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java
index 49570348..4b97bcd2 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewPbomParentMapper.java
@@ -46,9 +46,9 @@ public interface BomNewPbomParentMapper extends BaseMapper<BomNewPbomParentEntit
 
     void updatePBomMaterialUse();
 
-    List<BomNewPbomParentVO> getParentForMaterialNoSeach(@Param("userFac") String userFac,@Param("materialNoList") List<String> materialNoList);
+    List<BomNewPbomParentVO> getParentForMaterialNoSeach(@Param("userFac") String userFac,@Param("materialNoList") List<String> materialNoList,@Param("userCode")String userCode);
 
-    List<BomNewPbomParentVO> getChildForMaterialNoSeach(@Param("userFac") String userFac,@Param("materialNoList") List<String> materialNoList,@Param("materialNo")String materialNo);
+    List<BomNewPbomParentVO> getChildForMaterialNoSeach(@Param("userFac") String userFac,@Param("materialNoList") List<String> materialNoList,@Param("materialNo")String materialNo,@Param("userCode")String userCode);
 
 
     Integer checkIsRoot(@Param("materialNo")String materialNo);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 7fb0acd1..c7345d84 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -145,8 +145,8 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                 if (CollUtil.isNotEmpty(parentMaterialByMaterialNo)) {
                     String queryFac= StrUtil.isBlank(query.getFacCode())? userRoleService.getUserFactory():query.getFacCode();
 
-                    List<BomNewPbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(queryFac , parentMaterialByMaterialNo);
-                    List<BomNewPbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(queryFac , parentMaterialByMaterialNo, materialNo);
+                    List<BomNewPbomParentVO> parents = this.getBaseMapper().getParentForMaterialNoSeach(queryFac , parentMaterialByMaterialNo,SessionUtil.getUserCode());
+                    List<BomNewPbomParentVO> childs = this.getBaseMapper().getChildForMaterialNoSeach(queryFac , parentMaterialByMaterialNo, materialNo,SessionUtil.getUserCode());
                     List<BomNewPbomParentVO> data = new ArrayList<>();
                     data.addAll(parents);
                     data.addAll(childs);
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
index 55f85525..3d520ea9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewPbomParentMapper.xml
@@ -211,7 +211,7 @@
     <!--物料编码搜索-父级-->
     <select id="getParentForMaterialNoSeach" resultType="com.nflg.product.bomnew.pojo.vo.BomNewPbomParentVO">
         SELECT created_by as bomCreatedBy , row_id as bomRowId, row_id as childBomRowId, a.*
-        FROM t_bom_new_pbom_parent a where a.last_version_is=1 and a.status=1
+        FROM t_bom_new_pbom_parent a where a.last_version_is=1 and a.status=1 and a.created_by=#{userCode}
         <if test="userFac!=null and userFac!=''">
             and fac_code=#{userFac}
         </if>  and material_no in
@@ -227,7 +227,7 @@
         from t_bom_new_pbom_parent a
         join t_bom_new_pbom_child b on a.row_id =b.parent_row_id
         left join t_bom_new_pbom_parent c on b.material_no=c.material_no and b.fac_code=c.fac_code and c.last_version_is=1
-        where a.last_version_is=1 and a.status=1
+        where a.last_version_is=1 and a.status=1 and a.created_by=#{userCode}
         <if test="userFac!=null and userFac!=''">
             and a.fac_code=#{userFac}
         </if>

From f3ba4c82487d51cf7dec8c6f4a08ddb5d09fb827 Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sat, 12 Oct 2024 17:01:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?pbom-=E7=89=A9=E6=96=99=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=9C=A8=E5=88=AB=E4=BA=BABOM=E4=B8=8B=E5=8F=8A=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewEbomParentService.java     | 2 ++
 .../product/bomnew/service/BomNewPbomParentService.java     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 1b36fdac..6770e250 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -992,6 +992,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             parent.setBomRowId(parent.getRowId());
             parent.setChildBomRowId(parent.getRowId());
             parent.setParentRowId(0L);
+            parent.setUserRootIs(1);
             bomTree.add(parent);
 
             EBomToPbomBase eBomToPBom =parent.getMaterialNo().startsWith("31")?  new EBomToPBomFor31(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())):new EBomToPBom(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode()));
@@ -1177,6 +1178,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             parent.setBomRowId(parent.getRowId());
             parent.setChildBomRowId(parent.getRowId());
             parent.setParentRowId(0L);
+            parent.setUserRootIs(1);
             bomTree.add(parent);
             FormalEBomToPbomBase eBomToPBom =parent.getMaterialNo().startsWith("31")?  new EBomToPBomForFormal31New(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode())):new EBomToPBomForFormalNew(parent, bomTree, paramDto.getFacCodes(), 0L,EnumUtils.getValueEnum(ConvertToPBomModelEnum.class,paramDto.getConvertMode()));
             eBomToPBom.convert();
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index c7345d84..4ae4bb50 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -1156,9 +1156,9 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
                 this.delPBom(delNoReleaseBom);
             }
 
-            List<Long> bomRowIds = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0 && !u.getDelIs().equals(1)).map(u -> u.getBomRowId()).collect(Collectors.toList());
+            List<Long> bomRowIds = allBom.stream().filter(u -> SessionUtil.getUserCode().equals(u.getCreatedBy()) && PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0 && !u.getDelIs().equals(1)).map(u -> u.getBomRowId()).collect(Collectors.toList());
 
-            List<String> parentMaterialNos = allBom.stream().filter(u -> PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0 && !u.getDelIs().equals(1)).map(u->u.getMaterialNo()).collect(Collectors.toList());
+            List<String> parentMaterialNos = allBom.stream().filter(u -> SessionUtil.getUserCode().equals(u.getCreatedBy()) &&  PBomStatusEnum.WAIT_PUBLISH.equalsValue(u.getStatus()) && u.getBomRowId() > 0 && !u.getDelIs().equals(1)).map(u->u.getMaterialNo()).collect(Collectors.toList());
 
             //Integer state = (parent.getMaterialNo().startsWith("31") && parent.getFacCode().equals(EBomConstant.MAIN_FACTORY_CODE_1010)) ? PBomStatusEnum.WAIT_FACTORY.getValue() : PBomStatusEnum.PUBLISH.getValue();
             Integer state = parent.getMaterialNo().startsWith("31") ? PBomStatusEnum.FACTORY_CONFIRM.getValue() : PBomStatusEnum.PUBLISH.getValue();
@@ -1241,7 +1241,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
 
             Set<String> oldChildSet0 = oldBomNoTChildren.stream().map(u -> u.getMaterialNoAndNumAndProjectType()).collect(Collectors.toSet());
             Set<String> newChildSet0 = newBomNoTChildren.stream().map(u -> u.getMaterialNoAndNumAndProjectType()).collect(Collectors.toSet());
-            if(oldChildSet0.equals(newChildSet0)){
+            if(oldChildSet0.equals(newChildSet0) && SessionUtil.getUserCode().equals(newPBom.getCreatedBy())  ){
                 newPBom.setStatus(PBomStatusEnum.PUBLISH.getValue());
                 newPBom.setDelIs(1);
 

From 901a68d2b7c8a77fcac015161e92209695d34e05 Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sat, 12 Oct 2024 22:00:59 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=ACPBOM-=E7=BB=B4=E6=8A=A4=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/domain/EBom/EBomToPbomBase.java  | 6 ++++++
 .../service/domain/EBom/topbomnew/FormalEBomToPbomBase.java | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
index fd993474..6204683e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomToPbomBase.java
@@ -200,6 +200,10 @@ public abstract class EBomToPbomBase {
                     oldParent.setDeptName(SessionUtil.getDepartName());
                     oldParent.setDeptRowId(SessionUtil.getDepartRowId());
                     oldParent.setEbomVersion(parentVo.getEbomVersion());
+                    oldParent.setDeviseName(SessionUtil.getRealName());
+                    oldParent.setDeviseUserCode(SessionUtil.getUserCode());
+                    oldParent.setTechnologyUserCode(SessionUtil.getUserCode());
+                    oldParent.setTechnologyUserName(SessionUtil.getUserName());
                     if(StrUtil.isNotBlank(parentVo.getEbomVersion())){
                         oldParent.setCurrentVersion(parentVo.getEbomVersion());
                     }
@@ -332,6 +336,8 @@ public abstract class EBomToPbomBase {
         pBomParent.setDeptRowId(SessionUtil.getDepartRowId());
         pBomParent.setCreatedTime(LocalDateTime.now());
         pBomParent.setCreatedBy(SessionUtil.getUserCode());
+        pBomParent.setDeviseName(SessionUtil.getRealName());
+        pBomParent.setDeviseUserCode(SessionUtil.getUserCode());
         //版本=EBom版本
         pBomParent.setCurrentVersion(bomVersion);
         pBomParent.setEditStatus(PBomEditStatusEnum.HANDLER_CREATED.getValue());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
index fa423a46..7d25b4b9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/topbomnew/FormalEBomToPbomBase.java
@@ -200,6 +200,10 @@ public abstract class FormalEBomToPbomBase {
                         oldParent.setCreatedBy(SessionUtil.getUserCode());
                         oldParent.setDeptName(SessionUtil.getDepartName());
                         oldParent.setDeptRowId(SessionUtil.getDepartRowId());
+                        oldParent.setDeviseUserCode(SessionUtil.getUserCode());
+                        oldParent.setDeviseName(SessionUtil.getRealName());
+                        oldParent.setTechnologyUserName(SessionUtil.getRealName());
+                        oldParent.setTechnologyUserCode(SessionUtil.getUserCode());
                         if(StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
                             oldParent.setCurrentVersion(parentVo.getCurrentVersion());
                             oldParent.setEbomVersion(parentVo.getCurrentVersion());
@@ -320,6 +324,8 @@ public abstract class FormalEBomToPbomBase {
         pBomParent.setCreatedBy(SessionUtil.getUserCode());
         pBomParent.setSource(PbomSourceEnum.FROM_EBOM.getValue());
         pBomParent.setSourceStatus(PbomSourceStatusEnum.EBOM.getValue());
+        pBomParent.setDeviseName(SessionUtil.getRealName());
+        pBomParent.setDeviseUserCode(SessionUtil.getUserCode());
         //EBOM版本大于pbom版本则用EBOm版本
         if( oldParent!=null &&  StrUtil.isNotBlank(parentVo.getCurrentVersion()) && VersionUtil.compare(parentVo.getCurrentVersion(),oldParent.getCurrentVersion())>0){
             pBomParent.setCurrentVersion(parentVo.getCurrentVersion());

From 21a75d672606f3e3eb3be10e1fc38c01899a8351 Mon Sep 17 00:00:00 2001
From: luolm <470431449@qq.com>
Date: Sun, 13 Oct 2024 20:46:36 +0800
Subject: [PATCH 4/4] =?UTF-8?q?pbom-=E7=94=A8=E6=88=B7=E8=B7=9F=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bomnew/service/BomNewEbomParentService.java       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
index 6770e250..1907368f 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
@@ -1060,6 +1060,12 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             }
 
             if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {
+                //将物料标记为用户跟节点
+                List<BomNewPbomParentEntity> rootParent = eBomToPBom.getPBomParentResult().stream().filter(u -> u.getMaterialNo().equals(parent.getMaterialNo())).collect(Collectors.toList());
+                if(CollUtil.isNotEmpty(rootParent)) {
+                    rootParent.get(0).setUserRootIs(1);
+                }
+
                 pBomParentService.saveOrUpdateBatch(eBomToPBom.getPBomParentResult());
 
             }
@@ -1258,6 +1264,11 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
 
 
             if (CollUtil.isNotEmpty(eBomToPBom.getPBomParentResult())) {
+                //将物料标记为用户跟节点
+                List<BomNewPbomParentEntity> rootParent = eBomToPBom.getPBomParentResult().stream().filter(u -> u.getMaterialNo().equals(parent.getMaterialNo())).collect(Collectors.toList());
+                if(CollUtil.isNotEmpty(rootParent)) {
+                    rootParent.get(0).setUserRootIs(1);
+                }
                 pBomParentService.saveOrUpdateBatch(eBomToPBom.getPBomParentResult());
 
             }