결제라인 수정 및 직접비(접대비) 관련 수정

This commit is contained in:
2026-01-26 14:17:53 +09:00
parent 923297bc2a
commit dcb647e0b9
5 changed files with 60 additions and 23 deletions

View File

@@ -139,11 +139,11 @@
perQuery = perQuery & " WHERE p_ip IS NOT NULL AND LEFT(krc_in_date, 7) <= '" & ym & "' AND ( krc_out_date = '' OR krc_out_date LIKE '" & ym & "%' ) "
If Session("teamplace") = 6 Then '<27><>ǥ<EFBFBD>̻<EFBFBD>
if Session("User_Number") = "20080101" then
perQuery = perQuery & " AND ( p_position_now = 5 OR p_no in ('20191202', '20220901', '20190601', '20151203', '20031102','20210107') ) " '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ü <20>ڹ̼<DAB9>
perQuery = perQuery & " AND ( p_position_now = 5 OR p_no in ('20191202', '20220901', '20190601', '20210405', '20031102','20210107') ) " '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ü <20>ڹ̼<DAB9>
else '2024-06-17 (20211001, 20210105, 20230905) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
perQuery = perQuery & " AND ( p_position_now = 5 OR p_no in ('20191202', '20220901', '20190601', '20151203', '20031102','20210107') ) "
perQuery = perQuery & " AND ( p_position_now = 5 OR p_no in ('20191202', '20220901', '20190601', '20210405', '20031102','20210107','20150302') ) " '<27><>ȯ<EFBFBD>׷<EFBFBD><D7B7><EFBFBD> 1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ǥ<EFBFBD><C7A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
end if
ElseIf (Session("teamplace") = 3 OR Session("teamplace") = 2) and Session("User_Number") <> "20200103" and Session("User_Number") <> "20210405" and Session("User_Number") <> "20181009" Then '<27>Ѱ<EFBFBD> <20>׷<EFBFBD><D7B7><EFBFBD> / <20>׷<EFBFBD><D7B7><EFBFBD> , din <20>׷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>Ⱥ<EFBFBD><EFBFBD>̵<EFBFBD><EFBFBD><EFBFBD> <20>ϰ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>ɺ<EFBFBD><C9BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ը<EFBFBD> <20><><EFBFBD>簡<EFBFBD><EFBFBD>
ElseIf (Session("teamplace") = 3 OR Session("teamplace") = 2) and Session("User_Number") <> "20200103" and Session("User_Number") <> "20210405" and Session("User_Number") <> "20181009" Then '<27>Ѱ<EFBFBD> <20>׷<EFBFBD><D7B7><EFBFBD> / <20>׷<EFBFBD><D7B7><EFBFBD> , din <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>׷<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
' If Session("N_depart") & Session("N_team") = "S301" Then ' ä<><C3A4><EFBFBD><EFBFBD> <20>׷<EFBFBD><D7B7><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
' perQuery = perQuery & " and (p_no not in ('20240701','20240702') ) " '<27>̼<EFBFBD><CCBC><EFBFBD> <20><><EFBFBD><EFBFBD> 401Ű<31><C5B0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>Խ<EFBFBD>Ŵ 2024-07-09
' perQuery = perQuery & " AND (p_depart_now = 'S' AND p_team_now in ('401') OR (p_no in ('20160203', '20210302'))" '<27>ַ<EFBFBD><D6B7>ǰ<EFBFBD><C7B0><EFBFBD>, <20>鼺<EFBFBD><E9BCBA>, <20><>ä<EFBFBD><C3A4>
@@ -198,20 +198,20 @@
' perQuery = perQuery & " OR p_no in ('20160205', '20210107', '20240205') "
' End if
If session("User_Number") = "20190601" Then '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 1,2,3 <20>׷<EFBFBD><D7B7><EFBFBD>
perQuery = perQuery & " OR (p_depart_now = 'R' AND p_team_now in ('701','702','703') AND p_position_now = 3 ) OR p_no in ('20230906') "'<27>׷<EFBFBD><D7B7><EFBFBD><EFBFBD>鸸 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
perQuery = perQuery & " OR (p_depart_now = 'R' AND p_team_now in ('701','702','703') AND p_position_now = 3 ) OR p_no in ('20230906','20230705','20250103','20250901') "'<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<EFBFBD>׷<EFBFBD><D7B7><EFBFBD> <20><><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>) -> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>,<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȭ,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>߰<EFBFBD>
End If
if session("User_Number") = "20031102" Then 'ä<><C3A4><EFBFBD><EFBFBD> - DCO <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
perQuery = perQuery & " OR (p_depart_now = 'S' AND p_team_now IN ('301','401','501','601') AND p_position_now = 3) "
' perQuery = perQuery & " OR (p_depart_now = 'S' AND p_team_now in ('401')) " '<27>ַ<EFBFBD><D6B7><EFBFBD> <20><><EFBFBD><EFBFBD> <20>׷<EFBFBD><D7B7><EFBFBD> <20>븮 250122 jelee
End if
if session("User_Number") = "20151203" Then '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - DIN <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
if session("User_Number") = "20210405" Then '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - DIN <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> -> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>׷<EFBFBD><D7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
perQuery = perQuery & " OR (p_depart_now = 'S' AND p_team_now IN ('101','201')) "
End if
if session("User_Number") = "20160205" Then '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - <20>ۺ<EFBFBD><DBBA><EFBFBD> <20><><EFBFBD><EFBFBD> 250121 jelee
perQuery = perQuery & " OR (p_depart_now IN ('R') AND p_team_now IN ('601','602','603','604','606') AND p_position_now = 3) "
End if
if session("User_Number") = "20210107" Then '<27>Ż<EFBFBD><C5BB><EFBFBD> - <20>ۺ<EFBFBD><DBBA><EFBFBD> R&D<><44><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
perQuery = perQuery & " OR p_no in ('20150302','20220602','20230205','20230801') "
perQuery = perQuery & " OR p_no in ('20220602','20230205','20230801') "
perQuery = perQuery & " OR (p_depart_now IN ('R') AND p_team_now IN ('605') AND p_position_now = 3) "
End if
perQuery = perQuery & " ) "

View File

@@ -208,7 +208,10 @@ eddate = iif(conweek <> "1", Dateadd("d", 6, cdate(selweekRange(0))), cdate(selw
weekQuery = weekQuery & " , ROW_NUMBER() OVER(ORDER BY yearnum, weeknum) AS monthnum "
weekQuery = weekQuery & " , sdate, edate,sdate+'~'+edate AS rangedate "
weekQuery = weekQuery & " FROM project2.dbo.login_weeknum with(nolock) "
weekQuery = weekQuery & " WHERE LEFT(sdate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "' OR LEFT(edate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "' "
weekQuery = weekQuery & " WHERE (LEFT(sdate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "' OR LEFT(edate,7) = '" & left(conyear & "-" & RIGHT("0" & conmonth, 2),7) & "') "
If RIGHT("0" & conmonth, 2) = "12" Then
weekQuery = weekQuery & " and weeknum <> 1 "
End if
weekQuery = weekQuery & " ORDER BY yearnum, weeknum "
'response.write weekQuery
@@ -1801,8 +1804,8 @@ eddate = iif(conweek <> "1", Dateadd("d", 6, cdate(selweekRange(0))), cdate(selw
var option = $("<option value='"+ obj.weeknum +"' >"+ obj.monthnum +"<22><><EFBFBD><EFBFBD>("+ obj.rangedate +")</option>");
}
} else if($('#conyear').val() == 2025 && $('#conmonth').val() == 1){
if(obj.weeknum != 53){
} else if($('#conmonth').val() == 1){
if(obj.weeknum < 50 ){
var option = $("<option value='"+ obj.weeknum +"' >"+ obj.monthnum +"<22><><EFBFBD><EFBFBD>("+ obj.rangedate +")</option>");
}
} else {