diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index b0ed5ca7..9eb43eb4 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1243,8 +1243,6 @@ public class EstimateService { if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) { estimateRequest.setFileName( estimateResponse.getObjectNo() - + "_" - + estimateResponse.getObjectName() + "_" + new SimpleDateFormat("yyyyMMdd").format(new Date())); } diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index b1aa420e..68adf78a 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -162,10 +162,12 @@ , (SELECT CODE FROM M_COMM_L WHERE HEAD_CD = '200800' AND CODE_NM = O.OBJECT_NAME_OMIT) AS OBJECT_NAME_OMIT_CD FROM T_PLAN P WITH (NOLOCK) INNER JOIN T_OBJECT O WITH (NOLOCK) - ON P.OBJECT_NO = O.OBJECT_NO - INNER JOIN M_SALES_STORE SS WITH(NOLOCK) - ON O.SALE_STORE_ID = SS.SALE_STORE_ID + ON P.OBJECT_NO = O.OBJECT_NO + INNER JOIN M_SALES_STORE SS WITH(NOLOCK) + ON O.SALE_STORE_ID = SS.SALE_STORE_ID WHERE P.SYNC_FLG = '0' + AND O.SOURCE_ORIGIN = 'QCAST_III' + AND O.ORG_DEL_FLG = '0'