샵링커 송장수정

src/main/java/com/style24/persistence/mybatis/shop/TsaShoplinker.xml

@@ -662,10 +662,9 @@
 				TB_ORDER_DETAIL OD
 				LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 			WHERE OD.VENDOR_ID = 'G003_V001'
-			ORDER BY OD.ORD_NO, OD.ORD_DTL_NO
+
+			<include refid="getSlkInvoiceCondition_sql"/>
 		) A
-		WHERE 1=1
-		<include refid="getSlkInvoiceCondition_sql"/>
 
 	</select>
 
@@ -699,99 +698,98 @@
 				TB_ORDER_DETAIL OD
 				LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
 			WHERE OD.VENDOR_ID = 'G003_V001'
-			ORDER BY OD.ORD_NO, OD.ORD_DTL_NO
+
+			<include refid="getSlkInvoiceCondition_sql"/>
+
 		) A
-		WHERE 1=1
-		<include refid="getSlkInvoiceCondition_sql"/>
 
+		ORDER BY DELV_STDT DESC, ORD_NO, ORD_DTL_NO
 		LIMIT #{pageable.limitStartRow} ,  #{pageable.pageSize}
 	</select>
 
 	<!-- 송장전송-전송 목록 엑셀 -->
 	<select id="getInvoiceExcelList" parameterType="ShoplinkerInvoice" resultType="paramMap">
 		/* TsaShoplinker.getInvoiceExcelList */
-		SELECT * FROM
-		(
-			SELECT
-				OD.ORD_NO
-				, OD.ORD_DTL_NO
-				, (SELECT SHIP_COMP_NM FROM TB_SHIP_COMPANY S WHERE S.SHIP_COMP_CD = OD.SHIP_COMP_CD ) AS SHIP_COMP_NM
-				, OD.SHIP_COMP_CD AS DELIVERY_CODE-- 배송업체(택배사코드)
-				, OD.INVOICE_NO AS DELIVERY_INVOICE-- 송장번호
-
-				, OD.VENDOR_ID -- 외부몰벤더ID
-				, OD.EXTMALL_ID -- 외부몰ID(외부몰)
-				, OD.AGENT_ORDER_ID -- 에이전트주문번호
-				, OD.EXTMALL_ORDER_ID -- 외부몰주문번호
-				, OD.DELV_ASSIGN_STAT -- 출고지정상태(P:대기,Y:수락,N:거부)
-				, OD.ORD_EXCH_GB -- 주문교환구분(O:주문,E:교환)
-				, OD.ORD_DTL_STAT -- 주문상세상태(공통코드G013)
-				, FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT) AS ORD_DTL_STAT_NM
-				, OD.DELV_STDT
+		SELECT
+			OD.ORD_NO
+			, OD.ORD_DTL_NO
+			, (SELECT SHIP_COMP_NM FROM TB_SHIP_COMPANY S WHERE S.SHIP_COMP_CD = OD.SHIP_COMP_CD ) AS SHIP_COMP_NM
+			, OD.SHIP_COMP_CD AS DELIVERY_CODE-- 배송업체(택배사코드)
+			, OD.INVOICE_NO AS DELIVERY_INVOICE-- 송장번호
+
+			, OD.VENDOR_ID -- 외부몰벤더ID
+			, OD.EXTMALL_ID -- 외부몰ID(외부몰)
+			, OD.AGENT_ORDER_ID -- 에이전트주문번호
+			, OD.EXTMALL_ORDER_ID -- 외부몰주문번호
+			, OD.DELV_ASSIGN_STAT -- 출고지정상태(P:대기,Y:수락,N:거부)
+			, OD.ORD_EXCH_GB -- 주문교환구분(O:주문,E:교환)
+			, OD.ORD_DTL_STAT -- 주문상세상태(공통코드G013)
+			, FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT) AS ORD_DTL_STAT_NM
+			, OD.DELV_STDT
+
+			, SL.API_RESULT
+			, SL.API_MESSAGE
+			, SL.XML_TXT
+			, SL.REG_DT
+		FROM
+			TB_ORDER_DETAIL OD
+			LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
+		WHERE OD.VENDOR_ID = 'G003_V001'
 
-				, SL.API_RESULT
-				, SL.API_MESSAGE
-				, SL.XML_TXT
-				, SL.REG_DT
-			FROM
-				TB_ORDER_DETAIL OD
-				LEFT OUTER JOIN SHOPLINKER_SYNC_HST SL ON OD.ORD_DTL_NO = SL.ORD_DTL_NO AND SL.API_TYPE = 'INVOICE'
-			WHERE OD.VENDOR_ID = 'G003_V001'
-			ORDER BY OD.ORD_NO, OD.ORD_DTL_NO
-		) A
-		WHERE 1=1
 		<include refid="getSlkInvoiceCondition_sql"/>
 
+		ORDER BY OD.ORD_NO, OD.ORD_DTL_NO
+
 	</select>
 
 	<!-- 상품 목록 조건 정보 -->
 	<sql id="getSlkInvoiceCondition_sql">
 
 			<if test="stDate != null and stDate != ''">
-	        AND DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
+	        AND OD.DELV_STDT >= DATE_FORMAT(#{stDate}, '%Y-%m-%d %H:%i:%S')
             </if>
             <if test="edDate != null and edDate != ''">
             <![CDATA[
-	        AND DELV_STDT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
+	        AND OD.DELV_STDT < DATE_FORMAT(DATE_ADD(#{edDate}, INTERVAL 1 DAY), '%Y-%m-%d %H:%i:%S')
             ]]>
             </if>
 
             <if test="extmallId != null and extmallId != ''">
-	        AND EXTMALL_ID = #{extmallId}
+	        AND OD.EXTMALL_ID = #{extmallId}
             </if>
 
 	        <if test='apiResult != null and apiResult != "" and apiResult != "default"'>
-	        AND API_RESULT = #{apiResult}
+	        AND SL.API_RESULT = #{apiResult}
 	        </if>
 	        <if test='apiResult != null and apiResult == "default"'>
-	        AND API_RESULT != 'true'
+	        AND SL.API_RESULT != 'true'
 	        </if>
 
 			<if test='conditionList != null and conditionList.length>0'>
 	            <choose>
 	              <when test='search != null and search == "agentOrderId"'>
-	              	AND UPPER(A.AGENT_ORDER_ID) IN
+	              	AND UPPER(OD.AGENT_ORDER_ID) IN
 			            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
 			       		UPPER(#{item})
 			            </foreach>
 	              </when>
 
 	              <when test='search != null and search == "extmallOrderId"'>
-	              	AND UPPER(A.EXTMALL_ORDER_ID) IN
+	              	AND UPPER(OD.EXTMALL_ORDER_ID) IN
 			            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
 			       		UPPER(#{item})
 			            </foreach>
 	              </when>
 
 	              <when test='search != null and search == "ordNo"'>
-	              	AND UPPER(A.ORD_NO) IN
+	              	AND UPPER(OD.ORD_NO) IN
 			            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
 			       		UPPER(#{item})
 			            </foreach>
 	              </when>
 
 	              <when test='search != null and search == "deliveryInvoice"'>
-	              	AND UPPER(A.DELIVERY_INVOICE) IN
+	              	AND UPPER(OD.INVOICE_NO) IN
 			            <foreach collection="conditionList" item="item" index="index"  open="(" close=")" separator=",">
 			       		UPPER(#{item})
 			            </foreach>

src/main/webapp/WEB-INF/views/ocm/ExtmallForm.html

@@ -70,6 +70,9 @@
 		
 		<!-- 등록/수정 -->
 		<div class="panelStyle">
+			<div class="panelTitle">
+				<h3><i class="fa fa-info-circle"></i><font color="red">신규등록 시 WMS에도 꼭 등록요청해주세요.</font></h3>
+			</div>
 			<form id="detailForm" name="detailForm" action="#" th:action="@{'/ocm/extmall/save'}">
 				<table class="frmStyle" aria-describedby="등록/수정 폼">
 					<colgroup>

src/main/webapp/WEB-INF/views/shoplinker/ShoplinkerInvoiceSendForm.html

@@ -153,13 +153,13 @@
 		{headerName: "IF결과", field: "apiResult", width: 100, cellClass: 'text-center',
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(procGbValue, params.value); }
 		},
-		{headerName: "전송결과메세지", field: "apiMessage", width: 380, cellClass: 'text-center'},
+		{headerName: "전송결과메세지", field: "apiMessage", width: 300, cellClass: 'text-center'},
 		{headerName: "샵링커주문번호", field: "agentOrderId", width: 130, cellClass: 'text-center'},
 		{headerName: "쇼핑몰주문번호", field: "extmallOrderId", width: 130, cellClass: 'text-center'},
 		{
 			headerName		: "스타일24 주문번호"
 			, field			: 'ordNo'
-			, width			: 130
+			, width			: 120
 			, cellClass		: 'text-center'
 			, sortable		: true
 			, cellRenderer	: function (params) {
@@ -171,10 +171,11 @@
 				}
 			}
 		},
-		{headerName: "주문상세번호", field: "ordDtlNo", width: 130, cellClass: 'text-center'},
+		{headerName: "주문상세번호", field: "ordDtlNo", width: 120, cellClass: 'text-center'},
 		{headerName: "배송업체", field: "shipCompNm", width: 150, cellClass: 'text-center'},
 		{headerName: "송장번호", field: "deliveryInvoice", width: 130, cellClass: 'text-center'},
-		{headerName: "전송일시", field: "regDt", width: 150, cellClass: 'text-center'}
+		{headerName: "배송시작일자", field: "delvStdt", width: 140, cellClass: 'text-center'},
+		{headerName: "전송일시", field: "regDt", width: 140, cellClass: 'text-center'}
 		/*{headerName: "xml", field: "xmlTxt", width: 100, cellClass: 'text-center', editable: true,
 			cellEditor: 'agLargeTextCellEditor',
 			cellRenderer: function(params) {