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

Merge pull request 'V20260210' (#167) from V20260210 into main

Browse Source 
Reviewed-on: #167
This commit was merged in pull request #167.
This commit is contained in:
hjjeong
2026-03-11 09:35:38 +00:00
parent e2d53c6cd4 60fde7f615
commit b0b8db7030
9 changed files with 201 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
WebContent/WEB-INF/view/productionplanning/prodPlanResultMgmtList.jsp
View File

@@ -287,19 +287,19 @@ var columns = [
},
// 18. 장비조립WBS
{
headerHozAlign: 'center',
hozAlign: 'center',
minWidth: 110,
title: '장비조립WBS',
field: 'EQUIPMENT_WBS',
cssClass: 'col-light-green',
formatter:fnc_subInfoValueFormatter,
cellClick:function(e, cell){
var objid = fnc_checkNull(cell.getData().OBJID);
wbs_popup(objid);
}
},
// {
// headerHozAlign: 'center',
// hozAlign: 'center',
// minWidth: 110,
// title: '장비조립WBS',
// field: 'EQUIPMENT_WBS',
// cssClass: 'col-light-green',
// formatter:fnc_subInfoValueFormatter,
// cellClick:function(e, cell){
// var objid = fnc_checkNull(cell.getData().OBJID);
// wbs_popup(objid);
// }
// },
// 19. 등록자
{

602
WebContent/WEB-INF/view/purchaseOrder/deliveryAcceptanceFormPopUp_new.jsp
View File

@@ -26,30 +26,34 @@
<c:set var="sysDate"><fmt:formatDate value="${now}" pattern="yyyy-MM-dd" /></c:set>
<style>
/*
#gview_list_Attachments .ui-jqgrid-bdiv{
max-height: 300px;
overflow-y: visible;
html, body {
margin: 0;
padding: 0;
overflow: hidden;
height: 100%;
box-sizing: border-box;
}
section {
margin: 0;
padding: 0 4px;
}
form {
margin: 0;
}
*/
.ui-jqgrid-view {
max-height: 322px;
//min-height: 100px !important;
}
.ui-jqgrid-bdiv {
overflow-y: scroll !important;
max-height: 280px !important;
//min-height: 100px !important;
}
.footrow {
display : none;
}
.pointer {
cursor: pointer;
text-decoration: underline;
}
cursor: pointer;
text-decoration: underline;
}
</style>
<script type="text/javascript">
@@ -114,7 +118,7 @@ $(document).ready(function(){
//상신된 결재라인 가져오기
fn_getApprLine();
if("${info.PARTNER_OBJID}" != ""){
if("${info.PARTNER_OBJID}" != "" && typeof changelist === "function"){
changelist("${info.PARTNER_OBJID}");
}
@@ -197,7 +201,7 @@ function fn_addarrival(){
var appendHead2Text = "";
var listSize = "${partList.size()}";
var addColStr = '<col width="90px" /><col width="90px" /><col width="90px" /><col width="130x" /><col width="130px" /><col width="90px" /><col width="90px" class="lastCol" />';
var addColStr = '<col width="90px" /><col width="130px" /><col width="130px" /><col width="90px" /><col width="90px" class="lastCol" />';
var tdHeaderCount = $(".tdHeader").length + 1;
// 현재 최대 그룹 시퀀스를 찾기 위해 추가
@@ -223,16 +227,14 @@ function fn_addarrival(){
var seq=1;
appendText+="<thead style='position: relative; z-index: 2;'>";
appendText+="<tr class='plm_thead' id='head1' >";
appendText+="<td class='tdHeader thead' colspan='6'>1차</td>";
appendText+="<td class='tdHeader thead' colspan='4'>1차</td>";
appendText+= "<td rowspan='2' class='NON_ARRIVAL_QTY_TXT'>미입고수량</td>";
//appendText+="<td rowspan='2'>미입고수량</td>";
appendText+="</tr>";
appendText+="<tr class='plm_thead' id='head2'>";
appendText+="<td>입고예정수량</td>";
appendText+="<td>입고예정일</td>";
appendText+="<td>입고일</td>";
appendText+="<td><input type='checkbox' name='groupCheck_1' value='1'>Location</td>";
appendText+="<td><input type='checkbox' name='groupSubCheck_1' value='1'>SubLocation</td>";
appendText+="<td><input type='checkbox' name='groupCheck_1' value='1'>입고창고</td>";
appendText+="<td><input type='checkbox' name='groupSubCheck_1' value='1'>계정과목</td>";
appendText+="<td>입고수량</td>";
appendText+="</tr>";
appendText+="</thead>";
@@ -246,24 +248,17 @@ function fn_addarrival(){
appendText+="<input type='hidden' name='RECEIPT_INV_QTY' value='' />";
var ARRIVAL_QTY = $('#part_table tbody tr').eq(i).find('td').eq(5).text().trim();
var RECEIPT_DATE = $('#part_table tbody tr').eq(i).find('td').eq(6).text().trim();
var PART_OBJID = $('#part_table tbody tr').eq(i).find("input[name^='PART_OBJID']").val();
var ORDER_PART_OBJID = $('#part_table tbody tr').eq(i).find("input[name^='ORDER_PART_OBJID']").val();
var sysDate = "${sysDate}";
//alert("PART_OBJID:"+PART_OBJID)
appendText+=" <input type='text' name='ARRIVAL_QTY' class='date' value='"+ARRIVAL_QTY+"'/>";
appendText+="</td>";
appendText+="<td>";
appendText+=" <input type='text' name='ARRIVAL_PLAN_DATE' class='date' value='"+RECEIPT_DATE+"'/>";
appendText+="</td>";
appendText+="<td>";
appendText+=" <input type='hidden' name='ARRIVAL_QTY' value='"+ARRIVAL_QTY+"'/>";
appendText+=" <input type='text' name='RECEIPT_DATE' class='date' value='"+sysDate+"'/>";
appendText+="</td>";
appendText+="<td>";
appendText+=" <select name='LOCATION' id='LOCATION_"+seq+"' class='LOCATION_1' data-select='${item.LOCATION}' onchange='chageLangSelect("+seq+",\"${item.SUB_LOCATION}\")'><option value=''>선택</option>${code_map.location}</select>";
appendText+="</td>";
appendText+="<td>";
appendText+=" <select name='SUB_LOCATION' id='SUB_LOCATION_"+seq+"' class='SUB_LOCATION_1' data-select='${item.SUB_LOCATION}'><option value=''>선택</option></select>";
appendText+=" <select name='LOCATION' id='LOCATION_"+seq+"' class='LOCATION_1'>"+_warehouseOptHtml+"</select>";
appendText+="</td>";
appendText+="<td>";
appendText+=" <select name='SUB_LOCATION' id='SUB_LOCATION_"+seq+"' class='SUB_LOCATION_1'>"+_acctCodeOptHtml+"</select>";
appendText+="</td>";
appendText+="<td>";
appendText+=" <input type='text' style='text-align:center; color:red;' name='RECEIPT_QTY' class='RECEIPT_QTY_"+ORDER_PART_OBJID+"' value='"+ARRIVAL_QTY+"' onchange='fn_calc("+ORDER_PART_OBJID+");' />";
@@ -285,13 +280,11 @@ function fn_addarrival(){
$(".NON_ARRIVAL_QTY_TXT").remove();
$('.lastCol').remove();
var seq = maxSeq;
appendHead1Text += "<td class='tdHeader' colspan='6'>" + tdHeaderCount + "차</td>";
appendHead1Text += "<td class='tdHeader' colspan='4'>" + tdHeaderCount + "차</td>";
appendHead1Text += "<td rowspan='2' class='NON_ARRIVAL_QTY_TXT'>미입고수량</td>";
appendHead2Text += "<td>입고예정수량</td>";
appendHead2Text += "<td>입고예정일</td>";
appendHead2Text += "<td>입고일</td>";
appendHead2Text += "<td><input type='checkbox' name='groupCheck_" + newGroupSeq + "' value='" + newGroupSeq + "'>Location</td>";
appendHead2Text += "<td><input type='checkbox' name='groupSubCheck_" + newGroupSeq + "' value='" + newGroupSeq + "'>SubLocation</td>";
appendHead2Text += "<td><input type='checkbox' name='groupCheck_" + newGroupSeq + "' value='" + newGroupSeq + "'>입고창고</td>";
appendHead2Text += "<td><input type='checkbox' name='groupSubCheck_" + newGroupSeq + "' value='" + newGroupSeq + "'>계정과목</td>";
appendHead2Text += "<td>입고수량</td>";
$("#head1").append(appendHead1Text);
@@ -309,25 +302,19 @@ function fn_addarrival(){
Text+="<input type='hidden' name='RECEIPT_INV_QTY' value='' />";
var ARRIVAL_QTY = $('#part_table tbody tr').eq(i).find('td').eq(5).text().trim();
var RECEIPT_DATE = $('#part_table tbody tr').eq(i).find('td').eq(6).text().trim();
var PART_OBJID = $('#part_table tbody tr').eq(i).find("input[name^='PART_OBJID']").val();
var ORDER_PART_OBJID = $('#part_table tbody tr').eq(i).find("input[name^='ORDER_PART_OBJID']").val();
var NON_ARRIVAL_QTY = $('#part_table tbody tr').eq(i).find("input[name^='NON_RECEIPT_QTY']").val();
var sysDate = "${sysDate}";
Text+=" <input type='text' style='text-align:center;' name='ARRIVAL_QTY' class='' value='"+NON_ARRIVAL_QTY+"'/>";
Text+="</td>";
Text+="<td>";
Text+=" <input type='text' name='ARRIVAL_PLAN_DATE' class='date' value='"+sysDate+"'/>";
Text+="</td>";
Text+="<td>";
Text+=" <input type='hidden' name='ARRIVAL_QTY' value='"+NON_ARRIVAL_QTY+"'/>";
Text+=" <input type='text' name='RECEIPT_DATE' class='date' value='"+sysDate+"'/>";
Text+="</td>";
Text+="<td>";
Text+=" <select name='LOCATION' id='LOCATION_"+seq+"' class='LOCATION_"+newGroupSeq+"' data-select='${item.LOCATION}' onchange='chageLangSelect("+seq+",\"${item.SUB_LOCATION}\")'><option value=''>선택</option>${code_map.location}</select>";
Text+="</td>";
Text+="<td>";
Text+=" <select name='SUB_LOCATION' id='SUB_LOCATION_"+seq+"' class='SUB_LOCATION_"+newGroupSeq+"' data-select='${item.SUB_LOCATION}'><option value=''>선택</option></select>";
Text+=" <select name='LOCATION' id='LOCATION_"+seq+"' class='LOCATION_"+newGroupSeq+"'>"+_warehouseOptHtml+"</select>";
Text+="</td>";
Text+="<td>";
Text+=" <select name='SUB_LOCATION' id='SUB_LOCATION_"+seq+"' class='SUB_LOCATION_"+newGroupSeq+"'>"+_acctCodeOptHtml+"</select>";
Text+="</td>";
Text+="<td>";
Text+=" <input type='text' style='text-align:center; color:red;' name='RECEIPT_QTY' class='RECEIPT_QTY_"+ORDER_PART_OBJID+"' value='"+NON_ARRIVAL_QTY+"' onchange='fn_calc("+ORDER_PART_OBJID+");' />";
@@ -372,15 +359,14 @@ function fn_removearrival() {
// head2에서 마지막 차수 삭제
var head2Cells = $("#head2 td");
var cellsToRemove = 6;
//var cellsToRemove = head2Cells.slice(-3).find("input[type='checkbox']").length > 0 ? 2 : 3;
var cellsToRemove = 4;
head2Cells.slice(-cellsToRemove).remove();
// 데이터 행에서 마지막 차수 삭제
$("tr[id^='dataTr_']").each(function() {
var cells = $(this).find("td");
var lastCell = cells.last(); // 마지막 td를 선택
var cellsToRemove = cells.slice(-7, -1); // 마지막 td를 제외하고 그 앞의 네 개 td를 선택
var cellsToRemove = cells.slice(-5, -1); // 마지막 td(미입고수량)를 제외하고 그 앞의 4개 td를 선택
cellsToRemove.remove(); // 선택한 td를 삭제
$("input[name*=RECEIPT_QTY]").trigger("change");
@@ -395,7 +381,7 @@ function fn_removearrival() {
});
// colgroup 조정
//var colsToRemove = $("#addColgroup col").slice(-3).length === 3 ? 3 : 2;
$("#addColgroup1 col").slice(-7, -1).remove();
$("#addColgroup1 col").slice(-5, -1).remove();
applyScrollHandler();
// 창 크기 조정
@@ -462,64 +448,6 @@ function fn_setMultiInfoForSaved(val){
</c:choose>
}
//동시발주 영역 내용 생성
function fn_setMultiInfo(val){
var projectCnt = 0;
$(".APPLICATION_PROJECT_NO option").remove();
$(".APPLICATION_PROJECT_NO").attr("disabled", "disabled");
$(".DELIVERY_PLAN_DATE").attr("disabled", "disabled");
$(".DELIVERY_PLAN_QTY").attr("disabled", "disabled");
$(".APPLICATION_PROJECT_NO").val('');
$(".DELIVERY_PLAN_DATE").val('');
$(".DELIVERY_PLAN_QTY").val('');
for (i=1; i < 11; i++){
var APPLICATION_PROJECT_NO = "APPLICATION_PROJECT_NO"+i
fn_projectNameList("", APPLICATION_PROJECT_NO, "", val);
projectCnt = $("#"+APPLICATION_PROJECT_NO).find('option').length;
if(projectCnt > 2){
$("#"+APPLICATION_PROJECT_NO).attr("disabled", false);
}
if(projectCnt-2 <= i){ //projectCnt == 0 ||
break;
}
}
//마스터 프로젝트번호 제거
if(fnc_isNotEmpty(val)){
$("select[name^=APPLICATION_PROJECT_NO]").each(function(){
$(this).find('option[value='+val+']').remove();
});
}
}
//동시구매건수 + 메인(1) 건수
function fn_getProjectCount(){
var sameProjectCount = $('.APPLICATION_PROJECT_NO').filter(function(){
return $(this).val() !== '' && fnc_isEmpty($(this).attr("disabled"));
}).length;
return fnc_checkNullDefaultValue(sameProjectCount, 0) + 1;
}
function changelist(objid, kindCode){
$("#SUPPLY_BUS_NO, #SUPPLY_USER_NAME, #SUPPLY_USER_HP, #SUPPLY_USER_TEL, #SUPPLY_USER_FAX, #SUPPLY_USER_EMAIL, #SUPPLY_ADDR").val("");
if(objid!=""){
//공급업체에 발주서공급담당자(0000330)로 지정된 정보를 가져온다
var list = fnc_getJsonAllDataListBySqlId({"sqlId":"purchaseOrder.purchaseOrderAdminSupplyInfo", "PARTNER_OBJID":objid});
if(fnc_checkNull( list )!=""){
var row = list[0];
$("#SUPPLY_BUS_NO" ).val( row["SUPPLY_BUS_NO" ] );
$("#SUPPLY_USER_NAME" ).val( row["SUPPLY_USER_NAME" ] );
$("#SUPPLY_USER_HP" ).val( row["SUPPLY_USER_HP" ] );
$("#SUPPLY_USER_TEL" ).val( row["SUPPLY_USER_TEL" ] );
$("#SUPPLY_USER_FAX" ).val( row["SUPPLY_USER_FAX" ] );
$("#SUPPLY_USER_EMAIL").val( row["SUPPLY_USER_EMAIL"] );
$("#SUPPLY_ADDR" ).val( row["SUPPLY_ADDR" ] );
}
}
}
function addZeroEvtAtPriceInput(){
$("input:text[name*=PRICE]").on("focus", function() {
var val = $(this).val();
@@ -810,6 +738,13 @@ function fn_location_save(){
</script>
</head>
<body>
<%-- 옵션 목록 템플릿: 1회만 출력하여 JS에서 재사용 --%>
<select id="_tpl_warehouse" style="display:none"><option value="">선택</option>${code_map.warehouse}</select>
<select id="_tpl_acctCode" style="display:none"><option value="">선택</option>${code_map.acctCode}</select>
<script>
var _warehouseOptHtml = document.getElementById('_tpl_warehouse').innerHTML;
var _acctCodeOptHtml = document.getElementById('_tpl_acctCode').innerHTML;
</script>
<form name="hiddenForm" id="hiddenForm" method="post">
<!-- <input type="hidden" name="OBJID" id="OBJID"> -->
</form>
@@ -823,165 +758,17 @@ function fn_location_save(){
<input type="hidden" name="DELIVERY_STATUS" id="DELIVERY_STATUS" value="${param.DELIVERY_STATUS}" />
<section>
<div class="plm_menu_name">
<h2><span>입고결과등록</span></h2>
<h2><span>입고등록</span></h2>
</div>
<div id="expenseApplyPopupFormWrap1">
<table class="pmsPopupForm">
<colgroup>
<col width="5%" />
<col width="5%" />
<col width="10%" />
<col width="10%" />
<col width="10%" />
<col width="10%" />
<!-- <col width="10%" /> -->
<col width="5%" />
<col width="5%" />
<col width="10%" />
<col width="10%" />
<col width="10%" />
<col width="10%" />
</colgroup>
<tr>
<td colspan="2">발주번호</td>
<td colspan="1"><input type="text" name="PURCHASE_ORDER_NO" id="PURCHASE_ORDER_NO" value="${info.PURCHASE_ORDER_NO }" readonly /></td>
<td colspan="">발주부품</td>
<td colspan="2">
<input type="text" name="TYPE_NAME" id="TYPE_NAME" value="${info.TYPE_NAME }" readonly />
<%-- <select name="TYPE" id="TYPE" required reqTitle="발주부품" type="select" class="select2" autocomplete="off" disabled>
<option value="">선택</option>
${code_map.type}
</select> --%>
</td>
<td colspan="2">프로젝트번호</td>
<td colspan="1">
<input type="text" name="PROJECT_NO" id="PROJECT_NO" value="${info.PROJECT_NO }" readonly />
<input type="hidden" name="CONTRACT_MGMT_OBJID" id="CONTRACT_MGMT_OBJID" value="${info.CONTRACT_MGMT_OBJID }" readonly />
<%-- <select name="CONTRACT_MGMT_OBJID" id="CONTRACT_MGMT_OBJID" required reqTitle="PROJECT명" type="select" class="select2" autocomplete="off" disabled>
<option value="">선택</option>
${code_map.project_no}
</select> --%>
</td>
<td colspan="">유닛명</td>
<td colspan="2">
<input type="text" name="UNIT_NAME" id="UNIT_NAME" value="${info.UNIT_NAME }" readonly />
<input type="hidden" name="UNIT_CODE" id="UNIT_CODE" value="${info.UNIT_CODE }" readonly />
<!-- <select name="UNIT_CODE" id="UNIT_CODE" required reqTitle="유닛명" type="select" class="select2" autocomplete="off" disabled></select> -->
</td>
</tr>
<tr>
<td rowspan="2" colspan="6" style="text-align:center; height: 65px;"><h1 style="font-size: 35px;">입고결과등록<!-- <br/><p style="font-size:12px; border:none; width:100%;">(Inspection sheet)</p> --></h1></td>
<td rowspan="2" colspan="2" style="height: 65px;" class="input_title">결재</td>
<td style="text-align:center; height: 15px;" class="input_title">담당</td>
<td style="text-align:center;" class="input_title">검토</td>
<td style="text-align:center;" class="input_title">결재</td>
<td style="text-align:center;" class="input_title">대표</td>
</tr>
<tr>
<td style="text-align:center;" id="appr0"></td>
<td style="text-align:center;" id="appr1"></td>
<td style="text-align:center;" id="appr2"></td>
<td style="text-align:center;" id="appr3"></td>
</tr>
<tr>
<td rowspan="6" colspan="2" class="input_title">발주처</td>
<td class="input_title">회사명</td>
<td colspan="3">우성에스이주식회사</td>
<td rowspan="6" colspan="2" class="input_title">공급처</td>
<td class="input_title">회사명</td>
<td colspan="3">
<input type="text" name="PARTNER_OBJID" id="PARTNER_OBJID" value="${info.PARTNER_NAME }" readonly />
</td>
</tr>
<tr>
<td class="input_title">사업자번호</td>
<td colspan="3">514-81-95155</td>
<td class="input_title">사업자번호</td>
<td colspan="3"><input type="text" name="SUPPLY_BUS_NO" id="SUPPLY_BUS_NO" value="${info.SUPPLY_BUS_NO }" readonly /></td>
</tr>
<tr>
<td class="input_title">담당자</td>
<td>
<input type="text" name="SALES_MNG_USER_ID" id="SALES_MNG_USER_ID" value="${info.SALES_MNG_USER }" readonly />
</td>
<td class="input_title">HP</td>
<td><input type="text" name="SALES_MNG_USER_HP" id="SALES_MNG_USER_HP" value="${info.SALES_MNG_USER_CELL_PHONE }" readonly /></td>
<td class="input_title">담당자</td>
<td><input type="text" name="SUPPLY_USER_NAME" id="SUPPLY_USER_NAME" value="${info.SUPPLY_USER_NAME }" readonly /></td>
<td class="input_title">HP</td>
<td><input type="text" name="SUPPLY_USER_HP" id="SUPPLY_USER_HP" value="${info.SUPPLY_USER_HP }" readonly /></td>
</tr>
<tr>
<td class="input_title">전 화</td>
<td><input type="text" name="SALES_MNG_USER_TEL" id="SALES_MNG_USER_TEL" value="${oemInfo.OFFICE_NO }" readonly /></td>
<td class="input_title">FAX</td>
<td><input type="text" name="SALES_MNG_USER_FAX" id="SALES_MNG_USER_FAX" value="${oemInfo.SUPPLY_FAX_NO }" readonly /></td>
<td class="input_title">전 화</td>
<td><input type="text" name="SUPPLY_USER_TEL" id="SUPPLY_USER_TEL" value="${info.SUPPLY_USER_TEL }" readonly /></td>
<td class="input_title">FAX</td>
<td><input type="text" name="SUPPLY_USER_FAX" id="SUPPLY_USER_FAX" value="${info.SUPPLY_USER_FAX }" readonly /></td>
</tr>
<tr>
<td class="input_title">E-MAIL</td>
<td colspan="3">woosung@wsse.co.kr</td>
<td class="input_title">E-MAIL</td>
<td colspan="3"><input type="text" name="SUPPLY_USER_EMAIL" id="SUPPLY_USER_EMAIL" value="${info.SUPPLY_USER_EMAIL }" readonly /></td>
</tr>
<tr>
<td class="input_title">주 소</td>
<td colspan="3">대구광역시 달성군 다사읍 세천로3길 28</td>
<td class="input_title">주 소</td>
<td colspan="3"><input type="text" name="SUPPLY_ADDR" id="SUPPLY_ADDR" value="${info.SUPPLY_ADDR }" readonly /></td>
</tr>
<tr>
<td colspan="12" style="text-align: center; height:40px; color:#003399; font-weight:500;">아래의 자재를 발주하오니 기일 내 필히 납품하여 주시기 바랍니다.</td>
</tr>
<tr>
<td colspan="2" class="input_title">발주구분</td>
<td colspan="1">
<input type="text" name="ORDER_TYPE_CD_NAME" id="ORDER_TYPE_CD_NAME" value="${info.ORDER_TYPE_CD_NAME}" required reqTitle="발주구분" readonly style="width:100%;"/>
<%-- <select name="ORDER_TYPE_CD" id="ORDER_TYPE_CD" required reqTitle="발주구분" type="select" class="select2" autocomplete="off" disabled style="width:100%;">
<option value="">선택</option>
${code_map.order_type_cd}
</select> --%>
</td>
<td colspan="" class="input_title">납품장소</td>
<td colspan="1">
<input type="text" name="DELIVERY_PLACE" id="DELIVERY_PLACE" value="${info.DELIVERY_PLACE_NAME}" required reqTitle="납품장소" readonly style="width:100%;"/>
</td>
<td colspan="1" class="input_title">검수방법</td>
<td colspan="2">
<input type="text" name="INSPECT_METHOD" id="INSPECT_METHOD" value="${info.INSPECT_METHOD_NAME}" required reqTitle="검수방법" readonly style="width:100%;"/>
</td>
<td colspan="1" class="input_title">결제조건</td>
<td colspan="1">
<input type="text" name="PAYMENT_TERMS" id="PAYMENT_TERMS" value="${info.PAYMENT_TERMS_NAME}" required reqTitle="결제조건" readonly style="width:100%;"/>
</td>
<td colspan="1" class="input_title">입고요청일</td>
<td colspan="1"><input type="text" name="DELIVERY_DATE" id="DELIVERY_DATE" class="date_icon" required reqTitle="입고요청일" value="${info.DELIVERY_DATE }" readonly/></td>
</tr>
<tr>
<td colspan="2" class="input_title">발주서 No.</td>
<td colspan="1">
<input type="text" name="PURCHASE_ORDER_NO_ORG" id="PURCHASE_ORDER_NO_ORG" value="${info.PURCHASE_ORDER_NO_ORG}" readonly style="width:100%;"/>
<!-- <select name="PURCHASE_ORDER_NO_ORG" id="PURCHASE_ORDER_NO_ORG" required reqTitle="발주서 No." type="select" class="select2" autocomplete="off" disabled style="width:100%;">
</select> -->
</td>
<td colspan="1" class="input_title">제목</td>
<td colspan="2"><input type="text" name="TITLE" id="TITLE" value="${info.TITLE }" required reqTitle="제목" readonly style="width:100%;"/></td>
<td colspan="2" class="input_title">합계금액(원)</td>
<td colspan="5"><input type="text" name="TOTAL_PRICE_TXT" id="TOTAL_PRICE_TXT" value="${info.TOTAL_PRICE_TXT }" readonly placeHolder="금액합계 자동계산"/></td>
</tr>
</table>
<div id="expenseApplyPopupFormWrap1" style="display:flex; justify-content:space-between; align-items:center; padding:4px 8px;">
<h1 style="font-size:28px; margin:0; white-space:nowrap;">입고등록</h1>
<div style="display:flex; align-items:center; gap:8px; white-space:nowrap;">
<span>발주번호</span>
<input type="text" name="PURCHASE_ORDER_NO" id="PURCHASE_ORDER_NO" value="${info.PURCHASE_ORDER_NO }" readonly style="width:140px;" />
<span>프로젝트번호</span>
<input type="text" name="PROJECT_NO" id="PROJECT_NO" value="${info.PROJECT_NO }" readonly style="width:160px;" />
<input type="hidden" name="CONTRACT_MGMT_OBJID" id="CONTRACT_MGMT_OBJID" value="${info.CONTRACT_MGMT_OBJID }" readonly />
</div>
</div>
<div class="btn_wrap" style="height:40px;">
@@ -1003,9 +790,9 @@ function fn_location_save(){
<div style="float: left;">
<span style="color:red;">미입고 </span>
<td><input type="checkbox" name="LOCATION_CHECK" id="LOCATION_CHECK" value="YES"/></td>
<td><select name="LOCATION_CD" id="LOCATION_CD" style="width:100px;margin-right:10px;" onchange="chageLangSelect('CD','')"><option value=''>선택</option>${code_map.location}</select></td>
<td><select name="LOCATION_CD" id="LOCATION_CD" style="width:150px;margin-right:10px;"><option value=''>입고창고</option>${code_map.warehouse}</select></td>
<td><input type="checkbox" name="SUB_CHECK" id="SUB_CHECK" value="YES"/></td>
<td><select name="SUB_LOCATION_CD" id="SUB_LOCATION_CD" style="width:100px;margin-right:10px;"></select></td>
<td><select name="SUB_LOCATION_CD" id="SUB_LOCATION_CD" style="width:150px;margin-right:10px;"><option value=''>계정과목</option>${code_map.acctCode}</select></td>
</div>
<%-- <c:if test="${info.TYPE eq '0001538'}"> --%>
<input type="button" value="추가" id="btnAdd" class="plm_btns" style="background:#dfeffc">
@@ -1022,8 +809,8 @@ function fn_location_save(){
</div>
</div>
<div id="plm_table_wrap1" style="padding:0 8 0 8;">
<div id="plm_over" style="height:379px ; overflow-y: auto; overflow-x: auto;">
<div id="plm_table_wrap1" style="padding:0 8px 0 8px;">
<div id="plm_over" style="height: calc(100vh - 210px); overflow-y: auto; overflow-x: auto;">
<div style="width:44%; display: inline-block; float:left;">
<div class="plm_table_wrap1" style="height: auto;">
<div class="in_table_scroll_wrap _table1" style="height:40%;">
@@ -1076,7 +863,7 @@ function fn_location_save(){
<td title="${item.MAKER}" style="text-align:left;">${item.MAKER}</td>
<td title="${item.UNIT_TITLE}">${item.UNIT_TITLE}</td>
<td title="${item.ORDER_QTY}"><input type="hidden" name="ORDER_QTY" class="ORDER_QTY_${item.ORDER_PART_OBJID}" value="${item.ORDER_QTY}" onchange="fn_calc('${item.ORDER_PART_OBJID}');"/><fmt:formatNumber value="${item.ORDER_QTY}" pattern="#,###" /></td>
<td title="${item.POM_DELIVERY_DATE}">${item.POM_DELIVERY_DATE}</td>
<td title="${item.DELIVERY_REQUEST_DATE}">${item.DELIVERY_REQUEST_DATE}</td>
</tr>
</c:forEach>
</c:otherwise>
@@ -1099,49 +886,33 @@ function fn_location_save(){
<c:forEach var="item" items="${arrivalList}" varStatus="varStatus">
<c:choose>
<c:when test="${varStatus.index == 0}">
<colgroup id="addColgroup1">
<col width="90px" />
<col width="90px" />
<col width="90px" />
<col width="130px" />
<col width="130px" />
<col width="90px" />
<!-- <col width="75px" />
<col width="80px" />
<col width="80px" /> -->
</colgroup>
<thead style="position: relative; z-index: 2;">
<tr class="plm_thead" id="head1">
<td colspan="6" class="tdHeader">1차</td>
</tr>
<tr class="plm_thead" id='head2'>
<td>입고예정수량</td>
<td>입고예정일</td>
<td>입고일</td>
<td><input type='checkbox' name='groupCheck_1' value='1'>Location</td>
<td><input type='checkbox' name='groupSubCheck_1' value='1'>SubLocation</td>
<td>입고수량</td>
<!-- <td>부적합수량</td>
<td>부적합사유</td>
<td>귀책</td> -->
</tr>
</thead>
<colgroup id="addColgroup1">
<col width="90px" />
<col width="130px" />
<col width="130px" />
<col width="90px" />
</colgroup>
<thead style="position: relative; z-index: 2;">
<tr class="plm_thead" id="head1">
<td colspan="4" class="tdHeader">1차</td>
</tr>
<tr class="plm_thead" id='head2'>
<td>입고일</td>
<td><input type='checkbox' name='groupCheck_1' value='1'>입고창고</td>
<td><input type='checkbox' name='groupSubCheck_1' value='1'>계정과목</td>
<td>입고수량</td>
</tr>
</thead>
<tbody style="position: relative; z-index: 1;" >
<tr id="dataTr_${varStatus.count}">
<td>
<c:set var="GROUP_SEQ" value="${item.GROUP_SEQ}" />
<input type="hidden" name="OBJID" value="${item.OBJID}" />
<input type="hidden" name="GROUP_SEQ" value="${item.GROUP_SEQ}" />
<input type="hidden" name="SEQ" value="${item.SEQ}" />
<input type="hidden" name="INVENTORY_STATUS" value="${item.INVENTORY_STATUS}" />
<input type="hidden" name="INVOICE_OBJID" id="INVOICE_OBJID_${item.OBJID}" value="${item.INVOICE_OBJID}" />
<input type="text" name="ARRIVAL_QTY" style="text-align:center;" value="<fmt:formatNumber value="${item.ARRIVAL_QTY}" pattern="#,###" />" numberOnly />
<%-- <fmt:formatNumber value="${item.ARRIVAL_QTY}" pattern="#,###" /> --%>
</td>
<td>
<input type='text' name='ARRIVAL_PLAN_DATE' readonly id='ARRIVAL_PLAN_DATE_${item.OBJID}' class='date' value='${item.ARRIVAL_PLAN_DATE}' />
</td>
<td>
<tr id="dataTr_${varStatus.count}">
<td>
<c:set var="GROUP_SEQ" value="${item.GROUP_SEQ}" />
<input type="hidden" name="OBJID" value="${item.OBJID}" />
<input type="hidden" name="GROUP_SEQ" value="${item.GROUP_SEQ}" />
<input type="hidden" name="SEQ" value="${item.SEQ}" />
<input type="hidden" name="INVENTORY_STATUS" value="${item.INVENTORY_STATUS}" />
<input type="hidden" name="INVOICE_OBJID" id="INVOICE_OBJID_${item.OBJID}" value="${item.INVOICE_OBJID}" />
<input type="hidden" name="ARRIVAL_QTY" value="${item.ARRIVAL_QTY}" />
<c:choose>
<c:when test="${item.INVENTORY_STATUS eq 'Y'}">
<input type="text" name="RECEIPT_DATE" id="RECEIPT_DATE_${item.OBJID}" class="date" value="${item.RECEIPT_DATE}" />
@@ -1150,24 +921,24 @@ function fn_location_save(){
<input type="text" name="RECEIPT_DATE" id="RECEIPT_DATE_${item.OBJID}" class="date" value="${sysDate}" />
</c:otherwise>
</c:choose>
</td>
<td>
<select name="LOCATION" id="LOCATION_${item.OBJID}" data-select="${item.LOCATION}" class="LOCATION_1" onchange="chageLangSelect('${item.OBJID}','${item.SUB_LOCATION}')"><option value="">선택</option>${code_map.location}</select>
</td>
<td>
<select name="SUB_LOCATION" id="SUB_LOCATION_${item.OBJID}" data-select="${item.SUB_LOCATION}" class="SUB_LOCATION_1"><option value="">선택</option></select>
</td>
<td>
<input type="hidden" name="RECEIPT_INV_QTY" id="RECEIPT_INV_QTY_${item.OBJID}" value="${item.RECEIPT_QTY}" />
<c:choose>
<c:when test="${item.INVENTORY_STATUS eq 'Y' or param.DELIVERY_STATUS eq '입고완료'}">
<input type="text" name="RECEIPT_QTY" id="RECEIPT_QTY_${item.OBJID}" class="RECEIPT_QTY_${item.ORDER_PART_OBJID}" style="text-align:center;" value="<fmt:formatNumber value="${item.RECEIPT_QTY}" pattern="#,###" />" numberOnly onchange="fn_calc('${item.ORDER_PART_OBJID}');" />
</c:when>
<c:otherwise>
<input type="text" name="RECEIPT_QTY" id="RECEIPT_QTY_${item.OBJID}" class="RECEIPT_QTY_${item.ORDER_PART_OBJID}" style="text-align:center; color:red;" value="<fmt:formatNumber value="${item.ARRIVAL_QTY}" pattern="#,###" />" numberOnly onchange="fn_calc('${item.ORDER_PART_OBJID}');" />
</c:otherwise>
</c:choose>
</td>
</td>
<td>
<select name="LOCATION" id="LOCATION_${item.OBJID}" data-select="${item.LOCATION}" class="LOCATION_1 _loc_opt"></select>
</td>
<td>
<select name="SUB_LOCATION" id="SUB_LOCATION_${item.OBJID}" data-select="${item.SUB_LOCATION}" class="SUB_LOCATION_1 _acct_opt"></select>
</td>
<td>
<input type="hidden" name="RECEIPT_INV_QTY" id="RECEIPT_INV_QTY_${item.OBJID}" value="${item.RECEIPT_QTY}" />
<c:choose>
<c:when test="${item.INVENTORY_STATUS eq 'Y' or param.DELIVERY_STATUS eq '입고완료'}">
<input type="text" name="RECEIPT_QTY" id="RECEIPT_QTY_${item.OBJID}" class="RECEIPT_QTY_${item.ORDER_PART_OBJID}" style="text-align:center;" value="<fmt:formatNumber value="${item.RECEIPT_QTY}" pattern="#,###" />" numberOnly onchange="fn_calc('${item.ORDER_PART_OBJID}');" />
</c:when>
<c:otherwise>
<input type="text" name="RECEIPT_QTY" id="RECEIPT_QTY_${item.OBJID}" class="RECEIPT_QTY_${item.ORDER_PART_OBJID}" style="text-align:center; color:red;" value="<fmt:formatNumber value="${item.ARRIVAL_QTY}" pattern="#,###" />" numberOnly onchange="fn_calc('${item.ORDER_PART_OBJID}');" />
</c:otherwise>
</c:choose>
</td>
<%-- <td>
<input type="text" name="ERROR_QTY" id="ERROR_QTY_${item.OBJID}" class="ERROR_QTY_${item.PART_OBJID}" style="text-align:center;" value="${item.ERROR_QTY}" numberOnly onchange="fn_calc('${item.PART_OBJID}');" />
</td>
@@ -1179,56 +950,45 @@ function fn_location_save(){
</td> --%>
</tr>
</c:when>
<c:otherwise>
<c:if test="${varStatus.index % partList.size() == 0}">
<colgroup id="addColgroup">
<col width="90px" />
<col width="90px" />
<col width="90px" />
<col width="130x" />
<col width="130px" />
<col width="90px" />
<!-- <col width="75px" />
<col width="80px" />
<col width="80px" /> -->
</colgroup>
<script>
var appendHead1Text ="<td colspan='6' class='tdHeader realData'>${item.GROUP_SEQ}차</td>";
var appendHead2Text ="<td>입고예정수량</td> <td>입고예정일</td> <td>입고일</td> <td><input type='checkbox' name='groupCheck_${item.GROUP_SEQ}' value='${item.GROUP_SEQ}'>Location</td> <td><input type='checkbox' name='groupSubCheck_${item.GROUP_SEQ}' value='${item.GROUP_SEQ}'>SubLocation</td> <td>입고수량</td>";
$("#head1").append(appendHead1Text);
$("#head2").append(appendHead2Text);
</script>
<c:otherwise>
<c:if test="${partList.size() > 0 and varStatus.index % partList.size() == 0}">
<colgroup id="addColgroup">
<col width="90px" />
<col width="130px" />
<col width="130px" />
<col width="90px" />
</colgroup>
<script>
var appendHead1Text ="<td colspan='4' class='tdHeader realData'>${item.GROUP_SEQ}차</td>";
var appendHead2Text ="<td>입고일</td> <td><input type='checkbox' name='groupCheck_${item.GROUP_SEQ}' value='${item.GROUP_SEQ}'>입고창고</td> <td><input type='checkbox' name='groupSubCheck_${item.GROUP_SEQ}' value='${item.GROUP_SEQ}'>계정과목</td> <td>입고수량</td>";
$("#head1").append(appendHead1Text);
$("#head2").append(appendHead2Text);
</script>
</c:if>
<c:if test="${varStatus.count <= partList.size()}">
<tr id="dataTr_${varStatus.count}">
<td>
<input type="hidden" name="OBJID" value="${item.OBJID}" />
<input type="hidden" name="GROUP_SEQ" value="${item.GROUP_SEQ}" />
<input type="hidden" name="SEQ" value="${item.SEQ}" />
<input type="hidden" name="INVENTORY_STATUS" value="${item.INVENTORY_STATUS}" />
<input type="hidden" name="INVOICE_OBJID" id="INVOICE_OBJID_${item.OBJID}" value="${item.INVOICE_OBJID}" />
<input type="hidden" name="ARRIVAL_QTY" value="${item.ARRIVAL_QTY}" />
<c:choose>
<c:when test="${item.INVENTORY_STATUS eq 'Y'}">
<input type="text" name="RECEIPT_DATE" id="RECEIPT_DATE_${item.OBJID}" class="date" value="${item.RECEIPT_DATE}" />
</c:when>
<c:otherwise>
<input type="text" name="RECEIPT_DATE" id="RECEIPT_DATE_${item.OBJID}" class="date" value="${sysDate}" />
</c:otherwise>
</c:choose>
</td>
<td>
<input type="hidden" name="OBJID" value="${item.OBJID}" />
<input type="hidden" name="GROUP_SEQ" value="${item.GROUP_SEQ}" />
<input type="hidden" name="SEQ" value="${item.SEQ}" />
<input type="hidden" name="INVENTORY_STATUS" value="${item.INVENTORY_STATUS}" />
<input type="hidden" name="INVOICE_OBJID" id="INVOICE_OBJID_${item.OBJID}" value="${item.INVOICE_OBJID}" />
<input type="text" name="ARRIVAL_QTY" style="text-align:center;" value="<fmt:formatNumber value="${item.ARRIVAL_QTY}" pattern="#,###" />" numberOnly />
<%-- <fmt:formatNumber value="${item.ARRIVAL_QTY}" pattern="#,###" /> --%>
<select name="LOCATION" id="LOCATION_${item.OBJID}" class="LOCATION_${item.GROUP_SEQ} _loc_opt" data-select="${item.LOCATION}"></select>
</td>
<td>
<input type='text' name='ARRIVAL_PLAN_DATE' readonly id='ARRIVAL_PLAN_DATE_${item.OBJID}' class='date' value='${item.ARRIVAL_PLAN_DATE}' />
</td>
<td>
<c:choose>
<c:when test="${item.INVENTORY_STATUS eq 'Y'}">
<input type="text" name="RECEIPT_DATE" id="RECEIPT_DATE_${item.OBJID}" class="date" value="${item.RECEIPT_DATE}" />
</c:when>
<c:otherwise>
<input type="text" name="RECEIPT_DATE" id="RECEIPT_DATE_${item.OBJID}" class="date" value="${sysDate}" />
</c:otherwise>
</c:choose>
</td>
<td>
<select name="LOCATION" id="LOCATION_${item.OBJID}" class="LOCATION_${item.GROUP_SEQ}" data-select="${item.LOCATION}" onchange="chageLangSelect('${item.OBJID}','${item.SUB_LOCATION}')"><option value="">선택</option>${code_map.location}</select>
</td>
<td>
<select name="SUB_LOCATION" id="SUB_LOCATION_${item.OBJID}" class="SUB_LOCATION_${item.GROUP_SEQ}" data-select="${item.SUB_LOCATION}" ><option value="">선택</option></select>
<select name="SUB_LOCATION" id="SUB_LOCATION_${item.OBJID}" class="SUB_LOCATION_${item.GROUP_SEQ} _acct_opt" data-select="${item.SUB_LOCATION}"></select>
</td>
<td>
<input type="hidden" name="RECEIPT_INV_QTY" id="RECEIPT_INV_QTY_${item.OBJID}" value="${item.RECEIPT_QTY}" />
@@ -1257,43 +1017,33 @@ function fn_location_save(){
<script>
var Text ="";
Text += "<td>";
Text += "<input type='hidden' name='OBJID' value='${item.OBJID}' />";
Text += "<input type='hidden' name='GROUP_SEQ' value='${item.GROUP_SEQ}' />";
Text += "<input type='hidden' name='SEQ' value='${item.SEQ}' />";
Text += "<input type='hidden' name='INVENTORY_STATUS' value='${item.INVENTORY_STATUS}' />";
Text += "<input type='hidden' name='INVOICE_OBJID' id='INVOICE_OBJID_${item.OBJID}' value='${item.INVOICE_OBJID}' />";
Text += "<input type='text' name='ARRIVAL_QTY' style='text-align:center;' value='${item.ARRIVAL_QTY}' numberOnly />";
/* Text += numberWithCommas(fnc_checkNull(${item.ARRIVAL_QTY})); */
Text += "</td>";
Text += "<td>";
/* Text += ${item.ARRIVAL_PLAN_DATE}; */
Text += "<input type='text' name='ARRIVAL_PLAN_DATE' readonly id='ARRIVAL_PLAN_DATE_${item.OBJID}' class='date' value='${item.ARRIVAL_PLAN_DATE}' />";
Text += "</td>";
/* 박창현 */
if("${item.INVENTORY_STATUS}"=="Y"){
//alert("qwe");
Text += "<td>";
Text += "<input type='hidden' name='OBJID' value='${item.OBJID}' />";
Text += "<input type='hidden' name='GROUP_SEQ' value='${item.GROUP_SEQ}' />";
Text += "<input type='hidden' name='SEQ' value='${item.SEQ}' />";
Text += "<input type='hidden' name='INVENTORY_STATUS' value='${item.INVENTORY_STATUS}' />";
Text += "<input type='hidden' name='INVOICE_OBJID' id='INVOICE_OBJID_${item.OBJID}' value='${item.INVOICE_OBJID}' />";
Text += "<input type='hidden' name='ARRIVAL_QTY' value='${item.ARRIVAL_QTY}' />";
if("${item.INVENTORY_STATUS}"=="Y"){
Text += "<input type='text' name='RECEIPT_DATE' id='RECEIPT_DATE_${item.OBJID}' class='date' value='${item.RECEIPT_DATE}' />";
Text += "</td>";
Text += "<td class='align_c'>";
Text += " <select name='LOCATION' id='LOCATION_${item.OBJID}' class='LOCATION_${item.GROUP_SEQ}' data-select='${item.LOCATION}' onchange='chageLangSelect(\"${item.OBJID}\",\"${item.SUB_LOCATION}\")'><option value=''>선택</option>${code_map.location}</select>";
Text += " <select name='LOCATION' id='LOCATION_${item.OBJID}' class='LOCATION_${item.GROUP_SEQ}' data-select='${item.LOCATION}'>"+_warehouseOptHtml+"</select>";
Text += "</td>";
Text += "<td class='align_c'>";
Text += " <select name='SUB_LOCATION' id='SUB_LOCATION_${item.OBJID}' class='SUB_LOCATION_${item.GROUP_SEQ}' data-select='${item.SUB_LOCATION}'><option value=''>선택</option></select>";
Text += " <select name='SUB_LOCATION' id='SUB_LOCATION_${item.OBJID}' class='SUB_LOCATION_${item.GROUP_SEQ}' data-select='${item.SUB_LOCATION}'>"+_acctCodeOptHtml+"</select>";
Text += "</td>";
Text += "<td class='align_c'>";
Text += "<input type='hidden' name='RECEIPT_INV_QTY' id='RECEIPT_INV_QTY_${item.OBJID}' value='${item.RECEIPT_QTY}' />";
Text += "<input type='text' numberOnly name='RECEIPT_QTY' id='RECEIPT_QTY_${item.OBJID}' class='RECEIPT_QTY_${item.ORDER_PART_OBJID}' value='${item.RECEIPT_QTY}' style='text-align:center;' onchange='fn_calc(${item.ORDER_PART_OBJID});'>";
Text += "</td>";
}else{
Text += "<td>";
Text += "<input type='text' name='RECEIPT_DATE' id='RECEIPT_DATE_${item.OBJID}' class='date' value='${sysDate}' />";
Text += "</td>";
Text += "<td class='align_c'>";
Text += " <select name='LOCATION' id='LOCATION_${item.OBJID}' class='LOCATION_${item.GROUP_SEQ}' data-select='${item.LOCATION}' onchange='chageLangSelect(\"${item.OBJID}\",\"${item.SUB_LOCATION}\")'><option value=''>선택</option>${code_map.location}</select>";
Text += " <select name='LOCATION' id='LOCATION_${item.OBJID}' class='LOCATION_${item.GROUP_SEQ}' data-select='${item.LOCATION}'>"+_warehouseOptHtml+"</select>";
Text += "</td>";
Text += "<td class='align_c'>";
Text += " <select name='SUB_LOCATION' id='SUB_LOCATION_${item.OBJID}' class='SUB_LOCATION_${item.GROUP_SEQ}' data-select='${item.SUB_LOCATION}'><option value=''>선택</option></select>";
Text += " <select name='SUB_LOCATION' id='SUB_LOCATION_${item.OBJID}' class='SUB_LOCATION_${item.GROUP_SEQ}' data-select='${item.SUB_LOCATION}'>"+_acctCodeOptHtml+"</select>";
Text += "</td>";
Text += "<td class='align_c'>";
Text += "<input type='hidden' name='RECEIPT_INV_QTY' id='RECEIPT_INV_QTY_${item.OBJID}' value='${item.RECEIPT_QTY}' />";
@@ -1334,6 +1084,8 @@ function fn_location_save(){
var appendText ="<td rowspan='2' class='NON_ARRIVAL_QTY_TXT' style='width:100px;'>미입고수량</td>";
$("#head1").append(appendText);
$("select._loc_opt").html(_warehouseOptHtml);
$("select._acct_opt").html(_acctCodeOptHtml);
selectSetVal("data-select", true);
</script>
@@ -1366,63 +1118,19 @@ function fn_location_save(){
</div>
</div>
</div>
<div id="expenseApplyPopupFormWrap1" style="margin-top:30px;position: ">
<table class="pmsPopupForm">
<colgroup>
<col width="10%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
<col width="9%" />
</colgroup>
<tr>
<input type="hidden" name="APPLICATION_OBJID1" id="APPLICATION_OBJID1" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID2" id="APPLICATION_OBJID2" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID3" id="APPLICATION_OBJID3" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID4" id="APPLICATION_OBJID4" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID5" id="APPLICATION_OBJID5" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID6" id="APPLICATION_OBJID6" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID7" id="APPLICATION_OBJID7" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID8" id="APPLICATION_OBJID8" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID9" id="APPLICATION_OBJID9" value="" class="APPLICATION_OBJID"/>
<input type="hidden" name="APPLICATION_OBJID10" id="APPLICATION_OBJID10" value="" class="APPLICATION_OBJID"/>
<td rowspan="" colspan="" class="input_title">동시적용 프로젝트번호</td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER1" id="APPLICATION_PROJECT_NUMBER1" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER2" id="APPLICATION_PROJECT_NUMBER2" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER3" id="APPLICATION_PROJECT_NUMBER3" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER4" id="APPLICATION_PROJECT_NUMBER4" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER5" id="APPLICATION_PROJECT_NUMBER5" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER6" id="APPLICATION_PROJECT_NUMBER6" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER7" id="APPLICATION_PROJECT_NUMBER7" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER8" id="APPLICATION_PROJECT_NUMBER8" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER9" id="APPLICATION_PROJECT_NUMBER9" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
<td><input type="text" name="APPLICATION_PROJECT_NUMBER10" id="APPLICATION_PROJECT_NUMBER10" value="" class="APPLICATION_PROJECT_NUMBER"/></td>
</tr>
<tr>
<td rowspan="" colspan="" class="input_title">작업지시사항</td>
<td rowspan="" colspan="10">
<textarea style="width:100%; height: 80px;background-color: #fff;" name="REMARK" id="REMARK" readonly>${info.REMARK}</textarea>
</td>
</tr>
<tr>
<td colspan="12" style="text-align: right; color: #980000; font-weight:500;">★거래명세서 자동생성은 발주서 기준으로 입고수량 대비 정품수량 동일시 구매팀 확인후 발주서 기준으로 자동생성 된다.</td>
</tr>
</table>
</div>
</section>
</form>
<script>
window.onload = function() {
applyScrollHandler();
// 스크립트로 동적 생성된 입고일 필드에 datepicker 재초기화
$("input[name='RECEIPT_DATE']").each(function(){
if(!$(this).hasClass('hasDatepicker')){
$(this).attr("size","10");
$(this).datepicker({ changeMonth:true, changeYear:true });
}
});
/* var tableHeader1 = document.querySelector('.plm_table4 thead');
console.log(tableHeader1);
var tableBody = document.querySelector('.plm_table4 tbody');

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

@@ -267,7 +267,7 @@ function fn_deliveryAcceptancePopUp(){
return false;
}else{
var popup_width = 1560;
var popup_height = 1050;
var popup_height = 700;
var hiddenForm = document.hiddenForm;
var target = "deliveryAcceptancePopUp";
@@ -295,7 +295,7 @@ function fn_deliveryAcceptancePopUp(){
function fn_deliveryAcceptanceViewPopUp(objId,DELIVERY_STATUS){
var popup_width = 1560;
var popup_height = 1050;
var popup_height = 700;
var hiddenForm = document.hiddenForm;
var target = "deliveryAcceptancePopUp";

2
WebContent/WEB-INF/view/purchaseOrder/purchaseOrderFormPopup_general.jsp
View File

@@ -838,7 +838,7 @@ function fn_generateAndUploadPdf(callback) {
<!-- 담당자 박스 (PDF 양식과 동일한 테이블 형태) -->
<table class="manager-table" style="width:100%; border-collapse:collapse; border:1px solid #000; font-size:10px;">
<tr>
<td rowspan="4" class="graycolor" style="width:50px; text-align:center; font-weight:bold; border:1px solid #000; letter-spacing:3px; vertical-align:middle; font-size:11px;">담 당 자</td>
<td rowspan="4" class="graycolor" style="width:60px; text-align:center; font-weight:bold; border:1px solid #000; letter-spacing:3px; vertical-align:middle; font-size:11px; white-space:nowrap;">담 당 자</td>
<td style="border:1px solid #000; padding:2px 6px; text-align:center;">
<% if(isModify){ %>
<select name="SALES_MNG_USER_ID" id="SALES_MNG_USER_ID" class="select2" style="width:150px; font-size:10px;">

16
src/com/pms/controller/PurchaseOrderController.java
View File

@@ -1993,7 +1993,11 @@ public class PurchaseOrderController {
code_map.put("vat_method" , commonService.bizMakeOptionList("0001077", (String)info.get("VAT_METHOD"),"common.getCodeselect"));
//발주구분
code_map.put("order_type_cd" , commonService.bizMakeOptionList("0001406", (String)info.get("ORDER_TYPE_CD"),"common.getCodeselect"));
//Location
//입고창고
code_map.put("warehouse", commonService.bizMakeOptionList("", "", "admin.getWarehouseOptionList"));
//계정과목
code_map.put("acctCode", commonService.bizMakeOptionList("", "", "admin.getAcctCodeOptionList"));
//Location (기존 호환)
code_map.put("location", commonService.bizMakeOptionList(Constants.INVENTORY_LOCATION_CD, "", "common.getCodeselect"));
//불량사유
code_map.put("defectReason", commonService.bizMakeOptionList("0001113", "", "common.getCodeselect"));
@@ -2010,24 +2014,24 @@ public class PurchaseOrderController {
request.setAttribute("gridDetailList", JsonUtil.ListToJson(detailList));
request.setAttribute("arrivalList", arrivalList);
request.setAttribute("partList", partList);
request.setAttribute("code_map",code_map);
request.setAttribute("objId", objId);
request.setAttribute("writer" , writer );
request.setAttribute("writerName", writerName);
}catch(Exception e){
e.printStackTrace();
}
if(CommonUtils.checkNull(paramMap.get("actType")).equals("DOWN")){ //발주서다운
request.setAttribute("detailList", detailList);
Map apprParam = new HashMap();
apprParam.put("objId", objId);
request.setAttribute("apprList", commonService.getApprovalLine(apprParam));
return "/purchaseOrder/purchaseOrderFormPopup_newDOWN";
}else{
return "/purchaseOrder/deliveryAcceptanceFormPopUp_new";

14
src/com/pms/mapper/admin.xml
View File

@@ -8625,7 +8625,21 @@ FROM (
ORDER BY LOCATION_CODE
</select>
<!-- 입고창고 옵션 리스트 -->
<select id="getWarehouseOptionList" parameterType="map" resultType="map">
SELECT LOCATION_CODE AS CODE, LOCATION_CODE || ' ' || LOCATION_NAME AS NAME
FROM WAREHOUSE_LOCATION
WHERE 1=1
ORDER BY LOCATION_CODE
</select>
<!-- 계정과목 옵션 리스트 -->
<select id="getAcctCodeOptionList" parameterType="map" resultType="map">
SELECT ACCT_CD AS CODE, ACCT_CD || ' ' || ACCT_NM AS NAME
FROM ERP_ACCT_CODE
WHERE 1=1
ORDER BY ACCT_CD
</select>
<select id="getWarehouseListInfo" parameterType="map" resultType="map">
SELECT

1
src/com/pms/mapper/purchaseOrder.xml
View File

@@ -1908,6 +1908,7 @@
,coalesce(AP.TOTAL_DELIVERY_QTY, '0') as TOTAL_DELIVERY_QTY
,coalesce(AP.TOTAL_DEFECT_QTY, '0') as TOTAL_DEFECT_QTY
,pom.delivery_date as pom_delivery_date
,pop.delivery_request_date
FROM
PURCHASE_ORDER_MASTER POM
INNER JOIN PURCHASE_ORDER_PART POP

3
src/com/pms/mapper/supplyChainMgmt.xml
View File

@@ -791,11 +791,14 @@ SELECT
,AP.ATTRIBUTION
,AP.INVENTORY_STATUS
,IM.OBJID AS INVOICE_OBJID
,POP.DELIVERY_REQUEST_DATE
FROM
ARRIVAL_PLAN AP
LEFT OUTER JOIN INVOICE_MGMT IM
ON IM.PARENT_OBJID = AP.PARENT_OBJID
AND IM.GROUP_SEQ = AP.GROUP_SEQ
LEFT OUTER JOIN PURCHASE_ORDER_PART POP
ON AP.ORDER_PART_OBJID = POP.OBJID
WHERE AP.PARENT_OBJID = #{PURCHASE_ORDER_MASTER_OBJID}
ORDER BY SEQ::NUMERIC
</select>

7
src/com/pms/service/PurchaseOrderService.java
View File

@@ -823,14 +823,11 @@ public class PurchaseOrderService {
saveMap.put("ARRIVAL_QTY" , CommonUtils.checkNull(request.getParameterValues("ARRIVAL_QTY")[i],"0"));
saveMap.put("RECEIPT_INV_QTY" , CommonUtils.checkNull(request.getParameterValues("RECEIPT_INV_QTY")[i],"0"));
saveMap.put("RECEIPT_DATE" , CommonUtils.checkNull(request.getParameterValues("RECEIPT_DATE")[i]));
saveMap.put("ARRIVAL_PLAN_DATE" , CommonUtils.checkNull(request.getParameterValues("ARRIVAL_PLAN_DATE")[i]));
saveMap.put("ARRIVAL_PLAN_DATE" , request.getParameterValues("ARRIVAL_PLAN_DATE") != null ? CommonUtils.checkNull(request.getParameterValues("ARRIVAL_PLAN_DATE")[i]) : "");
saveMap.put("LOCATION" , CommonUtils.checkNull(request.getParameterValues("LOCATION")[i]));
saveMap.put("SUB_LOCATION" , CommonUtils.checkNull(request.getParameterValues("SUB_LOCATION")[i]));
saveMap.put("WRITER" , CommonUtils.checkNull(paramMap.get("WRITER")));
saveMap.put("ORDER_QTY" , REAL_ORDER_QTY);
//saveMap.put("ERROR_QTY" , CommonUtils.checkNull(request.getParameterValues("ERROR_QTY")[i],"0"));
//saveMap.put("ERROR_REASON" , CommonUtils.checkNull(request.getParameterValues("ERROR_REASON")[i]));
//saveMap.put("ATTRIBUTION" , CommonUtils.checkNull(request.getParameterValues("ATTRIBUTION")[i]));
System.out.println("saveMap ------->"+saveMap);
sqlSession.update("supplyChainMgmt.saveDeliveryInfo", saveMap); //ARRIVAL_PLAN
@@ -1103,7 +1100,7 @@ public class PurchaseOrderService {
saveMap.put("RECEIPT_QTY" , CommonUtils.checkNull(request.getParameterValues("RECEIPT_QTY")[i],"0"));
saveMap.put("ARRIVAL_QTY" , CommonUtils.checkNull(request.getParameterValues("ARRIVAL_QTY")[i],"0"));
saveMap.put("RECEIPT_DATE" , CommonUtils.checkNull(request.getParameterValues("RECEIPT_DATE")[i]));
saveMap.put("ARRIVAL_PLAN_DATE" , CommonUtils.checkNull(request.getParameterValues("ARRIVAL_PLAN_DATE")[i]));
saveMap.put("ARRIVAL_PLAN_DATE" , request.getParameterValues("ARRIVAL_PLAN_DATE") != null ? CommonUtils.checkNull(request.getParameterValues("ARRIVAL_PLAN_DATE")[i]) : "");
saveMap.put("LOCATION" , CommonUtils.checkNull(request.getParameterValues("LOCATION")[i]));
saveMap.put("SUB_LOCATION" , CommonUtils.checkNull(request.getParameterValues("SUB_LOCATION")[i]));
saveMap.put("ORDER_QTY" , REAL_ORDER_QTY);