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

V20260210 #152

Merged
hjjeong merged 2 commits from V20260210 into main 2026-02-25 09:02:28 +00:00
Conversation 0 Commits 2 Files Changed 6 +46 -44
6 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebContent/WEB-INF/view/contractMgmt/estimateTemplate1.jsp
View File

@@ -420,8 +420,8 @@ function fn_controlButtons() {
console.log("=== fn_controlButtons 호출 ===");
console.log("g_apprStatus:", g_apprStatus);
if(g_apprStatus === "결재완료") {
console.log("결재완료 상태 - 입력 필드 비활성화");
if(g_apprStatus === "결재완료" || g_apprStatus === "결재중") {
console.log(g_apprStatus + " 상태 - 입력 필드 비활성화");
// 결재완료된 경우 행추가, 저장 버튼 숨김
$("#btnAddRow").hide();
$("#btnSave").hide();

2
WebContent/WEB-INF/view/contractMgmt/estimateTemplate2.jsp
View File

@@ -9,7 +9,7 @@ String userId = CommonUtils.checkNull(person.getUserId());
String objId = CommonUtils.checkNull(request.getParameter("objId"));
String templateObjId = CommonUtils.checkNull(request.getParameter("templateObjId"));
String apprStatus = CommonUtils.checkNull((String)request.getAttribute("apprStatus"));
boolean isApproved = "결재완료".equals(apprStatus);
boolean isApproved = "결재완료".equals(apprStatus) || "결재중".equals(apprStatus);
%>
<!DOCTYPE html>
<html>

4
WebContent/WEB-INF/view/contractMgmt/orderMgmtList.jsp
View File

@@ -165,7 +165,7 @@ var columns = [
}
},
// 2. 주문유형
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 55, widthGrow: 0.6, title : '주문유형', field : 'CATEGORY_NAME' },
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 77, widthGrow: 0.8, title : '주문유형', field : 'CATEGORY_NAME' },
// 3. 발주일
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 70, widthGrow: 0.7, title : '발주일', field : 'ORDER_DATE' },
// 4. 발주번호
@@ -343,7 +343,7 @@ var columns = [
function fn_search(){
// fnc_tabul_search로 페이징 처리
_tabulGrid = fnc_tabul_search(
_tabul_layout_fitColumns,
_tabul_layout_fitDataStretch,
_tabulGrid,
"/contractMgmt/contractGridList.do",
columns,

20
WebContent/WEB-INF/view/quality/customerCsList.jsp
View File

@@ -343,13 +343,13 @@ function fn_delete(){
${code_map.customer_cd}
</select>
</td>
<!-- <td><label>제품구분</label></td>
<td><label>제품구분</label></td>
<td>
<select name="search_product_type" id="search_product_type" class="select2" autocomplete="off" style="width:120px;">
<select name="search_product_type" id="search_product_type" class="select2" autocomplete="off" style="">
<option value="">전체</option>
${code_map.product_type}
</select>
</td> -->
</td>
<td><label>품번</label></td>
<td><input type="text" name="search_product_no" id="search_product_no" style="width:210px;" autocomplete="off"></td>
<td><label>품명</label></td>
@@ -359,14 +359,16 @@ function fn_delete(){
<td><label>부품품명</label></td>
<td><input type="text" name="search_part_name" id="search_part_name" style="" autocomplete="off"></td> -->
<td><label>S/N</label></td>
<td><input type="text" name="search_serial_no" id="search_serial_no" style="width:215px;" autocomplete="off"></td>
<td><label>제조사</label></td>
<td><input type="text" name="search_manufacturer" id="search_manufacturer" style="width:230px;" autocomplete="off"></td>
<td><input type="text" name="search_serial_no" id="search_serial_no" style="width:230px;" autocomplete="off"></td>
</tr>
<tr>
<tr>
<td><label>제조사</label></td>
<td><input type="text" name="search_manufacturer" id="search_manufacturer" style="width:215px;" autocomplete="off"></td>
<td><label>귀책판정</label></td>
<td>
<select name="search_blame_decision" id="search_blame_decision" class="select2" autocomplete="off" style="width:212px;">
<select name="search_blame_decision" id="search_blame_decision" class="select2" autocomplete="off" style="width:230px;">
<option value="">전체</option>
<option value="R">RPS</option>
<option value="C">고객사</option>
@@ -376,7 +378,7 @@ function fn_delete(){
</td>
<td><label>상태</label></td>
<td>
<select name="search_status" id="search_status" class="select2" autocomplete="off" style="width:230px;">
<select name="search_status" id="search_status" class="select2" autocomplete="off" style="">
<option value="">전체</option>
<option value="Open">Open</option>
<option value="Closed">Closed</option>

3
src/com/pms/salesmgmt/controller/ContractMgmtController.java
View File

@@ -2193,6 +2193,9 @@ public class ContractMgmtController {
request.setAttribute("estimate", estimate);
request.setAttribute("items", items);
request.setAttribute("code_map", code_map);
if(estimate != null && estimate.get("APPR_STATUS") != null) {
request.setAttribute("apprStatus", estimate.get("APPR_STATUS"));
}
} catch (Exception e) {
e.printStackTrace();

57
src/com/pms/salesmgmt/mapper/contractMgmt.xml
View File

@@ -4191,18 +4191,17 @@ ORDER BY ASM.CLIENT_NM
ROW_NUMBER() OVER (PARTITION BY ET.TEMPLATE_TYPE ORDER BY ET.REGDATE) AS "REVISION",
COALESCE(
(SELECT CASE
WHEN A.STATUS = 'complete' THEN '결재완료'
WHEN A.STATUS = 'cancel' THEN '취소'
WHEN A.STATUS = 'reject' THEN '반려'
WHEN A.STATUS = 'inProcess' THEN '결재중'
ELSE '작성중'
WHEN AMR.STATUS = 'complete' THEN '결재완료'
WHEN AMR.STATUS = 'reject' THEN '반려'
WHEN AMR.STATUS = 'inProcess' THEN '결재중'
WHEN AMR.STATUS = 'create' THEN '작성중'
ELSE ''
END
FROM APPROVAL A
WHERE A.TARGET_OBJID::VARCHAR = ET.OBJID
AND A.TARGET_TYPE = 'CONTRACT_ESTIMATE'
ORDER BY A.REGDATE DESC
FROM AMARANTH_APPROVAL AMR
WHERE AMR.TARGET_OBJID = ET.OBJID::VARCHAR
AND AMR.TARGET_TYPE = 'CONTRACT_ESTIMATE'
LIMIT 1),
'작성중'
''
) AS "APPR_STATUS"
FROM
ESTIMATE_TEMPLATE ET
@@ -4248,18 +4247,17 @@ ORDER BY ASM.CLIENT_NM
CODE_NAME(CM.CONTRACT_CURRENCY) AS CONTRACT_CURRENCY_NAME,
COALESCE(
(SELECT CASE
WHEN A.STATUS = 'complete' THEN '결재완료'
WHEN A.STATUS = 'cancel' THEN '취소'
WHEN A.STATUS = 'reject' THEN '반려'
WHEN A.STATUS = 'inProcess' THEN '결재중'
ELSE '작성중'
WHEN AMR.STATUS = 'complete' THEN '결재완료'
WHEN AMR.STATUS = 'reject' THEN '반려'
WHEN AMR.STATUS = 'inProcess' THEN '결재중'
WHEN AMR.STATUS = 'create' THEN '작성중'
ELSE ''
END
FROM APPROVAL A
WHERE A.TARGET_OBJID::VARCHAR = ET.OBJID
AND A.TARGET_TYPE = 'CONTRACT_ESTIMATE'
ORDER BY A.REGDATE DESC
FROM AMARANTH_APPROVAL AMR
WHERE AMR.TARGET_OBJID = ET.OBJID::VARCHAR
AND AMR.TARGET_TYPE = 'CONTRACT_ESTIMATE'
LIMIT 1),
'작성중'
''
) AS APPR_STATUS
FROM
ESTIMATE_TEMPLATE ET
@@ -4318,18 +4316,17 @@ ORDER BY ASM.CLIENT_NM
CODE_NAME(CM.CONTRACT_CURRENCY) AS CONTRACT_CURRENCY_NAME,
COALESCE(
(SELECT CASE
WHEN A.STATUS = 'complete' THEN '결재완료'
WHEN A.STATUS = 'cancel' THEN '취소'
WHEN A.STATUS = 'reject' THEN '반려'
WHEN A.STATUS = 'inProcess' THEN '결재중'
ELSE '작성중'
WHEN AMR.STATUS = 'complete' THEN '결재완료'
WHEN AMR.STATUS = 'reject' THEN '반려'
WHEN AMR.STATUS = 'inProcess' THEN '결재중'
WHEN AMR.STATUS = 'create' THEN '작성중'
ELSE ''
END
FROM APPROVAL A
WHERE A.TARGET_OBJID::VARCHAR = ET.OBJID
AND A.TARGET_TYPE = 'CONTRACT_ESTIMATE'
ORDER BY A.REGDATE DESC
FROM AMARANTH_APPROVAL AMR
WHERE AMR.TARGET_OBJID = ET.OBJID::VARCHAR
AND AMR.TARGET_TYPE = 'CONTRACT_ESTIMATE'
LIMIT 1),
'작성중'
''
) AS APPR_STATUS
FROM
ESTIMATE_TEMPLATE ET