qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into feature/ysCha

Browse Source 
# Conflicts:
#	src/main/resources/mappers/estimate/estimateMapper.xml
This commit is contained in:
ysCha 2026-01-05 11:30:47 +09:00
commit 1a2963cd91
1 changed files with 957 additions and 961 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/mappers/estimate/estimateMapper.xml
View File

@ -193,7 +193,9 @@
ON O.OBJECT_NO = OI.OBJECT_NO
INNER JOIN M_SALES_STORE SS WITH(NOLOCK)
ON O.SALE_STORE_ID = SS.SALE_STORE_ID
WHERE PI.SYNC_FLG = '0'
WHERE P.DEL_FLG = '0'
AND PI.TEMP_FLG = '0'
AND PI.SYNC_FLG = '0'
AND OI.SOURCE_ORIGIN = 'QCAST_III'
AND OI.ORG_DEL_FLG = '0'
</select>
@ -389,13 +391,7 @@
FROM T_PART_ROOF_ITEM_ESTIMATE (NOLOCK)
WHERE OBJECT_NO = PE.OBJECT_NO
AND PLAN_NO = PE.PLAN_NO
-- AND ISNULL(NULLIF(QCAST_CUST_PRD_ID, ''), PC_ITEM_ID) = PE.ITEM_ID
AND (
(QCAST_CUST_PRD_ID IS NOT NULL AND QCAST_CUST_PRD_ID = PC_ITEM_ID AND ISNULL(QCAST_CUST_PRD_ID, '') = PE.ITEM_ID)
OR
(QCAST_CUST_PRD_ID IS NULL AND PC_ITEM_ID = PE.ITEM_ID)
OR
(QCAST_CUST_PRD_ID IS NOT NULL AND QCAST_CUST_PRD_ID != PC_ITEM_ID)
AND ISNULL(NULLIF(QCAST_CUST_PRD_ID, ''), PC_ITEM_ID) = PE.ITEM_ID
), 0) AS MODULE_VOL_KW
FROM T_PLAN P WITH (NOLOCK)
INNER JOIN T_PART_ESTIMATE PE WITH (NOLOCK)