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

src/main/java/com/style24/admin/biz/service/TsaDeliveryService.java

@@ -322,6 +322,9 @@ public class TsaDeliveryService {
 	 * @since 2020. 11. 05
 	 */
 	public Collection<Delivery> getBangoodsRegistList(Delivery delivery) {
+		if (StringUtils.isNotBlank(delivery.getCondition())) {
+			delivery.setConditions(delivery.getCondition().replaceAll("\r", "").split("\n"));
+		}
 		return deliveryDao.getBangoodsRegistList(delivery);
 	}
 	

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

@@ -458,10 +458,10 @@
 		</if>
 		<if test='searchTxt != null and searchTxt != ""'>
 			<if test='goodsGb == "goodsCd"'>
-				AND G.GOODS_CD LIKE UPPER(#{searchTxt} || '%')
+				AND G.GOODS_CD LIKE  CONCAT(UPPER( #{searchTxt}), '%')
 			</if>
 			<if test='goodsGb == "goodsNm"'>
-				AND G.GOODS_NM LIKE #{searchTxt} || '%'
+				AND G.GOODS_NM LIKE CONCAT(UPPER( #{searchTxt}), '%')
 			</if>
 		</if>
 		<if test='delvLocCd != null and delvLocCd != ""'>
@@ -518,12 +518,19 @@
 		<if test='brandCd != null and brandCd != ""'>
 			AND G.BRAND_CD = #{brandCd}
 		</if>
-		<if test='searchTxt != null and searchTxt != ""'>
+		<if test='conditions != null and conditions != ""'>
 			<if test='goodsGb == "goodsCd"'>
-				AND G.GOODS_CD LIKE CONCAT(UPPER(#{searchTxt}),'%')
+		         AND G.GOODS_CD IN 
+		          <foreach collection="conditions" item="item" index="index"  open="(" close=")" separator=",">
+		      		#{item}
+		         </foreach>
+				
 			</if>
 			<if test='goodsGb == "goodsNm"'>
-				AND G.GOODS_NM LIKE #{searchTxt} || '%'
+		         AND G.GOODS_NM IN 
+		          <foreach collection="conditions" item="item" index="index"  open="(" close=")" separator=",">
+		      		#{item}
+		         </foreach>
 			</if>
 		</if>
 		<if test='goodsStat != null and goodsStat != ""'>
@@ -565,7 +572,7 @@
 			, #{optCd1}
 			, #{optCd2}
 			, replace(#{delvBanStdt},'-','')
-			, replace(#{delvBanEddt},'-','')
+			, STR_TO_DATE(CONCAT(#{delvBanEddt},' 235959'), '%Y-%m-%d %H%i%S')
 			, 'N'
 			, #{regNo}
 			, NOW()

src/main/webapp/WEB-INF/views/delivery/AssignListForm.html

@@ -55,15 +55,15 @@
 							</td>
 							<th>주문번호</th>
 							<td>
-								<input type="text" class="" name="ordNo" placeholder="" maxlength="20" />
+								<input type="text" class="" name="ordNo"  oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"  placeholder="" maxlength="9" />
 							</td>
 							<th>주문상세번호</th>
 							<td>
-								<input type="text" class="" name="ordDtlNo" placeholder="" maxlength="20" />
+								<input type="text" class="" name="ordDtlNo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"  placeholder="" maxlength="9" />
 							</td>
 							<th>외부몰주문번호</th>
 							<td>
-								<input type="text" class="" name="extmallOrderId" placeholder="" maxlength="100" />
+								<input type="text" class="" name="extmallOrderId" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"  placeholder="" maxlength="20" />
 							</td>
 						</tr>
 						<tr>
@@ -263,6 +263,7 @@
 	* 조회 클릭
 	**************************************************************************/
 	$('#btnSearch').on('click', function() {
+		$("#searchForm input[name=pageNo]").val('1');
 		fnSearchList();
 	});
 	
@@ -289,6 +290,13 @@
 
 	}
 	
+	// 페이징
+	$('#searchForm select[name=pageSize]').on('change', function() {
+		$("#searchForm input[name=pageNo]").val('1');
+		fnSearchList($("#searchForm input[name=searchGb]").val());
+	});
+	
+	
 	/*************************************************************************
 	* 조회 콜백
 	**************************************************************************/	

src/main/webapp/WEB-INF/views/delivery/BanGoodsRegistForm.html

@@ -45,13 +45,14 @@
 								<option value="">[전체]</option>
 							</select>
 						</td>
-						<th>구분</th>
-						<td>
+						<th rowspan="2">구분</th>
+						<td rowspan="2">
 								<select name="goodsGb" id="">
 									<option value="goodsCd">상품코드</option>
 									<option value="goodsNm">상품명</option>
 								</select>
-								<input type="text" class="w60p" name="searchTxt" placeholder="" maxlength="20" />
+								<textarea class="textareaR2 w60p"  name="condition" id="condition" />
+								
 						</td>
 					</tr>
 					<tr>
@@ -148,10 +149,10 @@
 	var fnPopSearch = function() {
 
 		var supplyCompcd = $('#bangoodsRegistForm select[name=supplyCompCd]').val();
-		var searchTxt    = $('#bangoodsRegistForm input[name=searchTxt]').val();
+		var condition    = $('#bangoodsRegistForm textarea[name=condition]').val();
 		
 		
-		if (gagajf.isNull(supplyCompcd) && gagajf.isNull(searchTxt)) {
+		if (gagajf.isNull(supplyCompcd) && gagajf.isNull(condition)) {
 			mcxDialog.alert("업체를 선택 또는 상풐코드(상품명)을 입력해주세요!");
 			 $("#bangoodsRegistForm select[name=supplyCompCd]").focus();
 			return;

src/main/webapp/WEB-INF/views/delivery/BangoodsListForm.html

@@ -147,7 +147,6 @@
 			
 		},
 		{headerName: "출고금지상품번호",			field: "delvBanGoodsSq",width: 50,	cellClass: 'text-center', hide: true},
-		{headerName: "삭제",					field: "delYn",			width: 50,	cellClass: 'text-center'},
 		{headerName: "브랜드",				field: "brandKnm",		width: 150,	cellClass: 'text-center'},
 		{headerName: "출고처명",				field: "delvLocNm",		width: 150,	cellClass: 'text-center'},
 		{headerName: "이미지",				field: "sysImgNm",		width: 100,	height: 60, cellClass: 'text-center', 
@@ -171,10 +170,11 @@
 		},
 		{headerName: "옵션1",		    field: "optCd1",		width: 80,	cellClass: 'text-center'},
 		{headerName: "옵션2",			field: "optCd2",		width: 80,	cellClass: 'text-center'},
-		{headerName: "상품상태",		field: "goodsStat",		width: 80,	cellClass: 'text-center'},
+		{headerName: "상품상태",			field: "goodsStat",		width: 80,	cellClass: 'text-center'},
 		{headerName: "출고금지시작일자",	field: "delvBanStdt",	width: 150,	cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateFormat(params.value); }},
 		{headerName: "출고금지종료일자",	field: "delvBanEddt",	width: 150,	cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateFormat(params.value); }},
-		{headerName: "등록일자",		field: "regDt",			width: 100,	cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateFormat(params.value); }}
+		{headerName: "등록일자",			field: "regDt",			width: 100,	cellClass: 'text-center', cellRenderer: function (params) { return gagaAgGrid.toDateFormat(params.value); }},
+		{headerName: "삭제여부",			field: "delYn",			width: 80,	cellClass: 'text-center'}
 		
 	];
 

src/main/webapp/WEB-INF/views/delivery/DeliveryListForm.html

@@ -102,7 +102,7 @@
 						</td>
 						<th>주문상세번호</th>
 						<td>
-							<input type="text" class="" name="ordDtlNo" placeholder="" maxlength="20"/>
+							<input type="text" class="" name="ordDtlNo" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" placeholder="" maxlength="20"/>
 						</td>
 						<th rowspan="4">키워드<i class="star"></i></th>
 						<td rowspan="4" colspan="5">
@@ -401,6 +401,7 @@
 	* 조회 클릭
 	**************************************************************************/
 	$('#btnSearch').on('click', function () {
+		$("#searchForm input[name=pageNo]").val('1');
 		fnSearchList();
 	});
 
@@ -426,6 +427,13 @@
 
 	}
 
+	// 페이징
+	$('#searchForm select[name=pageSize]').on('change', function() {
+		$("#searchForm input[name=pageNo]").val('1');
+		fnSearchList();
+	});
+	
+	
 	/*************************************************************************
 	* 조회 콜백
 	**************************************************************************/