diff --git a/src/docs/mapper-examples/awms/fmp/mei.xml b/src/docs/mapper-examples/awms/fmp/mei.xml
index 1934371..4565305 100644
--- a/src/docs/mapper-examples/awms/fmp/mei.xml
+++ b/src/docs/mapper-examples/awms/fmp/mei.xml
@@ -4,136 +4,272 @@
diff --git a/src/docs/mapper-examples/mkami/mob/obs.xml b/src/docs/mapper-examples/mkami/mob/obs.xml
index c2c3b33..e1a48ab 100644
--- a/src/docs/mapper-examples/mkami/mob/obs.xml
+++ b/src/docs/mapper-examples/mkami/mob/obs.xml
@@ -141,11 +141,11 @@
USING DUAL ON (ERR_ID = #{ERR_ID})
WHEN NOT MATCHED THEN
INSERT (
- ERR_ID, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, ACT_FCTY_CD, DCU_ID, ERR_CAUSE1, ERR_CAUSE2, ERR_CAUSE3, ERR_ACTION, NEW_DCU_ID, CHBD_DCU_YN, CHBD_TDU_YN, CHBD_PLC_YN, CHBD_FRU_YN, CHBD_EXT_YN, MAT1_CD, MAT1_PRICE, MAT1_CNT, MAT2_CD, MAT2_PRICE, MAT2_CNT, MAT3_CD, MAT3_PRICE, MAT3_CNT, MAT4_CD, MAT4_PRICE, MAT4_CNT, MAT5_CD, MAT5_PRICE, MAT5_CNT, SV_SEQ, WORKER1_SEQ, WORKER2_SEQ, WORKER3_SEQ, REPAIR_DETAIL, REWORK_YN, ACT_DATE, ATCH_FILE_ID1, ATCH_FILE_ID2, ATCH_FILE_ID3, ATCH_FILE_ID4, NEW_DCU_IP, WORKER1_DIV, WORKER2_DIV, WORKER3_DIV, MEMO, EXT_DCU_MAC, NEW_DCU_MAC
+ ERR_ID, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, ACT_FCTY_CD, DCU_ID, ERR_CAUSE1, ERR_CAUSE2, ERR_CAUSE3, ERR_ACTION, NEW_DCU_ID, CHBD_DCU_YN, CHBD_TDU_YN, CHBD_PLC_YN, CHBD_FRU_YN, CHBD_EXT_YN, MAT1_CD, MAT1_PRICE, MAT1_CNT, MAT2_CD, MAT2_PRICE, MAT2_CNT, MAT3_CD, MAT3_PRICE, MAT3_CNT, MAT4_CD, MAT4_PRICE, MAT4_CNT, MAT5_CD, MAT5_PRICE, MAT5_CNT, SV_SEQ, WORKER1_SEQ, WORKER2_SEQ, WORKER3_SEQ, REPAIR_DETAIL, REWORK_YN, ACT_DATE, ATCH_FILE_ID1, ATCH_FILE_ID2, ATCH_FILE_ID3, ATCH_FILE_ID4, NEW_DCU_IP, WORKER1_DIV, WORKER2_DIV, WORKER3_DIV, EXT_DCU_MAC, NEW_DCU_MAC
, MOD_ID, MOD_DATE, REG_ID, REG_DATE
)
VALUES (
- #{ERR_ID}, #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{ACT_FCTY_CD}, #{DCU_ID}, #{ERR_CAUSE1}, #{ERR_CAUSE2}, #{ERR_CAUSE3}, #{ERR_ACTION}, #{NEW_DCU_ID}, #{CHBD_DCU_YN}, #{CHBD_TDU_YN}, #{CHBD_PLC_YN}, #{CHBD_FRU_YN}, #{CHBD_EXT_YN}, #{MAT1_CD}, #{MAT1_PRICE}, #{MAT1_CNT}, #{MAT2_CD}, #{MAT2_PRICE}, #{MAT2_CNT}, #{MAT3_CD}, #{MAT3_PRICE}, #{MAT3_CNT}, #{MAT4_CD}, #{MAT4_PRICE}, #{MAT4_CNT}, #{MAT5_CD}, #{MAT5_PRICE}, #{MAT5_CNT}, #{SV_SEQ}, #{WORKER1_SEQ}, #{WORKER2_SEQ}, #{WORKER3_SEQ}, #{REPAIR_DETAIL}, NVL(#{REWORK_YN}, 'N'), TO_DATE(#{ACT_DATE}, 'YYYYMMDDHH24MISS'), #{ATCH_FILE_ID1}, #{ATCH_FILE_ID2}, #{ATCH_FILE_ID3}, #{ATCH_FILE_ID4}, #{NEW_DCU_IP}, #{WORKER1_DIV}, #{WORKER2_DIV}, #{WORKER3_DIV}, #{MEMO}, #{EXT_DCU_MAC}, #{NEW_DCU_MAC}
+ #{ERR_ID}, #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{ACT_FCTY_CD}, #{DCU_ID}, #{ERR_CAUSE1}, #{ERR_CAUSE2}, #{ERR_CAUSE3}, #{ERR_ACTION}, #{NEW_DCU_ID}, #{CHBD_DCU_YN}, #{CHBD_TDU_YN}, #{CHBD_PLC_YN}, #{CHBD_FRU_YN}, #{CHBD_EXT_YN}, #{MAT1_CD}, #{MAT1_PRICE}, #{MAT1_CNT}, #{MAT2_CD}, #{MAT2_PRICE}, #{MAT2_CNT}, #{MAT3_CD}, #{MAT3_PRICE}, #{MAT3_CNT}, #{MAT4_CD}, #{MAT4_PRICE}, #{MAT4_CNT}, #{MAT5_CD}, #{MAT5_PRICE}, #{MAT5_CNT}, #{SV_SEQ}, #{WORKER1_SEQ}, #{WORKER2_SEQ}, #{WORKER3_SEQ}, #{REPAIR_DETAIL}, NVL(#{REWORK_YN}, 'N'), TO_DATE(#{ACT_DATE}, 'YYYYMMDDHH24MISS'), #{ATCH_FILE_ID1}, #{ATCH_FILE_ID2}, #{ATCH_FILE_ID3}, #{ATCH_FILE_ID4}, #{NEW_DCU_IP}, #{WORKER1_DIV}, #{WORKER2_DIV}, #{WORKER3_DIV}, #{EXT_DCU_MAC}, #{NEW_DCU_MAC}
, NVL(#{MOD_ID}, 'DFXAGENT_USER'), DECODE(#{MOD_DATE}, NULL, SYSDATE, TO_DATE(#{MOD_DATE}, 'YYYYMMDDHH24MISS')), NVL(#{REG_ID}, 'DFXAGENT_USER'), DECODE(#{REG_DATE}, NULL, SYSDATE, TO_DATE(#{REG_DATE}, 'YYYYMMDDHH24MISS'))
)
WHEN MATCHED THEN
@@ -197,7 +197,6 @@
, WORKER1_DIV = #{WORKER1_DIV}
, WORKER2_DIV = #{WORKER2_DIV}
, WORKER3_DIV = #{WORKER3_DIV}
- , MEMO = #{MEMO}
, EXT_DCU_MAC = #{EXT_DCU_MAC}
, NEW_DCU_MAC = #{NEW_DCU_MAC}
, MOD_ID = NVL(#{MOD_ID}, 'DFXAGENT_USER')
@@ -207,6 +206,21 @@
SET WORK_STEP = '50'
WHERE ERR_ID = #{ERR_ID}
;
+ MERGE INTO T_MEMO
+ USING DUAL ON (MEMO_DIV = 'AD' AND TARGET_ID = #{ERR_ID})
+ WHEN NOT MATCHED THEN
+ INSERT (
+ MEMO_DIV, TARGET_ID, MEMO_CONTENT
+ , MOD_ID, MOD_DATE, REG_ID, REG_DATE
+ )
+ VALUES (
+ 'AD', #{ERR_ID}, #{MEMO}
+ , NVL(#{MOD_ID}, 'DFXAGENT_USER'), DECODE(#{MOD_DATE}, NULL, SYSDATE, TO_DATE(#{MOD_DATE}, 'YYYYMMDDHH24MISS')), NVL(#{REG_ID}, 'DFXAGENT_USER'), DECODE(#{REG_DATE}, NULL, SYSDATE, TO_DATE(#{REG_DATE}, 'YYYYMMDDHH24MISS'))
+ )
+ WHEN MATCHED THEN
+ UPDATE SET
+ MEMO_CONTENT = #{MEMO}
+ ;
END;
]]>
@@ -215,15 +229,17 @@
@@ -366,11 +406,11 @@
USING DUAL ON (SEQ = #{SEQ})
WHEN NOT MATCHED THEN
INSERT (
- SEQ, WORK_STEP, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, ACT_FCTY_CD, MODEM_MAC, ERR_CAUSE1, ERR_CAUSE2, ERR_CAUSE3, ERR_ACTION, NEW_MODEM_MAC, NEW_DCU_ID, MAT1_CD, MAT1_PRICE, MAT1_CNT, MAT2_CD, MAT2_PRICE, MAT2_CNT, MAT3_CD, MAT3_PRICE, MAT3_CNT, MAT4_CD, MAT4_PRICE, MAT4_CNT, MAT5_CD, MAT5_PRICE, MAT5_CNT, SV_SEQ, WORKER1_SEQ, WORKER2_SEQ, WORKER3_SEQ, ACT_DATE, ATCH_FILE_ID1, ATCH_FILE_ID2, ATCH_FILE_ID3, ATCH_FILE_ID4, METER_SEAL1, METER_SEAL2, BOX_SEAL1, BOX_SEAL2, METER_ID, M_METER_ID, MEMO, ACT_DETAIL, REPAIR_DETAIL, ADDRESS, ROAD_ADDRESS
+ SEQ, WORK_STEP, DEPT1, DEPT2, KDN_DEPT1, KDN_DEPT2, ACT_FCTY_CD, MODEM_MAC, ERR_CAUSE1, ERR_CAUSE2, ERR_CAUSE3, ERR_ACTION, NEW_MODEM_MAC, NEW_DCU_ID, MAT1_CD, MAT1_PRICE, MAT1_CNT, MAT2_CD, MAT2_PRICE, MAT2_CNT, MAT3_CD, MAT3_PRICE, MAT3_CNT, MAT4_CD, MAT4_PRICE, MAT4_CNT, MAT5_CD, MAT5_PRICE, MAT5_CNT, SV_SEQ, WORKER1_SEQ, WORKER2_SEQ, WORKER3_SEQ, ACT_DATE, ATCH_FILE_ID1, ATCH_FILE_ID2, ATCH_FILE_ID3, ATCH_FILE_ID4, METER_SEAL1, METER_SEAL2, BOX_SEAL1, BOX_SEAL2, METER_ID, M_METER_ID, ACT_DETAIL, REPAIR_DETAIL, ADDRESS, ROAD_ADDRESS
, MOD_ID, MOD_DATE, REG_ID, REG_DATE
)
VALUES (
- #{SEQ}, #{WORK_STEP}, #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{ACT_FCTY_CD}, #{MODEM_MAC}, #{ERR_CAUSE1}, #{ERR_CAUSE2}, #{ERR_CAUSE3}, #{ERR_ACTION}, #{NEW_MODEM_MAC}, #{NEW_DCU_ID}, #{MAT1_CD}, #{MAT1_PRICE}, #{MAT1_CNT}, #{MAT2_CD}, #{MAT2_PRICE}, #{MAT2_CNT}, #{MAT3_CD}, #{MAT3_PRICE}, #{MAT3_CNT}, #{MAT4_CD}, #{MAT4_PRICE}, #{MAT4_CNT}, #{MAT5_CD}, #{MAT5_PRICE}, #{MAT5_CNT}, #{SV_SEQ}, #{WORKER1_SEQ}, #{WORKER2_SEQ}, #{WORKER3_SEQ}, TO_DATE(#{ACT_DATE}, 'YYYYMMDDHH24MISS'), #{ATCH_FILE_ID1}, #{ATCH_FILE_ID2}, #{ATCH_FILE_ID3}, #{ATCH_FILE_ID4}, #{METER_SEAL1}, #{METER_SEAL2}, #{BOX_SEAL1}, #{BOX_SEAL2}, #{METER_ID}, #{M_METER_ID}, #{MEMO}, #{ACT_DETAIL}, #{REPAIR_DETAIL}, #{ADDRESS}, #{ROAD_ADDRESS}
+ #{SEQ}, #{WORK_STEP}, #{DEPT1}, #{DEPT2}, #{KDN_DEPT1}, #{KDN_DEPT2}, #{ACT_FCTY_CD}, #{MODEM_MAC}, #{ERR_CAUSE1}, #{ERR_CAUSE2}, #{ERR_CAUSE3}, #{ERR_ACTION}, #{NEW_MODEM_MAC}, #{NEW_DCU_ID}, #{MAT1_CD}, #{MAT1_PRICE}, #{MAT1_CNT}, #{MAT2_CD}, #{MAT2_PRICE}, #{MAT2_CNT}, #{MAT3_CD}, #{MAT3_PRICE}, #{MAT3_CNT}, #{MAT4_CD}, #{MAT4_PRICE}, #{MAT4_CNT}, #{MAT5_CD}, #{MAT5_PRICE}, #{MAT5_CNT}, #{SV_SEQ}, #{WORKER1_SEQ}, #{WORKER2_SEQ}, #{WORKER3_SEQ}, TO_DATE(#{ACT_DATE}, 'YYYYMMDDHH24MISS'), #{ATCH_FILE_ID1}, #{ATCH_FILE_ID2}, #{ATCH_FILE_ID3}, #{ATCH_FILE_ID4}, #{METER_SEAL1}, #{METER_SEAL2}, #{BOX_SEAL1}, #{BOX_SEAL2}, #{METER_ID}, #{M_METER_ID}, #{ACT_DETAIL}, #{REPAIR_DETAIL}, #{ADDRESS}, #{ROAD_ADDRESS}
, NVL(#{MOD_ID}, 'DFXAGENT_USER'), DECODE(#{MOD_DATE}, NULL, SYSDATE, TO_DATE(#{MOD_DATE}, 'YYYYMMDDHH24MISS')), NVL(#{REG_ID}, 'DFXAGENT_USER'), DECODE(#{REG_DATE}, NULL, SYSDATE, TO_DATE(#{REG_DATE}, 'YYYYMMDDHH24MISS'))
)
WHEN MATCHED THEN
@@ -418,7 +458,6 @@
, BOX_SEAL2 = #{BOX_SEAL2}
, METER_ID = #{METER_ID}
, M_METER_ID = #{M_METER_ID}
- , MEMO = #{MEMO}
, ACT_DETAIL = #{ACT_DETAIL}
, REPAIR_DETAIL = #{REPAIR_DETAIL}
, ADDRESS = #{ADDRESS}