update - 产品BOM改

aucma-base/src/main/java/com/aucma/base/domain/OrderBomInfo.java

@@ -27,7 +27,6 @@ public class OrderBomInfo extends TreeStringEntity {
     /**
      * BOM编号
      */
-    @Excel(name = "BOM编号")
     private String bomCode;
 
     /**
@@ -43,11 +42,29 @@ public class OrderBomInfo extends TreeStringEntity {
     private String materialName;
 
     /**
-     * 物料类别
+     * 子物料小类
      */
-    @Excel(name = "物料类别")
+    @Excel(name = "子物料小类")
     private String materialType;
 
+    /**
+     * 父物料编号
+     */
+    @Excel(name = "父物料编号")
+    private String parentId;
+
+    /**
+     * 父物料名称
+     */
+    @Excel(name = "父物料名称")
+    private String parentName;
+
+    /**
+     * 父物料小类
+     */
+    @Excel(name = "父物料小类")
+    private String parentMaterialType;
+
     /**
      * 标准数量
      */
@@ -115,6 +132,34 @@ public class OrderBomInfo extends TreeStringEntity {
      */
     private String ancestors;
 
+    @Override
+    public String getParentId() {
+        return parentId;
+    }
+
+    @Override
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
+    @Override
+    public String getParentName() {
+        return parentName;
+    }
+
+    @Override
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getParentMaterialType() {
+        return parentMaterialType;
+    }
+
+    public void setParentMaterialType(String parentMaterialType) {
+        this.parentMaterialType = parentMaterialType;
+    }
+
     @Override
     public String getAncestors() {
         return ancestors;

aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml

@@ -22,6 +22,8 @@
         <result property="vbeln" column="vbeln"/>
         <result property="vbpos" column="vbpos"/>
         <result property="ancestors"    column="ancestors"    />
+        <result property="parentName"    column="parentName"    />
+        <result property="parentMaterialType"    column="parentMaterialType"    />
     </resultMap>
 
     <sql id="selectOrderBomInfoVo">
@@ -29,9 +31,11 @@
                ob.bom_code,
                ob.material_code,
                bm.material_name,
-               bm.material_type,
+               bm.MATERIAL_SUBCLASS material_type,
                ob.standard_amount,
                ob.parent_id,
+               mp.MATERIAL_NAME     parentName,
+               mp.MATERIAL_SUBCLASS parentMaterialType,
                ob.is_flag,
                ob.created_by,
                ob.created_time,
@@ -43,7 +47,8 @@
                ob.vbeln,
                ob.vbpos
         from order_bominfo ob
-                 left join BASE_MATERIALINFO bm ON bm.MATERIAL_CODE = ob.material_code
+                 LEFT JOIN BASE_MATERIALINFO bm ON bm.MATERIAL_CODE = ob.material_code
+                 LEFT JOIN BASE_MATERIALINFO mp ON mp.MATERIAL_CODE = ob.PARENT_ID
     </sql>
 
     <select id="selectOrderBomInfoList" parameterType="OrderBomInfo" resultMap="OrderBomInfoResult">
@@ -53,9 +58,11 @@
             <if test="materialCode != null  and materialCode != ''">and ob.material_code like concat(#{materialCode}, '%')</if>
             <if test="materialName != null  and materialName != ''">and bm.material_name like concat(concat('%',#{materialName}), '%')
             </if>
-            <if test="materialType != null  and materialType != ''">and ob.material_type = #{materialType}</if>
+            <if test="materialType != null  and materialType != ''">and bm.MATERIAL_SUBCLASS = #{materialType}</if>
             <if test="standardAmount != null ">and ob.standard_amount = #{standardAmount}</if>
-            <if test="parentId != null  and parentId != ''">and ob.parent_id = like concat(#{parentId}, '%')</if>
+            <if test="parentId != null  and parentId != ''">and ob.parent_id like concat(#{parentId}, '%')</if>
+            <if test="parentName != null  and parentName != ''">and mp.MATERIAL_NAME like concat(concat('%',#{parentName}), '%')
+            </if>
             <if test="isFlag != null ">and ob.is_flag = #{isFlag}</if>
             <if test="createdBy != null  and createdBy != ''">and ob.created_by = #{createdBy}</if>
             <if test="createdTime != null ">and ob.created_time = #{createdTime}</if>

aucma-production/src/main/java/com/aucma/production/domain/BaseBomInfo.java

@@ -35,15 +35,15 @@ public class BaseBomInfo extends TreeStringEntity {
     private String materialCode;
 
     /**
-     * 物料名称
+     * 子物料名称
      */
-    @Excel(name = "物料名称")
+    @Excel(name = "子物料名称")
     private String materialName;
 
     /**
-     * 物料类型
+     * 子物料小类
      */
-    @Excel(name = "物料类型")
+    @Excel(name = "子物料小类")
     private String materialType;
 
     /**
@@ -58,6 +58,18 @@ public class BaseBomInfo extends TreeStringEntity {
     @Excel(name = "父物料编号")
     private String parentId;
 
+    /**
+     * 父物料名称
+     */
+    @Excel(name = "父物料名称")
+    private String parentName;
+
+    /**
+     * 父物料小类
+     */
+    @Excel(name = "父物料小类")
+    private String parentMaterialType;
+
     /**
      * 工厂编号
      */
@@ -114,6 +126,24 @@ public class BaseBomInfo extends TreeStringEntity {
     @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date updatedTime;
 
+    @Override
+    public String getParentName() {
+        return parentName;
+    }
+
+    @Override
+    public void setParentName(String parentName) {
+        this.parentName = parentName;
+    }
+
+    public String getParentMaterialType() {
+        return parentMaterialType;
+    }
+
+    public void setParentMaterialType(String parentMaterialType) {
+        this.parentMaterialType = parentMaterialType;
+    }
+
     public String getPlantName() {
         return plantName;
     }

aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml

@@ -22,6 +22,8 @@
         <result property="updatedTime" column="updated_time"/>
         <result property="ancestors" column="ancestors"/>
         <result property="plantName" column="factory_name"/>
+        <result property="parentName" column="parent_name"/>
+        <result property="parentMaterialType" column="parent_material_type"/>
     </resultMap>
 
     <sql id="selectBaseBomInfoVo">