From fc2448eb6baeb2f311e60c0cd911ece99f7f2574 Mon Sep 17 00:00:00 2001
From: Johngreen <ramses203@naver.com>
Date: Thu, 23 Oct 2025 13:30:12 +0900
Subject: [PATCH] =?UTF-8?q?=ED=8C=90=EB=A7=A4=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=ED=95=84=ED=84=B0=EB=B6=80=EB=B6=84=20?=
 =?UTF-8?q?=EB=A7=A4=EC=B6=9C=EA=B4=80=EB=A6=AC=EB=9E=91=20=EB=A7=9E?=
 =?UTF-8?q?=EC=B6=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salesmgmt/salesMgmt/salesMgmtList.jsp     | 171 ++++++++++--------
 .../SalesNcollectMgmtController.java          |   2 +
 2 files changed, 101 insertions(+), 72 deletions(-)

diff --git a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
index 9419115..dc151e7 100644
--- a/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
+++ b/WebContent/WEB-INF/view/salesmgmt/salesMgmt/salesMgmtList.jsp
@@ -15,7 +15,7 @@
 
 <script>
 	$(document).ready(function(){
-		fnc_datepick(); // 날짜 선택기 초기화
+		_fnc_datepick(); // 날짜 선택기 초기화
 		$('.select2').select2(); // select2 초기화
 
 	// 엔터키로 조회
@@ -38,6 +38,18 @@
 		});
 	});
 	
+	// 날짜 선택기 초기화 함수
+	function _fnc_datepick(){
+		var $dateinput = $("input.date_icon");
+		for(var i=0; i<$dateinput.length; i++){
+			$dateinput.eq(i).attr("size","10");
+			$dateinput.eq(i).datepicker({
+				changeMonth:true,
+				changeYear:true
+			});
+		}
+	}
+	
 	function fn_openSaleRegPopup(orderNo, saleNo){
 		var popup_width = 850;
 		var popup_height = 550;
@@ -168,91 +180,106 @@ function fn_bulkRegister(){
 				</div>
 				<div id="plmSearchZon">
 					<table>
-						<colgroup>
-							<col width="120px">
-							<col width="20%">
-							<col width="120px">
-							<col width="20%">
-							<col width="120px">
-							<col width="20%">
-							<col width="120px">
-							<col width="*">
-						</colgroup>
-						<tr>
-							<td class="label"><label for="">주문유형</label></td>
-							<td><select name="orderType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
-							<td class="label"><label for="">제품구분</label></td>
-							<td><select name="productType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.productTypeList}</select></td>
-							<td class="label"><label for="">국내/해외</label></td>
-							<td>
-								<select name="nation" class="select2" style="width:120px;">
-									<option value="">전체</option>
-									<option value="D">국내</option>
-									<option value="E">해외</option>
-								</select>
-							</td>
-							<td class="label"><label for="">유/무상</label></td>
-							<td>
-								<select name="paymentType" class="select2" style="width:120px;">
-									<option value="">전체</option>
-									<option value="N">유상</option>
-									<option value="Y">무상</option>
-								</select>
-							</td>
-						</tr>
-						<tr>
-							<td class="label"><label for="">고객사</label></td>
-							<td><input type="text" name="customer" /></td>
-							<td class="label"><label for="">품번</label></td>
-							<td><input type="text" name="productNo" /></td>
-							<td class="label"><label for="">품명</label></td>
-							<td><input type="text" name="productName" /></td>
-							<td class="label"><label for="">S/N</label></td>
-							<td><input type="text" name="serialNo" /></td>
-						</tr>
-						<tr>
-							<td class="label"><label for="">수주상태</label></td>
-							<td><select name="orderStatus" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.orderStatusList}</select></td>
-							<td class="label"><label for="">발주번호</label></td>
-							<td><input type="text" name="poNo" /></td>
-							<td class="label"><label for="">담당자</label></td>
-							<td><select name="manager" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.managerList}</select></td>
+						
+					<tr>
+						<td class="label"><label for="">주문유형</label></td>
+						<td><select name="orderType" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.orderTypeList}</select></td>
+						
+						<td class="label"><label for="">제품구분</label></td>
+						<td><select name="productType" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.productTypeList}</select></td>
+						
+						<td class="label"><label for="">국내/해외</label></td>
+						<td>
+							<select name="nation" class="select2" style="width:150px;">
+								<option value="">선택</option>
+								${codeMap.nationList}
+							</select>
+						</td>
+
+						<td class="label"><label for="">유/무상</label></td>
+						<td>
+							<select name="paymentType" class="select2" style="width:120px;">
+								<option value="">전체</option>
+								<option value="N">유상</option>
+								<option value="Y">무상</option>
+							</select>
+						</td>
+						
+						<td><label for="customer_objid">고객사</label></td>
+						<td>
+							<select name="customer_objid" id="customer_objid" style="width:150px" class="select2" autocomplete="off">
+								<option value="">선택</option>
+								${codeMap.customer_cd}
+							</select>
+						</td>
+
+						<td class="align_r">
+							<label for="" class="">품번</label>
+						</td>
+						<td>
+							<select name="search_partNo" id="search_partNo" class="select2-part" style="width: 100%;">
+								<option value="">품번 선택</option>
+							</select>
+							<input type="hidden" name="search_partObjId" id="search_partObjId" value=""/>
+						</td>
+						<td class="align_r">
+							<label for="" class="">품명</label>
+						</td>
+						<td colspan="3">
+							<select name="search_partName" id="search_partName" class="select2-part" style="width: 100%;">
+								<option value="">품명 선택</option>
+							</select>
+						</td>
+					</tr>
+
+					<tr>						
+						<td class="label"><label for="">S/N</label></td>
+						<td><input type="text" name="serialNo" /></td>
+
+						<td class="label"><label for="">수주상태</label></td>
+						<td><select name="orderStatus" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.orderStatusList}</select></td>
+						
+						<td class="label"><label for="">발주번호</label></td>
+						<td><input type="text" name="poNo" /></td>
+
+						<td class="label"><label for="">담당자</label></td>
+						<td><select name="manager" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.managerList}</select></td>
+						
 						<td class="label"><label for="">인도조건</label></td>
 						<td>
-							<select name="incoterms" class="select2" style="width:120px;">
+							<select name="incoterms" class="select2" style="width:150px;">
 								<option value="">전체</option>
-								<option value="FOB">FOB</option>
 								<option value="EXW">EXW</option>
+								<option value="FOB">FOB</option>
 								<option value="CIF">CIF</option>
 								<option value="DDP">DDP</option>
-								<option value="DAP">DAP</option>
 							</select>
 						</td>
-						</tr>
-						<tr>
+
 						<td class="label"><label for="">출하대기 상태</label></td>
-						<td><select name="shippingStatus" class="select2" style="width:120px;"><option value="">전체</option>${codeMap.shippingStatusList}</select></td>
+						<td><select name="shippingStatus" class="select2" style="width:150px;"><option value="">전체</option>${codeMap.shippingStatusList}</select></td>
 						<td class="label"><label for="">출하방법</label></td>
 						<td>
-							<select name="shippingMethod" class="select2" style="width:120px;">
+							<select name="shippingMethod" class="select2" style="width:150px;">
 								<option value="">전체</option>
-								<option value="내수/직납">내수/직납</option>
-								<option value="내수/택배">내수/택배</option>
-								<option value="내수/기타">내수/기타</option>
-								<option value="수출">수출</option>
+								<option value="DIRECT">직납</option>
+								<option value="PARCEL">택배</option>
 							</select>
 						</td>
-							<td class="label"><label for="">요청납기</label></td>
-							<td colspan="3"><input type="date" name="requestDateFrom" /> ~ <input type="date" name="requestDateTo" /></td>
-						</tr>
-						<tr>
-							<td class="label"><label for="">발주일</label></td>
-							<td colspan="3"><input type="date" name="orderDateFrom" /> ~ <input type="date" name="orderDateTo" /></td>
-							<td class="label"><label for="">출고일</label></td>
-							<td colspan="3"><input type="date" name="shippingDateFrom" /> ~ <input type="date" name="shippingDateTo" /></td>
-						</tr>
-					</table>
-				</div>
+					</tr>
+
+       				<tr>
+       			
+						<td class="label"><label for="">요청납기</label></td>
+						<td colspan="3"><input type="text" name="requestDateFrom" class="date_icon"/> ~ <input type="text" name="requestDateTo" class="date_icon"/></td>
+
+						<td class="label"><label for="">발주일</label></td>
+						<td colspan="3"><input type="text" name="orderDateFrom" class="date_icon"/> ~ <input type="text" name="orderDateTo" class="date_icon"/></td>
+						<td class="label"><label for="">출고일</label></td>
+						<td colspan="3"><input type="text" name="shippingDateFrom" class="date_icon"/> ~ <input type="text" name="shippingDateTo" class="date_icon"/></td>
+					</tr>
+				</table>
+			</div>
 
 	        	<%@include file= "/WEB-INF/view/common/common_gridArea.jsp" %>
 			</div>
diff --git a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
index 84b83b3..ffa6ced 100644
--- a/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
+++ b/src/com/pms/salesmgmt/controller/SalesNcollectMgmtController.java
@@ -172,6 +172,8 @@ public class SalesNcollectMgmtController {
 			// 국내/해외
 			codeMap.put("nationList", 
 					salesMgmtCommonService.bizMakeOptionList("AR", "", "salesMgmtCommon.getCodeList"));
+			// 고객사
+			codeMap.put("customer_cd", commonService.bizMakeOptionList("", CommonUtils.nullToEmpty((String)paramMap.get("customer_objid")), "common.getsupplyselect"));
 			// 수주상태
 			codeMap.put("orderStatusList", 
 					commonService.bizMakeOptionList("0000932", "", "common.getCodeselect"));