chpark/wace_plm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

검색필터 수정 일단 50퍼 나중에 검색필터 이름들 변경이나 추가가 필요합니다.

Browse Source
This commit is contained in:
leeheejin
2025-12-19 12:06:39 +09:00
parent 3910596bc2
commit f040156f88
6 changed files with 78 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
WebContent/WEB-INF/classes/com/pms/mapper/project.xml
View File

@@ -4218,12 +4218,20 @@
AND result_cd = #{result_cd}
</if>
<!-- 요청납기일 필터: REQ_DEL_DATE 로직과 동일하게 COALESCE 사용 -->
<if test="contract_start_date != null and !''.equals(contract_start_date)">
AND TO_DATE(DUE_DATE,'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD')
AND TO_DATE(COALESCE(
(SELECT CI.DUE_DATE FROM CONTRACT_ITEM CI WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID AND CI.PART_OBJID = T.PART_OBJID AND CI.STATUS = 'ACTIVE'),
T.DUE_DATE,
(SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)
),'YYYY-MM-DD') <![CDATA[ >= ]]> TO_DATE(#{contract_start_date}, 'YYYY-MM-DD')
</if>
<if test="contract_end_date != null and !''.equals(contract_end_date)">
AND TO_DATE(DUE_DATE,'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{contract_end_date}, 'YYYY-MM-DD')
AND TO_DATE(COALESCE(
(SELECT CI.DUE_DATE FROM CONTRACT_ITEM CI WHERE CI.CONTRACT_OBJID = T.CONTRACT_OBJID AND CI.PART_OBJID = T.PART_OBJID AND CI.STATUS = 'ACTIVE'),
T.DUE_DATE,
(SELECT CM.due_date FROM CONTRACT_MGMT CM WHERE CM.OBJID = T.CONTRACT_OBJID)
),'YYYY-MM-DD') <![CDATA[ <= ]]> TO_DATE(#{contract_end_date}, 'YYYY-MM-DD')
</if>
<if test="pm_user_id !=null and pm_user_id !=''">

12
WebContent/WEB-INF/view/project/projectMgmtList.jsp
View File

@@ -58,7 +58,13 @@ String connector = person.getUserId();
$(document).ready(function(){
//날짜
_fnc_datepick();
fnc_datepick();
// 예상납기일 datepicker 명시적 적용
$('#contract_start_date, #contract_end_date').datepicker({
changeMonth: true,
changeYear: true
});
$('.select2').select2();
@@ -155,7 +161,7 @@ var columns = [
//{headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '설비길이', field : 'FACILITY_DEPTH' },
{headerHozAlign : 'center', hozAlign : 'center', width : '90', title : 'PM', field : 'PM_USER_NAME' },
{headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '제작공장', field : 'MANUFACTURE_PLANT_NAME' },
{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '예상납기일', field : 'CONTRACT_DEL_DATE' }
{headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '요청납기일', field : 'CONTRACT_DEL_DATE' }
],
},
@@ -535,7 +541,7 @@ function setup_wbs_popup(objId){
</tr>
<tr>
<td class="align_r">
<label>예상납기일</label>
<label>요청납기일</label>
</td>
<td>
<input type="text" name="contract_start_date" id="contract_start_date" style="width:90px;" autocomplete="off" value="${param.contract_start_date}" class="date_icon">~

12
WebContent/WEB-INF/view/project/projectMgmtWbsList3.jsp
View File

@@ -52,6 +52,12 @@ String connector = person.getUserId();
$(document).ready(function(){
$('.select2').select2();
// 요청납기일 datepicker 적용
$('#contract_start_date, #contract_end_date').datepicker({
changeMonth: true,
changeYear: true
});
//$('#Year' ).select2();
$("#btnSearch").click(function(){
@@ -212,7 +218,7 @@ function openProjectFormPopUp(objId){
</select>
</td>
<td><label for="category_cd">계약구분</label></td>
<td><label for="category_cd">주문유형</label></td>
<td>
<select name="category_cd" id="category_cd" style="" class="select2" autocomplete="off">
<option value="">선택</option>
@@ -237,7 +243,7 @@ function openProjectFormPopUp(objId){
</select>
</td>
<td class="align_r">
<label>예상납기일</label>
<label>요청납기일</label>
</td>
<td>
<input type="text" name="contract_start_date" id="contract_start_date" style="width:90px;" autocomplete="off" value="${param.contract_start_date}" class="date_icon">~
@@ -245,6 +251,7 @@ function openProjectFormPopUp(objId){
</td>
</tr>
<%-- 입고지, 셋업지, PM 검색필터 주석처리
<tr>
<td class="align_r">
<label>입고지</label>
@@ -268,6 +275,7 @@ function openProjectFormPopUp(objId){
</select>
</td>
</tr>
--%>
</table>
</div>

15
WebContent/WEB-INF/view/purchaseOrder/deliveryMngAcceptanceList.jsp
View File

@@ -475,10 +475,17 @@ function fn_purchaseClose(){
<td><label for="">발주No.</label></td>
<td><input type="text" name="purchase_order_no" id="purchase_order_no" autocomplete="off" value="${param.purchase_order_no}" style="width:185px;"/></td>
<%-- 부품구분 주석처리
<td><label for="">부품구분</label></td>
<td><select name="type" id="type" class="select2" autocomplete="off" style="width:130px;"><option value="">선택</option>${code_map.type}</select></td>
<td><label for="">규격</label></td>
<td><select name="type" id="type" class="select2" autocomplete="off" style="width:130px;"><option value="">선택</option>${code_map.type}</select></td>
--%>
<td><label for="">규격</label></td>
<td><input type="text" name="SEARCH_PART_SPEC" id="SEARCH_PART_SPEC" autocomplete="off" value="${param.SEARCH_PART_SPEC }" style="width:120px;"/></td>
<td><label for="">품명</label></td>
<td>
<input type="text" name="SEARCH_PART_NAME" id="SEARCH_PART_NAME" style="width:130px;" autocomplete="off" value="${param.SEARCH_PART_NAME}">
</td>
</tr>
<tr>
<td><label for="">공급업체</label></td>
@@ -508,10 +515,6 @@ function fn_purchaseClose(){
<option value="지연">지연</option>
</select>
</td>
<td><label for="">품명</label></td>
<td>
<input type="text" name="SEARCH_PART_NAME" id="SEARCH_PART_NAME" style="width:130px;" autocomplete="off" value="${param.SEARCH_PART_NAME}">
</td>
<td><label for="">품번</label></td>
<td><input type="text" name="SEARCH_PART_NO" id="SEARCH_PART_NO" autocomplete="off" value="${param.SEARCH_PART_NO }" style="width:120px;"/></td>
</tr>

52
WebContent/WEB-INF/view/purchaseOrder/purchaseOrderList_new.jsp
View File

@@ -867,32 +867,9 @@ function fn_openMailFormPopup(purchaseOrderObjId){
<td><label for="">발주No.</label></td>
<td><input type="text" name="purchase_order_no" id="purchase_order_no" autocomplete="off" value="${param.purchase_order_no}" style=""/></td>
<td><label for="">발주부품</label></td>
<td><select name="type" id="type" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.type}</select></td>
<td><label for="">발주구분</label></td>
<td><select name="order_type_cd" id="order_type_cd" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.order_type_cd}</select></td>
</tr>
<tr>
<td class=""><label>입고요청일</label></td>
<td>
<input type="text" name="delivery_start_date" id="delivery_start_date" style="width:77px;" autocomplete="off" value="${param.delivery_start_date}" class="date_icon">~
<input type="text" name="delivery_end_date" id="delivery_end_date" style="width:77px;" autocomplete="off" value="${param.delivery_end_date }" class="date_icon">
</td>
<td><label for="">공급업체</label></td>
<td><label for="">공급업체</label></td>
<td><select name="partner_objid" id="partner_objid" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.partner_objid}</select></td>
<td><label for="">구매담당자</label></td>
<td><select name="sales_mng_user_id" id="sales_mng_user_id" class="select2" autocomplete="off" style="width:190px;" multiple="multiple" ><option value="">선택</option>${code_map.sales_mng_user_id}</select></td>
<td><label>발주일</label></td>
<td>
<input type="text" name="reg_start_date" id="reg_start_date" style="width:77px;" autocomplete="off" value="${param.reg_start_date}" class="date_icon">~
<input type="text" name="reg_end_date" id="reg_end_date" style="width:77px;" autocomplete="off" value="${param.reg_end_date }" class="date_icon">
</td>
<td><label for="">품번</label></td>
<td>
<input type="text" name="SEARCH_PART_NO" id="SEARCH_PART_NO" style="" autocomplete="off" value="${param.SEARCH_PART_NO}">
@@ -903,6 +880,33 @@ function fn_openMailFormPopup(purchaseOrderObjId){
<input type="text" name="SEARCH_PART_NAME" id="SEARCH_PART_NAME" style="" autocomplete="off" value="${param.SEARCH_PART_NAME}">
</td>
<%-- 발주부품, 발주구분 주석처리
<td><label for="">발주부품</label></td>
<td><select name="type" id="type" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.type}</select></td>
<td><label for="">발주구분</label></td>
<td><select name="order_type_cd" id="order_type_cd" class="select2" autocomplete="off" style=""><option value="">선택</option>${code_map.order_type_cd}</select></td>
--%>
</tr>
<tr>
<td class=""><label>입고요청일</label></td>
<td>
<input type="text" name="delivery_start_date" id="delivery_start_date" style="width:77px;" autocomplete="off" value="${param.delivery_start_date}" class="date_icon">~
<input type="text" name="delivery_end_date" id="delivery_end_date" style="width:77px;" autocomplete="off" value="${param.delivery_end_date }" class="date_icon">
</td>
<%-- 구매담당자 주석처리
<td><label for="">구매담당자</label></td>
<td><select name="sales_mng_user_id" id="sales_mng_user_id" class="select2" autocomplete="off" style="width:190px;" multiple="multiple" ><option value="">선택</option>${code_map.sales_mng_user_id}</select></td>
--%>
<td><label>발주일</label></td>
<td>
<input type="text" name="reg_start_date" id="reg_start_date" style="width:77px;" autocomplete="off" value="${param.reg_start_date}" class="date_icon">~
<input type="text" name="reg_end_date" id="reg_end_date" style="width:77px;" autocomplete="off" value="${param.reg_end_date }" class="date_icon">
</td>
</tr>
</table>
</div>