From dcb647e0b9c49fd12af18ee8ecee551ff305664a Mon Sep 17 00:00:00 2001 From: Choins Date: Mon, 26 Jan 2026 14:17:53 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EB=9D=BC=EC=9D=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=A7=81=EC=A0=91=EB=B9=84(?= =?UTF-8?q?=EC=A0=91=EB=8C=80=EB=B9=84)=20=EA=B4=80=EB=A0=A8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/busi_list.asp | 12 +++++------ business/busi_write.asp | 9 ++++++--- ess/0config_ess.asp | 20 +++++++++++------- ess/direct_cost_print_2014.asp | 37 +++++++++++++++++++++++++++++----- inspection/Ajax_Money.asp | 5 +++-- 5 files changed, 60 insertions(+), 23 deletions(-) diff --git a/business/busi_list.asp b/business/busi_list.asp index 51aafe1..d8b4b27 100644 --- a/business/busi_list.asp +++ b/business/busi_list.asp @@ -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 '대표이사 if Session("User_Number") = "20080101" then - 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') ) " '조기혜 대체 박미선 else '2024-06-17 (20211001, 20210105, 20230905) 퇴사로 삭제 - 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') ) " '최환그룹장 1차상위자 대표님으로 변경 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 '총괄 그룹장 / 그룹장 , din 그룹장은 안보이도록 일괄 최정심본부장님만 결재가능 + ElseIf (Session("teamplace") = 3 OR Session("teamplace") = 2) and Session("User_Number") <> "20200103" and Session("User_Number") <> "20210405" and Session("User_Number") <> "20181009" Then '총괄 그룹장 / 그룹장 , din 김희정 그룹장이 결재 가능 ' If Session("N_depart") & Session("N_team") = "S301" Then ' 채주희 그룹장님 전용 ' perQuery = perQuery & " and (p_no not in ('20240701','20240702') ) " '이서윤 제외 401키위 공석으로 포함시킴 2024-07-09 ' perQuery = perQuery & " AND (p_depart_now = 'S' AND p_team_now in ('401') OR (p_no in ('20160203', '20210302'))" '솔루션개발, 백성희, 박채원 @@ -198,20 +198,20 @@ ' perQuery = perQuery & " OR p_no in ('20160205', '20210107', '20240205') " ' End if If session("User_Number") = "20190601" Then '이혜진 - 마케팅 1,2,3 그룹장 - 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') "'그룹장들만 보여지도록 + 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') "'마케팅2그룹장 공석(이혜진상무 직무대행) -> 윤인주,서보화,오수연 추가 End If if session("User_Number") = "20031102" Then '채주희 - DCO 본부장 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')) " '솔루션 개발 그룹장 대리 250122 jelee End if - if session("User_Number") = "20151203" Then '최정심 - DIN 본부장 + if session("User_Number") = "20210405" Then '최정심 - DIN 본부장 -> 김희정 그룹장으로 변경 perQuery = perQuery & " OR (p_depart_now = 'S' AND p_team_now IN ('101','201')) " End if if session("User_Number") = "20160205" Then '박지훈 - 퍼블릭 본부 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 '신상욱 - 퍼블릭 R&D센터 센터장 - 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 & " ) " diff --git a/business/busi_write.asp b/business/busi_write.asp index 6b3eaa3..50dfd81 100644 --- a/business/busi_write.asp +++ b/business/busi_write.asp @@ -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 = $(""); } - } else if($('#conyear').val() == 2025 && $('#conmonth').val() == 1){ - if(obj.weeknum != 53){ + } else if($('#conmonth').val() == 1){ + if(obj.weeknum < 50 ){ var option = $(""); } } else { diff --git a/ess/0config_ess.asp b/ess/0config_ess.asp index 8aa755c..7f5215d 100644 --- a/ess/0config_ess.asp +++ b/ess/0config_ess.asp @@ -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:디지털COMM tmp_ess(3, 0) = "20031102" ' 채주희(본부장) ELSEIF Session("N_depart") = "S" AND (Session("N_team") = "101" OR Session("N_team") = "201") Then'DIN, DIN(QC) - tmp_ess(3, 0) = "20151203" '//-- 최정심 + tmp_ess(3, 0) = "20210405" '//-- 김희정 (2025년12월 최정심 상무님 퇴사에 따라 결제권한 김희정 그룹장님으로 변경 + 'tmp_ess(3, 0) = "20151203" '//-- 최정심 ' tmp_ess(2, 0) = "20151203" '//-- 최정심 End If @@ -139,11 +140,12 @@ tmp_ess(3, 3) = "20250301" ' tmp_ess(3, 4) = "20210302" '온라인서베이운영그룹 박채원(그룹장) tmp_ess(3, 6) = "20220901" '디지털COMM 이서윤(그룹장) -tmp_ess(3, 2) = "20151203" 'DIN 최정심 -' tmp_ess(2, 1) = "20181009" 'FW그룹 조민아 -' tmp_ess(2, 2) = "20210405" '비즈니스운영그룹 김희정 -' tmp_ess(2, 3) = "20200103" 'QC그룹 공미애 -tmp_ess(3, 5) = "20191202" '경영문화본부 조기혜 대체 김현정 +tmp_ess(3, 2) = "20210405" 'DIN 김희정 +' tmp_ess(3, 2) = "20151203" 'DIN 최정심 +' tmp_ess(2, 1) = "20181009" 'FW그룹 조민아 +' tmp_ess(2, 2) = "20210405" '비즈니스운영그룹 김희정 +' tmp_ess(2, 3) = "20200103" 'QC그룹 공미애 +tmp_ess(3, 5) = "20191202" '경영문화본부 조기혜 대체 김현정 tmp_ess(4, 2) = "20191202" '경영지원부담당 조기혜 대체 김현정 (세금계산서 처리담당) tmp_ess(4, 3) = "20210403" '경영지원부담당 문봄이 (휴가원, 출퇴근보고서 처리담당) @@ -170,7 +172,7 @@ tmp_ess(60, 6) = "20191001" 'PSBU6 ' 마케팅 tmp_ess(70, 0) = "20190601" 'M1 이혜진(본부장) tmp_ess(70, 1) = "20160301" 'MSBU1 최혜원(그룹장) -tmp_ess(70, 2) = "20221101" 'MSBU2 임주희(그룹장) +tmp_ess(70, 2) = "20190601" 'MSBU2 이혜진 MSBU2 그룹장 공석 총괄그룹장이 대리 결재_2025-12-29 tmp_ess(70, 3) = "20210701" 'MSBU2 김경은(그룹장) '2본부 일때 살리면 됨. @@ -187,6 +189,10 @@ tmp_ess(70, 3) = "20210701" 'MSBU2 tmp_ess(91, 0) = "20210107" '퍼블릭R&D센터 신상욱 tmp_ess(91, 1) = "20150302" '퍼블릭R&D센터 - 퍼블릭5그룹 그룹장 최환 +If Session("N_depart") = "R" AND Session("N_team") = "605" Then '605:퍼블릭5그룹 + tmp_ess(91, 0) = "20190301" 'PSBU5 조우철(대표) 퍼블릭5그룹 본부장 공석 조우철대표님 대리 결재_2025-12-29 +End If + tmp_ess(93, 0) = "20210801" '여론조사센터 서강신 diff --git a/ess/direct_cost_print_2014.asp b/ess/direct_cost_print_2014.asp index c1d1efd..2f52fa2 100644 --- a/ess/direct_cost_print_2014.asp +++ b/ess/direct_cost_print_2014.asp @@ -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'실사(SV) query = query & " tpm.p_code_1, tpm.p_code_2, tpm.p_code_3, tpm.p_code_4, "&VbCrlf'코딩 query = query & " tpm.p_verify_1, tpm.p_verify_2, tpm.p_verify_3, tpm.p_verify_4, "&VbCrlf'검증 query = query & " tpm.p_punch_1, tpm.p_punch_2, tpm.p_punch_3, tpm.p_punch_4 "&VbCrlf'펀치 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.문서내용 M LEFT JOIN project2.dbo.Document D ON M.문서번호 = D.d_no "&VbCrlf + query = query & " WHERE M.문서제목 = '접대비보고서' 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 ('메모','메모_경영지원실') "&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:순서, y:1:항목, 2:세부내용, 3:예상의 원, 4:예상의 부/명, 5:예상의 도수/시간, 6:예상의 금액,7:실제의 원, 8:실제의 부/명, 9:실제의 도수/시간, 10:실제의 금액,11:실제금액-예상금액의 차이 '0:메모, 12:경영지원실 전용 메모, 14:p_child_sn, 15:confirm 유무 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)) '실제직접비 누계 + 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 %> + + 업무일지비용 + ㅉ + <%if job_sum <> "" then response.write FormatNumber(job_sum ,0) end if%> + - + - + 계약액 <%=formatnumber(p_cont_cost,0)%> 원
(부가세 별도) diff --git a/inspection/Ajax_Money.asp b/inspection/Ajax_Money.asp index d24793f..174bb81 100644 --- a/inspection/Ajax_Money.asp +++ b/inspection/Ajax_Money.asp @@ -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 &" --내근직(코딩 제외)"&VbCrlf query = query &" select '내근직' 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()