リビジョン 398
工事基本情報：台帳完了日更新、増減工事を含むすべてを対象にする
工事詳細台帳：支払可能額ない那須予算に対応
データコピー処理：台帳完了日クリア追加
マスタメンテナンス画面マキシマライズボタンfalse
メニュー：マスタメンテメニュー製品版対応
| trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs | ||
|---|---|---|
| 57 | 57 |
public static bool SetLedgerComplateDate(int ConstrCode, DateTime SetDate) |
| 58 | 58 |
{
|
| 59 | 59 |
IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo(); |
| 60 |
IOConstructionLink LinkDB = new IOConstructionLink(); |
|
| 60 | 61 |
try |
| 61 | 62 |
{
|
| 63 |
BaseDB.connect(); BaseDB.beginTran(); |
|
| 64 |
LinkDB.connect(); LinkDB.beginTran(); |
|
| 65 |
|
|
| 62 | 66 |
// 工事詳細台帳入力完了日をセットする |
| 63 |
if (!BaseDB.UpdateFeild(ConstrCode, (int)IOConstructionBaseInfo.TableColumn.LedgerComplateDate, SetDate)) return false; |
|
| 67 |
if (!BaseDB.UpdateFeild(ConstrCode, (int)IOConstructionBaseInfo.TableColumn.LedgerComplateDate, SetDate, false)) |
|
| 68 |
{
|
|
| 69 |
BaseDB.rollback(); |
|
| 70 |
return false; |
|
| 71 |
} |
|
| 64 | 72 |
|
| 73 |
// 増減工事があればそれもセットする |
|
| 74 |
StringBuilder strSQL = new StringBuilder(); |
|
| 75 |
strSQL.Append(LinkDB.CreatePrimarykeyString(ConstrCode)); |
|
| 76 |
List<ConstructionLink> LinkList = new List<ConstructionLink>(); |
|
| 77 |
if (!LinkDB.SelectAction(strSQL.ToString(), ref LinkList, false)) |
|
| 78 |
{
|
|
| 79 |
BaseDB.rollback(); |
|
| 80 |
LinkDB.rollback(); |
|
| 81 |
return false; |
|
| 82 |
} |
|
| 83 |
|
|
| 84 |
// 増減工事が無ければ終了 |
|
| 85 |
if (LinkList.Count < 1) return true; |
|
| 86 |
|
|
| 87 |
strSQL.Clear(); |
|
| 88 |
strSQL.Append("Update constructionbaseinfo");
|
|
| 89 |
strSQL.Append(" Set LedgerComplateDate = DATE(NOW())");
|
|
| 90 |
strSQL.Append(", UpdateDate = NOW()");
|
|
| 91 |
strSQL.Append(" Where ConstructionCode In(");
|
|
| 92 |
strSQL.Append(" Select B.FluctuationCode From constructionlink AS B");
|
|
| 93 |
strSQL.AppendFormat(" Where B.ConstructionCode = {0})", ConstrCode);
|
|
| 94 |
if (!BaseDB.ExecuteNonQuery(strSQL.ToString(), false)) |
|
| 95 |
{
|
|
| 96 |
BaseDB.rollback(); |
|
| 97 |
LinkDB.rollback(); |
|
| 98 |
return false; |
|
| 99 |
} |
|
| 100 |
|
|
| 65 | 101 |
return true; |
| 66 | 102 |
} |
| 67 | 103 |
catch (System.Exception ex) |
| ... | ... | |
| 71 | 107 |
} |
| 72 | 108 |
finally |
| 73 | 109 |
{
|
| 74 |
BaseDB.close(); BaseDB = null; |
|
| 110 |
BaseDB.commit(); BaseDB.close(); BaseDB = null; |
|
| 111 |
LinkDB.commit(); LinkDB.close(); LinkDB = null; |
|
| 75 | 112 |
} |
| 76 | 113 |
} |
| 77 | 114 |
#endregion |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
|---|---|---|
| 5981 | 5981 |
if (ResultValue < 0) |
| 5982 | 5982 |
{
|
| 5983 | 5983 |
CurRow.Cells[ResultCols].Style.ForeColor = Color.Red; |
| 5984 |
if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value) > 0)
|
|
| 5984 |
if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value) > -1)
|
|
| 5985 | 5985 |
{
|
| 5986 | 5986 |
CurRow.Cells[OverpaymentCols].Style.ForeColor = Color.Red; |
| 5987 | 5987 |
CurRow.Cells[OverpaymentCols].Value = CurRow.Cells[ResultCols].Value; |
| 5988 | 5988 |
} |
| 5989 | 5989 |
else |
| 5990 |
{
|
|
| 5990 |
{ // 予算時よりマイナスは数値を表示しない
|
|
| 5991 | 5991 |
CurRow.Cells[OverpaymentCols].Style.ForeColor = Color.Black; |
| 5992 | 5992 |
CurRow.Cells[OverpaymentCols].Value = "0"; |
| 5993 | 5993 |
} |
| trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.cs | ||
|---|---|---|
| 1031 | 1031 |
cbRec.TransferConstructionDate = DateTime.MinValue; // 部署引継日 |
| 1032 | 1032 |
cbRec.ConstructionStartingDate = DateTime.MinValue; // 施工開始日 |
| 1033 | 1033 |
cbRec.ConstructionCompletionDate = DateTime.MinValue; // 施工完了日 |
| 1034 |
cbRec.BillingStartDate = DateTime.MinValue; // 請求準備開始日 |
|
| 1034 |
cbRec.BillingStartDate = DateTime.MinValue; // 請求準備開始日 |
|
| 1035 |
cbRec.LedgerComplateDate = DateTime.MinValue; // 工事詳細台帳入力完了日付 |
|
| 1035 | 1036 |
cbRec.BillingDate = DateTime.MinValue; // 請求日 |
| 1036 | 1037 |
|
| 1037 | 1038 |
// 工事情報のみコピー・新規工事作成は工事の情報以外はクリアする |
| trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Component/FrmComponent.designer.cs | ||
|---|---|---|
| 234 | 234 |
this.cmbMyExpenses.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 235 | 235 |
this.cmbMyExpenses.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 236 | 236 |
this.cmbMyExpenses.FormattingEnabled = true; |
| 237 |
this.cmbMyExpenses.Location = new System.Drawing.Point(153, 147);
|
|
| 237 |
this.cmbMyExpenses.Location = new System.Drawing.Point(153, 145);
|
|
| 238 | 238 |
this.cmbMyExpenses.Name = "cmbMyExpenses"; |
| 239 | 239 |
this.cmbMyExpenses.Size = new System.Drawing.Size(200, 24); |
| 240 | 240 |
this.cmbMyExpenses.TabIndex = 46; |
| ... | ... | |
| 296 | 296 |
this.cmbSubItems.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 297 | 297 |
this.cmbSubItems.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 298 | 298 |
this.cmbSubItems.FormattingEnabled = true; |
| 299 |
this.cmbSubItems.Location = new System.Drawing.Point(153, 77);
|
|
| 299 |
this.cmbSubItems.Location = new System.Drawing.Point(153, 75);
|
|
| 300 | 300 |
this.cmbSubItems.Name = "cmbSubItems"; |
| 301 | 301 |
this.cmbSubItems.Size = new System.Drawing.Size(200, 24); |
| 302 | 302 |
this.cmbSubItems.TabIndex = 2; |
| ... | ... | |
| 321 | 321 |
this.cmbDirectInput.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 322 | 322 |
this.cmbDirectInput.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 323 | 323 |
this.cmbDirectInput.FormattingEnabled = true; |
| 324 |
this.cmbDirectInput.Location = new System.Drawing.Point(153, 112);
|
|
| 324 |
this.cmbDirectInput.Location = new System.Drawing.Point(153, 110);
|
|
| 325 | 325 |
this.cmbDirectInput.Name = "cmbDirectInput"; |
| 326 | 326 |
this.cmbDirectInput.Size = new System.Drawing.Size(200, 24); |
| 327 | 327 |
this.cmbDirectInput.TabIndex = 3; |
| ... | ... | |
| 485 | 485 |
this.ForeColor = System.Drawing.Color.White; |
| 486 | 486 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
| 487 | 487 |
this.KeyPreview = true; |
| 488 |
this.MaximizeBox = false; |
|
| 488 | 489 |
this.Name = "FrmComponent"; |
| 489 | 490 |
this.ShowIcon = false; |
| 490 | 491 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
| trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionType/FrmConstructionType.designer.cs | ||
|---|---|---|
| 396 | 396 |
this.cmbPublicFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 397 | 397 |
this.cmbPublicFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 398 | 398 |
this.cmbPublicFlg.FormattingEnabled = true; |
| 399 |
this.cmbPublicFlg.Location = new System.Drawing.Point(153, 75);
|
|
| 399 |
this.cmbPublicFlg.Location = new System.Drawing.Point(153, 77);
|
|
| 400 | 400 |
this.cmbPublicFlg.Name = "cmbPublicFlg"; |
| 401 | 401 |
this.cmbPublicFlg.Size = new System.Drawing.Size(340, 24); |
| 402 | 402 |
this.cmbPublicFlg.TabIndex = 2; |
| ... | ... | |
| 474 | 474 |
this.cmbDataSecRank.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 475 | 475 |
this.cmbDataSecRank.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 476 | 476 |
this.cmbDataSecRank.FormattingEnabled = true; |
| 477 |
this.cmbDataSecRank.Location = new System.Drawing.Point(153, 147);
|
|
| 477 |
this.cmbDataSecRank.Location = new System.Drawing.Point(153, 145);
|
|
| 478 | 478 |
this.cmbDataSecRank.Name = "cmbDataSecRank"; |
| 479 | 479 |
this.cmbDataSecRank.Size = new System.Drawing.Size(340, 24); |
| 480 | 480 |
this.cmbDataSecRank.TabIndex = 4; |
| ... | ... | |
| 499 | 499 |
this.cmbRepairFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 500 | 500 |
this.cmbRepairFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 501 | 501 |
this.cmbRepairFlg.FormattingEnabled = true; |
| 502 |
this.cmbRepairFlg.Location = new System.Drawing.Point(153, 112);
|
|
| 502 |
this.cmbRepairFlg.Location = new System.Drawing.Point(153, 110);
|
|
| 503 | 503 |
this.cmbRepairFlg.Name = "cmbRepairFlg"; |
| 504 | 504 |
this.cmbRepairFlg.Size = new System.Drawing.Size(340, 24); |
| 505 | 505 |
this.cmbRepairFlg.TabIndex = 3; |
| ... | ... | |
| 635 | 635 |
this.ForeColor = System.Drawing.Color.White; |
| 636 | 636 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
| 637 | 637 |
this.KeyPreview = true; |
| 638 |
this.MaximizeBox = false; |
|
| 638 | 639 |
this.Name = "FrmConstructionType"; |
| 639 | 640 |
this.ShowIcon = false; |
| 640 | 641 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
| trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Expenses/FrmExpenses.designer.cs | ||
|---|---|---|
| 340 | 340 |
this.ForeColor = System.Drawing.Color.White; |
| 341 | 341 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
| 342 | 342 |
this.KeyPreview = true; |
| 343 |
this.MaximizeBox = false; |
|
| 343 | 344 |
this.Name = "FrmExpenses"; |
| 344 | 345 |
this.ShowIcon = false; |
| 345 | 346 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
| trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmBizHisList.Designer.cs | ||
|---|---|---|
| 161 | 161 |
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 16F); |
| 162 | 162 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; |
| 163 | 163 |
this.BackColor = System.Drawing.Color.Black; |
| 164 |
this.ClientSize = new System.Drawing.Size(584, 306);
|
|
| 164 |
this.ClientSize = new System.Drawing.Size(588, 310);
|
|
| 165 | 165 |
this.ControlBox = false; |
| 166 | 166 |
this.Controls.Add(this.dgvDispData); |
| 167 | 167 |
this.Controls.Add(this.btnEnd); |
| trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.designer.cs | ||
|---|---|---|
| 560 | 560 |
this.btnHistory.TabStop = false; |
| 561 | 561 |
this.btnHistory.Text = "過去履歴"; |
| 562 | 562 |
this.btnHistory.UseVisualStyleBackColor = false; |
| 563 |
this.btnHistory.Click += new System.EventHandler(this.btnHistory_Click); |
|
| 563 | 564 |
// |
| 564 | 565 |
// groupBoxEx3 |
| 565 | 566 |
// |
| trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Vehicle/FrmVehicle.designer.cs | ||
|---|---|---|
| 1516 | 1516 |
this.ForeColor = System.Drawing.Color.White; |
| 1517 | 1517 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
| 1518 | 1518 |
this.KeyPreview = true; |
| 1519 |
this.MaximizeBox = false; |
|
| 1519 | 1520 |
this.Name = "FrmVehicle"; |
| 1520 | 1521 |
this.ShowIcon = false; |
| 1521 | 1522 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs | ||
|---|---|---|
| 454 | 454 |
/// <summary> |
| 455 | 455 |
/// マスタメンテナンスメニューボタン配置 |
| 456 | 456 |
/// </summary> |
| 457 |
private static int[,] MentenanceMenuButton = new int[,] {
|
|
| 457 |
private static int[,] MentMenuButtonOrg = new int[,] {
|
|
| 458 | 458 |
{ (int)ClsExcute.MaintenanceExecuteNo.System,
|
| 459 | 459 |
(int)ClsExcute.MaintenanceExecuteNo.Security, |
| 460 | 460 |
(int)ClsExcute.MaintenanceExecuteNo.ApprovalRouteList, |
| ... | ... | |
| 501 | 501 |
(int)ClsExcute.MaintenanceExecuteNo.SalesConfirm |
| 502 | 502 |
}, |
| 503 | 503 |
}; |
| 504 |
private static int[,] MentMenuButtonPro = new int[,] {
|
|
| 505 |
{ (int)ClsExcute.MaintenanceExecuteNo.System,
|
|
| 506 |
(int)ClsExcute.MaintenanceExecuteNo.Security, |
|
| 507 |
(int)ClsExcute.MaintenanceExecuteNo.ApprovalRouteList, |
|
| 508 |
(int)ClsExcute.MaintenanceExecuteNo.TermMaster |
|
| 509 |
}, |
|
| 510 |
{ (int)ClsExcute.MaintenanceExecuteNo.Department,
|
|
| 511 |
(int)ClsExcute.MaintenanceExecuteNo.PersonInCharge, |
|
| 512 |
0, |
|
| 513 |
0 |
|
| 514 |
}, |
|
| 515 |
{ (int)ClsExcute.MaintenanceExecuteNo.Orderers,
|
|
| 516 |
(int)ClsExcute.MaintenanceExecuteNo.ConstructionType, |
|
| 517 |
0, |
|
| 518 |
0 |
|
| 519 |
}, |
|
| 520 |
{ (int)ClsExcute.MaintenanceExecuteNo.SubContractor,
|
|
| 521 |
(int)ClsExcute.MaintenanceExecuteNo.SubContrItem, |
|
| 522 |
(int)ClsExcute.MaintenanceExecuteNo.SubContrJobCat, |
|
| 523 |
0 |
|
| 524 |
}, |
|
| 525 |
{ (int)ClsExcute.MaintenanceExecuteNo.Component,
|
|
| 526 |
(int)ClsExcute.MaintenanceExecuteNo.ConstructionItem, |
|
| 527 |
(int)ClsExcute.MaintenanceExecuteNo.ConstructionWork, |
|
| 528 |
(int)ClsExcute.MaintenanceExecuteNo.ComponentLink |
|
| 529 |
}, |
|
| 530 |
{ (int)ClsExcute.MaintenanceExecuteNo.BudgetCodeSum,
|
|
| 531 |
(int)ClsExcute.MaintenanceExecuteNo.AddressConvert, |
|
| 532 |
0, |
|
| 533 |
0 |
|
| 534 |
}, |
|
| 535 |
{ (int)ClsExcute.MaintenanceExecuteNo.BusinessType,
|
|
| 536 |
(int)ClsExcute.MaintenanceExecuteNo.OrderDivision, |
|
| 537 |
(int)ClsExcute.MaintenanceExecuteNo.ConstrExpenses, |
|
| 538 |
(int)ClsExcute.MaintenanceExecuteNo.Unit |
|
| 539 |
}, |
|
| 540 |
{ 0,
|
|
| 541 |
0, |
|
| 542 |
0, |
|
| 543 |
0 |
|
| 544 |
}, |
|
| 545 |
{ 0,
|
|
| 546 |
0, |
|
| 547 |
0, |
|
| 548 |
0 |
|
| 549 |
}, |
|
| 550 |
}; |
|
| 504 | 551 |
#endregion |
| 505 | 552 |
|
| 506 | 553 |
#region 初期時システム更新ステータス |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
|---|---|---|
| 548 | 548 |
// タブ名セット |
| 549 | 549 |
tabMenu.TabPages[tabPageCnt].Text = CommonMotions.LoginUserSecurity.SecName + "マスタ"; |
| 550 | 550 |
|
| 551 |
// ループ用変数にセット |
|
| 552 |
int[,] LoopBtnDef = null; |
|
| 553 |
switch (ProductDefine.ProductType) |
|
| 554 |
{
|
|
| 555 |
case (int)ProductDefine.ProductTypeDef.Originals: |
|
| 556 |
// オリジナル |
|
| 557 |
LoopBtnDef = MentMenuButtonOrg; |
|
| 558 |
break; |
|
| 559 |
case (int)ProductDefine.ProductTypeDef.MassProductionType1: |
|
| 560 |
LoopBtnDef = MentMenuButtonPro; |
|
| 561 |
break; |
|
| 562 |
} |
|
| 563 |
if (LoopBtnDef == null) return; |
|
| 564 |
|
|
| 551 | 565 |
// ボタンの作成 |
| 552 | 566 |
bool bCreateLine = false; |
| 553 | 567 |
bool bFisrt = true; |
| 554 | 568 |
// 起動処理に設定されているかをチェックする |
| 555 |
for (int iy = 0; iy < MentenanceMenuButton.GetLength(0); iy++)
|
|
| 569 |
for (int iy = 0; iy < LoopBtnDef.GetLength(0); iy++)
|
|
| 556 | 570 |
{
|
| 557 | 571 |
bCreateLine = false; |
| 558 |
for (int ix = 0; ix < MentenanceMenuButton.GetLength(1); ix++)
|
|
| 572 |
for (int ix = 0; ix < LoopBtnDef.GetLength(1); ix++)
|
|
| 559 | 573 |
{
|
| 560 | 574 |
foreach (ProcessExcute wrkRec in CommonMotions.LoginUserProcExe) |
| 561 | 575 |
{
|
| ... | ... | |
| 563 | 577 |
if (wrkRec.ExecCode < (int)ClsExcute.MaintenanceExecuteNo.System) continue; |
| 564 | 578 |
|
| 565 | 579 |
// コードが違う場合は次レコード |
| 566 |
if (MentenanceMenuButton[iy, ix] != wrkRec.ExecCode) continue;
|
|
| 580 |
if (LoopBtnDef[iy, ix] != wrkRec.ExecCode) continue;
|
|
| 567 | 581 |
|
| 568 | 582 |
// 新規時は行を作成する |
| 569 | 583 |
if (!bCreateLine) |
| trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs | ||
|---|---|---|
| 963 | 963 |
} |
| 964 | 964 |
#endregion |
| 965 | 965 |
|
| 966 |
#region 製品版確認：施工管理
|
|
| 966 |
#region 製品版タブ：確認運用施工管理
|
|
| 967 | 967 |
/// <summary> |
| 968 |
/// 製品版確認：施工管理
|
|
| 968 |
/// 製品版タブ：確認運用施工管理
|
|
| 969 | 969 |
/// </summary> |
| 970 | 970 |
/// <param name="btnKey"></param> |
| 971 | 971 |
private void MassProductionMenu1(Button btnKey) |
| ... | ... | |
| 1224 | 1224 |
} |
| 1225 | 1225 |
#endregion |
| 1226 | 1226 |
|
| 1227 |
#region 製品版タブ：承認運用施工管理 |
|
| 1228 |
/// <summary> |
|
| 1229 |
/// 製品版タブ：承認運用施工管理 |
|
| 1230 |
/// </summary> |
|
| 1231 |
/// <param name="btnKey"></param> |
|
| 1227 | 1232 |
private void MassProductionMenu2(Button btnKey) |
| 1228 | 1233 |
{
|
| 1229 | 1234 |
int NowPoint = -1; |
| ... | ... | |
| 1478 | 1483 |
if (CommonMotions.ProductionExecution) this.Visible = true; |
| 1479 | 1484 |
} |
| 1480 | 1485 |
} |
| 1486 |
#endregion |
|
| 1481 | 1487 |
} |
| 1482 | 1488 |
} |
他の形式にエクスポート: Unified diff