リビジョン 212
入金確認画面 案件の並び替えの不備の修正、 請求金額合計を取得する際のロジックの修正
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs | ||
---|---|---|
1207 | 1207 |
sql.AppendFormat(" I.REQUESTMONTH = {0} ", m_Select_TargetDate); |
1208 | 1208 |
sql.Append(" ) "); |
1209 | 1209 |
sql.Append(" ORDER BY "); |
1210 |
sql.Append(" ORDERERSCODE "); |
|
1210 |
sql.Append(" ORDERERSDIVISION "); |
|
1211 |
sql.Append(" , ORDERERSCODE "); |
|
1211 | 1212 |
sql.Append(" , REQUESTDATE "); |
1212 | 1213 |
sql.Append(" , REQCONSTRUCTIONCODE "); |
1213 | 1214 |
sql.Append(" , KB; "); |
... | ... | |
1291 | 1292 |
{ |
1292 | 1293 |
var sql = new StringBuilder(); |
1293 | 1294 |
sql.Append(" SELECT "); |
1294 |
sql.Append(" SUM(REQUESTAMOUNT) "); |
|
1295 |
sql.Append(" , SUM(TAXAMOUNT) "); |
|
1295 |
sql.Append(" SUM(H.REQUESTAMOUNT) ");
|
|
1296 |
sql.Append(" , SUM(H.TAXAMOUNT) ");
|
|
1296 | 1297 |
sql.Append(" FROM "); |
1297 |
sql.Append(" REQUESTHEAD "); |
|
1298 |
sql.Append(" REQUESTHEAD AS H "); |
|
1299 |
sql.Append(" INNER JOIN INVOICEDATA AS I "); |
|
1300 |
sql.Append(" ON I.INVOICENO = H.INVOICENO "); |
|
1298 | 1301 |
sql.Append(" WHERE "); |
1299 | 1302 |
if (tgl == 1) |
1300 | 1303 |
{ |
1301 |
sql.AppendFormat(" ORDERERSDIVISION = {0} ", orderersDiv); |
|
1302 |
sql.AppendFormat(" AND ORDERERSCODE = {0} ", orderersCd); |
|
1303 |
sql.AppendFormat(" AND REQUESTMONTH = {0} ", targetDate); |
|
1304 |
sql.AppendFormat(" H.ORDERERSDIVISION = {0} ", orderersDiv);
|
|
1305 |
sql.AppendFormat(" AND H.ORDERERSCODE = {0} ", orderersCd);
|
|
1306 |
sql.AppendFormat(" AND H.REQUESTMONTH = {0} ", targetDate);
|
|
1304 | 1307 |
} |
1305 | 1308 |
else if(tgl == 2) |
1306 | 1309 |
{ |
1307 |
sql.AppendFormat(" REQUESTMONTH = {0} ", targetDate); |
|
1310 |
sql.AppendFormat(" H.REQUESTMONTH = {0} ", targetDate);
|
|
1308 | 1311 |
} |
1309 | 1312 |
var data = new ArrayList(); |
1310 | 1313 |
if (!ivD.ExecuteReader(sql.ToString(), ref data)) |
... | ... | |
1650 | 1653 |
SumRequestTax = CommonMotions.cnvInt(sum[1]); |
1651 | 1654 |
} |
1652 | 1655 |
|
1653 |
depositTotal = SumDepositAmountCash+SumDepositAmountBill;
|
|
1656 |
depositTotal = SumDepositAmountCash + SumDepositAmountBill;
|
|
1654 | 1657 |
requestTotal = SumRequestBill + SumRequestTax; |
1655 | 1658 |
lblDepositTotal.Text = depositTotal.ToString("#,0") + " 円"; |
1656 | 1659 |
lblRequestTotal.Text = requestTotal.ToString("#,0") + " 円"; |
他の形式にエクスポート: Unified diff