销售单关联物料

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/SaleDetailDTO.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.sale.dto;
 
 import com.usoftchina.saas.base.dto.CommonBaseDTO;
 
+import com.usoftchina.saas.document.dto.ProductDTO;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -54,4 +55,6 @@ public class SaleDetailDTO extends CommonBaseDTO implements Serializable {
     private String sd_text4;
 
     private String sd_text5;
+
+    private ProductDTO productDTO;
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleDetail.java

@@ -1,6 +1,8 @@
 package com.usoftchina.saas.sale.po;
 
 import com.usoftchina.saas.base.entity.CommonBaseEntity;
+import com.usoftchina.saas.document.dto.ProductDTO;
+import com.usoftchina.saas.document.entities.Product;
 import lombok.Data;
 
 import java.util.Date;
@@ -52,4 +54,6 @@ public class SaleDetail extends CommonBaseEntity{
     private String sd_text4;
 
     private String sd_text5;
+
+    private ProductDTO productDTO;
 }

applications/sale/sale-server/src/main/resources/application.yml

@@ -47,7 +47,7 @@ eureka:
     serviceUrl:
       defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
-  port: 8900
+  port: 8820
   tomcat:
     uri-encoding: UTF-8
 info:

applications/sale/sale-server/src/main/resources/mapper/SaledetailMapper.xml

@@ -25,6 +25,36 @@
     <result column="sd_text3" property="sd_text3" jdbcType="VARCHAR" />
     <result column="sd_text4" property="sd_text4" jdbcType="VARCHAR" />
     <result column="sd_text5" property="sd_text5" jdbcType="VARCHAR" />
+    <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
+      <id column="pr_id" property="id"/>
+      <result column="pr_code" property="pr_code"/>
+      <result column="pr_detail" property="pr_detail"/>
+      <result column="pr_spec" property="pr_spec"/>
+      <result column="pr_unit" property="pr_unit"/>
+      <result column="pr_kind" property="pr_kind"/>
+      <result column="pr_orispeccode" property="pr_orispeccode"/>
+      <result column="pr_whid" property="pr_whid"/>
+      <result column="pr_whcode" property="pr_whcode"/>
+      <result column="pr_whname" property="pr_whname"/>
+      <result column="pr_zxbzs" property="pr_zxbzs"/>
+      <result column="pr_leadtime" property="pr_leadtime"/>
+      <result column="pr_brand" property="pr_brand"/>
+      <result column="pr_standardprice" property="pr_standardprice"/>
+      <result column="pr_purcprice" property="pr_purcprice"/>
+      <result column="pr_saleprice" property="pr_saleprice"/>
+      <result column="pr_vendid" property="pr_vendid"/>
+      <result column="pr_vendname" property="pr_vendname"/>
+      <result column="pr_vendcode" property="pr_vendcode"/>
+      <result column="pr_docdate" property="pr_docdate"/>
+      <result column="pr_recordmanid" property="pr_recordmanid"/>
+      <result column="pr_recordman" property="pr_recordman"/>
+      <result column="pr_status" property="pr_status"/>
+      <result column="pr_statuscode" property="pr_statuscode"/>
+      <result column="pr_text1" property="pr_text1"/>
+      <result column="pr_text2" property="pr_text2"/>
+      <result column="pr_text3" property="pr_text3"/>
+      <result column="pr_text4" property="pr_text4"/>
+    </association>
   </resultMap>
   <sql id="Base_Column_List" >
     sd_id, sd_said, sd_detno, sd_prodid, sd_prodcode, sd_qty, sd_price, sd_total, sd_taxrate, 
@@ -336,7 +366,7 @@
   </delete>
 
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
-    select * from saledetail
+    select * from saledetail a left join product b on a.companyid=b.companyid and a.sd_prodid=b.pr_id
     where sd_said=#{id} order by sd_detno
   </select>
 </mapper>