주문목록 추가 개발중

style24.admin/src/main/java/com/style24/persistence/mybatis/shop/TsaOrder.xml

@@ -34,12 +34,8 @@
 		<if test='supplyCompCd != null and supplyCompCd != ""'>
 		AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 		</if>
-		<if test="multiBrand != null and multiBrand != ''">
-<<<<<<< HEAD
-        AND    G1.BRAND_CD IN
-=======
-        AND    G2.BRAND_CD IN
->>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
+		<if test="multiBrand != null and multiBrand != ''">
+        AND    G1.BRAND_CD IN
 			<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
         		#{item}
             </foreach>
@@ -72,22 +68,14 @@
 		<if test='orderPhnno != null and orderPhnno != ""'>
 		AND    O.ORD_PHNNO = #{orderPhnno}
 		</if>
-		<if test='goodsCd != null and goodsCd != ""'>
-<<<<<<< HEAD
-		AND    G1.GOODS_CD = #{goodsCd}
-=======
-		AND    G2.GOODS_CD = #{goodsCd}
->>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
+		<if test='goodsCd != null and goodsCd != ""'>
+		AND    G1.GOODS_CD = #{goodsCd}
 		</if>
 		<if test='sizeCd != null and sizeCd != ""'>
 		AND    ODI.OPT_CD2 = #{sizeCd}
 		</if>
-		<if test='goodsNm != null and goodsNm != ""'>
-<<<<<<< HEAD
-		AND    G1.GOODS_NM = #{goodsNm}
-=======
-		AND    G2.GOODS_NM = #{goodsNm}
->>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
+		<if test='goodsNm != null and goodsNm != ""'>
+		AND    G1.GOODS_NM = #{goodsNm}
 		</if>
 		<if test='recipNm != null and recipNm != ""'>
 		AND    DA.RECIP_NM = #{recipNm}
@@ -196,8 +184,7 @@
 				<if test='supplyCompCd != null and supplyCompCd != ""'>
 				AND    OD.SUPPLY_COMP_CD = #{supplyCompCd}
 				</if>
-				<if test="multiBrand != null and multiBrand != ''">
-<<<<<<< HEAD
+				<if test="multiBrand != null and multiBrand != ''">
 		        AND    G1.BRAND_CD IN
 					<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
 		        		#{item}
@@ -239,7 +226,8 @@
 				</if>
 				<if test='goodsNm != null and goodsNm != ""'>
 				AND    G1.GOODS_NM = #{goodsNm}
-=======
+				</if>
+				<if test='multiBrand != null and multiBrand != ""'>
 		        AND    G2.BRAND_CD IN
 					<foreach collection="multiBrand" item="item" index="index"  open="(" close=")" separator=",">
 		        		#{item}
@@ -280,8 +268,7 @@
 				AND    ODI.OPT_CD2 = #{sizeCd}
 				</if>
 				<if test='goodsNm != null and goodsNm != ""'>
-				AND    G2.GOODS_NM = #{goodsNm}
->>>>>>> branch 'develop' of http://112.172.147.34:4936/style24/STYLE24.git
+				AND    G2.GOODS_NM = #{goodsNm}
 				</if>
 				<if test='recipNm != null and recipNm != ""'>
 				AND    DA.RECIP_NM = #{recipNm}

style24.admin/src/main/webapp/WEB-INF/views/order/OrderListForm.html

@@ -195,7 +195,7 @@
 				<ul class="panelBar">
 					<li class="center">
 						<button type="button" class="btn btn-info btn-lg" id="btnOrderSearch">조회</button>
-						<button type="button" class="btn btn-base btn-lg" id="btnSearchExcel">엑셀조회</button>
+						<!-- <button type="button" class="btn btn-base btn-lg" id="btnSearchExcel">엑셀조회</button> -->
 						<button type="button" class="btn btn-gray btn-lg" id="btnInit">초기화</button>
 					</li>
 				</ul>
@@ -207,16 +207,6 @@
 			<ul class="panelBar">
 				<li>
 					<button type="button" class="btn btn-info btn-lg" onclick="fnOrderExcelList();">엑셀다운로드</button>
-					<!--
-					<span style="margin-left:10px;">
-						주문금액 : <strong><span id="sumOrdAmt">0</span></strong>&nbsp;
-						판매금액 : <strong><span id="sumOrdCnclAmt">0</span></strong>&nbsp;
-						실결제금액 : <strong><span id="sumRealPayAmt">0</span></strong>&nbsp;
-						주문건수  : <strong><span id="ordNoCnt">0</span></strong>&nbsp;
-						주문수량  : <strong><span id="sumOrdQty">0</span></strong>&nbsp;
-						판매수량  : <strong><span id="sumOrdCnclQty">0</span></strong>&nbsp;
-					</span>
-					  -->
 				</li>
 				<li class="aR">
 					검색결과 : <strong><span id="rowCntOrderList">0</span> 건</strong>&nbsp;
@@ -250,6 +240,7 @@
 </label>
 
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js?v=2019072202"></script>
+
 <script th:inline="javascript">
 /*<![CDATA[*/
 var sessRoleCd 		= [[${sessionInfo.roleCd}]];
@@ -257,8 +248,6 @@ var siteCdList 		= gagajf.convertToArray([[${siteCdList}]]);
 var mallGbList 		= gagajf.convertToArray([[${mallGbList}]]);
 var ordDtlStatList 	= gagajf.convertToArray([[${ordDtlStatList}]]);
 var payMeansList 	= gagajf.convertToArray([[${payMeansList}]]);
-//var vendorList 		= gagajf.convertToArray([[${vendorList}]]);
-//var goodsTypeList 	= gagajf.convertToArray([[${goodsTypeList}]]);
 var chgStatList 	= gagajf.convertToArray([[${chgStatList}]]);
 var chgGbList 		= gagajf.convertToArray([[${chgGbList}]]);
 var formalGbList 	= gagajf.convertToArray([[${formalGbList}]]);
@@ -675,6 +664,9 @@ function onFirstDataRendered(params) {
 	
 }
 
+// 최근상세보기한 주문번호
+var currOrdNo = '';
+
 // 조회
 $('#btnOrderSearch').on('click', function () {
 	fnSearchList();
@@ -721,13 +713,12 @@ var fnSearchCallBack = function(result){
 // 주문리스트 합계 정보
 var fnOrderListSumInfoCallback = function(result) {
 	if (!gagajf.isNull(result)) {
-		var sumOrdAmt = 0
-		  , sumOrdCnclAmt = 0
-		  , sumRealPayAmt = 0
-		  , ordNoCnt = 0
-		  , sumOrdQty = 0
-		  , sumOrdCnclQty = 0
-		 ;
+		var sumOrdAmt 		= 0;
+		var sumOrdCnclAmt 	= 0;
+		var sumRealPayAmt 	= 0;
+		var ordNoCnt 		= 0;
+		var sumOrdQty 		= 0;
+		var sumOrdCnclQty 	= 0;
 
 		if (!gagajf.isNull(result.sumOrdAmt)) {
 			sumOrdAmt = result.sumOrdAmt.addComma();
@@ -756,26 +747,12 @@ var fnOrderListSumInfoCallback = function(result) {
 		$('#sumOrdCnclQty').text(sumOrdCnclQty);
 	}
 };
-	
-// 엑셀조회
-$("#btnSearchExcel").on('click', function () {
-	cfnExcelUploadPopup('', 'fnExcelUpoadCallback');
-});
-
-var currOrdNo = '';		//최근상세보기한 주문번호
-var fnExcelUpoadCallback = function (data) {
-	$("#excelFileNm").val(data.excelFileNm);
-	gagaAgGrid.fetch('/order/excel/search', gridOptionsOrderList, '#searchForm', function () {
-		$("#rowCntOrderList").text(gridOptionsOrderList.api.getDisplayedRowCount());
-	});
-};
 
 // 엑셀조회
 $("#btnSearchExcel").on('click', function () {
 	cfnExcelUploadPopup('', 'fnExcelUpoadCallback');
 });
 
-var currOrdNo = '';		// 최근상세보기한 주문번호
 var fnExcelUpoadCallback = function (data) {
 	$("#excelFileNm").val(data.excelFileNm);
 	gagaAgGrid.fetch('/order/excel/search', gridOptionsOrderList, '#searchForm', function () {
@@ -790,12 +767,12 @@ $('#btnInit').on('click', function() {
 });
 
 // 엑셀 다운로드
+// 2020.12.11 현재는 그리드의 조회 목록을 엑셀 다운로드 하고 있지만 추후 에는 조건의 엑셀 조회 후 다운로드 기능으로 변경 해야 할듯함
+// 기존의 주문목록은 페이징 기능이 없었지만 페이징 기능을 추가 하면서 엑셀다운로드시 조회 후 파일다운 기능 필요  
 var fnOrderExcelList = function () {
-	gagaAgGrid.showOrHideColumn(gridOptionsOrderList, "custNo", true);
-	
-	// 엑셀다운로드
-	gagaAgGrid.exportToExcel('주문목록', gridOptionsOrderList);
-	gagaAgGrid.showOrHideColumn(gridOptionsOrderList, "custNo", false);
+	gagaAgGrid.showOrHideColumn(gridOptionsOrderList	, "custNo", true);
+	gagaAgGrid.exportToExcel('주문목록'					, gridOptionsOrderList);
+	gagaAgGrid.showOrHideColumn(gridOptionsOrderList	, "custNo", false);
 };
 
 var fnOpenOrderDetailPopup = function (ordNo) {