From bc17c0cd3a17a7cde265a40947f1719dc74bcd90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=B1=B3?= <470431449@qq.com>
Date: Wed, 24 Jan 2024 11:06:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A01|=E8=87=AA=E5=88=B6;2|=E5=A4=96?=
 =?UTF-8?q?=E5=8D=8F;3|=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/dto/AddVirtrualMaterialDTO.java      |  2 ++
 .../service/BomNewPbomParentService.java      |  2 ++
 .../bomnew/service/MaterialService.java       |  3 ++
 .../domain/EBom/VirtualPackageBase.java       |  2 +-
 .../mapper/master/BomNewEbomParentMapper.xml  | 30 +++++++++----------
 5 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java
index 46d627dd..38759472 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/dto/AddVirtrualMaterialDTO.java
@@ -16,6 +16,8 @@ public class AddVirtrualMaterialDTO {
    private  String materialDesc ;
    private  String materialCategoryCode;
 
+   private String projectType;
+
    @ApiModelProperty("申请后返回的物料编码")
    private 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 6a499d88..8c25e5a6 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
@@ -418,6 +418,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
         toM.setDrawingNo(drawingNo);
         toM.setMaterialDesc(materialDesc);
         toM.setMaterialCategoryCode("201201");
+        toM.setProjectType(packageParam.getProjectType());
         Map<String, AddVirtrualMaterialDTO> mMap = materialService.batchAddMaterial(ImmutableList.of(toM));
 //        String materialNo = materialService.addMaterial(drawingNo, materialName, materialDesc, "201201");
         String materialNo=mMap.get(key).getMaterialNo();
@@ -437,6 +438,7 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             throw new NflgBusinessException(STATE.BusinessError, "单条物料时,请选择上下级");
         }
         TechnologyPackageParamBuilder builder = new TechnologyPackageParamBuilder(technologyPackageParam);
+        builder.builder();
         if (CollUtil.isNotEmpty(builder.getPackageParent())) {
             this.saveOrUpdateBatch(builder.getPackageParent());
         }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
index 7ece978c..807fdcf0 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/MaterialService.java
@@ -187,6 +187,9 @@ public class MaterialService {
             ma.setApplyUserCode(SessionUtil.getRealName());
             ma.setMaterialUnit("PC");
             ma.setProcessState(10);
+            if(StrUtil.isNotBlank(md.getProjectType())){
+                ma.setProjectType(md.getProjectType());
+            }
             resultList.add(ma);
 
             AddMaterialMainDTO ent=new AddMaterialMainDTO();
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
index 3b4d8a3b..c7e509a4 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/VirtualPackageBase.java
@@ -146,7 +146,7 @@ public abstract class VirtualPackageBase {
         parent.setSourceRowId(0L);
         parent.setLastVersionIs(1);
         parent.setNum(new BigDecimal(1));
-        parent.setDeviseName(SessionUtil.getUserCode());
+        parent.setDeviseUserCode(SessionUtil.getUserCode());
         parent.setDeviseName(SessionUtil.getRealName());
         parent.setCreatedBy(SessionUtil.getUserCode());
         parent.setDeptName(SessionUtil.getDepartName());
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index 849bea3e..1484f981 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -178,22 +178,22 @@
     </select>
 
     <update id="updateRootState">
-        update t_bom_new_ebom_parent
-        set root_is=0,
-            user_root_is=0
-        where last_version_is = 1;
-        update t_bom_new_ebom_parent a set  a.root_is=1 ,a.user_root_is=1   where material_no not in (select material_no from     (
-        select b.material_no from t_bom_new_ebom_parent a
-        join t_bom_new_ebom_child b   on a.row_id=b.parent_row_id
-         where a.last_version_is=1   ) b )    and last_version_is=1;
-
-
-        update t_bom_new_ebom_parent a   left join    (select material_no ,created_by from     (
-            select b.material_no ,b.created_by  from t_bom_new_ebom_parent a
+            update t_bom_new_ebom_parent
+            set root_is=0,
+                user_root_is=0
+            where last_version_is = 1;
+            update t_bom_new_ebom_parent a set  a.root_is=1 ,a.user_root_is=1   where material_no not in (select material_no from     (
+            select b.material_no from t_bom_new_ebom_parent a
             join t_bom_new_ebom_child b   on a.row_id=b.parent_row_id
-            where a.last_version_is=1   ) b ) t   on a.material_no=t.material_no  and a.created_by=t.created_by
-            set user_root_is=1
-        where  a.last_version_is=1 and t.created_by is null
+             where a.last_version_is=1   ) b )    and last_version_is=1;
+
+
+            update t_bom_new_ebom_parent a   left join    (select material_no ,created_by from     (
+                select b.material_no ,b.created_by  from t_bom_new_ebom_parent a
+                join t_bom_new_ebom_child b   on a.row_id=b.parent_row_id
+                where a.last_version_is=1   ) b ) t   on a.material_no=t.material_no  and a.created_by=t.created_by
+                set user_root_is=1
+            where  a.last_version_is=1 and t.created_by is null
 
     </update>