Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -1242,9 +1242,15 @@
 		  , #{formalGb}
 		  , IFNULL(#{changeableYn},'Y')
 		  , IFNULL(#{returnableYn},'Y')
-		  , IFNULL(#{minOrdQty},1)
-		  , IFNULL(#{maxOrdQty},20)
-		  , IFNULL(#{dayMaxOrdQty},20)
+		  , CASE WHEN NULLIF(#{minOrdQty},'') IS NULL THEN 1
+		         WHEN #{minOrdQty} = 0 THEN 1
+		         ELSE #{minOrdQty} END
+		  , CASE WHEN NULLIF(#{maxOrdQty},'') IS NULL THEN 20
+		         WHEN #{maxOrdQty} = 0 THEN 20
+		         ELSE #{maxOrdQty} END
+		  , CASE WHEN NULLIF(#{dayMaxOrdQty},'') IS NULL THEN 20
+		         WHEN #{dayMaxOrdQty} = 0 THEN 20
+		         ELSE #{dayMaxOrdQty} END
 		  , IFNULL(#{giftPackYn},'N')
 		  , #{originCd}
 		  , #{makeYmd}

src/main/java/com/style24/scm/biz/service/TssGoodsService.java

@@ -3991,6 +3991,7 @@ public class TssGoodsService {
 		//상품코드 생성
 		regGoods.setGoodsType("G056_D");
 //		regGoods.setGoodsNm(GagaStringUtil.replace(GagaStringUtil.replace(goods.getGoodsNm(), "&lt;", "<"), "&gt;", ">"));
+		regGoods.setGoodsNm(goods.getGoodsNm());
 		regGoods.setSexGb(goods.getSexGb());
 		regGoods.setMainColorCd("XX");
 		regGoods.setOriginCd(goods.getOriginCd());

src/main/webapp/WEB-INF/views/order/OrderSellerClaimListForm.html

@@ -144,7 +144,6 @@
 var sessRoleCd 			= [[${sessionInfo.roleCd}]];
 
 var columnDefs = [
-	{width: 40, minWidth: 40, cellClass: 'text-right', headerCheckboxSelection: true, checkboxSelection: true, filter: false},
 	{headerName: 'No', width: 60, cellClass: 'text-center', valueGetter: function(params) { return params.node.rowIndex + 1 }},
 	{headerName: "입점업체",			field:"supplyCompNm",		width:120, cellClass: 'text-center'},
 	{headerName: "입점업체코드",		field:"supplyCompCd",		width:120, cellClass: 'text-center', hide: true},
@@ -163,8 +162,8 @@ var columnDefs = [
 	{headerName: "업체상품코드",		field:"supplyGoodsCd",		width:100, cellClass: 'text-center'},
 	{headerName: "상품코드",			field:"goodsCd",			width:100, cellClass: 'text-center'},
 	{headerName: "상품명",			field:"goodsNm",			width:100, cellClass: 'text-center'},
-	{headerName: "옵션1",				field:"optCd1",				width:100, cellClass: 'text-center'},
-	{headerName: "옵션2",				field:"optCd2",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션1",			field:"optCd1",				width:100, cellClass: 'text-center'},
+	{headerName: "옵션2",			field:"optCd2",				width:100, cellClass: 'text-center'},
 	{headerName: "요청수량",			field:"chgQty",				width:100, cellClass: 'text-center'},
 	{headerName: "교환상세번호",		field:"exchangeOrdDtlNo",	width:100, cellClass: 'text-center'},
 	{headerName: "교환옵션1",			field:"optCd11",			width:100, cellClass: 'text-center'},

src/main/webapp/WEB-INF/views/order/OrderSellerDelvListForm.html

@@ -25,9 +25,9 @@
 	</div>
 	
 	<form id="searchForm" name="searchForm" action="#" th:action="@{'/order/seller/unorder/list'}">
-		<input type="hidden" name="ordDtlStat" value="G013_40" />
-		<input type="hidden" name="pageNo" id="pageNo" value ="1"/>
-		<input type="hidden" name="supplyCompCd" th:value="${supplyCompCd}" />
+		<input type="hidden" name="ordDtlStat" 						value="G013_40" />
+		<input type="hidden" name="pageNo" 			id="pageNo" 	value ="1"/>
+		<input type="hidden" name="supplyCompCd" 					th:value="${supplyCompCd}" />
 		<div class="panelStyle">
 			<ul class="panelBar">
 				<li class="aR">
@@ -71,7 +71,7 @@ var columnDefs = [
 	{headerName: "주문수량",			field:"ordQty",				width:100, cellClass: 'text-center'},
 	{headerName: "취소수량",			field:"cnclRtnQty",			width:100, cellClass: 'text-center'},
 	{headerName: "출고수량",			field:"delvQty",			width:100, cellClass: 'text-center'},
-	{headerName: "미출고수량",		field:"cancelQty",			width:100, cellClass: 'text-center'
+	{headerName: "미출고수량",			field:"cancelQty",			width:100, cellClass: 'text-center'
 		, editable 			: true
 		, cellEditor		: 'agRichSelectCellEditor'
 		, cellStyle			: {color: '#fffff', 'background-color': '#aaaaff'}
@@ -99,15 +99,16 @@ var columnDefs = [
 			}
 		}
 	},
-	{headerName: "결품수량",			field: "cnclRtnQty",		width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "결제PG",			field: "pgGb",				width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "결제수단",			field: "payMeans",			width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "고객번호",			field: "custNo",			width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "주문고객명",		field: "ordNm",				width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "주문고객명",			field: "ordNm",				width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "환불계좌은행코드",	field: "bankCd",			width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "환불계좌예금주명",	field: "accountNm",			width: 100, cellClass: 'text-center', hide: true},
 	{headerName: "주문고객휴대폰번호",	field: "ordPhnno",			width: 100, cellClass: 'text-center', hide: true},
-	{headerName: "환불계좌번호",		field: "accountNo",			width: 100, cellClass: 'text-center', hide: true}
+	{headerName: "환불계좌번호",		field: "accountNo",			width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "배송정책",			field: "delvFeeCd",			width: 100, cellClass: 'text-center', hide: true},
+	{headerName: "변경요청번호",		field: "ordChgSq",			width: 100, cellClass: 'text-center', hide: true}
 ];
 
 var gridOptions = gagaAgGrid.getGridOptions(columnDefs);

src/main/webapp/WEB-INF/views/order/OrderSellerWithdrawListForm.html

@@ -2,7 +2,7 @@
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">
 <!--
  *******************************************************************************
- * @source  : OrderSellerWidthdrawListForm.html
+ * @source  : OrderSellerWithdrawListForm.html
  * @desc    : 임점상품검수중목록 Page
  *============================================================================
  * SISUN