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

영업관리>견적관리>견적작성 화면에서 수신인 입력 부분 선택을 텍스트 입력 형태로 변경

Browse Source 
영업관리>주문서관리>수주등록 화면에서 수주단가 컬럼 필수 해제
영업관리>견적관리 & 주문서관리 리스트 오른쪽 맨 끝에 작성자 컬럼 추가
This commit is contained in:
syc0123
2026-03-20 17:17:50 +09:00
parent 24036b9abd
commit 5542f00ea2
6 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
WebContent/WEB-INF/classes/com/pms/mapper/purchaseOrder.xml
View File

@@ -6625,12 +6625,12 @@ FROM(
<!-- 마감정보 -->
,COALESCE(AP.tax_type, '') AS TAX_TYPE
,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.tax_type) AS TAX_TYPE_NAME
,COALESCE((SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.tax_type), '') AS TAX_TYPE_NAME
,COALESCE(AP.tax_invoice_date, '') AS TAX_INVOICE_DATE
,COALESCE(AP.export_decl_no, '') AS EXPORT_DECL_NO
,COALESCE(AP.loading_date, '') AS LOADING_DATE
,COALESCE(AP.foreign_type, '') AS FOREIGN_TYPE
,(SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.foreign_type) AS FOREIGN_TYPE_NAME
,COALESCE((SELECT CODE_NAME FROM COMM_CODE CC WHERE CC.CODE_ID = AP.foreign_type), '') AS FOREIGN_TYPE_NAME
,COALESCE(AP.duty, 0) AS DUTY
,COALESCE(AP.exchange_rate, 0) AS EXCHANGE_RATE
,COALESCE(AP.import_vat, 0) AS IMPORT_VAT

12
WebContent/WEB-INF/view/contractMgmt/estimateAndOrderRegistFormPopup.jsp
View File

@@ -218,12 +218,6 @@
$row.find(".item-order-quantity").focus();
return false;
}
if(orderUnitPrice == "" || orderUnitPrice == "0") {
alert((i+1) + "번째 품목의 수주단가를 입력해주세요.");
$row.find(".item-order-unit-price").focus();
return false;
}
}
return true;
@@ -344,7 +338,7 @@
// 수주단가
html += '<td style="padding:5px; border:1px solid #ddd;">';
html += '<input type="text" name="item_order_unit_price[]" class="item-order-unit-price" style="width:90%; padding:5px;" required numberOnly />';
html += '<input type="text" name="item_order_unit_price[]" class="item-order-unit-price" style="width:90%; padding:5px;" numberOnly />';
html += '</td>';
// 수주공급가액 (자동계산 + 수정가능)
@@ -554,7 +548,7 @@
}
html += '</td>';
html += '<td style="padding:5px; border:1px solid #ddd;">';
html += '<input type="text" name="item_order_unit_price[]" class="item-order-unit-price" style="width:90%; padding:5px;" required numberOnly value="' + (orderUnitPrice ? addComma(orderUnitPrice) : '') + '" />';
html += '<input type="text" name="item_order_unit_price[]" class="item-order-unit-price" style="width:90%; padding:5px;" numberOnly value="' + (orderUnitPrice ? addComma(orderUnitPrice) : '') + '" />';
html += '</td>';
html += '<td style="padding:5px; border:1px solid #ddd;">';
html += '<input type="text" name="item_order_supply_price[]" class="item-order-supply-price" style="width:90%; padding:5px;" numberOnly value="' + (orderSupplyPrice ? addComma(orderSupplyPrice) : '') + '" />';
@@ -1482,7 +1476,7 @@
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#e3f2fd;">고객요청사항</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#e3f2fd;">반납사유</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#fff3e0;">수주수량 <span style="color:red;">*</span></th>
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#fff3e0;">수주단가 <span style="color:red;">*</span></th>
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#fff3e0;">수주단가 </th>
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#fff3e0;">수주공급가액</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#fff3e0;">수주부가세</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd; background:#fff3e0;">수주총액</th>

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

@@ -471,7 +471,8 @@ var columns = [
},
// 17. 품번
{headerHozAlign : 'center', hozAlign : 'center', minWidth: 80, widthGrow: 1, title : '품번', field : 'PART_NO' },
// 18. 작성자
{headerHozAlign : 'center', hozAlign : 'center', minWidth: 70, widthGrow: 0.8, title : '작성자', field : 'WRITER_NAME' },
/* 아래는 주석처리된 컬럼들 - 필요시 활성화 */
/*
// 제품구분
@@ -486,7 +487,6 @@ var columns = [
// {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '설비대수', field : 'FACILITY_QTY' },
// {headerHozAlign : 'center', hozAlign : 'center', width : '100', title : '설비타입', field : 'FACILITY_TYPE' },
// {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '설비길이', field : 'FACILITY_DEPTH' },
// {headerHozAlign : 'center', hozAlign : 'center', width : '70', title : '담당자', field : 'WRITER_NAME' },
// {headerHozAlign : 'center', hozAlign : 'center', width : '90', title : '등록일', field : 'REG_DATE' },
// {headerHozAlign : 'center', hozAlign : 'center', width : '80', title : '첨부파일', field : 'CU01_CNT',
// formatter:fnc_subInfoValueFormatter,

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

@@ -1387,9 +1387,7 @@ function fn_save() {
<tr>
<td class="label">수신인</td>
<td class="editable">
<select id="contact_person" style="width: 100%; border: none; font-size: 9pt; padding: 2px;">
<option value="">담당자 선택</option>
</select>
<input type="text" id="contact_person" value="">
</td>
</tr>
<tr>

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

@@ -362,6 +362,9 @@ var columns = [
// 21. 품번
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 70, widthGrow: 0.8, title : '품번', field : 'PART_NO' },
// 22. 작성자
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 100, widthGrow: 1.2, title : '작성자', field : 'WRITER_NAME' },
/* 주석처리된 컬럼 - 필요시 활성화 */
/*
{headerHozAlign : 'center', hozAlign : 'center', minWidth : 55, widthGrow: 0.6, title : '제품구분', field : 'PRODUCT_NAME' },

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

@@ -518,7 +518,7 @@
<th style="text-align:center; padding:8px; border:1px solid #ddd;">품명</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd;">S/N</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd;">수주수량 <span style="color:red;">*</span></th>
<th style="text-align:center; padding:8px; border:1px solid #ddd;">수주단가 <span style="color:red;">*</span></th>
<th style="text-align:center; padding:8px; border:1px solid #ddd;">수주단가 </th>
<th style="text-align:center; padding:8px; border:1px solid #ddd;">수주공급가액</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd;">수주부가세</th>
<th style="text-align:center; padding:8px; border:1px solid #ddd;">수주총액</th>