diff --git a/src/com/pms/mapper/salesMng.xml b/src/com/pms/mapper/salesMng.xml index 91adefd..b79cb49 100644 --- a/src/com/pms/mapper/salesMng.xml +++ b/src/com/pms/mapper/salesMng.xml @@ -3471,7 +3471,7 @@ SELECT G.STOCK_QTY, G.SHORTAGE_QTY, G.VENDOR AS VENDOR_PM, - (SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE OBJID::VARCHAR = G.VENDOR) AS VENDOR_NAME, + (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = G.VENDOR) AS VENDOR_NAME, G.UNIT_PRICE, G.TOTAL_PRICE, G.CURRENCY, @@ -3492,7 +3492,7 @@ SELECT P.WEIGHT, P.PART_TYPE, P.REVISION, - COALESCE(P.MAKER, G.VENDOR) AS VENDOR, + G.VENDOR AS VENDOR, P.THICKNESS, P.WIDTH, P.HEIGHT, @@ -3734,7 +3734,7 @@ SELECT V.STOCK_QTY, V.SHORTAGE_QTY, V.VENDOR AS VENDOR_PM, - (SELECT SUPPLY_NAME FROM ADMIN_SUPPLY_MNG WHERE OBJID::VARCHAR = V.VENDOR) AS VENDOR_NAME, + (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = V.VENDOR) AS VENDOR_NAME, V.UNIT_PRICE, V.TOTAL_PRICE, V.CURRENCY, @@ -4973,7 +4973,7 @@ ORDER BY V.PATH2 LEFT JOIN SALES_REQUEST_MASTER SRM ON QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = SRM.OBJID::VARCHAR LEFT JOIN PROJECT_MGMT PM ON PM.OBJID = SRM.PROJECT_NO LEFT JOIN CONTRACT_MGMT CTM ON CTM.OBJID = PM.CONTRACT_OBJID - LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID::VARCHAR = CM.OBJID::VARCHAR + LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID = CM.OBJID::VARCHAR WHERE 1=1 AND QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = #{SALES_REQUEST_MASTER_OBJID} @@ -5057,7 +5057,7 @@ ORDER BY V.PATH2 LEFT JOIN SALES_REQUEST_MASTER SRM ON QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = SRM.OBJID::VARCHAR LEFT JOIN PROJECT_MGMT PM ON PM.OBJID = SRM.PROJECT_NO LEFT JOIN CONTRACT_MGMT CTM ON CTM.OBJID = PM.CONTRACT_OBJID - LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID::VARCHAR = CM.OBJID::VARCHAR + LEFT JOIN CLIENT_MNG CM ON QRM.VENDOR_OBJID = CM.OBJID::VARCHAR WHERE QRM.OBJID = #{QUOTATION_REQUEST_MASTER_OBJID}::NUMERIC @@ -5080,7 +5080,7 @@ ORDER BY V.PATH2 -- 마스터 정보 QRM.VENDOR_TYPE, QRM.VENDOR_OBJID, - (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = QRM.VENDOR_OBJID::VARCHAR) AS VENDOR_NAME + (SELECT CLIENT_NM FROM CLIENT_MNG WHERE OBJID::VARCHAR = QRM.VENDOR_OBJID) AS VENDOR_NAME FROM QUOTATION_REQUEST_DETAIL QRD LEFT JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID WHERE QRD.QUOTATION_REQUEST_MASTER_OBJID = #{QUOTATION_REQUEST_MASTER_OBJID}::NUMERIC @@ -5119,7 +5119,7 @@ ORDER BY V.PATH2 #{QUOTATION_REQUEST_NO}, #{SALES_REQUEST_MASTER_OBJID}::NUMERIC, #{PROJECT_MGMT_OBJID}::NUMERIC, - #{VENDOR_OBJID}::NUMERIC, + #{VENDOR_OBJID}, #{VENDOR_TYPE}, 'create', #{DUE_DATE}::DATE