chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '견적요청서 vendor_objid numeric -> varchar 로 변경' (#139) from V20260210 into main

Browse Source 
Reviewed-on: #139
This commit was merged in pull request #139.
This commit is contained in:
hjjeong
2026-02-19 11:31:02 +00:00
parent 9d18095cf0 1fd8060fb3
commit 159bde686a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/pms/mapper/salesMng.xml
View File

@@ -3471,7 +3471,7 @@ SELECT
G.STOCK_QTY, G.STOCK_QTY,
G.SHORTAGE_QTY, G.SHORTAGE_QTY,
G.VENDOR AS VENDOR_PM, 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.UNIT_PRICE,
G.TOTAL_PRICE, G.TOTAL_PRICE,
G.CURRENCY, G.CURRENCY,
@@ -3492,7 +3492,7 @@ SELECT
P.WEIGHT, P.WEIGHT,
P.PART_TYPE, P.PART_TYPE,
P.REVISION, P.REVISION,
COALESCE(P.MAKER, G.VENDOR) AS VENDOR, G.VENDOR AS VENDOR,
P.THICKNESS, P.THICKNESS,
P.WIDTH, P.WIDTH,
P.HEIGHT, P.HEIGHT,
@@ -3734,7 +3734,7 @@ SELECT
V.STOCK_QTY, V.STOCK_QTY,
V.SHORTAGE_QTY, V.SHORTAGE_QTY,
V.VENDOR AS VENDOR_PM, 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.UNIT_PRICE,
V.TOTAL_PRICE, V.TOTAL_PRICE,
V.CURRENCY, 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 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 PROJECT_MGMT PM ON PM.OBJID = SRM.PROJECT_NO
LEFT JOIN CONTRACT_MGMT CTM ON CTM.OBJID = PM.CONTRACT_OBJID 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 WHERE 1=1
<if test="SALES_REQUEST_MASTER_OBJID != null and SALES_REQUEST_MASTER_OBJID != ''"> <if test="SALES_REQUEST_MASTER_OBJID != null and SALES_REQUEST_MASTER_OBJID != ''">
AND QRM.SALES_REQUEST_MASTER_OBJID::VARCHAR = #{SALES_REQUEST_MASTER_OBJID} 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 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 PROJECT_MGMT PM ON PM.OBJID = SRM.PROJECT_NO
LEFT JOIN CONTRACT_MGMT CTM ON CTM.OBJID = PM.CONTRACT_OBJID 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 WHERE QRM.OBJID = #{QUOTATION_REQUEST_MASTER_OBJID}::NUMERIC
</select> </select>
@@ -5080,7 +5080,7 @@ ORDER BY V.PATH2
-- 마스터 정보 -- 마스터 정보
QRM.VENDOR_TYPE, QRM.VENDOR_TYPE,
QRM.VENDOR_OBJID, 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 FROM QUOTATION_REQUEST_DETAIL QRD
LEFT JOIN QUOTATION_REQUEST_MASTER QRM ON QRD.QUOTATION_REQUEST_MASTER_OBJID = QRM.OBJID 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 WHERE QRD.QUOTATION_REQUEST_MASTER_OBJID = #{QUOTATION_REQUEST_MASTER_OBJID}::NUMERIC
@@ -5119,7 +5119,7 @@ ORDER BY V.PATH2
#{QUOTATION_REQUEST_NO}, #{QUOTATION_REQUEST_NO},
#{SALES_REQUEST_MASTER_OBJID}::NUMERIC, #{SALES_REQUEST_MASTER_OBJID}::NUMERIC,
#{PROJECT_MGMT_OBJID}::NUMERIC, #{PROJECT_MGMT_OBJID}::NUMERIC,
#{VENDOR_OBJID}::NUMERIC, #{VENDOR_OBJID},
#{VENDOR_TYPE}, #{VENDOR_TYPE},
'create', 'create',
<if test="DUE_DATE != null and DUE_DATE != ''">#{DUE_DATE}::DATE</if> <if test="DUE_DATE != null and DUE_DATE != ''">#{DUE_DATE}::DATE</if>