Merge pull request '[1379] 견적서 주소 조건 재수정' (#429) from feature/1379 into dev

Reviewed-on: #429
This commit is contained in:
ysCha 2026-03-17 13:25:24 +09:00
commit fb43564aa9

View File

@ -95,10 +95,35 @@
T.* T.*
, SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME
, COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME
<if test='saleStoreId != null and saleStoreId != "T01"'>
, COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO
, COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS
, COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL
, COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX
</if>
<if test='saleStoreId != null and saleStoreId == "T01"'>
, ISNULL((SELECT
SUBSTRING(MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3) + 1,
CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) - CHARINDEX('〒', MCL.REF_CHR3) - 1)
FROM M_COMM_L MCL
WHERE MCL.HEAD_CD = '103200'
AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ZIP_NO
, ISNULL((SELECT
LTRIM(SUBSTRING(MCL.REF_CHR3,
CHARINDEX(')', MCL.REF_CHR3, CHARINDEX('〒', MCL.REF_CHR3)) + 1,
LEN(MCL.REF_CHR3)))
FROM M_COMM_L MCL
WHERE MCL.HEAD_CD = '103200'
AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS ADDRESS
, ISNULL((SELECT MCL.REF_CHR4
FROM M_COMM_L MCL
WHERE MCL.HEAD_CD = '103200'
AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS TEL
, ISNULL((SELECT MCL.REF_CHR5
FROM M_COMM_L MCL
WHERE MCL.HEAD_CD = '103200'
AND MCL.CODE = T.BUSINESS_TEAM_CD), '') AS FAX
</if>
, SSI2.BIZ_NO , SSI2.BIZ_NO
FROM FROM
( (
@ -117,6 +142,14 @@
, O.OBJECT_NAME , O.OBJECT_NAME
, O.OBJECT_NAME_OMIT , O.OBJECT_NAME_OMIT
, (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID , (SELECT SALE_STORE_ID FROM M_USER WHERE USER_ID = OI.CREATE_USER) AS CREATE_SALE_STORE_ID
<if test='saleStoreId != null and saleStoreId == "T01"'>
, (SELECT BC.BUSINESS_TEAM_CD
FROM M_SALES_STORE SS WITH (NOLOCK)
INNER JOIN M_BUSINESS_CHARGER BC WITH (NOLOCK)
ON SS.BUSINESS_CHARGER_CD = BC.BUSINESS_CHARGER_CD
WHERE SS.SALE_STORE_ID = O.SALE_STORE_ID
) AS BUSINESS_TEAM_CD
</if>
, ISNULL(MP.PREF_NAME, '') AS PREF_NAME , ISNULL(MP.PREF_NAME, '') AS PREF_NAME
, ISNULL(MPA.AREA_NAME, '') AS AREA_NAME , ISNULL(MPA.AREA_NAME, '') AS AREA_NAME
, ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME , ISNULL(C1.CODE_NM, '') AS STANDARD_WIND_SPEED_NAME