From 5ba2c25ac552af2afcb8e99194162efcd5a6a782 Mon Sep 17 00:00:00 2001 From: Choins Date: Mon, 16 Mar 2026 12:00:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B5=9C=EB=82=A8=EC=8B=9D=20::=2020260316=20:?= =?UTF-8?q?:=20=EB=82=B4=EA=B7=BC=EC=A7=81=EC=97=85=EB=AC=B4=EC=9D=BC?= =?UTF-8?q?=EC=A7=80/=EB=82=B4=EA=B7=BC=EC=A7=81=20=EA=B7=BC=EB=AC=B4?= =?UTF-8?q?=ED=99=95=EC=9D=B8=20=EC=88=98=EC=A0=95(=EC=A0=80=EB=85=81?= =?UTF-8?q?=EC=8B=9D=EB=8C=80=20=EC=82=AD=EC=A0=9C,=20=EC=88=98=EB=8B=B9?= =?UTF-8?q?=20->=20=EB=93=B1=EA=B8=89=EC=9D=98=20=EA=B8=88=EC=95=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inspection/neakeun_work_confirm.asp | 16 +- inspection/neakeun_work_confirm_save.asp | 9 +- nk/input_time_2014.asp | 182 +++++++++++++---------- nk/work_submit_save_2014.asp | 20 ++- 4 files changed, 134 insertions(+), 93 deletions(-) diff --git a/inspection/neakeun_work_confirm.asp b/inspection/neakeun_work_confirm.asp index c8d211a..5e24b52 100644 --- a/inspection/neakeun_work_confirm.asp +++ b/inspection/neakeun_work_confirm.asp @@ -59,7 +59,7 @@ 업무
날짜 내근직
코드 생년
월일 - 성명 + 성명 프로젝트
코드 프로젝트
명 업
무 @@ -67,12 +67,12 @@ 출
근 퇴
근 업무
시간 - 초과
시간 + +/-
시간 +/-
사유 수당 - 추가
수당1 - 추가
수당2 + 추가수당
(점심) + 수당
계 결재상태 Confirm
@@ -94,7 +94,8 @@ sql = sql & " CASE WHEN NW.job_confirm_yn = 'Y' THEN " & VbCrlf sql = sql & " ISNULL((SELECT s_sum FROM T_NEAKEUN_PAY with(nolock) WHERE attribute01 = CONVERT(VARCHAR(20), NW.id) AND s_gubun = '추가수당1'), 0) " & VbCrlf sql = sql & " ELSE " & VbCrlf - sql = sql & " CONVERT(INTEGER, dbo.M_FOOD_COST(MA.id, NW.[date], NW.p_child_sn, NW.p_sebu_code, 'lunch')) " & VbCrlf + 'sql = sql & " CONVERT(INTEGER, dbo.M_FOOD_COST(MA.id, NW.[date], NW.p_child_sn, NW.p_sebu_code, 'lunch')) " & VbCrlf + sql = sql & " CONVERT(INTEGER, dbo.M_FOOD_COST_GRADE(MA.id, NW.[date], NW.p_child_sn, NW.p_sebu_code, 'lunch',ISNULL(dbo.M_GRADE_COST(MA.id, NW.[date], NW.p_sebu_code), '0'))) " & VbCrlf sql = sql & " END " & VbCrlf sql = sql & " ELSE 0 END AS lunch_cost, " & VbCrlf sql = sql & " CASE WHEN NW.job_dinner_yn = '1' THEN " & VbCrlf @@ -161,7 +162,7 @@ <%=adors("in_time") %> <%=adors("out_time") %> <%=adors("job_in_time") %> - <%=adors("job_out_time") %> + " style="width:95%;text-align:right" <% if adors("d_order_cnt") = "결재 완료" OR adors("d_order_cnt") = "결재중" then %> readonly <% end if %> /> @@ -172,7 +173,8 @@ <%= FormatNumber(cDbl(adors("grade_cost")) * (cDbl(adors("job_in_time")) + cDbl(iif(adors("job_add_time") = "", "0", adors("job_add_time")))) + cDbl(adors("job_out_time")) * 1000, 0) %> <%= FormatNumber(adors("lunch_cost"), 0) %> - <%= FormatNumber(adors("dinner_cost"), 0) %> + "/> + <%= FormatNumber((cDbl(adors("grade_cost")) * (cDbl(adors("job_in_time")) + cDbl(iif(adors("job_add_time") = "", "0", adors("job_add_time")))) + cDbl(adors("job_out_time")) * 1000) + cdbl(adors("lunch_cost")) + cdbl(adors("dinner_cost")), 0) %> <%=adors("d_order_cnt") %> diff --git a/inspection/neakeun_work_confirm_save.asp b/inspection/neakeun_work_confirm_save.asp index c64cdc0..05b3f2d 100644 --- a/inspection/neakeun_work_confirm_save.asp +++ b/inspection/neakeun_work_confirm_save.asp @@ -83,8 +83,9 @@ for i=1 to request("cnt") grade_cost = 0 End If - grade_cost = rsa("m_grade_cost") - + 'grade_cost = rsa("m_grade_cost") + grade_cost = request("lunch_cost_"&i) + Dim currentMonth currentMonth = Left(Replace(rsp("date"), "-", ""), 6) @@ -157,7 +158,9 @@ for i=1 to request("cnt") rsa.open query, adoConn, adopenstatic, adlockreadonly If rsa.recordcount > 0 Then - lunch_cost = rsa("cost") + 'lunch_cost = rsa("cost") + lunch_cost = request("lunch_cost_"&i) + '위에 쿼리 없어지고, lunch_cost = grade_cost 가 되어야함 End if rsa.close diff --git a/nk/input_time_2014.asp b/nk/input_time_2014.asp index 0d652c1..d1aabf1 100644 --- a/nk/input_time_2014.asp +++ b/nk/input_time_2014.asp @@ -70,6 +70,7 @@ query = query & " where neakeun_name = '" & neakeun_name & "' " query = query & " and left(neakeun_jumin, 6) = left('" & neakeun_jumin & "', 6) " query = query & " and [date] = '" & condate & "'" + 'Response.Write query adoRs.Open query, adoconn, adopenstatic, adlockreadonly if adoRs.recordcount = 0 then in_time_chk= 0 '미출근 @@ -148,6 +149,7 @@ alert("세부근무를 불러오는 중 오류가 발생하였습니다."); } } + function setAvailableTime() { var actualStartTime = "0" var actualEndTime = "0" @@ -157,78 +159,105 @@ var actualInputTime = "0" var actualOutputTime = "0" - var LogInTime = $("input[name=InTime]").val(); - var LogOutTime = $("input[name=OutTime]").val(); + var LogInTime = $("input[name=InTime]").val(); //실제출근시간 + var LogOutTime = $("input[name=OutTime]").val(); //실제퇴근시간 - var StartTime = $("input[name=txtStartTime]").val(); - var EndTime = $("input[name=txtEndTime]").val(); + var StartTime = $("input[name=txtStartTime]").val(); //업무시작시간 : 0945 + var EndTime = $("input[name=txtEndTime]").val(); //업무종료시간 : 2400 var workEndTime = ""; - var lunch_time_st = <%=lunch_time_st %>; - var lunch_time_end = <%=lunch_time_end %>; - var dinner_time_st = <%=dinner_time_st %>; - var dinner_time_end = <%=dinner_time_end %>; + var lunch_time_st = <%=lunch_time_st %>; //점심지급 시작 시간 : 1100 + var lunch_time_end = <%=lunch_time_end %>; //점심지급 종료 시간 : 1500 + var dinner_time_st = <%=dinner_time_st %>; //저녁지급 시작 시간 : 1800 + var dinner_time_end = <%=dinner_time_end %>; //저녁지급 종료 시간 : 2100 //출근 시간과 근무시작시간, 퇴근시간과 근무종료시간을 체크 하여 하루의 근무인정시간을 계산~! - if (Number(LogInTime) < Number(StartTime)) { - actualStartTime = StartTime; - } else { - actualStartTime = LogInTime; + // 출근시간 설정 + if (Number(LogInTime) < Number(StartTime)) { //실제출근시간 < 업무시작시간 : 0945 + actualStartTime = StartTime; //actualStartTime(인정시작시간) = 업무시작시간 + } else { //실제출근시간 > 업무시작시간 : 0945 + actualStartTime = LogInTime; //actualStartTime(인정시작시간) = 출근시간 } - if (Number(LogOutTime) < Number(EndTime)) { - if(Number(LogOutTime) < Number(StartTime)){ - actualEndTime = StartTime; - }else{ - actualEndTime = LogOutTime; + //퇴근시간 설정 + if (Number(LogOutTime) < Number(EndTime)) { //실제퇴근시간 < 업무종료시간 : 2400 + if(Number(LogOutTime) < Number(StartTime)){ //실제퇴근시간 < 업무시작시간 : 0945 + actualEndTime = StartTime; //actualEndTime(인정종료시간) = 업무시작시간 + }else{ //실제퇴근시간 > 업무시작시간 : 0945 + actualEndTime = LogOutTime; //actualEndTime(인정종료시간) = 실제퇴근시간 } - } else { - actualEndTime = EndTime; + } else { //실제퇴근시간 > 업무종료시간 : 2400 + actualEndTime = EndTime; //actualEndTime(인정종료시간) = 업무종료시간 } + //식대 체크 if (actualStartTime != "0" && actualEndTime != "0") { + //출근, 퇴근시간을 분으로 변환 actualInTime = Number(actualStartTime.substr(0, 2)) * 60 + Number(actualStartTime.substr(2, 2)); actualOutTime = Number(actualEndTime.substr(0, 2)) * 60 + Number(actualEndTime.substr(2, 2)); - - var tempActualInTime = (18 * 60 > actualOutTime ? actualOutTime : 18 * 60) - eval(actualInTime); - var tempActualOutTime = eval(actualOutTime) - 18 * 60; - //위의 actualTime에서 점심시간은 1시간, 저녁시간은 30분을 체크하여 제외하고, 15분단위로 정산~!!! - //점심식대 체크~! + //출근 ~ 18:00까지의 근무시간을 분으로 변환 + var tempActualInTime = (18 * 60 > actualOutTime ? actualOutTime : 18 * 60) - eval(actualInTime); + //18:00 이후의 근무시간을 분으로 변환 + var tempActualOutTime = eval(actualOutTime) - 18 * 60; + + //점심식대 체크~! + //출근시간이 점심 시작시간(11:00)보다 빠르거나 같고 퇴근시간이 점심 종료시간(15:00)보다 늦거나 같으면 점심식대 지급 하고 1시간(60분)을 실제근무시간에서 차감 if (Number(actualStartTime) <= lunch_time_st && Number(actualEndTime) >= lunch_time_end) { //$("input[name=lunch]").attr("checked", true); $("input[name=lunch]").val("1"); //$("input[name=lunch_flag]").val("1"); tempActualInTime = tempActualInTime - 60; //점심식대가 지급된다면 1시간을 제외~! } - //저녁식대 체크~! - if (Number(actualStartTime) <= dinner_time_st && Number(actualEndTime) >= dinner_time_end) { - //$("input[name=dinner]").attr("checked", true); - $("input[name=dinner]").val("1"); - //$("input[name=dinner_flag]").val("1"); - tempActualOutTime = tempActualOutTime - 30; - } - //마지막으로 15분 단위로 절삭 하는 부분~! + + // //저녁식대 체크~! + // //출근시간이 저녁 시작시간(1800)보다 빠르거나 같고 퇴근시간이 저녁 종료시간(2100)보다 늦거나 같으면 저녁식대 지급 하고 30분을 야간근무시간에서 차감 + // if (Number(actualStartTime) <= dinner_time_st && Number(actualEndTime) >= dinner_time_end) { + // //$("input[name=dinner]").attr("checked", true); + // $("input[name=dinner]").val("1"); + // //$("input[name=dinner_flag]").val("1"); + // tempActualOutTime = tempActualOutTime - 30; + // } + + //근무시간을 15분 단위로 아래 방향으로 절삭 + //00,15,45,60,75,90 을 기준으로 현재값 이하에서 가장 큰 15의 배수로 내림 + //61분 → 60분 + //74분 → 60분 + //89분 → 75분 + //104분 → 90분 + + //18시 이전 시간 절삭 처리 var temp_MinusInTime = tempActualInTime % 15; tempActualInTime = tempActualInTime - temp_MinusInTime; actualInputTime = (tempActualInTime / 60).toFixed(2); + //18시 이후 시간 절삭 처리 var temp_MinusOutTime = tempActualOutTime % 15; tempActualOutTime = tempActualOutTime - temp_MinusOutTime; actualOutputTime = (tempActualOutTime / 60).toFixed(2); - $("input[name=txtInputTime]").val(actualInputTime); - $("input[name=txtOutputTime]").val(actualOutputTime > 0 ? actualOutputTime : 0); - var workTimeSum = parseFloat(document.frm_neakeun_job.txtInTimeSum.value) + parseFloat(document.frm_neakeun_job.txtOutTimeSum.value); + //계산결과 셋팅 + // var outputTime = actualOutputTime > 0 ? actualOutputTime : 0; + // var totalTime = parseFloat(actualInputTime) + parseFloat(outputTime); + // + // $("input[name=txtInputTime]").val(totalTime.toFixed(2)); // 주간+야간 합계 + //$("input[name=txtOutputTime]").val(outputTime); // 야간 + + var totalTxtInputTime = Number(actualInputTime) + Number(actualOutputTime); + $("input[name=txtInputTime]").val(totalTxtInputTime); //근무인정시간(주간) + $("input[name=txtOutputTime]").val(actualOutputTime > 0 ? actualOutputTime : 0); //근무인정시간(야간) + + // var workTimeSum = parseFloat(document.frm_neakeun_job.txtInTimeSum.value) + parseFloat(document.frm_neakeun_job.txtOutTimeSum.value); + var workTimeSum = parseFloat(document.frm_neakeun_job.txtInTimeSum.value); if(workTimeSum >= 4){ $("input[name=lunch]").attr("checked", true); $("input[name=lunch_flag]").val("1"); } - if(workTimeSum >= 8){ - $("input[name=dinner]").attr("checked", true); - $("input[name=dinner_flag]").val("1"); - } + // if(workTimeSum >= 8){ + // $("input[name=dinner]").attr("checked", true); + // $("input[name=dinner_flag]").val("1"); + // } } } @@ -275,12 +304,12 @@ } function Sendit(txt) { var yoil = document.frm_neakeun_job.txtyoilvalue.value; - var availableInTime = document.frm_neakeun_job.txtInputTime.value; // '근무인정시간 - var availableOutTime = document.frm_neakeun_job.txtOutputTime.value; // '근무인정시간 + var availableInTime = document.frm_neakeun_job.txtInputTime.value; // '주간 근무인정시간 + // var availableOutTime = document.frm_neakeun_job.txtOutputTime.value; // '야간 근무인정시간 var txtInTime = 0 var txtInTimeSum = 0 - var txtOutTime = 0 - var txtOutTimeSum = 0 + // var txtOutTime = 0 + // var txtOutTimeSum = 0 for (var i = 0; i < 10; i++) { prj_code = document.frm_neakeun_job.prj_code[i].value; @@ -289,15 +318,16 @@ if(document.frm_neakeun_job.txtInTime[i].value == ""){ document.frm_neakeun_job.txtInTime[i].value = "0"; } - if(document.frm_neakeun_job.txtOutTime[i].value == ""){ - document.frm_neakeun_job.txtOutTime[i].value = "0"; - } + // if(document.frm_neakeun_job.txtOutTime[i].value == ""){ + // document.frm_neakeun_job.txtOutTime[i].value = "0"; + // } txtInTime = document.frm_neakeun_job.txtInTime[i].value; txtInTimeSum = txtInTimeSum + txtInTime * 1; - txtOutTime = document.frm_neakeun_job.txtOutTime[i].value; - txtOutTimeSum = txtOutTimeSum + txtOutTime * 1; + // txtOutTime = document.frm_neakeun_job.txtOutTime[i].value; + // txtOutTimeSum = txtOutTimeSum + txtOutTime * 1; - if (eval(txtInTime) > 0 || eval(txtOutTime) > 0) { + // if (eval(txtInTime) > 0 || eval(txtOutTime) > 0) { + if (eval(txtInTime) > 0) { if (prj_code == "") { alert((eval(i) + 1) + "번째 줄 프로젝트를 선택하세요."); return false; @@ -312,26 +342,28 @@ alert("주간 근무인정시간을 초과되었습니다."); return false; } - if (eval(availableOutTime) < eval(txtOutTimeSum)) { - alert("야간 근무인정시간을 초과되었습니다."); - return false; - } + // if (eval(availableOutTime) < eval(txtOutTimeSum)) { + // alert("야간 근무인정시간을 초과되었습니다."); + // return false; + // } document.frm_neakeun_job.txtInTimeSum.value = txtInTimeSum; - document.frm_neakeun_job.txtOutTimeSum.value = txtOutTimeSum; + // document.frm_neakeun_job.txtOutTimeSum.value = txtOutTimeSum; - if (eval(txtInTimeSum) == 0 && eval(txtOutTimeSum) == 0) { + // if (eval(txtInTimeSum) == 0 && eval(txtOutTimeSum) == 0) { + if (eval(txtInTimeSum) == 0) { alert("근무 시간을 입력하세요."); return false; } - var workTimeSum = parseFloat(document.frm_neakeun_job.txtInTimeSum.value) + parseFloat(document.frm_neakeun_job.txtOutTimeSum.value); + // var workTimeSum = parseFloat(document.frm_neakeun_job.txtInTimeSum.value) + parseFloat(document.frm_neakeun_job.txtOutTimeSum.value); + var workTimeSum = parseFloat(document.frm_neakeun_job.txtInTimeSum.value); if(workTimeSum >= 4){ $("input[name=lunch]").attr("checked", true); $("input[name=lunch_flag]").val("1"); } - if(workTimeSum >= 8){ - $("input[name=dinner]").attr("checked", true); - $("input[name=dinner_flag]").val("1"); - } + // if(workTimeSum >= 8){ + // $("input[name=dinner]").attr("checked", true); + // $("input[name=dinner_flag]").val("1"); + // } document.frm_neakeun_job.action = "work_submit_save_2014.asp"; document.frm_neakeun_job.submit(); } @@ -479,7 +511,7 @@ <% -If in_time_chk = 2 Then +If in_time_chk = 2 Then dim sv_list() dim in_time, out_time dim Categori_Cnt : Categori_Cnt = 10 @@ -531,7 +563,7 @@ If in_time_chk = 2 Then job_total_time = AdoRs("job_total_time") lunch_flag = AdoRs("job_lunch_yn") - dinner_flag = AdoRs("job_dinner_yn") + 'dinner_flag = AdoRs("job_dinner_yn") do until AdoRs.eof i = i + 1 @@ -588,11 +620,11 @@ If in_time_chk = 2 Then 대표SV
(선택X)
SV - 프 로 젝 트 명 - 업무내용 - 근무시간 - 업무확인
유무
- 업무확인
SV
+ 프 로 젝 트 명 + 업무내용 + 근무시간 + 업무확인
유무
+ 업무확인
SV
<%For i = 1 To Categori_Cnt%> @@ -704,8 +736,8 @@ If in_time_chk = 2 Then - 주간 : readonly <% end if %> style='width:50px;' OnKeyPress='onlyNum();' name='txtInTime'/> , - 야간 : readonly <% end if %> style='width:50px;' OnKeyPress='onlyNum();' name='txtOutTime'/> + readonly <% end if %> style='width:50px; text-align:center;' OnKeyPress='onlyNum();' name='txtInTime'/> + @@ -715,16 +747,16 @@ If in_time_chk = 2 Then <% next %> 합      계 - 근무인정시간 - 주간 : , - 야간 : + 근무인정시간 : + 중식 - 석식 - - - + + + + diff --git a/nk/work_submit_save_2014.asp b/nk/work_submit_save_2014.asp index 8172ce2..4e57cdc 100644 --- a/nk/work_submit_save_2014.asp +++ b/nk/work_submit_save_2014.asp @@ -17,7 +17,8 @@ permanent_position = request("permanent_position") lunch_flag = request("lunch_flag") dinner_flag = request("dinner_flag") - job_total_time = cDbl(trim(Request.form("txtInputTime"))) + cDbl(trim(Request.form("txtOutputTime"))) + 'job_total_time = cDbl(trim(Request.form("txtInputTime"))) + cDbl(trim(Request.form("txtOutputTime"))) + job_total_time = cDbl(trim(Request.form("txtInputTime"))) p_work_st = trim(Request.form("txtStartTime")) p_work_end = trim(Request.form("txtEndTime")) job_in_time = Request.form("in_time") @@ -55,12 +56,13 @@ If tmpInTime = "" Then tmpInTime = "0" End if - tmpOutTime= trim(Request.form("txtOutTime")(i)) - If tmpOutTime = "" Then - tmpOutTime = "0" - End if + 'tmpOutTime= trim(Request.form("txtOutTime")(i)) + 'If tmpOutTime = "" Then + ' tmpOutTime = "0" + 'End if - if (CDbl(tmpInTime) <> 0 or CDbl(tmpOutTime) <> 0) and request.form("job_confirm_yn")(i) <> "Y" then + 'if (CDbl(tmpInTime) <> 0 or CDbl(tmpOutTime) <> 0) and request.form("job_confirm_yn")(i) <> "Y" then + if (CDbl(tmpInTime) <> 0) and request.form("job_confirm_yn")(i) <> "Y" then Query = " INSERT INTO neakeun_work" Query = Query & "(neakeun_jumin, neakeun_name, p_sn, p_sebu, [date], yoil, in_time, out_time, " Query = Query & " job_in_time, job_out_time, job_jumal_time, insert_date, insert_time, insert_ip, p_sv_no, p_sv_main, " @@ -74,8 +76,10 @@ Query = Query & "'" & txtyoil & "', " ' 날짜 Query = Query & "'" & job_in_time & "', " ' Query = Query & "'" & job_out_time & "', " ' - Query = Query & "" & formatnumber(cdbl(tmpInTime) + cdbl(tmpOutTime),2) & ", " ' - Query = Query & "" & formatnumber(tmpOutTime,2) & ", " ' + 'Query = Query & "" & formatnumber(cdbl(tmpInTime) + cdbl(tmpOutTime),2) & ", " ' + Query = Query & "" & formatnumber(cdbl(tmpInTime),2) & ", " ' + 'Query = Query & "" & formatnumber(tmpOutTime,2) & ", " ' + Query = Query & "" & 0 & ", " ' Query = Query & "" & 0 & ", " '주말 0 Query = Query & "'" & formatdatetime(date,2) & "', " ' Query = Query & "'" & FormatDateTime(time,4) & "', " '