From 888e861a6e68d233da628197273ec4ba3631fdd1 Mon Sep 17 00:00:00 2001
From: jing's <tan_jing_song@126.com>
Date: Tue, 9 Jan 2024 21:10:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nflg/product/bomnew/service/BomNewEbomParentService.java | 2 +-
 .../src/main/resources/mapper/master/MaterialMainMapper.xml  | 5 +++--
 2 files changed, 4 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 9fb8e933..6afb8d22 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
@@ -1148,7 +1148,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             MaterialMainEntity materialMainEntity = materialMainList.get(0);
             BomNewEbomParentVO baseMaterialVO = new BomNewEbomParentVO();
             BeanUtil.copyProperties(materialMainEntity, baseMaterialVO);
-            baseMaterialVO.setCreatedBy(null);
+         //   baseMaterialVO.setCreatedBy(SessionUtil.getUserCode());
 
             baseMaterialVO.setExceptionStatus(materialMainEntity.getMaterialState());
             return baseMaterialVO;
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
index ed6c3482..8b837d34 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/MaterialMainMapper.xml
@@ -121,8 +121,9 @@
 
 
     <select id="getMaterialByAnyNo" resultType="com.nflg.product.bomnew.pojo.vo.BaseMaterialVO">
-        select material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,material_category_code ,material_get_type
-        from t_material_main
+        select a.row_id as materialRowId,  material_no, material_name, material_desc, procure_type, project_type, material_state,drawing_no,a.material_category_code ,material_get_type,drawing_no
+        ,material_texture as material ,material_texture ,material_weight,b.rel_category_code,b.category_name,material_unit
+        from t_material_main a join t_material_category b on a.material_category_code=b.category_code
         where drawing_no  in
         <foreach collection="drawingNos" item="item" open="(" close=")" separator=",">
             #{item}