rainco пре 7 година
родитељ
комит
026a8296d5

+ 4 - 0
applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/report/PurchaseReportDetail.java

@@ -97,6 +97,10 @@ public class PurchaseReportDetail extends CommonBaseEntity implements Serializab
 
     private Double pd_acceptqty;
 
+    private Double pd_pdacceptqty;
+
+    private Double pd_pdaccepttotal;
+
     private Date pd_delivery;
 
     private String pd_salecode;

+ 3 - 1
applications/purchase/purchase-server/src/main/resources/mapper/PurchaseReportMapper.xml

@@ -60,6 +60,8 @@
     <result column="PD_TOTAL" property="pd_total" jdbcType="DOUBLE" />
     <result column="PD_TAXTOTAL" property="pd_taxtotal" jdbcType="DOUBLE" />
     <result column="PD_ACCEPTQTY" property="pd_acceptqty" jdbcType="DOUBLE" />
+    <result column="pd_pdacceptqty" property="pd_pdacceptqty" jdbcType="DOUBLE" />
+    <result column="pd_pdaccepttotal" property="pd_pdaccepttotal" jdbcType="DOUBLE" />
     <result column="PD_DELIVERY" property="pd_delivery" jdbcType="TIMESTAMP" />
     <result column="PD_SALECODE" property="pd_salecode" jdbcType="VARCHAR" />
     <result column="PD_SALEDETNO" property="pd_saledetno" jdbcType="INTEGER" />
@@ -112,7 +114,7 @@
   </select>
 
   <select id="selectDetailByCondition"  resultMap="ListMap">
-    select  *,ifnull(purchasedetail.PD_ACCEPTQTY,0)*ifnull(purchasedetail.PD_PRICE,0) pd_accepttotal  from purchase left join purchasedetail on pu_id=pd_puid
+    select  * from purchase left join purchasedetail on pu_id=pd_puid
     left join product on pd_prodid=pr_id
     <where>
       <if test="con != null">