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

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

@@ -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>