リビジョン 258
請求データ作成消費税計算追加
請求データ作成承認申請後戻り位置をメニューへ変更
メニュー受注工事合計金額表示データ無時0クリア
工事情報参照時増減工事グリッドからの画面遷移修正
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 67;
|
|
17 |
public static int s_SystemVersion = 68;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
---|---|---|
64 | 64 |
break; |
65 | 65 |
// 5:請求承認 |
66 | 66 |
case (int)ClsExcute.ApprovalListNo.OrderBillingApproval: |
67 |
//if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.ConstructionBudget) bAns = true;
|
|
67 |
if (RecPara.ProcNo == (int)ClsExcute.ProcessExecuteNo.ConstructionBudget) bAns = true; |
|
68 | 68 |
break; |
69 | 69 |
// 6:工事日報承認 |
70 | 70 |
case (int)ClsExcute.ApprovalListNo.DRConstructionApproval: |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
---|---|---|
4597 | 4597 |
if (m_SubForm) return; |
4598 | 4598 |
|
4599 | 4599 |
// ?Q????????????? |
4600 |
if (m_EditLock) return; |
|
4600 |
//if (m_EditLock) return;
|
|
4601 | 4601 |
|
4602 | 4602 |
DataGridView dgv = dgvLink; |
4603 | 4603 |
DataGridViewRow CurRow = dgv.CurrentRow; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs | ||
---|---|---|
336 | 336 |
{ |
337 | 337 |
case (int)CommonDefine.BaseInfoBillingSplitFlg.AllOnBilling: |
338 | 338 |
// ?????????? |
339 |
strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG = {0}", Status1); |
|
339 |
strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG >= {0}", Status1);
|
|
340 | 340 |
break; |
341 | 341 |
case (int)CommonDefine.BaseInfoBillingSplitFlg.SplitBilling: |
342 | 342 |
// ???????????? |
343 |
strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG > {0}", Status2); |
|
343 |
strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG >= {0}", Status2);
|
|
344 | 344 |
break; |
345 | 345 |
default: |
346 | 346 |
break; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs | ||
---|---|---|
156 | 156 |
this.dgv1.Size = new System.Drawing.Size(1312, 477); |
157 | 157 |
this.dgv1.TabIndex = 10; |
158 | 158 |
this.dgv1.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgv1_CellBeginEdit); |
159 |
this.dgv1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellEndEdit); |
|
159 | 160 |
this.dgv1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dgv1_CellFormatting); |
160 | 161 |
this.dgv1.CellValidating += new System.Windows.Forms.DataGridViewCellValidatingEventHandler(this.dgv1_CellValidating); |
161 | 162 |
this.dgv1.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellValueChanged); |
... | ... | |
597 | 598 |
// |
598 | 599 |
this.cbReqMonth.BackColor = System.Drawing.Color.White; |
599 | 600 |
this.cbReqMonth.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
601 |
this.cbReqMonth.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
600 | 602 |
this.cbReqMonth.FormattingEnabled = true; |
601 | 603 |
this.cbReqMonth.Location = new System.Drawing.Point(707, 7); |
602 | 604 |
this.cbReqMonth.Name = "cbReqMonth"; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.cs | ||
---|---|---|
174 | 174 |
// 前プロセスに戻る |
175 | 175 |
ClsExcute.BackProcess(); |
176 | 176 |
|
177 |
Close(); |
|
177 |
this.Close();
|
|
178 | 178 |
|
179 | 179 |
return; |
180 | 180 |
} |
... | ... | |
416 | 416 |
cbReqMonth.Enabled = true; |
417 | 417 |
} |
418 | 418 |
} |
419 |
|
|
419 |
this.Close(); |
|
420 | 420 |
} |
421 | 421 |
#endregion |
422 | 422 |
|
... | ... | |
451 | 451 |
CommonMotions.EntryEndMessage("請求データ"); |
452 | 452 |
|
453 | 453 |
// Formを閉じる |
454 |
Close(); |
|
454 |
this.Close();
|
|
455 | 455 |
} |
456 | 456 |
#endregion |
457 | 457 |
|
... | ... | |
478 | 478 |
// 前プロセスに戻る |
479 | 479 |
ClsExcute.BackProcess(); |
480 | 480 |
|
481 |
Close(); |
|
481 |
this.Close();
|
|
482 | 482 |
|
483 | 483 |
} |
484 | 484 |
#endregion |
... | ... | |
532 | 532 |
} |
533 | 533 |
#endregion |
534 | 534 |
|
535 |
#region セル編集終了 |
|
536 |
/// <summary> |
|
537 |
/// セル編集終了 |
|
538 |
/// </summary> |
|
539 |
/// <param name="sender"></param> |
|
540 |
/// <param name="e"></param> |
|
541 |
private void dgv1_CellEndEdit(object sender, DataGridViewCellEventArgs e) |
|
542 |
{ |
|
543 |
// 請求金額から消費税の入力をする |
|
544 |
setTaxValue(e); |
|
545 |
} |
|
546 |
#endregion |
|
547 |
|
|
535 | 548 |
#region セルフォーマッティング(セル書式指定) |
536 | 549 |
/// <summary> |
537 | 550 |
/// セルフォーマッティング(セル書式指定) |
... | ... | |
550 | 563 |
this.dgv1.CellFormatting += dgv1_CellFormatting; |
551 | 564 |
return; |
552 | 565 |
} |
566 |
try |
|
567 |
{ |
|
568 |
// セルの編集タイプを取得 |
|
569 |
int nType = GetEditType(tcol, trow); |
|
553 | 570 |
|
554 |
// セルの編集タイプを取得
|
|
555 |
int nType = GetEditType(tcol, trow);
|
|
571 |
// 金額系セルの場合
|
|
572 |
if (nType != (int)EditType.Amount) return;
|
|
556 | 573 |
|
557 |
// 金額系セルの場合 |
|
558 |
if (nType == (int)EditType.Amount) |
|
559 |
{ |
|
560 | 574 |
// 金額系セルの終了制御(カンマ区切り、文字色変更等) |
561 | 575 |
CellEditEnd(tcol, trow); |
562 | 576 |
|
... | ... | |
582 | 596 |
calcBalance((int)HeaderRowIndex.TaxAmount); |
583 | 597 |
|
584 | 598 |
} |
585 |
|
|
586 |
this.dgv1.CellFormatting += dgv1_CellFormatting; |
|
599 |
catch (Exception ex) |
|
600 |
{ |
|
601 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
602 |
} |
|
603 |
finally |
|
604 |
{ |
|
605 |
this.dgv1.CellFormatting += dgv1_CellFormatting; |
|
606 |
} |
|
587 | 607 |
} |
588 | 608 |
#endregion |
589 | 609 |
|
... | ... | |
838 | 858 |
m_EndButton = DialogResult.Cancel; |
839 | 859 |
|
840 | 860 |
// 前プロセスに戻る |
841 |
ClsExcute.BackProcess();
|
|
861 |
ClsExcute.ClearProcess();
|
|
842 | 862 |
|
843 |
Close(); |
|
863 |
this.Close();
|
|
844 | 864 |
|
845 | 865 |
} |
846 | 866 |
#endregion |
... | ... | |
864 | 884 |
m_EndButton = DialogResult.Cancel; |
865 | 885 |
|
866 | 886 |
// 前プロセスに戻る |
867 |
ClsExcute.BackProcess();
|
|
887 |
ClsExcute.ClearProcess();
|
|
868 | 888 |
|
869 |
Close(); |
|
889 |
this.Close();
|
|
870 | 890 |
} |
871 | 891 |
#endregion |
872 | 892 |
|
... | ... | |
889 | 909 |
m_EndButton = DialogResult.Cancel; |
890 | 910 |
|
891 | 911 |
// 前プロセスに戻る |
892 |
ClsExcute.BackProcess();
|
|
912 |
ClsExcute.ClearProcess();
|
|
893 | 913 |
|
894 |
Close(); |
|
914 |
this.Close();
|
|
895 | 915 |
} |
896 | 916 |
#endregion |
897 | 917 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs | ||
---|---|---|
317 | 317 |
} |
318 | 318 |
dgv[(int)ColumnName.No, cnt].Value = cnt.ToString(); |
319 | 319 |
|
320 |
dgv[(int)ColumnName.Heading, cnt].Style.ForeColor = Color.DarkGray; |
|
320 |
//dgv[(int)ColumnName.Heading, cnt].Style.ForeColor = Color.DarkGray;
|
|
321 | 321 |
if (j == 0) |
322 | 322 |
{ |
323 | 323 |
dgv[(int)ColumnName.Heading, cnt].Value = "請求金額"; |
... | ... | |
632 | 632 |
} |
633 | 633 |
#endregion |
634 | 634 |
|
635 |
#region 請求金額入力時消費税のセット |
|
636 |
/// <summary> |
|
637 |
/// 消費税のセット |
|
638 |
/// </summary> |
|
639 |
private void setTaxValue(DataGridViewCellEventArgs e) |
|
640 |
{ |
|
641 |
try |
|
642 |
{ |
|
643 |
// 請求金額以外は処理しない |
|
644 |
string wrktitile = CommonMotions.cnvString(dgv1[(int)ColumnName.Heading, e.RowIndex].Value); |
|
645 |
if (!wrktitile.Equals("請求金額")) return; |
|
646 |
|
|
647 |
// 消費税セット |
|
648 |
long wrkInputValue = CommonMotions.cnvLong(dgv1[e.ColumnIndex, e.RowIndex].Value); |
|
649 |
int nTaxValue = CommonMotions.cnvRound((double)wrkInputValue * (CommonMotions.SystemMasterData.ConsumptionTax / 100.0)); |
|
650 |
dgv1[e.ColumnIndex, (e.RowIndex + 1)].Value = nTaxValue.ToString("#,0"); |
|
651 |
} |
|
652 |
catch (Exception ex) |
|
653 |
{ |
|
654 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
655 |
} |
|
656 |
} |
|
635 | 657 |
#endregion |
636 | 658 |
|
659 |
#endregion |
|
660 |
|
|
637 | 661 |
#region チェック関連メソッド |
638 | 662 |
|
639 | 663 |
#region 初期起動時チェック |
... | ... | |
1473 | 1497 |
|
1474 | 1498 |
#region 設定系メソッド |
1475 | 1499 |
|
1500 |
#region 請求先をTooltipに設定する |
|
1501 |
private ToolTip m_ToolTip1; |
|
1502 |
/// <summary> |
|
1503 |
/// 請求先をTooltipに設定する |
|
1504 |
/// </summary> |
|
1505 |
private void SetToolTipOrderersName() |
|
1506 |
{ |
|
1507 |
try |
|
1508 |
{ |
|
1509 |
// ToolTipを作成する |
|
1510 |
m_ToolTip1 = new ToolTip(); |
|
1511 |
|
|
1512 |
// ToolTipを表示する時間 |
|
1513 |
m_ToolTip1.AutoPopDelay = 10000; |
|
1514 |
|
|
1515 |
// 請求先名をToolTipへセット |
|
1516 |
m_ToolTip1.SetToolTip(txtOrderer, txtOrderer.Text); |
|
1517 |
} |
|
1518 |
catch (Exception ex) |
|
1519 |
{ |
|
1520 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1521 |
} |
|
1522 |
} |
|
1523 |
#endregion |
|
1524 |
|
|
1476 | 1525 |
#region 表示データの設定 |
1477 | 1526 |
/// <summary> |
1478 | 1527 |
/// 表示データの設定 |
... | ... | |
1486 | 1535 |
|
1487 | 1536 |
// 請求先名 |
1488 | 1537 |
txtOrderer.Text = ReqHead.OrderersName; |
1538 |
// 請求先をTooltipに設定する |
|
1539 |
SetToolTipOrderersName(); |
|
1489 | 1540 |
|
1490 | 1541 |
// 編集可かつ請求書データに紐づかない場合のみ編集可能 |
1491 | 1542 |
if ((m_bEdit == true) && (ReqHead.InvoiceNo == 0)) |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
---|---|---|
3074 | 3074 |
|
3075 | 3075 |
iGoukeiCode = CommonMotions.cnvInt(dgv.CurrentRow.Cells[m_GoukeiCode_Column].Value); |
3076 | 3076 |
|
3077 |
// ?s??????????????? |
|
3077 | 3078 |
if (CurGenbaCode == 0) |
3078 | 3079 |
{ |
3079 | 3080 |
MessageBox.Show("?s?????????????????B", "?f?[?^?m?F", MessageBoxButtons.OK, MessageBoxIcon.Warning); |
... | ... | |
3115 | 3116 |
if ((DataRowState)dgv.CurrentRow.Cells[(int)DispColumn.RowState].Value == DataRowState.Added) |
3116 | 3117 |
{ |
3117 | 3118 |
DataGridViewRow[] ExistenceData = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == CurCompanyCode |
3118 |
&& CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0 |
|
3119 |
&& (DataRowState)dgv.CurrentRow.Cells[(int)DispColumn.RowState].Value != DataRowState.Added) |
|
3120 |
.ToArray(); |
|
3119 |
&& CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == 0
|
|
3120 |
&& (DataRowState)dgv.CurrentRow.Cells[(int)DispColumn.RowState].Value != DataRowState.Added)
|
|
3121 |
.ToArray();
|
|
3121 | 3122 |
if (ExistenceData.Count() == 0) |
3122 | 3123 |
{ |
3123 | 3124 |
bDeleteRow = true; |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
---|---|---|
4105 | 4105 |
try |
4106 | 4106 |
{ |
4107 | 4107 |
dgv.Rows.Clear(); |
4108 |
// 金額表示 |
|
4109 |
lblTotal01.Text = @"\0-"; |
|
4110 |
lblTotal02.Text = @"\0-"; |
|
4111 |
lblTotal03.Text = @"\0-"; |
|
4112 |
|
|
4108 | 4113 |
long lTotal01 = 0; |
4109 | 4114 |
long lTotal02 = 0; |
4110 | 4115 |
|
... | ... | |
4197 | 4202 |
|
4198 | 4203 |
dgv.Rows[RowCnt].Cells[ColCnt].Value = DepName; |
4199 | 4204 |
dgv.Rows[RowCnt].Cells[ColCnt].Style.BackColor = Color.Aqua; |
4200 |
dgv.Rows[RowCnt].Cells[ColCnt + 1].Value = Price.ToString("#,0") + "-";
|
|
4205 |
dgv.Rows[RowCnt].Cells[ColCnt + 1].Value = string.Format(@"\{0}-", Price.ToString("#,0"));
|
|
4201 | 4206 |
} |
4202 | 4207 |
// 金額表示 |
4203 |
lblTotal01.Text = @"\" + (lTotal01 - lTotal02).ToString("#,0") + "-";
|
|
4204 |
lblTotal02.Text = @"\" + lTotal02.ToString("#,0") + "-";
|
|
4205 |
lblTotal03.Text = @"\" + lTotal01.ToString("#,0") + "-";
|
|
4208 |
lblTotal01.Text = string.Format(@"\{0}-", (lTotal01 - lTotal02).ToString("#,0"));
|
|
4209 |
lblTotal02.Text = string.Format(@"\{0}-", lTotal02.ToString("#,0"));
|
|
4210 |
lblTotal03.Text = string.Format(@"\{0}-", lTotal01.ToString("#,0"));
|
|
4206 | 4211 |
|
4207 | 4212 |
} |
4208 | 4213 |
catch (Exception ex) |
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.0.67")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.67")]
|
|
35 |
[assembly: AssemblyVersion("1.0.0.68")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.0.68")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff