zhangyuewww 2 éve
szülő
commit
6a994a09aa

+ 39 - 12
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -427,25 +427,52 @@
         m.signing_date as signingDate,
         m.status,
         '' as surplus,
-        IFNULL(SUM( exi.amount_money )- SUM(ssrr.settlement_weight* wo.avg_cost)- SUM( exi2.unallocated_amount ) ,0)AS profit,
-        m.approve_status as approveStatus,
-        m.agreement_type as agreementType
-        FROM contract_management_info m
-        LEFT JOIN expense_info exi ON exi.contract_id = m.id
+        (
+        SELECT
+        SUM( exi.amount_money )
+        FROM
+        expense_info exi
+        WHERE
+        exi.contract_id = m.id
         AND exi.expenses_type = '1'
         AND exi.expenses_purpose = '1'
         AND exi.delete_flag = '0'
+        ) - (
+        SELECT
+        SUM( ssrr.settlement_weight * wo.avg_cost )
+        FROM
+        contract_management_info cmi
+        LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = cmi.contract_no
+        AND ssrr.delete_flag = 0
+        LEFT JOIN warehouse_in_out_info wioi ON wioi.id = ssrr.warehouse_record_id
+        AND wioi.delete_flag = '0'
+        LEFT JOIN in_out_warehouse_task iowt ON iowt.in_out_task_no = wioi.in_out_task_no
+        AND iowt.delete_flag = '0'
+        LEFT JOIN source_relation_info sri ON sri.task_id = iowt.id
+        AND sri.delete_flag = '0'
+        LEFT JOIN warehousing_order wo ON wo.id = sri.source_id
+        AND wo.delete_flag = '0'
+        WHERE
+        cmi.id = m.id
+        ) - IFNULL( SUM( exi2.amount_money ), 0 ) AS profit,
+        m.approve_status as approveStatus,
+        m.agreement_type as agreementType
+        FROM contract_management_info m
+--         LEFT JOIN expense_info exi ON exi.contract_id = m.id
+--         AND exi.expenses_type = '1'
+--         AND exi.expenses_purpose = '1'
+--         AND exi.delete_flag = '0'
         LEFT JOIN expense_info exi2 ON exi2.contract_id = m.id
         AND exi2.expenses_type = '2'
         AND exi2.expenses_purpose = '1'
         AND exi2.delete_flag = '0'
-        LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = m.contract_no
-        and ssrr.delete_flag = 0
-        LEFT JOIN warehouse_in_out_info wioi ON wioi.id = ssrr.warehouse_record_id
-        AND wioi.delete_flag = '0'
-        LEFT JOIN in_out_warehouse_task iowt ON iowt.in_out_task_no=wioi.in_out_task_no and iowt.delete_flag='0'
-        LEFT JOIN source_relation_info sri on sri.task_id=iowt.id and sri.delete_flag='0'
-        LEFT JOIN warehousing_order wo on wo.id=sri.source_id and wo.delete_flag='0'
+--         LEFT JOIN stock_sale_receipt_report ssrr ON ssrr.contract_no = m.contract_no
+--         and ssrr.delete_flag = 0
+--         LEFT JOIN warehouse_in_out_info wioi ON wioi.id = ssrr.warehouse_record_id
+--         AND wioi.delete_flag = '0'
+--         LEFT JOIN in_out_warehouse_task iowt ON iowt.in_out_task_no=wioi.in_out_task_no and iowt.delete_flag='0'
+--         LEFT JOIN source_relation_info sri on sri.task_id=iowt.id and sri.delete_flag='0'
+--         LEFT JOIN warehousing_order wo on wo.id=sri.source_id and wo.delete_flag='0'
         WHERE
         m.comp_id = #{compId}
         AND m.delete_flag = '0'