diff --git a/src/docs/mapper-examples/awms/mob/mtl.xml b/src/docs/mapper-examples/awms/mob/mtl.xml
index b1efa27..e316256 100644
--- a/src/docs/mapper-examples/awms/mob/mtl.xml
+++ b/src/docs/mapper-examples/awms/mob/mtl.xml
@@ -92,10 +92,12 @@
WHEN NOT MATCHED THEN
INSERT (
MTRL_ID, MTRL_CL_CD, MTRL_UDI, MTRL_IDNT_NO, MTRL_SERNO, FCL_NO, MNFCT_YM, DLVG_PCKN_NO, NOW_PCKN_NO, MTRL_DLVG_NO, MTRL_NO, MTRL_OPE_STS_CL_CD, MTRL_STS_CL_CD, MTRL_STRG_PLCE_NO, MST_CL_CD, MTRL_EXPL, USE_YN, INST_L, INST_M, INST_S, POSS_CLCD
+ , FCTY_ID
, MOD_ID, MOD_DATE, REG_ID, REG_DATE
)
VALUES (
#{MTRL_ID}, #{MTRL_CL_CD}, #{MTRL_UDI}, #{MTRL_IDNT_NO}, #{MTRL_SERNO}, #{FCL_NO}, #{MNFCT_YM}, #{DLVG_PCKN_NO}, #{NOW_PCKN_NO}, #{MTRL_DLVG_NO}, #{MTRL_NO}, #{MTRL_OPE_STS_CL_CD}, #{MTRL_STS_CL_CD}, #{MTRL_STRG_PLCE_NO}, #{MST_CL_CD}, #{MTRL_EXPL}, #{USE_YN}, #{INST_L}, #{INST_M}, #{INST_S}, #{POSS_CLCD}
+ , (CASE WHEN LENGTH(#{FCL_NO}) = 11 AND SUBSTR(#{FCL_NO}, 1, 3) = '012' THEN #{FCL_NO} ELSE #{MTRL_IDNT_NO} END)
, NVL(#{MOD_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{MOD_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS'), NVL(#{REG_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{REG_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS')
)
WHEN MATCHED THEN
@@ -120,6 +122,7 @@
, INST_M = #{INST_M}
, INST_S = #{INST_S}
, POSS_CLCD = #{POSS_CLCD}
+ , FCTY_ID = (CASE WHEN LENGTH(#{FCL_NO}) = 11 AND SUBSTR(#{FCL_NO}, 1, 3) = '012' THEN #{FCL_NO} ELSE #{MTRL_IDNT_NO} END)
, MOD_ID = NVL(#{MOD_ID}, 'DFXAGENT_USER')
, MOD_DATE = DECODE(#{MOD_DATE}, NULL, SYSTIMESTAMP, TO_TIMESTAMP(#{MOD_DATE}, 'YYYYMMDDHH24MISS'))
]]>
diff --git a/src/docs/mapper-examples/awms/mob/obs.xml b/src/docs/mapper-examples/awms/mob/obs.xml
index 40603d0..fc3cf3f 100644
--- a/src/docs/mapper-examples/awms/mob/obs.xml
+++ b/src/docs/mapper-examples/awms/mob/obs.xml
@@ -9,10 +9,14 @@
USING DUAL ON (ERR_ID = #{ERR_ID})
WHEN NOT MATCHED THEN
INSERT (
- ERR_ID, WORK_STEP, WORK_DIV, FCTY_CD, DCU_ID, COMM_CD, EVENT_START_DT, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, BUSI_DIV, M_COMPANY, ERR_TYPE1, ERR_TYPE2, DCU_IP, GUM_DAY, DURAT_TIME, ORDER_DT, ORDERER_ID, METER_DT, MEMO, PRE_ERR_ID, WORK_GP_NO, NDIS_WORK_NO, NDIS_STAT, MOD_ID, MOD_DATE, REG_ID, REG_DATE
+ ERR_ID, WORK_STEP, WORK_DIV, FCTY_CD, DCU_ID, COMM_CD, EVENT_START_DT, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, BUSI_DIV, M_COMPANY, ERR_TYPE1, ERR_TYPE2, DCU_IP, GUM_DAY, DURAT_TIME, ORDER_DT, ORDERER_ID, METER_DT, MEMO, PRE_ERR_ID, WORK_GP_NO, NDIS_WORK_NO, NDIS_STAT
+ , ADDRESS, ROAD_ADDRESS, TR_FEED_NM
+ , MOD_ID, MOD_DATE, REG_ID, REG_DATE
)
VALUES (
- #{ERR_ID}, #{WORK_STEP}, #{WORK_DIV}, #{FCTY_CD}, #{DCU_ID}, #{COMM_CD}, TO_TIMESTAMP(#{EVENT_START_DT}, 'YYYYMMDDHH24MISS'), #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{BUSI_DIV}, #{M_COMPANY}, #{ERR_TYPE1}, #{ERR_TYPE2}, #{DCU_IP}, #{GUM_DAY}, #{DURAT_TIME}, TO_TIMESTAMP(#{ORDER_DT}, 'YYYYMMDDHH24MISS'), #{ORDERER_ID}, TO_TIMESTAMP(#{METER_DT}, 'YYYYMMDDHH24MISS'), #{MEMO}, #{PRE_ERR_ID}, #{WORK_GP_NO}, #{NDIS_WORK_NO}, #{NDIS_STAT}, NVL(#{MOD_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{MOD_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS'), NVL(#{REG_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{REG_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS')
+ #{ERR_ID}, #{WORK_STEP}, #{WORK_DIV}, #{FCTY_CD}, #{DCU_ID}, #{COMM_CD}, TO_TIMESTAMP(#{EVENT_START_DT}, 'YYYYMMDDHH24MISS'), #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{BUSI_DIV}, #{M_COMPANY}, #{ERR_TYPE1}, #{ERR_TYPE2}, #{DCU_IP}, #{GUM_DAY}, #{DURAT_TIME}, TO_TIMESTAMP(#{ORDER_DT}, 'YYYYMMDDHH24MISS'), #{ORDERER_ID}, TO_TIMESTAMP(#{METER_DT}, 'YYYYMMDDHH24MISS'), #{MEMO}, #{PRE_ERR_ID}, #{WORK_GP_NO}, #{NDIS_WORK_NO}, #{NDIS_STAT}
+ , #{ADDRESS}, #{ROAD_ADDRESS}, #{TR_FEED_NM}
+ , NVL(#{MOD_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{MOD_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS'), NVL(#{REG_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{REG_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS')
)
WHEN MATCHED THEN
UPDATE SET
@@ -41,9 +45,9 @@
, DURAT_TIME = #{DURAT_TIME}
, NDIS_WORK_NO = #{NDIS_WORK_NO}
, NDIS_STAT = #{NDIS_STAT}
- , SIGNGU_NM = #{SIGNGU_NM}
- , LNTD_VAL = #{LNTD_VAL}
- , LTTD_VAL = #{LTTD_VAL}
+ , ADDRESS = #{ADDRESS}
+ , ROAD_ADDRESS = #{ROAD_ADDRESS}
+ , 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'))
]]>
@@ -56,10 +60,14 @@
USING DUAL ON (ERR_ID = #{ERR_ID})
WHEN NOT MATCHED THEN
INSERT (
- ERR_ID, WORK_STEP, WORK_DIV, FCTY_CD, MODEM_MAC, COMM_CD, EVENT_START_DT, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, BUSI_DIV, M_COMPANY, ERR_TYPE1, ERR_TYPE2, GUM_DAY, ORDER_DT, ORDERER_ID, DCU_DT, METER_DT, SEVER_DT, MEMO, PRE_ERR_ID, WORK_GP_NO, METER_ID, MGMT_CD, DESN_ST_YMD, LAY_YMD, MOD_ID, MOD_DATE, REG_ID, REG_DATE
+ ERR_ID, WORK_STEP, WORK_DIV, FCTY_CD, MODEM_MAC, COMM_CD, EVENT_START_DT, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, BUSI_DIV, M_COMPANY, ERR_TYPE1, ERR_TYPE2, GUM_DAY, ORDER_DT, ORDERER_ID, DCU_DT, METER_DT, SEVER_DT, MEMO, PRE_ERR_ID, WORK_GP_NO, METER_ID, MGMT_CD, DESN_ST_YMD, LAY_YMD
+ , TRADE, COMBLD_NM, TR_FEED_NM, SV_FEED_NM, ADDRESS, ROAD_ADDRESS, INST_S, INST_M
+ , MOD_ID, MOD_DATE, REG_ID, REG_DATE
)
VALUES (
- #{ERR_ID}, #{WORK_STEP}, #{WORK_DIV}, #{FCTY_CD}, #{MODEM_MAC}, #{COMM_CD}, TO_TIMESTAMP(#{EVENT_START_DT}, 'YYYYMMDDHH24MISS'), #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{BUSI_DIV}, #{M_COMPANY}, #{ERR_TYPE1}, #{ERR_TYPE2}, #{GUM_DAY}, TO_TIMESTAMP(#{ORDER_DT}, 'YYYYMMDDHH24MISS'), #{ORDERER_ID}, TO_TIMESTAMP(#{DCU_DT}, 'YYYYMMDDHH24MISS'), TO_TIMESTAMP(#{METER_DT}, 'YYYYMMDDHH24MISS'), TO_TIMESTAMP(#{SEVER_DT}, 'YYYYMMDDHH24MISS'), #{MEMO}, #{PRE_ERR_ID}, #{WORK_GP_NO}, #{METER_ID}, #{MGMT_CD}, #{DESN_ST_YMD}, #{LAY_YMD}, NVL(#{MOD_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{MOD_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS'), NVL(#{REG_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{REG_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS')
+ #{ERR_ID}, #{WORK_STEP}, #{WORK_DIV}, #{FCTY_CD}, #{MODEM_MAC}, #{COMM_CD}, TO_TIMESTAMP(#{EVENT_START_DT}, 'YYYYMMDDHH24MISS'), #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{BUSI_DIV}, #{M_COMPANY}, #{ERR_TYPE1}, #{ERR_TYPE2}, #{GUM_DAY}, TO_TIMESTAMP(#{ORDER_DT}, 'YYYYMMDDHH24MISS'), #{ORDERER_ID}, TO_TIMESTAMP(#{DCU_DT}, 'YYYYMMDDHH24MISS'), TO_TIMESTAMP(#{METER_DT}, 'YYYYMMDDHH24MISS'), TO_TIMESTAMP(#{SEVER_DT}, 'YYYYMMDDHH24MISS'), #{MEMO}, #{PRE_ERR_ID}, #{WORK_GP_NO}, #{METER_ID}, #{MGMT_CD}, #{DESN_ST_YMD}, #{LAY_YMD}
+ , #{TRADE}, #{COMBLD_NM}, #{TR_FEED_NM}, #{SV_FEED_NM}, #{ADDRESS}, #{ROAD_ADDRESS}, #{INST_S}, #{INST_M}
+ , NVL(#{MOD_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{MOD_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS'), NVL(#{REG_ID}, 'DFXAGENT_USER'), TO_TIMESTAMP(NVL(#{REG_DATE}, TO_CHAR(SYSTIMESTAMP, 'YYYYMMDDHH24MISS')), 'YYYYMMDDHH24MISS')
)
WHEN MATCHED THEN
UPDATE SET
@@ -92,6 +100,14 @@
, LAY_YMD = #{LAY_YMD}
, DCU_DT = TO_TIMESTAMP(#{DCU_DT}, 'YYYYMMDDHH24MISS')
, SEVER_DT = TO_TIMESTAMP(#{SEVER_DT}, 'YYYYMMDDHH24MISS')
+ , TRADE = #{TRADE}
+ , COMBLD_NM = #{COMBLD_NM}
+ , TR_FEED_NM = #{TR_FEED_NM}
+ , SV_FEED_NM = #{SV_FEED_NM}
+ , ADDRESS = #{ADDRESS}
+ , ROAD_ADDRESS = #{ROAD_ADDRESS}
+ , INST_S = #{INST_S}
+ , INST_M = #{INST_M}
, MOD_ID = NVL(#{MOD_ID}, 'DFXAGENT_USER')
, MOD_DATE = DECODE(#{MOD_DATE}, NULL, SYSTIMESTAMP, TO_TIMESTAMP(#{MOD_DATE}, 'YYYYMMDDHH24MISS'))
]]>
diff --git a/src/docs/mapper-examples/mkami/mob/obs.xml b/src/docs/mapper-examples/mkami/mob/obs.xml
index a0787f8..c2c3b33 100644
--- a/src/docs/mapper-examples/mkami/mob/obs.xml
+++ b/src/docs/mapper-examples/mkami/mob/obs.xml
@@ -5,16 +5,21 @@
@@ -28,13 +33,18 @@
AND ERR_ID IN (
SELECT ERR_ID
FROM (
- SELECT ERR_ID, WORK_STEP, WORK_DIV, FCTY_CD, DCU_ID, COMM_CD, TO_CHAR(EVENT_START_DT, 'YYYYMMDDHH24MISS') AS EVENT_START_DT, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, BUSI_DIV, M_COMPANY, ERR_TYPE1, ERR_TYPE2, DCU_IP, GUM_DAY, DURAT_TIME, TO_CHAR(ORDER_DT, 'YYYYMMDDHH24MISS') AS ORDER_DT, ORDERER_ID, TO_CHAR(METER_DT, 'YYYYMMDDHH24MISS') AS METER_DT, MEMO, PRE_ERR_ID, WORK_GP_NO, NDIS_WORK_NO, NDIS_STAT, 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 ERR_ID) AS R_NUM
- FROM T_FAC_ERR_CUR_DCU
+ SELECT A.ERR_ID, A.WORK_STEP, A.WORK_DIV, A.FCTY_CD, A.COMM_CD, TO_CHAR(A.EVENT_START_DT, 'YYYYMMDDHH24MISS') AS EVENT_START_DT, A.DEPT1, A.DEPT2, A.KDN_DEPT1, A.KDN_DEPT2, A.BUSI_DIV, A.M_COMPANY, A.ERR_TYPE1, A.ERR_TYPE2, A.GUM_DAY, TO_CHAR(A.ORDER_DT, 'YYYYMMDDHH24MISS') AS ORDER_DT, A.ORDERER_ID, TO_CHAR(A.METER_DT, 'YYYYMMDDHH24MISS') AS METER_DT, A.MEMO, A.PRE_ERR_ID, A.WORK_GP_NO, A.DCU_ID, A.DCU_IP, A.DURAT_TIME, A.NDIS_WORK_NO, A.NDIS_STAT
+ , B.ADDRESS, B.ROAD_ADDRESS, B.TR_FEED_NM
+ , A.MOD_ID, TO_CHAR(A.MOD_DATE, 'YYYYMMDDHH24MISS') AS MOD_DATE, A.REG_ID, TO_CHAR(A.REG_DATE, 'YYYYMMDDHH24MISS') AS REG_DATE
+ , DENSE_RANK() OVER (ORDER BY A.ERR_ID) AS R_NUM
+ , ROW_NUMBER() OVER (PARTITION BY A.ERR_ID ORDER BY A.ERR_ID, B.M_DCU_ID, B.ADDRESS, B.CODN_LAT, B.CODN_LNG, B.TR_FEED_NM DESC) AS P_NUM
+ FROM T_FAC_ERR_CUR_DCU A
+ LEFT JOIN T_FCTY_CS_METER_INFO B ON (A.DCU_ID = B.M_DCU_ID AND A.DEPT1 = B.DEPT1 AND A.DEPT2 = B.DEPT2)
WHERE 1 = 1
- AND AWMS_SEND_YN = 'N'
+ AND A.AWMS_SEND_YN = 'N'
)
WHERE 1 = 1
+ AND P_NUM = 1
AND R_NUM BETWEEN 1 AND 1000
)
]]>
@@ -43,16 +53,39 @@
@@ -66,14 +99,35 @@
AND ERR_ID IN (
SELECT ERR_ID
FROM (
- SELECT ERR_ID, WORK_STEP, WORK_DIV, FCTY_CD, MODEM_MAC, COMM_CD, TO_CHAR(EVENT_START_DT, 'YYYYMMDDHH24MISS') AS EVENT_START_DT, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, BUSI_DIV, M_COMPANY, ERR_TYPE1, ERR_TYPE2, GUM_DAY, TO_CHAR(ORDER_DT, 'YYYYMMDDHH24MISS') AS ORDER_DT, ORDERER_ID, TO_CHAR(DCU_DT, 'YYYYMMDDHH24MISS') AS DCU_DT, TO_CHAR(METER_DT, 'YYYYMMDDHH24MISS') AS METER_DT, TO_CHAR(SEVER_DT, 'YYYYMMDDHH24MISS') AS SEVER_DT, MEMO, PRE_ERR_ID, WORK_GP_NO, WD_STATE, METER_ID, EMER_YN, MGMT_CD, DESN_ST_YMD, LAY_YMD, 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 ERR_ID) AS R_NUM
- FROM T_FAC_ERR_CUR_MODEM
+ SELECT A.ERR_ID, A.WORK_STEP, A.WORK_DIV, A.FCTY_CD, A.MODEM_MAC, A.COMM_CD, A.EVENT_START_DT, A.DEPT1, A.DEPT2, A.KDN_DEPT1, A.KDN_DEPT2, A.BUSI_DIV, A.M_COMPANY, A.ERR_TYPE1, A.ERR_TYPE2, A.GUM_DAY, A.ORDER_DT, A.ORDERER_ID, A.DCU_DT, A.METER_DT, A.SEVER_DT, A.MEMO, A.PRE_ERR_ID, A.WORK_GP_NO, A.WD_STATE, A.METER_ID, A.EMER_YN, A.MGMT_CD, A.DESN_ST_YMD, A.LAY_YMD
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.TRADE ELSE C.TRADE END AS TRADE
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.COMBLD_NM ELSE C.COMBLD_NM END AS COMBLD_NM
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.TR_FEED_NM ELSE C.TR_FEED_NM END AS TR_FEED_NM
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.SV_FEED_NM ELSE C.SV_FEED_NM END AS SV_FEED_NM
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.ADDRESS ELSE C.ADDRESS END AS ADDRESS
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.ROAD_ADDRESS ELSE C.ROAD_ADDRESS END AS ROAD_ADDRESS
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.INST_S ELSE C.INST_S END AS INST_S
+ , CASE WHEN A.FCTY_CD = 'M' THEN A.INST_M ELSE C.INST_M END AS INST_M
+ , A.MOD_ID, A.MOD_DATE, A.REG_ID, A.REG_DATE
+ , R_NUM, P_NUM_1
+ , ROW_NUMBER() OVER (PARTITION BY A.ERR_ID ORDER BY A.ERR_ID, C.M_METER_ID, C.ADDRESS, C.TR_FEED_NM, C.TRADE, C.COMBLD_NM, C.SV_FEED_NM, C.INST_S, C.INST_M) AS P_NUM_2
+ FROM (
+ SELECT A.ERR_ID, A.WORK_STEP, A.WORK_DIV, A.FCTY_CD, A.MODEM_MAC, A.COMM_CD, TO_CHAR(A.EVENT_START_DT, 'YYYYMMDDHH24MISS') AS EVENT_START_DT, A.DEPT1, A.DEPT2, A.KDN_DEPT1, A.KDN_DEPT2, A.BUSI_DIV, A.M_COMPANY, A.ERR_TYPE1, A.ERR_TYPE2, A.GUM_DAY, TO_CHAR(A.ORDER_DT, 'YYYYMMDDHH24MISS') AS ORDER_DT, A.ORDERER_ID, TO_CHAR(A.DCU_DT, 'YYYYMMDDHH24MISS') AS DCU_DT, TO_CHAR(A.METER_DT, 'YYYYMMDDHH24MISS') AS METER_DT, TO_CHAR(A.SEVER_DT, 'YYYYMMDDHH24MISS') AS SEVER_DT, A.MEMO, A.PRE_ERR_ID, A.WORK_GP_NO, A.WD_STATE, A.METER_ID, A.EMER_YN, A.MGMT_CD, A.DESN_ST_YMD, A.LAY_YMD
+ , B.TRADE, B.COMBLD_NM, B.TR_FEED_NM, B.SV_FEED_NM, B.ADDRESS, B.ROAD_ADDRESS, B.INST_S, B.INST_M
+ , A.MOD_ID, TO_CHAR(A.MOD_DATE, 'YYYYMMDDHH24MISS') AS MOD_DATE, A.REG_ID, TO_CHAR(A.REG_DATE, 'YYYYMMDDHH24MISS') AS REG_DATE
+ , DENSE_RANK() OVER (ORDER BY A.ERR_ID) AS R_NUM
+ , ROW_NUMBER() OVER (PARTITION BY A.ERR_ID ORDER BY A.ERR_ID, B.M_MODEM_MAC, B.ADDRESS, B.TR_FEED_NM, B.TRADE, B.COMBLD_NM, B.SV_FEED_NM, B.INST_S, B.INST_M) AS P_NUM_1
+ FROM T_FAC_ERR_CUR_MODEM A
+ LEFT JOIN T_FCTY_CS_METER_INFO B ON (A.FCTY_CD = 'M' AND A.MODEM_MAC = B.M_MODEM_MAC AND A.DEPT1 = B.DEPT1 AND A.DEPT2 = B.DEPT2)
+ WHERE 1 = 1
+ AND A.AWMS_SEND_YN = 'N'
+ ) A
+ LEFT JOIN T_FCTY_CS_METER_INFO C ON (A.METER_ID = C.M_METER_ID AND A.DEPT1 = C.DEPT1 AND A.DEPT2 = C.DEPT2)
WHERE 1 = 1
- AND AWMS_SEND_YN = 'N'
+ AND R_NUM BETWEEN 1 AND 1000
)
WHERE 1 = 1
- AND R_NUM BETWEEN 1 AND 1000
+ AND P_NUM_2 = 1
)
]]>
diff --git a/src/docs/settings-examples/dfxagent-mkami-dev.json b/src/docs/settings-examples/dfxagent-mkami-dev.json
index b4852b2..94e86f5 100644
--- a/src/docs/settings-examples/dfxagent-mkami-dev.json
+++ b/src/docs/settings-examples/dfxagent-mkami-dev.json
@@ -465,7 +465,7 @@
"taskType": "DB_READ_THEN_SEND",
"action": {
"type": "SCHEDULED",
- "cron": "9 1 0 * * *"
+ "cron": "31 0/1 * * * *"
},
"message": {
"messageType": "TRANSFER_DB_TO_DB",