diff --git a/src/docs/mapper-examples/awms/fmp/cdm.xml b/src/docs/mapper-examples/awms/fmp/cdm.xml
index 2083baa..ce0b4f5 100644
--- a/src/docs/mapper-examples/awms/fmp/cdm.xml
+++ b/src/docs/mapper-examples/awms/fmp/cdm.xml
@@ -255,7 +255,7 @@
/* 공통 첨부파일상세 송신 */
SELECT ATCH_FILE_ID, FILE_SN, FILE_STRE_COURS, STRE_FILE_NM, ORIGN_FILE_NM, FILE_EXTSN, FILE_CN, FILE_SIZE, FILE_TYPE, DEL_YN, IMAGE_WIDTH, IMAGE_HEIGHT, FILE_IMSI, MOD_ID, MOD_DATE, REG_ID, REG_DATE
FROM (
- SELECT ATCH_FILE_ID, FILE_SN, FILE_STRE_COURS, STRE_FILE_NM, ORIGN_FILE_NM, FILE_EXTSN, FILE_CN, FILE_SIZE, FILE_TYPE, DEL_YN, IMAGE_WIDTH, IMAGE_HEIGHT, FILE_IMSI, MOD_ID, TO_CHAR(MOD_DATE, 'YYYYMMDDHH24MISS') AS MOD_DATE, REG_ID, TO_CHAR(REG_DATE, 'YYYYMMDDHH24MISS') AS REG_DATE
+ SELECT ATCH_FILE_ID, FILE_SN, FILE_STRE_COURS, STRE_FILE_NM, ORIGN_FILE_NM, FILE_EXTSN, FILE_CN, FILE_SIZE, FILE_TYPE, DEL_YN, IMAGE_WIDTH, IMAGE_HEIGHT, 'Y' AS FILE_IMSI, MOD_ID, TO_CHAR(MOD_DATE, 'YYYYMMDDHH24MISS') AS MOD_DATE, REG_ID, TO_CHAR(REG_DATE, 'YYYYMMDDHH24MISS') AS REG_DATE
, ROW_NUMBER() OVER (ORDER BY ATCH_FILE_ID, FILE_SN) AS R_NUM
FROM TM_ATCH_FILE_DETAIL
WHERE 1 = 1
diff --git a/src/docs/mapper-examples/awms/fmp/mei.xml b/src/docs/mapper-examples/awms/fmp/mei.xml
index c36fdb4..3d06a54 100644
--- a/src/docs/mapper-examples/awms/fmp/mei.xml
+++ b/src/docs/mapper-examples/awms/fmp/mei.xml
@@ -178,7 +178,8 @@
, ADD_COL1, ADD_COL2, ADD_COL3, ADD_COL4, ADD_COL5, ADD_COL6, ADD_COL7, ADD_COL8, ADD_COL9, ADD_COL10
, INSTANT_KEY, INSERT_DTTM, INSERT_ID, INSERT_IP, INSERT_PGM
, UPDATE_DTTM, UPDATE_ID, UPDATE_IP, UPDATE_PGM
- , DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2
+ , DEPT1
+ , DEPT2, KDN_DEPT1, KDN_DEPT2
, BLON_CL_CD
, EMP_CL_CD, INLN_BUPE_ID
, SBCN_BUPE_ID
@@ -190,7 +191,11 @@
, NULL, #{BLON_CO_CL_CD}, #{WORK_DIV}, NULL, NULL, NULL, NULL, NULL, NULL, NULL
, NULL, DECODE(#{REG_DATE}, NULL, NULL, TO_DATETIME(#{REG_DATE}, 'YYYYMMDDHH24MISS')), DECODE(#{REG_ID}, NULL, NULL, #{REG_ID}), NULL, NULL
, DECODE(#{MOD_DATE}, NULL, NULL, TO_DATETIME(#{MOD_DATE}, 'YYYYMMDDHH24MISS')), DECODE(#{MOD_ID}, NULL, NULL, #{MOD_ID}), NULL, NULL
- , (SELECT MAX(DEPT1) AS DEPT1 FROM TM_KDN_DEPT WHERE KDN_DEPT1 = #{KDN_DEPT1}), NULL, #{KDN_DEPT1}, #{KDN_DEPT2}
+ , CASE
+ WHEN #{KDN_DEPT1} = '721A' THEN (SELECT MAX(DEPT1) AS DEPT1 FROM TM_KDN_DEPT WHERE KDN_DEPT1 = #{KDN_DEPT1} AND KDN_DEPT2 = #{KDN_DEPT2})
+ ELSE (SELECT MAX(DEPT1) AS DEPT1 FROM TM_KDN_DEPT WHERE KDN_DEPT1 = #{KDN_DEPT1})
+ END
+ , NULL, #{KDN_DEPT1}, #{KDN_DEPT2}
, CASE WHEN #{BLON_CO_CL_CD} = '10' AND #{WORK_DIV} = '1' THEN '20'
WHEN #{BLON_CO_CL_CD} = '20' AND #{WORK_DIV} = '1' THEN '40'
WHEN #{BLON_CO_CL_CD} = '10' AND #{WORK_DIV} = '2' THEN '20'
@@ -205,7 +210,10 @@
, USE_YN = #{USE_YN}
, ADD_COL2 = #{BLON_CO_CL_CD}
, ADD_COL3 = #{WORK_DIV}
- , DEPT1 = (SELECT MAX(DEPT1) AS DEPT1 FROM TM_KDN_DEPT WHERE KDN_DEPT1 = #{KDN_DEPT1})
+ , DEPT1 = CASE
+ WHEN #{KDN_DEPT1} = '721A' THEN (SELECT MAX(DEPT1) AS DEPT1 FROM TM_KDN_DEPT WHERE KDN_DEPT1 = #{KDN_DEPT1} AND KDN_DEPT2 = #{KDN_DEPT2})
+ ELSE (SELECT MAX(DEPT1) AS DEPT1 FROM TM_KDN_DEPT WHERE KDN_DEPT1 = #{KDN_DEPT1})
+ END
, KDN_DEPT1 = #{KDN_DEPT1}
, KDN_DEPT2 = #{KDN_DEPT2}
, BLON_CL_CD = CASE WHEN #{BLON_CO_CL_CD} = '10' AND #{WORK_DIV} = '1' THEN '20'
@@ -219,12 +227,12 @@
, UPDATE_ID = DECODE(#{MOD_ID}, NULL, NULL, #{MOD_ID})
;
/* KDN 외 KDN 일용직 유지보수 담당자 */
- /* 유지관리 U0001, 자재관리 U0004, 검침관리 U0005, 지역관리 U0006, 커뮤니티 U0009 */
+ /* 유지관리 U0001, AMI공사관리 U0002, 자재관리 U0004, 검침관리 U0005, 지역관리 U0006, 커뮤니티 U0009 */
MERGE INTO SMN_USER_AUTH T
USING (
SELECT #{ID} AS USER_ID, AUTH_CD
FROM SMN_AUTH
- WHERE AUTH_CD IN ('U0001', 'U0004', 'U0005', 'U0006', 'U0009')
+ WHERE AUTH_CD IN ('U0001', 'U0002', 'U0004', 'U0005', 'U0006', 'U0009')
AND #{WORK_DIV} = '1' AND #{BLON_CO_CL_CD} = '10'
) S
ON (T.USER_ID = S.USER_ID AND T.AUTH_CD = S.AUTH_CD)
@@ -232,12 +240,12 @@
INSERT (USER_ID, AUTH_CD, INSERT_DTTM) VALUES (S.USER_ID, S.AUTH_CD, SYSDATETIME)
;
/* KDN 외 하도급사 유지보수 담당자 */
- /* 유지관리 U0001, 자재관리 U0004, 검침관리 U0005, 지역관리 U0006, 커뮤니티 U0009 */
+ /* 유지관리 U0001, AMI공사관리 U0002, 자재관리 U0004, 검침관리 U0005, 지역관리 U0006, 커뮤니티 U0009 */
MERGE INTO SMN_USER_AUTH T
USING (
SELECT #{ID} AS USER_ID, AUTH_CD
FROM SMN_AUTH
- WHERE AUTH_CD IN ('U0001', 'U0004', 'U0005', 'U0006', 'U0009')
+ WHERE AUTH_CD IN ('U0001', 'U0002', 'U0004', 'U0005', 'U0006', 'U0009')
AND #{WORK_DIV} = '1' AND #{BLON_CO_CL_CD} = '20'
) S
ON (T.USER_ID = S.USER_ID AND T.AUTH_CD = S.AUTH_CD)
diff --git a/src/docs/mapper-examples/awms/mob/mtl.xml b/src/docs/mapper-examples/awms/mob/mtl.xml
index 045b5d6..81f97cc 100644
--- a/src/docs/mapper-examples/awms/mob/mtl.xml
+++ b/src/docs/mapper-examples/awms/mob/mtl.xml
@@ -503,5 +503,45 @@
)
]]>
-
+
+
+
+
+
+
+
diff --git a/src/docs/mapper-examples/awms/mob/mtr.xml b/src/docs/mapper-examples/awms/mob/mtr.xml
index ecc5bbf..326dfa7 100644
--- a/src/docs/mapper-examples/awms/mob/mtr.xml
+++ b/src/docs/mapper-examples/awms/mob/mtr.xml
@@ -1,19 +1,19 @@
-
+
-
-
- SELECT SQ_CONS_TGT_SEQNO.NEXTVAL AS CONS_TGT_SEQNO FROM DUAL
-
+
+ SELECT SQ_CONS_TGT_SEQNO.NEXTVAL AS CONS_TGT_SEQNO FROM DUAL
+
-
- SELECT SQ_CONS_TGT_SEQNO.NEXTVAL AS CONS_TGT_SEQNO FROM DUAL
-
+
+ SELECT SQ_CONS_TGT_SEQNO.NEXTVAL AS CONS_TGT_SEQNO FROM DUAL
+
-
+
\ No newline at end of file
diff --git a/src/docs/mapper-examples/awms/mob/obs.xml b/src/docs/mapper-examples/awms/mob/obs.xml
index 3ba440f..c220409 100644
--- a/src/docs/mapper-examples/awms/mob/obs.xml
+++ b/src/docs/mapper-examples/awms/mob/obs.xml
@@ -50,6 +50,7 @@
, TR_FEED_NM = #{TR_FEED_NM}
, MOD_ID = NVL(#{MOD_ID}, 'DFXAGENT_USER')
, MOD_DATE = DECODE(#{MOD_DATE}, NULL, SYSTIMESTAMP, TO_TIMESTAMP(#{MOD_DATE}, 'YYYYMMDDHH24MISS'))
+ WHERE WORK_STEP IN ('10','20')
]]>
@@ -134,6 +135,7 @@
AND TFMI.M_USE_YN = 'Y'
and TFMI.M_MODEM_MAC = '012' || SUBSTRING(REPLACE(#{MODEM_MAC}, '-0', ''), 2)
AND ROWNUM = 1))
+ WHERE WORK_STEP IN ('10','20')
]]>
diff --git a/src/docs/mapper-examples/mkami/fmp/cdm.xml b/src/docs/mapper-examples/mkami/fmp/cdm.xml
index cb42ea8..592b61a 100644
--- a/src/docs/mapper-examples/mkami/fmp/cdm.xml
+++ b/src/docs/mapper-examples/mkami/fmp/cdm.xml
@@ -349,7 +349,7 @@
ATCH_FILE_ID, FILE_SN, FILE_STRE_COURS, STRE_FILE_NM, ORIGN_FILE_NM, FILE_EXTSN, FILE_CN, FILE_SIZE, FILE_TYPE, DEL_YN, IMAGE_WIDTH, IMAGE_HEIGHT, FILE_IMSI, REG_DATE, REG_ID
)
VALUES (
- #{ATCH_FILE_ID}, #{FILE_SN}, #{FILE_STRE_COURS}, #{STRE_FILE_NM}, #{ORIGN_FILE_NM}, #{FILE_EXTSN}, #{FILE_CN}, #{FILE_SIZE}, #{FILE_TYPE}, #{DEL_YN}, #{IMAGE_WIDTH}, #{IMAGE_HEIGHT}, #{FILE_IMSI}, DECODE(#{REG_DATE}, NULL, SYSDATE, TO_DATE(#{REG_DATE}, 'YYYYMMDDHH24MISS')), NVL(#{REG_ID}, 'DFXAGENT_USER')
+ #{ATCH_FILE_ID}, #{FILE_SN}, #{FILE_STRE_COURS}, #{STRE_FILE_NM}, #{ORIGN_FILE_NM}, #{FILE_EXTSN}, #{FILE_CN}, #{FILE_SIZE}, #{FILE_TYPE}, #{DEL_YN}, #{IMAGE_WIDTH}, #{IMAGE_HEIGHT}, 'Y', DECODE(#{REG_DATE}, NULL, SYSDATE, TO_DATE(#{REG_DATE}, 'YYYYMMDDHH24MISS')), NVL(#{REG_ID}, 'DFXAGENT_USER')
)
diff --git a/src/docs/mapper-examples/mkami/fmp/mei.xml b/src/docs/mapper-examples/mkami/fmp/mei.xml
index 612b030..626cd8e 100644
--- a/src/docs/mapper-examples/mkami/fmp/mei.xml
+++ b/src/docs/mapper-examples/mkami/fmp/mei.xml
@@ -53,6 +53,7 @@
FROM T_AD_USER
WHERE 1 = 1
AND AWMS_SEND_YN = 'N'
+ AND USE_YN = 'Y'
)
WHERE 1 = 1
AND R_NUM BETWEEN 1 AND 1000
@@ -94,6 +95,7 @@
FROM T_ETC_USER
WHERE 1 = 1
AND AWMS_SEND_YN = 'N'
+ AND USE_YN = 'Y'
)
WHERE 1 = 1
AND R_NUM BETWEEN 1 AND 1000
diff --git a/src/docs/mapper-examples/mkami/mob/mtl.xml b/src/docs/mapper-examples/mkami/mob/mtl.xml
index 726364e..957ed42 100644
--- a/src/docs/mapper-examples/mkami/mob/mtl.xml
+++ b/src/docs/mapper-examples/mkami/mob/mtl.xml
@@ -55,7 +55,7 @@
, SHP_PURP_CD, ATCH_FILE_ID1
)
VALUES (
- #{MTRL_HST_SEQNO}, #{MTRL_ID}, #{MTRL_CL_CD}, #{DCU_ID}, #{MODEM_MAC}, #{METER_ID}, #{WRHSG_SHP_CL_CD}, #{HNDOVR_BLON_CL_CD}, #{TRF_DEPT1}, #{TRF_DEPT2}, #{TRF_KDN_DEPT1}, #{TRF_KDN_DEPT2}, #{HNDOVR_CO_ID}, #{HNDOVR_USER_ID}, #{HNDOVR_STRG_PLCE}, #{TKOVR_BLON_CL_CD}, #{TFE_DEPT1}, #{TFE_DEPT2}, #{TFE_KDN_DEPT1}, #{TFE_KDN_DEPT2}, #{TKOVR_CO_ID}, #{TKOVR_USER_ID}, #{TKOVR_STRG_PLCE}, #{MTRL_STS_CD}, #{WRHSG_SHP_YMD}, #{MTRL_BX_NO}
+ #{MTRL_HST_SEQNO}, #{MTRL_ID}, #{MTRL_CL_CD}, #{DCU_ID}, REGEXP_REPLACE(#{MODEM_MAC}, '[-:]', ''), #{METER_ID}, #{WRHSG_SHP_CL_CD}, #{HNDOVR_BLON_CL_CD}, #{TRF_DEPT1}, #{TRF_DEPT2}, #{TRF_KDN_DEPT1}, #{TRF_KDN_DEPT2}, #{HNDOVR_CO_ID}, #{HNDOVR_USER_ID}, #{HNDOVR_STRG_PLCE}, #{TKOVR_BLON_CL_CD}, #{TFE_DEPT1}, #{TFE_DEPT2}, #{TFE_KDN_DEPT1}, #{TFE_KDN_DEPT2}, #{TKOVR_CO_ID}, #{TKOVR_USER_ID}, #{TKOVR_STRG_PLCE}, #{MTRL_STS_CD}, #{WRHSG_SHP_YMD}, #{MTRL_BX_NO}
, NVL(#{MOD_ID}, 'DFXAGENT_USER'), TO_DATE(NVL(#{MOD_DATE}, TO_CHAR(SYSDATE, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS'), NVL(#{REG_ID}, 'DFXAGENT_USER'), TO_DATE(NVL(#{REG_DATE}, TO_CHAR(SYSDATE, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS'), 'N'
, #{SHP_PURP_CD}, #{ATCH_FILE_ID1}
)
@@ -64,7 +64,7 @@
MTRL_ID = #{MTRL_ID}
, MTRL_CL_CD = #{MTRL_CL_CD}
, DCU_ID = #{DCU_ID}
- , MODEM_MAC = #{MODEM_MAC}
+ , MODEM_MAC = REGEXP_REPLACE(#{MODEM_MAC}, '[-:]', '')
, METER_ID = #{METER_ID}
, WRHSG_SHP_CL_CD = #{WRHSG_SHP_CL_CD}
, HNDOVR_BLON_CL_CD = #{HNDOVR_BLON_CL_CD}
@@ -109,7 +109,7 @@
AND A.AWMS_SEND_YN = 'N'
)
WHERE 1 = 1
- AND R_NUM BETWEEN 1 AND 1000
+ AND R_NUM BETWEEN 1 AND 4000
]]>
@@ -132,7 +132,7 @@
AND A.AWMS_SEND_YN = 'N'
)
WHERE 1 = 1
- AND R_NUM BETWEEN 1 AND 1000
+ AND R_NUM BETWEEN 1 AND 4000
)
]]>
@@ -505,7 +505,7 @@
]]>
-
+
+
+
+
diff --git a/src/docs/mapper-examples/mkami/mob/obs.xml b/src/docs/mapper-examples/mkami/mob/obs.xml
index d549eb3..ab64099 100644
--- a/src/docs/mapper-examples/mkami/mob/obs.xml
+++ b/src/docs/mapper-examples/mkami/mob/obs.xml
@@ -53,11 +53,15 @@