リビジョン 421
メニュー：入金入力起動パラメタ削除・グリッドタイトル文字修正
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs | ||
|---|---|---|
| 581 | 581 |
} |
| 582 | 582 |
#endregion |
| 583 | 583 |
|
| 584 |
#region グリッドタイトル文字 |
|
| 585 |
/// <summary> |
|
| 586 |
/// グリッドタイトル文字 |
|
| 587 |
/// </summary> |
|
| 588 |
public static string[] GridTitleString = new string[] { "営業期", "工事年" };
|
|
| 584 | 589 |
#endregion |
| 585 | 590 |
|
| 591 |
#endregion |
|
| 592 |
|
|
| 586 | 593 |
#region 変数 |
| 587 | 594 |
/// <summary> |
| 588 | 595 |
/// 起動チェックパラメータ（true:更新チェックあり、false:更新チェック無し） |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
|---|---|---|
| 3478 | 3478 |
DataGridViewEX dgv = dgvSalesInProjects; |
| 3479 | 3479 |
try |
| 3480 | 3480 |
{
|
| 3481 |
if (CommonMotions.BasePeriodYear()) |
|
| 3482 |
dgv.Columns[2].HeaderText = CommonDefine.Type1YearString[0]; |
|
| 3483 |
else |
|
| 3484 |
dgv.Columns[2].HeaderText = CommonDefine.Type2YearString[0]; |
|
| 3481 |
// グリッドタイトルセット |
|
| 3482 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
|
| 3485 | 3483 |
|
| 3486 | 3484 |
dgv.SuspendLayout(); |
| 3487 | 3485 |
dgv.Rows.Clear(); |
| ... | ... | |
| 3700 | 3698 |
DataGridViewEX dgv = dgvTenders; |
| 3701 | 3699 |
try |
| 3702 | 3700 |
{
|
| 3703 |
if (CommonMotions.BasePeriodYear()) |
|
| 3704 |
dgv.Columns[2].HeaderText = CommonDefine.Type1YearString[0]; |
|
| 3705 |
else |
|
| 3706 |
dgv.Columns[2].HeaderText = CommonDefine.Type2YearString[0]; |
|
| 3701 |
// グリッドタイトルセット |
|
| 3702 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
|
| 3707 | 3703 |
|
| 3708 | 3704 |
dgv.SuspendLayout(); |
| 3709 | 3705 |
dgv.Rows.Clear(); |
| ... | ... | |
| 3921 | 3917 |
DataGridViewEX dgv = dgvBudgetUp; |
| 3922 | 3918 |
try |
| 3923 | 3919 |
{
|
| 3924 |
if (CommonMotions.BasePeriodYear()) |
|
| 3925 |
dgv.Columns[2].HeaderText = CommonDefine.Type1YearString[0]; |
|
| 3926 |
else |
|
| 3927 |
dgv.Columns[2].HeaderText = CommonDefine.Type2YearString[0]; |
|
| 3920 |
// グリッドタイトルセット |
|
| 3921 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
|
| 3928 | 3922 |
|
| 3929 | 3923 |
dgv.SuspendLayout(); |
| 3930 | 3924 |
dgv.Rows.Clear(); |
| ... | ... | |
| 4165 | 4159 |
DataGridViewEX dgv = dgvConstructionProjects; |
| 4166 | 4160 |
try |
| 4167 | 4161 |
{
|
| 4168 |
if (CommonMotions.BasePeriodYear()) |
|
| 4169 |
dgv.Columns[2].HeaderText = CommonDefine.Type1YearString[0]; |
|
| 4170 |
else |
|
| 4171 |
dgv.Columns[2].HeaderText = CommonDefine.Type2YearString[0]; |
|
| 4162 |
// グリッドタイトルセット |
|
| 4163 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
|
| 4172 | 4164 |
|
| 4173 | 4165 |
dgv.SuspendLayout(); |
| 4174 | 4166 |
dgv.Rows.Clear(); |
| ... | ... | |
| 4751 | 4743 |
DataGridViewEX dgv = dgvFluctuationProjects; |
| 4752 | 4744 |
try |
| 4753 | 4745 |
{
|
| 4754 |
if (CommonMotions.BasePeriodYear()) |
|
| 4755 |
dgv.Columns[2].HeaderText = CommonDefine.Type1YearString[0]; |
|
| 4756 |
else |
|
| 4757 |
dgv.Columns[2].HeaderText = CommonDefine.Type2YearString[0]; |
|
| 4746 |
// グリッドタイトルセット |
|
| 4747 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
|
| 4758 | 4748 |
|
| 4759 | 4749 |
dgv.SuspendLayout(); |
| 4760 | 4750 |
dgv.Rows.Clear(); |
| ... | ... | |
| 4886 | 4876 |
|
| 4887 | 4877 |
// 先頭の期数を取得する |
| 4888 | 4878 |
object[] firstwrkRec = (object[])arData[0]; |
| 4889 |
int BreakConstructionPeriod = CommonMotions.cnvInt(firstwrkRec[(int)DBColumn5.ConstructionPeriod]);
|
|
| 4879 |
int BreakConstrPeriod = CommonMotions.cnvInt(firstwrkRec[(int)DBColumn5.ConstructionPeriod]); |
|
| 4890 | 4880 |
int iLineCnt = 0; |
| 4891 | 4881 |
int DBCnt = Enum.GetNames(typeof(DBColumn5)).Length; |
| 4892 | 4882 |
int BreakConstructionCode = 0; |
| ... | ... | |
| 4899 | 4889 |
|
| 4900 | 4890 |
foreach (object[] DataRec in arData) |
| 4901 | 4891 |
{
|
| 4902 |
int iConstructionCode = CommonMotions.cnvInt(DataRec[(int)DBColumn5.ConstructionCode]);
|
|
| 4903 |
|
|
| 4892 |
int iConstrCode = CommonMotions.cnvInt(DataRec[(int)DBColumn5.ConstructionCode]); |
|
| 4893 |
int iConstrPeriod = CommonMotions.cnvInt(DataRec[(int)DBColumn5.ConstructionPeriod]); |
|
| 4904 | 4894 |
string salesname = CommonMotions.cnvString(DataRec[(int)DBColumn5.S_PERSONNAME]); |
| 4905 | 4895 |
|
| 4906 | 4896 |
string constructorname = CommonMotions.cnvString(DataRec[(int)DBColumn5.C_PERSONNAME]); |
| ... | ... | |
| 4918 | 4908 |
int iApprovalStatus = CommonMotions.cnvInt(DataRec[(int)DBColumn5.ApprovalSTatus]); |
| 4919 | 4909 |
|
| 4920 | 4910 |
// 1行目を表示するので明細が同じ間は処理しない |
| 4921 |
if (iConstructionCode == BreakConstructionCode) continue;
|
|
| 4911 |
if (iConstrCode == BreakConstructionCode) continue; |
|
| 4922 | 4912 |
|
| 4923 | 4913 |
// 親子以外場合は1行開ける |
| 4924 |
if ((iConstructionCode / 100) != (BreakConstructionCode / 100))
|
|
| 4914 |
if ((iConstrCode / 100) != (BreakConstructionCode / 100)) |
|
| 4925 | 4915 |
{
|
| 4926 | 4916 |
if (BreakConstructionCode != 0) dgv.Rows.Add(); |
| 4927 | 4917 |
} |
| 4928 | 4918 |
|
| 4929 | 4919 |
// 名称取得 |
| 4930 |
getDetailStrings(iConstructionCode, arData, ref Details);
|
|
| 4920 |
getDetailStrings(iConstrCode, arData, ref Details); |
|
| 4931 | 4921 |
|
| 4932 |
BreakConstructionCode = iConstructionCode;
|
|
| 4922 |
BreakConstructionCode = iConstrCode; |
|
| 4933 | 4923 |
|
| 4934 | 4924 |
// データを工事情報のフォーマットに詰めなおす |
| 4935 | 4925 |
Array.Clear(wrkobj, 0, wrkobj.Length); |
| ... | ... | |
| 4947 | 4937 |
wrkAvoRec.FieldNo = CommonMotions.cnvInt(DataRec[offset + (int)IOPeriodAvoidance.NameColumn.ConstructionStatusFlg]); |
| 4948 | 4938 |
|
| 4949 | 4939 |
// 期が違えば空白を開ける |
| 4950 |
if (BreakConstructionPeriod != wrkRec.ConstructionPeriod)
|
|
| 4940 |
if (BreakConstrPeriod != iConstrPeriod)
|
|
| 4951 | 4941 |
{
|
| 4952 |
BreakConstructionPeriod = wrkRec.ConstructionPeriod;
|
|
| 4942 |
BreakConstrPeriod = iConstrPeriod;
|
|
| 4953 | 4943 |
dgv.Rows.Add(); |
| 4954 | 4944 |
iLineCnt++; |
| 4955 | 4945 |
} |
| ... | ... | |
| 5066 | 5056 |
} |
| 5067 | 5057 |
} |
| 5068 | 5058 |
#endregion |
| 5069 |
|
|
| 5070 | 5059 |
#endregion |
| 5071 | 5060 |
|
| 5072 | 5061 |
#region 非受注案件一覧表示関連 |
| ... | ... | |
| 5097 | 5086 |
DataGridViewEX dgv = dgvNonOrders; |
| 5098 | 5087 |
try |
| 5099 | 5088 |
{
|
| 5100 |
if (CommonMotions.BasePeriodYear()) |
|
| 5101 |
dgv.Columns[2].HeaderText = CommonDefine.Type1YearString[0]; |
|
| 5102 |
else |
|
| 5103 |
dgv.Columns[2].HeaderText = CommonDefine.Type2YearString[0]; |
|
| 5089 |
// グリッドタイトルセット |
|
| 5090 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
|
| 5104 | 5091 |
|
| 5105 | 5092 |
dgv.SuspendLayout(); |
| 5106 | 5093 |
// 工事検索時は検索画面の値をセットする |
| ... | ... | |
| 5482 | 5469 |
/// <param name="arData"></param> |
| 5483 | 5470 |
private void DispCompOfConstrGrid(IOConstructionBaseInfo cbiDB, ArrayList arData) |
| 5484 | 5471 |
{
|
| 5472 |
DataGridViewEX dgv = dgvCompletionOfConstruction; |
|
| 5473 |
// グリッドタイトルセット |
|
| 5474 |
dgv.Columns[2].HeaderText = GridTitleString[CommonMotions.SystemMasterData.ConstructionNoBase]; |
|
| 5485 | 5475 |
try |
| 5486 | 5476 |
{
|
| 5487 |
DataGridViewEX dgv = dgvCompletionOfConstruction; |
|
| 5488 |
|
|
| 5489 |
if (CommonMotions.BasePeriodYear()) |
|
| 5490 |
dgv.Columns[2].HeaderText = CommonDefine.Type1YearString[0]; |
|
| 5491 |
else |
|
| 5492 |
dgv.Columns[2].HeaderText = CommonDefine.Type2YearString[0]; |
|
| 5493 |
|
|
| 5494 | 5477 |
dgv.SuspendLayout(); |
| 5495 | 5478 |
|
| 5496 | 5479 |
// データ表示 |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs | ||
|---|---|---|
| 491 | 491 |
// 入金確認 |
| 492 | 492 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.PaymentConfirmation); |
| 493 | 493 |
|
| 494 |
// 入金確認（出来高） |
|
| 495 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling); |
|
| 494 |
//// 入金確認（出来高）
|
|
| 495 |
//ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling);
|
|
| 496 | 496 |
break; |
| 497 | 497 |
#endregion |
| 498 | 498 |
} |
| ... | ... | |
| 561 | 561 |
// 入金確認 |
| 562 | 562 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.PaymentConfirmation); |
| 563 | 563 |
|
| 564 |
// 入金確認（完了後） |
|
| 565 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling); |
|
| 564 |
//// 入金確認（完了後）
|
|
| 565 |
//ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling);
|
|
| 566 | 566 |
break; |
| 567 | 567 |
#endregion |
| 568 | 568 |
} |
他の形式にエクスポート: Unified diff