BOM资料返回数据调整

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Bom.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.document.entities;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import com.usoftchina.saas.document.dto.ProductDTO;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -34,6 +35,36 @@ public class Bom extends CommonBaseEntity implements Serializable {
 
     private String bo_text5;
 
+    private String pr_spec;
+
+    private String pr_brand;
+
+    private String pr_orispeccode;
+
+    public String getPr_spec() {
+        return pr_spec;
+    }
+
+    public void setPr_spec(String pr_spec) {
+        this.pr_spec = pr_spec;
+    }
+
+    public String getPr_brand() {
+        return pr_brand;
+    }
+
+    public void setPr_brand(String pr_brand) {
+        this.pr_brand = pr_brand;
+    }
+
+    public String getPr_orispeccode() {
+        return pr_orispeccode;
+    }
+
+    public void setPr_orispeccode(String pr_orispeccode) {
+        this.pr_orispeccode = pr_orispeccode;
+    }
+
     public Integer getBo_motherid() {
         return bo_motherid;
     }

applications/document/document-server/src/main/resources/mapper/BomDetailMapper.xml

@@ -339,6 +339,6 @@
     WHERE BD_BOMID=#{id}
   </delete>
   <select id="selectByFK" resultMap="BaseResultMap">
-    SELECT * FROM BOMDETAIL LEFT JOIN PRODUCT ON PR_ID=BD_SONID WHERE BD_BOMID = #{id}
+    SELECT * FROM BOMDETAIL LEFT JOIN PRODUCT ON PR_ID=BD_SONID AND BOMDETAIL.COMPANYID=PRODUCT.COMPANYID WHERE BD_BOMID = #{id}
   </select>
 </mapper>

applications/document/document-server/src/main/resources/mapper/BomMapper.xml

@@ -20,6 +20,9 @@
     <result column="bo_text3" property="bo_text3" jdbcType="VARCHAR" />
     <result column="bo_text4" property="bo_text4" jdbcType="VARCHAR" />
     <result column="bo_text5" property="bo_text5" jdbcType="VARCHAR" />
+    <result column="pr_brand" property="pr_brand" jdbcType="VARCHAR" />
+    <result column="pr_spec" property="pr_spec" jdbcType="VARCHAR" />
+    <result column="pr_orispeccode" property="pr_orispeccode" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     bo_id, bo_motherid, bo_mothercode, bo_mothername, bo_version, bo_status, bo_statuscode, 
@@ -258,13 +261,13 @@
       SELECT BO_MOTHERCODE FROM BOM WHERE BO_ID = #{id} and COMPANYID = #{companyId}
   </select>
   <select id="getListData" resultMap="BaseResultMap">
-    SELECT * FROM BOM
+    SELECT * FROM BOM LEFT JOIN PRODUCT ON PR_ID=BO_MOTHERID
     <where>
       <if test="condition!=null">
         ${condition}
       </if>
       <if test="companyId!=null">
-        AND companyId = #{companyId}
+        AND BOM.companyId = #{companyId}
       </if>
     </where>
     ORDER BY BO_ID DESC