diff --git a/approval/doc_myun_pay_detail.asp b/approval/doc_myun_pay_detail.asp
index a657345..cc092a6 100644
--- a/approval/doc_myun_pay_detail.asp
+++ b/approval/doc_myun_pay_detail.asp
@@ -388,8 +388,8 @@
생년월일 |
업무 |
수당 |
- 추가수당1 |
- 추가수당2 |
+ 추가수당(점심) |
+
합계 |
@@ -448,7 +448,7 @@
<%=adoRs("s_gubun")%> |
<%=FormatNumber(CDbl(adoRs("s_sum")), 0)%> |
<%=FormatNumber(CDbl(adoRs("add_1")), 0)%> |
- <%=FormatNumber(CDbl(adoRs("add_2")), 0)%> |
+
<%=FormatNumber(CDbl(adoRs("s_sum")) + CDbl(adoRs("add_1")) + CDbl(adoRs("add_2")), 0)%> |
<%
s_sum_sum = s_sum_sum + CDbl(adoRs("s_sum"))
@@ -469,7 +469,7 @@
합계 |
<%=FormatNumber(s_sum_sum, 0)%> |
<%=FormatNumber(add_1_sum, 0)%> |
- <%=FormatNumber(add_2_sum, 0)%> |
+
<%=FormatNumber(s_sum_sum + add_1_sum + add_2_sum, 0)%> |
diff --git a/approval/doc_myun_pay_detail_ajax.asp b/approval/doc_myun_pay_detail_ajax.asp
index 827706d..6ef7f95 100644
--- a/approval/doc_myun_pay_detail_ajax.asp
+++ b/approval/doc_myun_pay_detail_ajax.asp
@@ -27,8 +27,8 @@
response.write " 추가 시간 | "
response.write " 추가 사유 | "
response.write " 수당 | "
- response.write " 추가 수당1 | "
- response.write " 추가 수당2 | "
+ response.write " 추가수당 (점심) | "
+ 'response.write " 추가 수당2 | "
response.write "
"
@@ -69,6 +69,7 @@
query = query & " and left(s_gubun, 2) <> '추가' and s_gubun = '" & s_gubun & "' "
query = query & " Order by work_dt "
+ 'Response.Write query & "
"
rsp.Open query, adoConn, 1
do while not rsp.eof
@@ -85,7 +86,7 @@
response.write " " & rsp("job_add_time_memo") & " | "
response.write " " & FormatNumber(CDbl(rsp("s_sum")), 0) & " | "
response.write " " & FormatNumber(CDbl(rsp("add_1")), 0) & " | "
- response.write " " & FormatNumber(CDbl(rsp("add_2")), 0) & " | "
+ 'response.write " " & FormatNumber(CDbl(rsp("add_2")), 0) & " | "
response.write " "
rsp.movenext
loop
diff --git a/inspection/neakeun_work_confirm_save.asp b/inspection/neakeun_work_confirm_save.asp
index 8fb70e7..1e0f18a 100644
--- a/inspection/neakeun_work_confirm_save.asp
+++ b/inspection/neakeun_work_confirm_save.asp
@@ -83,8 +83,8 @@ for i=1 to request("cnt")
grade_cost = 0
End If
- 'grade_cost = rsa("m_grade_cost")
- grade_cost = request("lunch_cost_"&i)
+ grade_cost = rsa("m_grade_cost")
+ 'grade_cost = request("lunch_cost_"&i)
Dim currentMonth
currentMonth = Left(Replace(rsp("date"), "-", ""), 6)