상품정산과 배송비정산 화면에 주문번호 검색조건 추가

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

@@ -197,6 +197,9 @@
 		            #{item}
 		            </foreach>
 		        </if>
+		        <if test='ordNo != null and ordNo != ""'>
+		        AND    O.ORD_NO = #{ordNo}
+		        </if>
 		       ) ODIH
 		ORDER  BY ODIH.ORD_DTL_ITEM_HST_SQ
 	</select>
@@ -445,6 +448,9 @@
 		            #{item}
 		            </foreach>
 		        </if>
+		        <if test='ordNo != null and ordNo != ""'>
+		        AND    OD.ORD_NO = #{ordNo}
+		        </if>
 		       ) OD
 		     , TB_DELIVERY_FEE DF
 		     , TB_SUPPLY_COMPANY SC

src/main/webapp/WEB-INF/views/settle/DeliveryFeeSettleForm.html

@@ -31,13 +31,15 @@
 				<table class="frmStyle" aria-describedby="검색조건">
 					<colgroup>
 						<col style="width:10%;"/>
-						<col style="width:60%;"/>
+						<col style="width:25%;"/>
+						<col style="width:10%;"/>
+						<col style="width:25%;"/>
 						<col style="width:10%;"/>
 						<col/>
 					</colgroup>
 					<tr>
 						<th>매출기간<i class="required" title="필수" aria-hidden="true"></i></th>
-						<td id="terms">
+						<td id="terms" colspan="3">
 						</td>
 						<th>유통구분</th>
 						<td>
@@ -70,6 +72,10 @@
 							<span id="brandTxt"></span>
 							<input type="hidden" name="brandList"/>
 						</td>
+						<th>주문번호</th>
+						<td>
+							<input type="text" class="w200" name="ordNo" placeholder="" maxlength="20" data-valid-type="numeric"/>
+						</td>
 					</tr>
 				</table>
 				

src/main/webapp/WEB-INF/views/settle/GoodsSettleForm.html

@@ -89,6 +89,12 @@
 							<input type="hidden" name="brandList"/>
 						</td>
 					</tr>
+					<tr>
+						<th>주문번호</th>
+						<td colspan="5">
+							<input type="text" class="w200" name="ordNo" placeholder="" maxlength="20" data-valid-type="numeric"/>
+						</td>
+					</tr>
 				</table>
 				
 				<ul class="panelBar">