V20260210 #168

Merged
hjjeong merged 2 commits from V20260210 into main 2026-03-11 10:26:22 +00:00
Showing only changes of commit 6a2a2ef63b - Show all commits

View File

@@ -6695,7 +6695,7 @@ SELECT T.*
WHERE MD2.MBOM_HEADER_OBJID = MH2.OBJID
AND MH2.PROJECT_OBJID = CM.OBJID
AND MD2.STATUS = 'ACTIVE'
AND COALESCE(MD2.PRODUCTION_QTY, 0) > 0
AND COALESCE(MD2.PRODUCTION_QTY, '0')::INTEGER > 0
AND COALESCE(MD2.VENDOR, '') != ''
GROUP BY CASE WHEN COALESCE(MD2.RAW_MATERIAL_PART_NO, '') != ''
THEN MD2.RAW_MATERIAL_PART_NO ELSE MD2.PART_OBJID END
@@ -6711,7 +6711,7 @@ SELECT T.*
WHERE MD2.MBOM_HEADER_OBJID = MH2.OBJID
AND MH2.PROJECT_OBJID = CM.OBJID
AND MD2.STATUS = 'ACTIVE'
AND COALESCE(MD2.PRODUCTION_QTY, 0) > 0
AND COALESCE(MD2.PRODUCTION_QTY, '0')::INTEGER > 0
AND COALESCE(MD2.PROCESSING_VENDOR, '') != ''
GROUP BY MD2.PART_OBJID
,COALESCE(MD2.RAW_MATERIAL_SIZE, '')
@@ -6724,25 +6724,25 @@ SELECT T.*
COALESCE((
SELECT SUM(
CASE WHEN COALESCE(MD2.RAW_MATERIAL_PART_NO, '') != ''
THEN COALESCE(MD2.PO_QTY, 0)::NUMERIC
ELSE COALESCE(MD2.PRODUCTION_QTY, 0)::NUMERIC END)
THEN COALESCE(MD2.PO_QTY, '0')::INTEGER
ELSE COALESCE(MD2.PRODUCTION_QTY, '0')::INTEGER END)
FROM MBOM_HEADER MH2
,MBOM_DETAIL MD2
WHERE MD2.MBOM_HEADER_OBJID = MH2.OBJID
AND MH2.PROJECT_OBJID = CM.OBJID
AND MD2.STATUS = 'ACTIVE'
AND COALESCE(MD2.PRODUCTION_QTY, 0) > 0
AND COALESCE(MD2.PRODUCTION_QTY, '0')::INTEGER > 0
AND COALESCE(MD2.VENDOR, '') != ''
), 0)
+
COALESCE((
SELECT SUM(COALESCE(MD2.PRODUCTION_QTY, 0)::NUMERIC)
SELECT SUM(COALESCE(MD2.PRODUCTION_QTY, '0')::INTEGER)
FROM MBOM_HEADER MH2
,MBOM_DETAIL MD2
WHERE MD2.MBOM_HEADER_OBJID = MH2.OBJID
AND MH2.PROJECT_OBJID = CM.OBJID
AND MD2.STATUS = 'ACTIVE'
AND COALESCE(MD2.PRODUCTION_QTY, 0) > 0
AND COALESCE(MD2.PRODUCTION_QTY, '0')::INTEGER > 0
AND COALESCE(MD2.PROCESSING_VENDOR, '') != ''
), 0)
) AS TOTAL_QTY
@@ -6820,6 +6820,13 @@ SELECT T.*
FROM PROJECT_MGMT CM
WHERE 1=1
AND EXISTS (
SELECT 1 FROM SALES_REQUEST_MASTER SRM
,MBOM_HEADER MH
WHERE SRM.MBOM_HEADER_OBJID = MH.OBJID::VARCHAR
AND MH.PROJECT_OBJID = CM.OBJID
AND SRM.DOC_TYPE = 'PURCHASE_REQUEST'
)
<if test="Year != null and Year != ''">
AND TO_CHAR(CM.REGDATE,'YYYY') = #{Year}
</if>