Merge pull request 'dev' (#289) from dev into dev-deploy

Reviewed-on: #289

src/main/resources/mappers/estimate/estimateMapper.xml

@@ -193,9 +193,7 @@
             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 P.DEL_FLG = '0'
-          AND PI.TEMP_FLG = '0'
-          AND PI.SYNC_FLG = '0'
+        WHERE PI.SYNC_FLG = '0'
             AND OI.SOURCE_ORIGIN = 'QCAST_III'
             AND OI.ORG_DEL_FLG = '0'
     </select>
@@ -391,7 +389,13 @@
                     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 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 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)