|
|
@@ -42,37 +42,38 @@
|
|
|
IF(arw.`status` = 10, arw.amount, 0) AS incomeAmount,
|
|
|
IF(arw.`status` = 20, arw.amount, 0) AS expenditureAmount,
|
|
|
arw.account_remainder AS balanceAmount,
|
|
|
- t2.supplier_names AS supplierName,
|
|
|
- t1.customerShortName AS customerShortName,
|
|
|
- t1.contract_codes AS contractCode,
|
|
|
- t2.subject_name AS subjectName,
|
|
|
- t2.calculate_item_type1 AS calculateItemType1,
|
|
|
- t2.calculate_item_type2 AS calculateItemType2,
|
|
|
- t2.calculate_item_name1 AS calculateItemName1,
|
|
|
- t2.calculate_item_name2 AS calculateItemName2,
|
|
|
- t2.opposite_subject_code AS oppositeSubjectCode,
|
|
|
- t2.opposite_subject_name AS oppositeSubjectName,
|
|
|
- t2.calculate_item_str AS calculateItemStr,
|
|
|
- am.jd_subject_code AS bankSubjectCode,
|
|
|
- am.jd_subject_name AS bankSubjectName,
|
|
|
- t2.subject_calculate_item_str AS subjectCalculateItemStr,
|
|
|
- cc.voucher_no AS voucherNo,
|
|
|
- t1.belongType AS belongType
|
|
|
+ t2.supplier_names AS supplierName,
|
|
|
+ t1.customerShortName AS customerShortName,
|
|
|
+ t1.contract_codes AS contractCode,
|
|
|
+ t2.subject_name AS subjectName,
|
|
|
+ t2.calculate_item_type1 AS calculateItemType1,
|
|
|
+ t2.calculate_item_type2 AS calculateItemType2,
|
|
|
+ t2.calculate_item_name1 AS calculateItemName1,
|
|
|
+ t2.calculate_item_name2 AS calculateItemName2,
|
|
|
+ t2.opposite_subject_code AS oppositeSubjectCode,
|
|
|
+ t2.opposite_subject_name AS oppositeSubjectName,
|
|
|
+ t2.calculate_item_str AS calculateItemStr,
|
|
|
+ am.jd_subject_code AS bankSubjectCode,
|
|
|
+ am.jd_subject_name AS bankSubjectName,
|
|
|
+ t2.subject_calculate_item_str AS subjectCalculateItemStr,
|
|
|
+ cc.voucher_no AS voucherNo,
|
|
|
+ t1.belongType AS belongType
|
|
|
FROM account_running_water arw
|
|
|
JOIN account_management am ON arw.account_management_id = am.id
|
|
|
LEFT JOIN cost_control cc ON arw.cost_control_id = cc.id
|
|
|
LEFT JOIN (SELECT cod.cost_control_id,
|
|
|
- GROUP_CONCAT(DISTINCT sui.`name` ) AS supplier_names,
|
|
|
- GROUP_CONCAT(asj.jd_subject_code) AS opposite_subject_code,
|
|
|
- GROUP_CONCAT(asj.jd_subject_name) AS opposite_subject_name,
|
|
|
- GROUP_CONCAT(asj.subjects_name) AS subject_name,
|
|
|
- GROUP_CONCAT(cod.calculate_item_type1) AS calculate_item_type1,
|
|
|
- GROUP_CONCAT(cod.calculate_item_name1) AS calculate_item_name1,
|
|
|
- GROUP_CONCAT(cod.calculate_item_type2) AS calculate_item_type2,
|
|
|
- GROUP_CONCAT(cod.calculate_item_name2) AS calculate_item_name2,
|
|
|
- GROUP_CONCAT(cod.calculate_item_str) AS calculate_item_str,
|
|
|
- GROUP_CONCAT(asj.subjects_name, ' - ' + cod.calculate_item_name1,
|
|
|
- IFNULL(' - ' + cod.calculate_item_name2, '')) AS subject_calculate_item_str
|
|
|
+ GROUP_CONCAT(DISTINCT sui.`name` ) AS supplier_names,
|
|
|
+ GROUP_CONCAT(asj.jd_subject_code) AS opposite_subject_code,
|
|
|
+ GROUP_CONCAT(asj.jd_subject_name) AS opposite_subject_name,
|
|
|
+ GROUP_CONCAT(asj.subjects_name) AS subject_name,
|
|
|
+ GROUP_CONCAT(cod.calculate_item_type1) AS calculate_item_type1,
|
|
|
+ GROUP_CONCAT(cod.calculate_item_name1) AS calculate_item_name1,
|
|
|
+ GROUP_CONCAT(cod.calculate_item_type2) AS calculate_item_type2,
|
|
|
+ GROUP_CONCAT(cod.calculate_item_name2) AS calculate_item_name2,
|
|
|
+ GROUP_CONCAT(cod.calculate_item_str) AS calculate_item_str,
|
|
|
+ GROUP_CONCAT(asj.subjects_name, CONCAT(' - ', cod.calculate_item_name1),
|
|
|
+ IF(cod.calculate_item_name2 is null, '',
|
|
|
+ CONCAT(' - ', cod.calculate_item_name2))) AS subject_calculate_item_str
|
|
|
FROM cost_control_detail cod
|
|
|
LEFT JOIN supplier_info sui ON cod.supplier_id = sui.id
|
|
|
LEFT JOIN account_subjects asj ON cod.account_subjects_id = asj.id
|
yzc