采购验退列表，关联采购验收

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java

@@ -173,4 +173,8 @@ public class ProdInOutList extends CommonBaseEntity{
     private String pr_text3;
     private String pr_text4;
 
+    //关联验收
+    private String iocode;
+
+    private Integer iodetno;
 }

applications/purchase/purchase-server/src/main/resources/mapper/ProdInOutListMapper.xml

@@ -100,6 +100,8 @@
     <result column="pr_text2" property="pr_text2"/>
     <result column="pr_text3" property="pr_text3"/>
     <result column="pr_text4" property="pr_text4"/>
+    <result column="iocode" jdbcType="VARCHAR" property="iocode" />
+    <result column="iodetno" jdbcType="INTEGER" property="iodetno" />
   </resultMap>
 
   <resultMap id="homePageList" type="com.usoftchina.saas.purchase.po.ProdHomePageList">
@@ -231,10 +233,37 @@
     </where>
     order by pi_id desc,pd_pdno desc
   </select>
-
+  <sql id="Prodinout_Column_List" >
+    prodinout.pi_id pi_id,prodinout.pi_inoutno pi_inoutno,prodinout.pi_class pi_class,prodinout.pi_date pi_date,prodinout.pi_vendid pi_vendid,prodinout.pi_vendcode pi_vendcode,prodinout.pi_vendname pi_vendname,prodinout.pi_custid pi_custid,prodinout.pi_custcode pi_custcode,prodinout.pi_custname pi_custname,prodinout.pi_puid pi_puid,prodinout.pi_pucode pi_pucode,prodinout.pi_said pi_said,prodinout.pi_sacode pi_sacode,prodinout.pi_total pi_total,prodinout.pi_address pi_address,prodinout.pi_ioid pi_ioid,prodinout.pi_status pi_status,prodinout.pi_statuscode pi_statuscode,prodinout.pi_printstatus pi_printstatus,prodinout.pi_printstatuscode pi_printstatuscode,prodinout.companyid companyid,prodinout.updaterId updaterId,prodinout.updatetime updatetime,prodinout.pi_text1 pi_text1,prodinout.pi_text2 pi_text2,prodinout.pi_text3 pi_text3,prodinout.pi_text4 pi_text4,prodinout.pi_text5 pi_text5,prodinout.pi_nettotal pi_nettotal,prodinout.pi_auditdate pi_auditdate,prodinout.pi_auditman pi_auditman,prodinout.pi_remark pi_remark,
+prodinout.creatorName creatorName,prodinout.creatorId creatorId,prodinout.createTime createTime,prodinout.updaterName updaterName,prodinout.pi_macode pi_macode,prodinout.pi_maid pi_maid,prodinout.pi_prstatuscode pi_prstatuscode,prodinout.pi_prstatus pi_prstatus,prodinout.pi_iocode pi_iocode,
+  </sql>
+  <sql id="Prodiodetail_Column_List" >
+    prodiodetail.pd_id pd_id,prodiodetail.pd_piid pd_piid,prodiodetail.pd_inoutno pd_inoutno,prodiodetail.pd_piclass pd_piclass,prodiodetail.pd_pdno pd_pdno,prodiodetail.pd_ordercode pd_ordercode,prodiodetail.pd_orderdetno pd_orderdetno,prodiodetail.pd_prodid pd_prodid,prodiodetail.pd_prodcode pd_prodcode,prodiodetail.pd_unit pd_unit,prodiodetail.pd_inqty pd_inqty,prodiodetail.pd_outqty pd_outqty,prodiodetail.pd_orderprice pd_orderprice,prodiodetail.pd_sendprice pd_sendprice,prodiodetail.pd_price pd_price,prodiodetail.pd_total pd_total,prodiodetail.pd_taxrate pd_taxrate,prodiodetail.pd_netprice pd_netprice,prodiodetail.pd_nettotal pd_nettotal,prodiodetail.pd_whid pd_whid,prodiodetail.pd_whcode pd_whcode,prodiodetail.pd_whname pd_whname,prodiodetail.pd_inwhid pd_inwhid,prodiodetail.pd_inwhcode pd_inwhcode,prodiodetail.pd_inwhname pd_inwhname,prodiodetail.pd_orderid pd_orderid,prodiodetail.pd_sdid pd_sdid,prodiodetail.pd_status pd_status,prodiodetail.pd_remark pd_remark,prodiodetail.pd_text1 pd_text1,prodiodetail.pd_text2 pd_text2,prodiodetail.pd_text3 pd_text3,
+    prodiodetail.pd_text4 pd_text4,prodiodetail.pd_text5 pd_text5,prodiodetail.pd_ym pd_ym,prodiodetail.pd_yqty pd_yqty,prodiodetail.pd_ioid pd_ioid,prodiodetail.pd_ordertotal pd_ordertotal
+    ,prodiodetail.pd_profit pd_profit,
+    prodiodetail.pd_profitpresent pd_profitpresent,
+  </sql>
+  <sql id="Vendor_Column_List" >
+    vendor.ve_id ve_id,vendor.ve_code ve_code,vendor.ve_shortname ve_shortname,vendor.ve_name ve_name,vendor.ve_uu ve_uu,vendor.ve_type ve_type,vendor.ve_begindate ve_begindate,vendor.ve_beginapamount ve_beginapamount,vendor.ve_beginprepayamount ve_beginprepayamount,vendor.ve_promisedays ve_promisedays,vendor.ve_taxrate ve_taxrate,vendor.ve_nsrzh ve_nsrzh,vendor.ve_bankaccount ve_bankaccount,vendor.ve_bankcode ve_bankcode,vendor.ve_status ve_status,vendor.ve_statuscode ve_statuscode,vendor.ve_text1 ve_text1,vendor.ve_text2 ve_text2,vendor.ve_text3 ve_text3,vendor.ve_text4 ve_text4,vendor.ve_text5 ve_text5,vendor.ve_payamount ve_payamount,vendor.ve_leftamount ve_leftamount,vendor.ve_beginym ve_beginym,vendor.ve_preamount ve_preamount,vendor.ve_remark ve_remark,vendor.ve_buyerid ve_buyerid,vendor.ve_buyercode ve_buyercode,vendor.ve_buyername ve_buyername,
+  </sql>
+  <sql id="Product_Column_List" >
+    product.pr_id pr_id,product.pr_code pr_code,product.pr_detail pr_detail,product.pr_spec pr_spec,product.pr_unit pr_unit,product.pr_kind pr_kind,product.pr_orispeccode pr_orispeccode,product.pr_whid pr_whid,product.pr_whcode pr_whcode,product.pr_whname pr_whname,product.pr_zxbzs pr_zxbzs,product.pr_leadtime pr_leadtime,product.pr_brand pr_brand,product.pr_standardprice pr_standardprice,product.pr_purcprice pr_purcprice,product.pr_saleprice pr_saleprice,product.pr_vendid pr_vendid,product.pr_vendcode pr_vendcode,product.pr_vendname pr_vendname,product.pr_status pr_status,product.pr_statuscode pr_statuscode,product.pr_text1 pr_text1,product.pr_text2 pr_text2,product.pr_text3 pr_text3,product.pr_text4 pr_text4,product.pr_text5 pr_text5,
+  </sql>
+  <sql id="Iopd_Column_List" >
+    iopd.pd_inoutno iocode,iopd.pd_pdno iodetno
+  </sql>
   <select id="selectProdInOutListByCondition"  resultMap="BaseResultMap">
-    select  *  from prodinout left join prodiodetail on pi_id = pd_piid left join vendor on pi_vendid=ve_id
-    left join product on pd_prodid=pr_id
+    select
+    <include refid="Prodinout_Column_List" />
+    <include refid="Prodiodetail_Column_List" />
+    <include refid="Vendor_Column_List" />
+    <include refid="Product_Column_List" />
+    <include refid="Iopd_Column_List" />
+    from prodinout
+    left join prodiodetail on pi_id = prodiodetail.pd_piid
+    left join vendor on pi_vendid=ve_id
+    left join product on prodiodetail.pd_prodid=pr_id
+    left join prodiodetail iopd on iopd.pd_id = prodiodetail.pd_ioid
     <where>
       <if test="con != null">
         ${con}
@@ -243,6 +272,6 @@
         and  prodinout.companyid = #{companyId}
       </if>
     </where>
-    order by pi_id desc,pd_pdno desc
+    order by pi_id desc,prodiodetail.pd_pdno asc
   </select>
 </mapper>