결제라인 수정 및 직접비(접대비) 관련 수정
This commit is contained in:
@@ -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 & " ) "
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -130,7 +130,8 @@ ELSEIF Session("N_depart") = "S" AND Session("N_team") = "401" Then'401:
|
||||
ELSEIF Session("N_depart") = "S" AND Session("N_team") = "601" Then'601:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>COMM
|
||||
tmp_ess(3, 0) = "20031102" ' ä<><C3A4><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
|
||||
ELSEIF Session("N_depart") = "S" AND (Session("N_team") = "101" OR Session("N_team") = "201") Then'DIN, DIN(QC)
|
||||
tmp_ess(3, 0) = "20151203" '//-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
tmp_ess(3, 0) = "20210405" '//-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (2025<32><35>12<31><32> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD> <20><><EFBFBD>翡 <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD><D7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
'tmp_ess(3, 0) = "20151203" '//-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
' tmp_ess(2, 0) = "20151203" '//-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
End If
|
||||
|
||||
@@ -139,11 +140,12 @@ tmp_ess(3, 3) = "20250301" '
|
||||
tmp_ess(3, 4) = "20210302" '<27>¶<EFBFBD><C2B6>μ<EFBFBD><CEBC><EFBFBD><EFBFBD>̿<CCBF><EFBFBD> <20><>ä<EFBFBD><C3A4>(<28><EFBFBD><D7B7><EFBFBD>)
|
||||
tmp_ess(3, 6) = "20220901" '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>COMM <20>̼<EFBFBD><CCBC><EFBFBD>(<28><EFBFBD><D7B7><EFBFBD>)
|
||||
|
||||
tmp_ess(3, 2) = "20151203" 'DIN <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
' tmp_ess(2, 1) = "20181009" 'FW<EFBFBD><EFBFBD> <20><><EFBFBD>ξ<EFBFBD>
|
||||
' tmp_ess(2, 2) = "20210405" '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
' tmp_ess(2, 3) = "20200103" 'QC<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>
|
||||
tmp_ess(3, 5) = "20191202" '<EFBFBD>濵<EFBFBD><EFBFBD>ȭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ü <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
tmp_ess(3, 2) = "20210405" 'DIN <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
' tmp_ess(3, 2) = "20151203" 'DIN <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
' tmp_ess(2, 1) = "20181009" 'FW<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>ξ<EFBFBD>
|
||||
' tmp_ess(2, 2) = "20210405" '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ͻ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
' tmp_ess(2, 3) = "20200103" 'QC<EFBFBD><EFBFBD> <20><><EFBFBD>̾<EFBFBD>
|
||||
tmp_ess(3, 5) = "20191202" '<27>濵<EFBFBD><E6BFB5>ȭ<EFBFBD><C8AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ü <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
tmp_ess(4, 2) = "20191202" '<27>濵<EFBFBD><E6BFB5><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD> <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ü <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD>ݰ<EFBFBD><DDB0>꼭 ó<><C3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
|
||||
tmp_ess(4, 3) = "20210403" '<27>濵<EFBFBD><E6BFB5><EFBFBD><EFBFBD><EFBFBD>δ<EFBFBD><CEB4><EFBFBD> <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28>ް<EFBFBD><DEB0><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD>ٺ<EFBFBD><D9BA><EFBFBD><EFBFBD><EFBFBD> ó<><C3B3><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
|
||||
@@ -170,7 +172,7 @@ tmp_ess(60, 6) = "20191001" 'PSBU6
|
||||
' <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
tmp_ess(70, 0) = "20190601" 'M1 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
|
||||
tmp_ess(70, 1) = "20160301" 'MSBU1 <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><EFBFBD><D7B7><EFBFBD>)
|
||||
tmp_ess(70, 2) = "20221101" 'MSBU2 <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><EFBFBD><D7B7><EFBFBD>)
|
||||
tmp_ess(70, 2) = "20190601" 'MSBU2 <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> MSBU2 <20><EFBFBD><D7B7><EFBFBD> <20><><EFBFBD><EFBFBD> <20>Ѱ<EFBFBD><D1B0><EFBFBD><D7B7><EFBFBD><EFBFBD><EFBFBD> <20>븮 <20><><EFBFBD><EFBFBD>_2025-12-29
|
||||
tmp_ess(70, 3) = "20210701" 'MSBU2 <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28><EFBFBD><D7B7><EFBFBD>)
|
||||
|
||||
'2<><32><EFBFBD><EFBFBD> <20>϶<EFBFBD> <20>츮<EFBFBD><ECB8AE> <20><>.
|
||||
@@ -187,6 +189,10 @@ tmp_ess(70, 3) = "20210701" 'MSBU2
|
||||
tmp_ess(91, 0) = "20210107" '<27>ۺ<EFBFBD><DBBA><EFBFBD>R&D<><44><EFBFBD><EFBFBD> <09>Ż<EFBFBD><C5BB><EFBFBD>
|
||||
tmp_ess(91, 1) = "20150302" '<27>ۺ<EFBFBD><DBBA><EFBFBD>R&D<><44><EFBFBD><EFBFBD> - <20>ۺ<EFBFBD><DBBA><EFBFBD>5<EFBFBD><EFBFBD> <20><EFBFBD><D7B7><EFBFBD> <09><>ȯ
|
||||
|
||||
If Session("N_depart") = "R" AND Session("N_team") = "605" Then '605:<3A>ۺ<EFBFBD><DBBA><EFBFBD>5<EFBFBD><EFBFBD>
|
||||
tmp_ess(91, 0) = "20190301" 'PSBU5 <20><><EFBFBD><EFBFBD>ö(<28><>ǥ) <20>ۺ<EFBFBD><DBBA><EFBFBD>5<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ö<EFBFBD><C3B6>ǥ<EFBFBD><C7A5> <20>븮 <20><><EFBFBD><EFBFBD>_2025-12-29
|
||||
End If
|
||||
|
||||
tmp_ess(93, 0) = "20210801" '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>缾<EFBFBD><E7BCBE> <09><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
|
||||
|
||||
|
||||
|
||||
@@ -172,13 +172,28 @@
|
||||
next
|
||||
|
||||
query = ""&VbCrlf
|
||||
query = query & " SELECT *, isnull(confirm_yn,'N') as confirmYN, "&VbCrlf
|
||||
query = query & " SELECT *, isnull(confirm_yn,'N') as confirmYN, ISNULL(MC.marketing_cost, 0) as marketing_cost , ISNULL(JC.job_money, 0) as job_money, "&VbCrlf
|
||||
query = query & " tpm.p_sv_1, tpm.p_sv_2, tpm.p_sv_3, tpm.p_sv_4, "&VbCrlf'<27>ǻ<EFBFBD>(SV)
|
||||
query = query & " tpm.p_code_1, tpm.p_code_2, tpm.p_code_3, tpm.p_code_4, "&VbCrlf'<27>ڵ<EFBFBD>
|
||||
query = query & " tpm.p_verify_1, tpm.p_verify_2, tpm.p_verify_3, tpm.p_verify_4, "&VbCrlf'<27><><EFBFBD><EFBFBD>
|
||||
query = query & " tpm.p_punch_1, tpm.p_punch_2, tpm.p_punch_3, tpm.p_punch_4 "&VbCrlf'<27><>ġ
|
||||
query = query & " FROM direct_cost dc LEFT OUTER JOIN direct_costcode dcc ON dc.hangmok = dcc.id "&VbCrlf
|
||||
query = query & " left outer join T_PROJECT_METHOD tpm on dc.p_child_sn = tpm.p_child_sn "&VbCrlf
|
||||
|
||||
query = query & " LEFT JOIN ( "&VbCrlf
|
||||
query = query & " SELECT M.p_sn, SUM(CONVERT(money, REPLACE(CONVERT(varchar(100), M.target6), ',', ''))) AS marketing_cost "&VbCrlf
|
||||
query = query & " FROM project2.dbo.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> M LEFT JOIN project2.dbo.Document D ON M.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȣ = D.d_no "&VbCrlf
|
||||
query = query & " WHERE M.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><F1BAB8B0><EFBFBD>' AND M.del_yes_no = 'no' "&VbCrlf
|
||||
query = query & " AND D.d_order_cnt = '77' "&VbCrlf
|
||||
query = query & " GROUP BY M.p_sn "&VbCrlf
|
||||
query = query & " ) MC ON TPM.p_child_sn = MC.p_sn "&VbCrlf
|
||||
query = query & " LEFT JOIN ( "&VbCrlf
|
||||
query = query & " SELECT CA.p_sn, SUM(CA.cost_money) AS job_money "&VbCrlf
|
||||
query = query & " FROM project2.dbo.V_BUSI_COST CA "&VbCrlf
|
||||
query = query & " WHERE CA.cost_money > 0 "&VbCrlf
|
||||
query = query & " GROUP BY CA.p_sn "&VbCrlf
|
||||
query = query & " ) JC ON TPM.p_child_sn = JC.p_sn "&VbCrlf
|
||||
|
||||
query = query & " WHERE dc.p_sn = '"& p_sn &"' "&VbCrlf
|
||||
query = query & " AND del_yes_no = 'no' "&VbCrlf
|
||||
query = query & " AND hangmok NOT IN ('<27><EFBFBD>','<27><EFBFBD>_<EFBFBD>濵<EFBFBD><E6BFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>') "&VbCrlf
|
||||
@@ -235,10 +250,10 @@
|
||||
line_total = adors.recordcount
|
||||
redim pay_Array_new(line_total, 13)
|
||||
|
||||
|
||||
Dim job_sum
|
||||
if adors.RecordCount > 0 Then
|
||||
|
||||
redim pay_Array_new(line_total, 16)
|
||||
redim pay_Array_new(line_total, 18)
|
||||
'x:<3A><><EFBFBD><EFBFBD>, y:1:<3A><EFBFBD>, 2:<3A><><EFBFBD>γ<EFBFBD><CEB3><EFBFBD>, 3:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>, 4:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>/<2F><>, 5:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>/<2F>ð<EFBFBD>, 6:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ݾ<EFBFBD>,7:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>, 8:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>/<2F><>, 9:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>/<2F>ð<EFBFBD>, 10:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ݾ<EFBFBD>,11:<3A><><EFBFBD><EFBFBD><EFBFBD>ݾ<EFBFBD>-<2D><><EFBFBD><EFBFBD><EFBFBD>ݾ<EFBFBD><DDBE><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
'0:<3A><EFBFBD>, 12:<3A>濵<EFBFBD><E6BFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><EFBFBD>, 14:p_child_sn, 15:confirm <20><><EFBFBD><EFBFBD>
|
||||
i = -1
|
||||
@@ -271,6 +286,8 @@
|
||||
pay_Array_new(i,14) = adors("p_child_sn")
|
||||
pay_Array_new(i,15) = adors("confirmYN")
|
||||
pay_Array_new(i,16) = adors("memo")
|
||||
pay_Array_new(i,17) = adors("marketing_cost")
|
||||
pay_Array_new(i,18) = adors("job_money")
|
||||
|
||||
if trim(pay_Array_new(i,6)) = "" then
|
||||
else
|
||||
@@ -279,9 +296,12 @@
|
||||
|
||||
if pay_Array_new(i,10) <> "" then
|
||||
act_sum = cdbl(act_sum) + cdbl(pay_Array_new(i,10)) '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
|
||||
If i = 0 Then
|
||||
act_sum = cdbl(act_sum) + cdbl(pay_Array_new(i,17)) + cdbl(pay_Array_new(i,18))
|
||||
job_sum = cdbl(pay_Array_new(i,18))
|
||||
End If
|
||||
end if
|
||||
|
||||
|
||||
|
||||
adors.movenext
|
||||
loop
|
||||
|
||||
@@ -512,6 +532,13 @@
|
||||
<%
|
||||
NEXT
|
||||
%>
|
||||
<tr>
|
||||
<td class='align-middle text-center'><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></td>
|
||||
<td class='align-middle text-center' colspan="9"></td><3E><>
|
||||
<td class='align-middle text-center'><%if job_sum <> "" then response.write FormatNumber(job_sum ,0) end if%></td>
|
||||
<td class='align-middle text-center'>-</td>
|
||||
<td class='align-middle text-center'>-</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class='align-middle text-center' rowspan="3"><3E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD></td>
|
||||
<td class='align-middle text-center' rowspan="3"><b class="tahoma_orange"><%=formatnumber(p_cont_cost,0)%></b> <20><><br>(<28>ΰ<EFBFBD><CEB0><EFBFBD> <20><><EFBFBD><EFBFBD>)</td>
|
||||
|
||||
@@ -9,7 +9,8 @@ Response.Expires = -1
|
||||
MoneyDate = Request("MoneyDate")
|
||||
|
||||
query = ""
|
||||
query = query &" select *, CASE WHEN p_subject LIKE '%KRC%' THEN 'KRC' WHEN p_subject LIKE '%KRD%' THEN 'KRD' ELSE 'KRI' END as comp from"&VbCrlf
|
||||
'query = query &" select *, CASE WHEN p_subject LIKE '%KRC%' THEN 'KRC' WHEN p_subject LIKE '%KRD%' THEN 'KRD' ELSE 'KRI' END as comp from"&VbCrlf
|
||||
query = query &" select *, (select p_project_type_cd from T_PROJECT_BASE where p_sn = left(t.p_sn,7)) as comp from"&VbCrlf
|
||||
query = query &" ("&VbCrlf
|
||||
query = query &" --<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(<28>ڵ<EFBFBD> <20><><EFBFBD><EFBFBD>)"&VbCrlf
|
||||
query = query &" select '<27><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>' as m_n, TMP.m_name, left(m.M_JUMIN,6) + '-' + right(m.M_JUMIN,7) as M_JUMIN, M.m_mobile, b.b_fullname, isnull(m.m_b_no,'') m_b_no, TMP.p_sn, TPM.p_subject, work_dt, D.d_write_date, s_gubun,"&VbCrlf
|
||||
@@ -83,7 +84,7 @@ Rs.Open query, adoConn, 1
|
||||
set json = jsObject()
|
||||
Redim data(Rs.recordcount-1)
|
||||
iCnt = 0
|
||||
|
||||
|
||||
if not Rs.eof then
|
||||
while not Rs.eof
|
||||
set MoneyList = jsObject()
|
||||
|
||||
Reference in New Issue
Block a user