From a88ab0abcb97eecc87974016c34329edce5f97c6 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Wed, 27 Dec 2023 23:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=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

---
 .../com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java     | 3 ++-
 .../com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java  | 6 +-----
 .../com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java | 5 -----
 .../src/main/resources/mapper/master/MaterialMainMapper.xml | 2 +-
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java
index 4ddd503e..991a0676 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BaseMaterialVO.java
@@ -58,6 +58,7 @@ public class BaseMaterialVO {
     @ApiModelProperty("物料分类编码名称")
     private  String categoryName;
 
-
+    @ApiModelProperty("单位")
+    private String materialUnit;
 
 }
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java
index 18787969..9735d835 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomChildVO.java
@@ -47,11 +47,7 @@ public class BomNewEbomChildVO extends BaseMaterialVO implements Serializable {
 
 
 
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String materialUnit;
+
 
 
     /**
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
index 833509cc..4984a39e 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/vo/BomNewEbomParentVO.java
@@ -55,11 +55,6 @@ public class BomNewEbomParentVO extends BaseMaterialVO implements Serializable {
 
 
 
-    /**
-     * 单位
-     */
-    @ApiModelProperty(value = "单位")
-    private String materialUnit;
 
     /**
      * 单重
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 7e4f2741..6c4f2e75 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
@@ -71,7 +71,7 @@
 
     <select id="getMaterialBaseInfo" resultType="com.nflg.product.bomnew.pojo.vo.BaseMaterialVO">
         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 , b.rel_category_code,b.category_name
+        ,material_texture as material ,material_texture , 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 material_no in
         <foreach collection="materialNos" item="item" open="(" close=")" separator=",">