リビジョン 244
協力金・消費税取得修正
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
|---|---|---|
| 234 | 234 |
/// </summary> |
| 235 | 235 |
private int s_ShoninPersonNameCnt = 1; |
| 236 | 236 |
/// <summary> |
| 237 |
/// ???F???J?????I?t?Z?b?g |
|
| 238 |
/// </summary> |
|
| 239 |
private int s_ShoninDateCnt = 2; |
|
| 240 |
/// <summary> |
|
| 237 | 241 |
/// ???F?????J?????I?t?Z?b?g |
| 238 | 242 |
/// </summary> |
| 239 | 243 |
private int s_ShoninAuthorityCnt = 3; |
| ... | ... | |
| 551 | 555 |
/// <param name="e"></param> |
| 552 | 556 |
private void FrmRequestSummaryList_Load(object sender, EventArgs e) |
| 553 | 557 |
{
|
| 554 |
// ?S??????F????? // TODO |
|
| 558 |
// ?S??????F????? |
|
| 559 |
// TODO |
|
| 555 | 560 |
if (ClsExcute.ProcControlPara.Count > 0) |
| 556 | 561 |
{
|
| 557 | 562 |
for (int i = 0; i < ClsExcute.ProcControlPara.Count; i++) |
| ... | ... | |
| 863 | 868 |
sql.AppendLine("select Am.APPROVALPERSON,Picm.SealPrintName,Am.ApprovalAuthority ");
|
| 864 | 869 |
sql.AppendLine("from ApprovalMaster as Am left join PersonInChargeMaster as Picm on Am.APPROVALPERSON = Picm.PERSONCODE ");
|
| 865 | 870 |
// ApprovalListNo ??R?[?h??????? |
| 866 |
//sql.AppendLine("where Am.APPROVALCODE = 99 "); // TODO
|
|
| 871 |
// TODO |
|
| 872 |
//sql.AppendLine("where Am.APPROVALCODE = 99 ");
|
|
| 867 | 873 |
int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName[m_Labourkind])).Key; |
| 868 | 874 |
sql.AppendFormat("where Am.APPROVALCODE = {0} ", iApprovalCode);
|
| 869 | 875 |
sql.AppendFormat("and Am.DepartmentCode = {0} ", DepartmentCode);
|
| ... | ... | |
| 963 | 969 |
|
| 964 | 970 |
//???????????????? (?b??I????l???p) ?@ |
| 965 | 971 |
//dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) * CommonMotions.cnvDouble(dgv.CurrentRow.Cells[(int)DispColumn.ShohiZeiRitu].Value); |
| 966 |
dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) * 0.08); |
|
| 972 |
//dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) * 0.08); |
|
| 973 |
dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) |
|
| 974 |
* (CommonMotions.SystemMasterData.ConsumptionTax / 100)); |
|
| 967 | 975 |
} |
| 968 | 976 |
else |
| 969 | 977 |
{
|
| ... | ... | |
| 995 | 1003 |
|
| 996 | 1004 |
//???????????????? (?b??I????l???p) ?@ |
| 997 | 1005 |
//dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) * CommonMotions.cnvDouble(dgv.CurrentRow.Cells[(int)DispColumn.ShohiZeiRitu].Value); |
| 998 |
dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) * 0.08); |
|
| 1006 |
//dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) * 0.08); |
|
| 1007 |
dgv[ColIndex, RowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[ColIndex, ShoukeiRowIndex].Value) |
|
| 1008 |
* (CommonMotions.SystemMasterData.ConsumptionTax / 100)); |
|
| 999 | 1009 |
} |
| 1000 | 1010 |
else |
| 1001 | 1011 |
{
|
| ... | ... | |
| 1506 | 1516 |
{
|
| 1507 | 1517 |
//???????????????? ?@ |
| 1508 | 1518 |
//dgv[e.ColumnIndex, ZeiRowIndex].Value = CommonMotions.cnvDouble(dgv.CurrentRow.Cells[e.ColumnIndex].Value) * CommonMotions.cnvDouble(dgv.CurrentRow.Cells[(int)DispColumn.ShohiZeiRitu].Value); |
| 1509 |
dgv[e.ColumnIndex, ZeiRowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[e.ColumnIndex, ShoukeiRowIndex].Value) * 0.08); |
|
| 1519 |
//dgv[e.ColumnIndex, ZeiRowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[e.ColumnIndex, ShoukeiRowIndex].Value) * 0.08); |
|
| 1520 |
dgv[e.ColumnIndex, ZeiRowIndex].Value = CommonMotions.cnvRound(CommonMotions.cnvDouble(dgv[e.ColumnIndex, ShoukeiRowIndex].Value) |
|
| 1521 |
* (CommonMotions.SystemMasterData.ConsumptionTax / 100)); |
|
| 1510 | 1522 |
} |
| 1511 | 1523 |
} |
| 1512 | 1524 |
|
| ... | ... | |
| 1674 | 1686 |
// 0?F????(?????j |
| 1675 | 1687 |
BpsWork.Payday = CommonMotions.cnvDate(lblPaymentDate.Text); |
| 1676 | 1688 |
BpsWork.BillPriceStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.SomuSeikyu); |
| 1677 |
BpsWork.ConsumptionTaxRate = 0.08; // ????????l????????????? |
|
| 1689 |
//BpsWork.ConsumptionTaxRate = 0.08; // ????????l????????????? |
|
| 1690 |
BpsWork.ConsumptionTaxRate = CommonMotions.SystemMasterData.ConsumptionTax; |
|
| 1678 | 1691 |
BpsWork.ConsumptionTaxPrice = CommonMotions.cnvRound(CommonMotions.cnvDouble(BpsWork.BillPriceStotal) * BpsWork.ConsumptionTaxRate); |
| 1679 | 1692 |
BpsWork.HighwPriceStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.SomuKosoku); |
| 1680 | 1693 |
BpsWork.HardwPriceStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.SomuKanamono); |
| 1681 | 1694 |
BpsWork.IndsWasteTaxStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.SomuSannhaiZei); |
| 1682 | 1695 |
|
| 1683 |
SystemMaster sm = new SystemMaster(); |
|
| 1684 |
BpsWork.CnstrPriceRate = (sm.CooperationRate/100); |
|
| 1696 |
//SystemMaster sm = new SystemMaster(); |
|
| 1697 |
//BpsWork.CnstrPriceRate = (sm.CooperationRate / 100); |
|
| 1698 |
BpsWork.CnstrPriceRate = (CommonMotions.SystemMasterData.CooperationRate / 100); |
|
| 1685 | 1699 |
BpsWork.CnstrPriceStotal = 0; |
| 1686 | 1700 |
BpsWork.BillingPriceTotal = BpsWork.BillPriceStotal + BpsWork.ConsumptionTaxPrice + BpsWork.HighwPriceStotal + BpsWork.HardwPriceStotal + BpsWork.IndsWasteTaxStotal; |
| 1687 | 1701 |
} |
| ... | ... | |
| 1690 | 1704 |
// 1?F?x??(?H???S??) |
| 1691 | 1705 |
BpsWork.Payday = CommonMotions.cnvDate(lblPaymentDate.Text); |
| 1692 | 1706 |
BpsWork.BillPriceStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.KojiSeikyu); |
| 1693 |
BpsWork.ConsumptionTaxRate = 0.08; // ????????l????????????? |
|
| 1707 |
//BpsWork.ConsumptionTaxRate = 0.08; // ????????l????????????? |
|
| 1708 |
BpsWork.ConsumptionTaxRate = CommonMotions.SystemMasterData.ConsumptionTax; |
|
| 1694 | 1709 |
BpsWork.ConsumptionTaxPrice = CommonMotions.cnvRound(CommonMotions.cnvDouble(BpsWork.BillPriceStotal) * BpsWork.ConsumptionTaxRate); |
| 1695 | 1710 |
BpsWork.HighwPriceStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.KojiKosoku); |
| 1696 | 1711 |
BpsWork.HardwPriceStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.KojiKanamono); |
| 1697 | 1712 |
BpsWork.IndsWasteTaxStotal = GetBpsGoukei(dgv, CompanyCode, DispColumn.KojiSannhaiZei); |
| 1698 |
SystemMaster sm = new SystemMaster(); |
|
| 1699 |
BpsWork.CnstrPriceRate = (sm.CooperationRate/100); |
|
| 1700 |
BpsWork.CnstrPriceStotal = CommonMotions.cnvRound(CommonMotions.cnvDouble(BpsWork.BillPriceStotal) * (sm.CooperationRate/100)); |
|
| 1713 |
//SystemMaster sm = new SystemMaster(); |
|
| 1714 |
//BpsWork.CnstrPriceRate = (sm.CooperationRate / 100); |
|
| 1715 |
//BpsWork.CnstrPriceStotal = CommonMotions.cnvRound(CommonMotions.cnvDouble(BpsWork.BillPriceStotal) * (sm.CooperationRate / 100)); |
|
| 1716 |
BpsWork.CnstrPriceRate = (CommonMotions.SystemMasterData.CooperationRate / 100); |
|
| 1717 |
BpsWork.CnstrPriceStotal = CommonMotions.cnvRound(CommonMotions.cnvDouble(BpsWork.BillPriceStotal) * BpsWork.CnstrPriceRate); |
|
| 1701 | 1718 |
BpsWork.BillingPriceTotal = BpsWork.BillPriceStotal + BpsWork.ConsumptionTaxPrice + BpsWork.HighwPriceStotal + BpsWork.HardwPriceStotal + BpsWork.IndsWasteTaxStotal - BpsWork.CnstrPriceStotal; |
| 1702 | 1719 |
|
| 1703 | 1720 |
} |
| ... | ... | |
| 3243 | 3260 |
} |
| 3244 | 3261 |
#endregion |
| 3245 | 3262 |
|
| 3263 |
// TODO ?i???g?p?H?j?? |
|
| 3246 | 3264 |
#region DataGridView_CellDoubleClick |
| 3247 | 3265 |
/// <summary> |
| 3248 | 3266 |
/// DataGridView_CellDoubleClick |
| ... | ... | |
| 3265 | 3283 |
//??I???F??t???O???????????A??????O?C??????????F??????\?? |
| 3266 | 3284 |
if(CommonMotions.cnvInt(dgv[i, e.RowIndex].Value)==1) |
| 3267 | 3285 |
{
|
| 3268 |
if(CommonMotions.cnvInt(dgv[i-3, e.RowIndex].Value)== CommonMotions.LoginUserData.PersonCode)
|
|
| 3286 |
if (CommonMotions.cnvInt(dgv[i - 3, e.RowIndex].Value) == CommonMotions.LoginUserData.PersonCode)
|
|
| 3269 | 3287 |
{
|
| 3270 | 3288 |
bApprovalAuthority = true; |
| 3271 | 3289 |
} |
他の形式にエクスポート: Unified diff