yzc 1 سال پیش
والد
کامیت
9dfde7f846
1فایلهای تغییر یافته به همراه2 افزوده شده و 5 حذف شده
  1. 2 5
      hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

+ 2 - 5
hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -26,6 +26,7 @@
     </select>
     <select id="getProfitSettlementHead" resultType="com.fjhx.jxst.entity.statement.bo.SettlementBo">
         SELECT
+            IFNULL( sum( contractClaimAmount ), 0 ) AS contractClaimAmount,
             IFNULL( sum( materialFee ), 0 ) AS materialFee,
             IFNULL( sum( afterSalesFee ), 0 ) AS afterSalesFee,
             IFNULL( sum( trailerFee ), 0 ) AS trailerFee,
@@ -53,11 +54,7 @@
                 FROM
                     bytesailing_wms.stock_journal_details sjd
                         LEFT JOIN bytesailing_wms.stock_journal sj ON sjd.stock_journal_id = sj.id
-                        JOIN bytesailing_wms.stock_wait_details swd ON sjd.business_details_id = swd.id
-                        JOIN bytesailing_wms.stock_wait sw ON swd.stock_wait_id = sw.id
-                        JOIN bytesailing_mes.production_task pt ON sw.business_id = pt.id
-                        JOIN bytesailing_mes.production_plan pp ON pt.production_plan_id = pp.id
-                        JOIN bytesailing_mes.work_order wo ON pp.work_order_id = wo.id
+                        JOIN bytesailing_mes.work_order wo ON sj.work_order_id = wo.id
                         JOIN sales_contract_details scd ON wo.contract_details_id = scd.id
                 WHERE
                     scd.sales_contract_id = sc.id