폭스소프트 업무지원

src/docs/mapper-examples/awms/mob/mtr.xml

@@ -31,14 +31,14 @@
 		<![CDATA[
 		/* 계기관리 계기작업공사현장정보 수신 */
 		MERGE INTO TM_MTR_MST_DETAIL
-		USING DUAL ON (HDQR_CD = #{HDQR_CD} AND CONS_NO = #{CONS_NO} AND WRK_NTTN_SEQNO = #{WRK_NTTN_SEQNO})
+		USING DUAL ON (HDQR_CD = #{HDQR_CD} AND CONS_NO = #{CONS_NO} AND WRK_NTTN_SEQNO = #{WRK_NTTN_SEQNO} AND ADDR_SEQNO = #{ADDR_SEQNO})
 		WHEN NOT MATCHED THEN
 			INSERT (
-				HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT, CNTR_NO, METER_NO, ADDR_SEQNO
+				HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT, CNTR_NO, METER_NO
 				, MOD_ID, MOD_DATE, REG_ID, REG_DATE
 			)
 			VALUES (
-				#{HDQR_CD}, #{CONS_NO}, #{WRK_NTTN_SEQNO}, #{ACPT_NO}, #{WRK_PLCE_NM}, #{WRK_PLCE_ADDR_CTT}, #{CNTR_NO}, #{METER_NO}, #{ADDR_SEQNO}
+				#{HDQR_CD}, #{CONS_NO}, #{WRK_NTTN_SEQNO}, #{ADDR_SEQNO}, #{ACPT_NO}, #{WRK_PLCE_NM}, #{WRK_PLCE_ADDR_CTT}, #{CNTR_NO}, #{METER_NO}
 				, 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
@@ -48,7 +48,6 @@
 				, WRK_PLCE_ADDR_CTT = #{WRK_PLCE_ADDR_CTT}
 				, CNTR_NO = #{CNTR_NO}
 				, METER_NO = #{METER_NO}
-				, ADDR_SEQNO = #{ADDR_SEQNO}
 				, MOD_ID = NVL(#{MOD_ID}, 'DFXAGENT_USER')
 				, MOD_DATE = DECODE(#{MOD_DATE}, NULL, SYSTIMESTAMP, TO_TIMESTAMP(#{MOD_DATE}, 'YYYYMMDDHH24MISS'))
 		]]>

src/docs/mapper-examples/mkami/mob/mtr.xml

@@ -46,12 +46,12 @@
 	<select id="selectMtrMstDetailListForSend" resultType="map">
 		<![CDATA[
 		/* 계기관리 계기작업공사현장정보 송신 */
-        SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT, CNTR_NO, METER_NO, ADDR_SEQNO
+        SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT, CNTR_NO, METER_NO
             , MOD_ID, MOD_DATE, REG_ID, REG_DATE
         FROM (
-            SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT, CNTR_NO, METER_NO, ADDR_SEQNO
+            SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT, CNTR_NO, METER_NO
                 , 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 HDQR_CD, CONS_NO, WRK_NTTN_SEQNO) AS R_NUM
+				, ROW_NUMBER() OVER (ORDER BY HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO) AS R_NUM
             FROM T_MTR_MST_DETAIL
 			WHERE 1 = 1
 				AND AWMS_SEND_YN = 'N'
@@ -68,12 +68,12 @@
 		SET AWMS_SEND_YN = 'Y'
 			, AWMS_SEND_DATE = SYSDATE
 		WHERE 1 = 1
-			AND (HDQR_CD, CONS_NO, WRK_NTTN_SEQNO) IN (
-				SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO
+			AND (HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO) IN (
+				SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO
 				FROM (
-					SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT
+					SELECT HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO, ACPT_NO, WRK_PLCE_NM, WRK_PLCE_ADDR_CTT
 						, 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 HDQR_CD, CONS_NO, WRK_NTTN_SEQNO) AS R_NUM
+						, ROW_NUMBER() OVER (ORDER BY HDQR_CD, CONS_NO, WRK_NTTN_SEQNO, ADDR_SEQNO) AS R_NUM
 					FROM T_MTR_MST_DETAIL
 					WHERE 1 = 1
 						AND AWMS_SEND_YN = 'N'