Merge branch 'dev' into 0623_fetch

This commit is contained in:
주수현
2025-06-30 11:38:30 +09:00
7 changed files with 22 additions and 22 deletions

View File

@@ -22,7 +22,7 @@
bat.source_purpose AS sourcePurpose, /* 수입원 */
bat.count, /* 수량 */
CASE
WHEN ui_unit.id = 'code.record.unit.self'
WHEN ui_unit.id = 'code.count.unit.self'
THEN bat.unit
ELSE ui_unit.code_text
END AS unitText, /* 단위 */
@@ -33,7 +33,7 @@
AND ui_crop.id = bat.crop_code
AND ui_crop.is_deleted = false
LEFT JOIN uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit'
ON ui_unit.parent_id = 'code.count.unit'
AND ui_unit.id = bat.unit_code
AND ui_unit.is_deleted = false
LEFT JOIN uicode ui_category
@@ -59,7 +59,7 @@
bat.source_purpose AS sourcePurpose, /* 용도 */
bat.count, /* 수량 */
CASE
WHEN ui_unit.id = 'code.record.unit.self'
WHEN ui_unit.id = 'code.count.unit.self'
THEN bat.unit
ELSE ui_unit.code_text
END AS unitText, /* 단위 */
@@ -67,7 +67,7 @@
FROM bank_auto_transfer bat
LEFT JOIN
uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit'
ON ui_unit.parent_id = 'code.count.unit'
AND ui_unit.id = bat.unit_code
AND ui_unit.is_deleted = false
LEFT JOIN