リビジョン 287
資材貸出：データチェックバグ修正
工事情報一覧：工事情報表示時に状態変更より1カ月の判定を追加（依頼受け・見積提出）
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 97;
|
|
| 17 |
public static int s_SystemVersion = 98;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerDetail.cs | ||
|---|---|---|
| 629 | 629 |
} |
| 630 | 630 |
#endregion |
| 631 | 631 |
|
| 632 |
#region パブリックメソッド（特殊処理）
|
|
| 632 |
#region 主キー検索の文字列を返す
|
|
| 633 | 633 |
/// <summary> |
| 634 | 634 |
/// 主キー検索の文字列を返す |
| 635 | 635 |
/// </summary> |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs | ||
|---|---|---|
| 48 | 48 |
this.btnDataUpDate = new System.Windows.Forms.Button(); |
| 49 | 49 |
this.btnDataCopy = new System.Windows.Forms.Button(); |
| 50 | 50 |
this.ProgressBar = new System.Windows.Forms.ProgressBar(); |
| 51 |
this.grpExample1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
|
| 52 |
this.lblEstimateType03 = new System.Windows.Forms.Label(); |
|
| 53 |
this.lblEstimateType02 = new System.Windows.Forms.Label(); |
|
| 54 |
this.lblEstimateType01 = new System.Windows.Forms.Label(); |
|
| 51 | 55 |
this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
| 52 | 56 |
this.label3 = new System.Windows.Forms.Label(); |
| 53 | 57 |
this.radioButton2 = new System.Windows.Forms.RadioButton(); |
| ... | ... | |
| 71 | 75 |
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 72 | 76 |
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 73 | 77 |
this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 74 |
this.pnlExample1 = new System.Windows.Forms.Panel(); |
|
| 75 |
this.lblEstimateType03 = new System.Windows.Forms.Label(); |
|
| 76 |
this.lblEstimateType02 = new System.Windows.Forms.Label(); |
|
| 77 |
this.lblEstimateType01 = new System.Windows.Forms.Label(); |
|
| 78 |
this.grpExample1.SuspendLayout(); |
|
| 78 | 79 |
this.groupBox1.SuspendLayout(); |
| 79 | 80 |
((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit(); |
| 80 | 81 |
((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit(); |
| 81 |
this.pnlExample1.SuspendLayout(); |
|
| 82 | 82 |
this.SuspendLayout(); |
| 83 | 83 |
// |
| 84 | 84 |
// btnDataEntry |
| ... | ... | |
| 168 | 168 |
this.ProgressBar.TabIndex = 31; |
| 169 | 169 |
this.ProgressBar.Visible = false; |
| 170 | 170 |
// |
| 171 |
// grpExample1 |
|
| 172 |
// |
|
| 173 |
this.grpExample1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
| 174 |
this.grpExample1.BackColor = System.Drawing.Color.White; |
|
| 175 |
this.grpExample1.BorderColor = System.Drawing.Color.Red; |
|
| 176 |
this.grpExample1.Controls.Add(this.lblEstimateType03); |
|
| 177 |
this.grpExample1.Controls.Add(this.lblEstimateType02); |
|
| 178 |
this.grpExample1.Controls.Add(this.lblEstimateType01); |
|
| 179 |
this.grpExample1.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
| 180 |
this.grpExample1.Font = new System.Drawing.Font("ＭＳ 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 181 |
this.grpExample1.Location = new System.Drawing.Point(10, 616); |
|
| 182 |
this.grpExample1.Name = "grpExample1"; |
|
| 183 |
this.grpExample1.Size = new System.Drawing.Size(400, 38); |
|
| 184 |
this.grpExample1.TabIndex = 33; |
|
| 185 |
this.grpExample1.TabStop = false; |
|
| 186 |
this.grpExample1.Text = "施工状態変更より1カ月経過時色"; |
|
| 187 |
this.grpExample1.Visible = false; |
|
| 188 |
// |
|
| 189 |
// lblEstimateType03 |
|
| 190 |
// |
|
| 191 |
this.lblEstimateType03.BackColor = System.Drawing.Color.OliveDrab; |
|
| 192 |
this.lblEstimateType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 193 |
this.lblEstimateType03.ForeColor = System.Drawing.Color.DarkRed; |
|
| 194 |
this.lblEstimateType03.Location = new System.Drawing.Point(264, 14); |
|
| 195 |
this.lblEstimateType03.Name = "lblEstimateType03"; |
|
| 196 |
this.lblEstimateType03.Size = new System.Drawing.Size(120, 20); |
|
| 197 |
this.lblEstimateType03.TabIndex = 0; |
|
| 198 |
this.lblEstimateType03.Text = "予算取り案件"; |
|
| 199 |
this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
| 200 |
// |
|
| 201 |
// lblEstimateType02 |
|
| 202 |
// |
|
| 203 |
this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange; |
|
| 204 |
this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 205 |
this.lblEstimateType02.ForeColor = System.Drawing.Color.Black; |
|
| 206 |
this.lblEstimateType02.Location = new System.Drawing.Point(136, 14); |
|
| 207 |
this.lblEstimateType02.Name = "lblEstimateType02"; |
|
| 208 |
this.lblEstimateType02.Size = new System.Drawing.Size(120, 20); |
|
| 209 |
this.lblEstimateType02.TabIndex = 0; |
|
| 210 |
this.lblEstimateType02.Text = "入札案件"; |
|
| 211 |
this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
| 212 |
// |
|
| 213 |
// lblEstimateType01 |
|
| 214 |
// |
|
| 215 |
this.lblEstimateType01.BackColor = System.Drawing.Color.OrangeRed; |
|
| 216 |
this.lblEstimateType01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 217 |
this.lblEstimateType01.ForeColor = System.Drawing.Color.DarkBlue; |
|
| 218 |
this.lblEstimateType01.Location = new System.Drawing.Point(8, 14); |
|
| 219 |
this.lblEstimateType01.Name = "lblEstimateType01"; |
|
| 220 |
this.lblEstimateType01.Size = new System.Drawing.Size(120, 20); |
|
| 221 |
this.lblEstimateType01.TabIndex = 0; |
|
| 222 |
this.lblEstimateType01.Text = "工事案件"; |
|
| 223 |
this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
| 224 |
// |
|
| 171 | 225 |
// groupBox1 |
| 172 | 226 |
// |
| 173 | 227 |
this.groupBox1.Anchor = System.Windows.Forms.AnchorStyles.Top; |
| ... | ... | |
| 504 | 558 |
this.Column11.Visible = false; |
| 505 | 559 |
this.Column11.Width = 5; |
| 506 | 560 |
// |
| 507 |
// pnlExample1 |
|
| 508 |
// |
|
| 509 |
this.pnlExample1.BackColor = System.Drawing.Color.White; |
|
| 510 |
this.pnlExample1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 511 |
this.pnlExample1.Controls.Add(this.lblEstimateType03); |
|
| 512 |
this.pnlExample1.Controls.Add(this.lblEstimateType02); |
|
| 513 |
this.pnlExample1.Controls.Add(this.lblEstimateType01); |
|
| 514 |
this.pnlExample1.Location = new System.Drawing.Point(10, 617); |
|
| 515 |
this.pnlExample1.Name = "pnlExample1"; |
|
| 516 |
this.pnlExample1.Size = new System.Drawing.Size(400, 34); |
|
| 517 |
this.pnlExample1.TabIndex = 32; |
|
| 518 |
this.pnlExample1.Visible = false; |
|
| 519 |
// |
|
| 520 |
// lblEstimateType03 |
|
| 521 |
// |
|
| 522 |
this.lblEstimateType03.BackColor = System.Drawing.Color.YellowGreen; |
|
| 523 |
this.lblEstimateType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 524 |
this.lblEstimateType03.ForeColor = System.Drawing.Color.DarkRed; |
|
| 525 |
this.lblEstimateType03.Location = new System.Drawing.Point(262, 7); |
|
| 526 |
this.lblEstimateType03.Name = "lblEstimateType03"; |
|
| 527 |
this.lblEstimateType03.Size = new System.Drawing.Size(120, 20); |
|
| 528 |
this.lblEstimateType03.TabIndex = 0; |
|
| 529 |
this.lblEstimateType03.Text = "予算取り案件"; |
|
| 530 |
this.lblEstimateType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
| 531 |
// |
|
| 532 |
// lblEstimateType02 |
|
| 533 |
// |
|
| 534 |
this.lblEstimateType02.BackColor = System.Drawing.Color.DarkOrange; |
|
| 535 |
this.lblEstimateType02.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 536 |
this.lblEstimateType02.ForeColor = System.Drawing.Color.Black; |
|
| 537 |
this.lblEstimateType02.Location = new System.Drawing.Point(134, 7); |
|
| 538 |
this.lblEstimateType02.Name = "lblEstimateType02"; |
|
| 539 |
this.lblEstimateType02.Size = new System.Drawing.Size(120, 20); |
|
| 540 |
this.lblEstimateType02.TabIndex = 0; |
|
| 541 |
this.lblEstimateType02.Text = "入札案件"; |
|
| 542 |
this.lblEstimateType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
| 543 |
// |
|
| 544 |
// lblEstimateType01 |
|
| 545 |
// |
|
| 546 |
this.lblEstimateType01.BackColor = System.Drawing.Color.OrangeRed; |
|
| 547 |
this.lblEstimateType01.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 548 |
this.lblEstimateType01.ForeColor = System.Drawing.Color.DarkBlue; |
|
| 549 |
this.lblEstimateType01.Location = new System.Drawing.Point(6, 7); |
|
| 550 |
this.lblEstimateType01.Name = "lblEstimateType01"; |
|
| 551 |
this.lblEstimateType01.Size = new System.Drawing.Size(120, 20); |
|
| 552 |
this.lblEstimateType01.TabIndex = 0; |
|
| 553 |
this.lblEstimateType01.Text = "工事案件"; |
|
| 554 |
this.lblEstimateType01.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
| 555 |
// |
|
| 556 | 561 |
// FrmConstructionList |
| 557 | 562 |
// |
| 558 | 563 |
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
| ... | ... | |
| 560 | 565 |
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; |
| 561 | 566 |
this.BackColor = System.Drawing.Color.Black; |
| 562 | 567 |
this.ClientSize = new System.Drawing.Size(1280, 657); |
| 563 |
this.Controls.Add(this.pnlExample1);
|
|
| 568 |
this.Controls.Add(this.grpExample1);
|
|
| 564 | 569 |
this.Controls.Add(this.ProgressBar); |
| 565 | 570 |
this.Controls.Add(this.btnDataCopy); |
| 566 | 571 |
this.Controls.Add(this.lblProcessTitil); |
| ... | ... | |
| 581 | 586 |
this.Load += new System.EventHandler(this.FrmConstructionList_Load); |
| 582 | 587 |
this.SizeChanged += new System.EventHandler(this.FrmConstructionList_SizeChanged); |
| 583 | 588 |
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmConstructionBaseInfoList_KeyDown); |
| 589 |
this.grpExample1.ResumeLayout(false); |
|
| 584 | 590 |
this.groupBox1.ResumeLayout(false); |
| 585 | 591 |
this.groupBox1.PerformLayout(); |
| 586 | 592 |
((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).EndInit(); |
| 587 | 593 |
((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit(); |
| 588 |
this.pnlExample1.ResumeLayout(false); |
|
| 589 | 594 |
this.ResumeLayout(false); |
| 590 | 595 |
|
| 591 | 596 |
} |
| ... | ... | |
| 622 | 627 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column3; |
| 623 | 628 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column2; |
| 624 | 629 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column11; |
| 625 |
private System.Windows.Forms.Panel pnlExample1; |
|
| 626 | 630 |
private System.Windows.Forms.Label lblEstimateType03; |
| 627 | 631 |
private System.Windows.Forms.Label lblEstimateType02; |
| 628 | 632 |
private System.Windows.Forms.Label lblEstimateType01; |
| 633 |
private CustomControls.GroupBoxEx grpExample1; |
|
| 629 | 634 |
} |
| 630 | 635 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
|---|---|---|
| 37 | 37 |
/// </summary> |
| 38 | 38 |
private static string[] s_SQLPart1 = new string[] { "SELECT A.CONSTRUCTIONCODE, A.CONSTRUCTIONPERIOD, B.DETAILSTRING, A.CONSTRUCTIONSTATUSFLG,",
|
| 39 | 39 |
" C.PERSONCODE, C.PERSONNAME, C.DEPARTMENTCODE, C.DEPARTMENTNAME, C.MANDISPORDER, C.DEPDISPORDER,", |
| 40 |
" D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER" }; |
|
| 40 |
" D.PERSONCODE, D.PERSONNAME, D.DEPARTMENTCODE, D.DEPARTMENTNAME, D.MANDISPORDER, D.DEPDISPORDER"}; |
|
| 41 |
|
|
| 41 | 42 |
private static string[] s_SQLPart1_1 = new string[] { " FROM CONSTRUCTIONBASEINFO A",
|
| 42 | 43 |
" LEFT JOIN CONSTRUCTIONBASEINFODETAIL B", |
| 43 | 44 |
" ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE", |
| ... | ... | |
| 95 | 96 |
} |
| 96 | 97 |
#endregion |
| 97 | 98 |
|
| 99 |
#region ????SQL??:?H????{????????????
|
|
| 100 |
/// <summary> |
|
| 101 |
/// ????SQL??:?H????{????????????
|
|
| 102 |
/// </summary> |
|
| 103 |
private enum GetDataAddSQL01 |
|
| 104 |
{
|
|
| 105 |
/// <summary> |
|
| 106 |
/// ?????? |
|
| 107 |
/// </summary> |
|
| 108 |
EstimateType = 0, |
|
| 109 |
/// <summary> |
|
| 110 |
/// ?????? |
|
| 111 |
/// </summary> |
|
| 112 |
RequestedDate, |
|
| 113 |
/// <summary> |
|
| 114 |
/// ?????o?? |
|
| 115 |
/// </summary> |
|
| 116 |
EstimatesSubmittedDate, |
|
| 117 |
} |
|
| 98 | 118 |
#endregion |
| 119 |
#endregion |
|
| 99 | 120 |
|
| 100 | 121 |
#region ??? |
| 101 | 122 |
#endregion |
| ... | ... | |
| 308 | 329 |
{
|
| 309 | 330 |
StringBuilder wrkFormat = new StringBuilder(); |
| 310 | 331 |
for (int i = 0; i < s_SQLPart1.Length; i++) wrkFormat.Append(s_SQLPart1[i]); |
| 311 |
wrkFormat.Append(", 0, 0"); // ???t?B?[???h???????????
|
|
| 332 |
|
|
| 333 |
// ???t?B?[???h??????????? |
|
| 334 |
wrkFormat.Append(", 0, 0");
|
|
| 335 |
wrkFormat.Append(", A.EstimateType, A.RequestedDate, A.EstimatesSubmittedDate");
|
|
| 336 |
|
|
| 312 | 337 |
for (int i = 0; i < s_SQLPart1_1.Length; i++) wrkFormat.Append(s_SQLPart1_1[i]); |
| 313 | 338 |
|
| 314 | 339 |
for (int i = 0; i < s_SQLPart2.Length; i++) wrkFormat.Append(s_SQLPart2[i]); |
| ... | ... | |
| 1025 | 1050 |
strConstDepName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTDEPNAME]); |
| 1026 | 1051 |
strConstName = CommonMotions.cnvString(objwrk[(int)GetData.CONSTNAME]); |
| 1027 | 1052 |
|
| 1028 |
dgv.Rows.Add((ino++) |
|
| 1029 |
, strSalesDepName |
|
| 1030 |
, strSalesName |
|
| 1031 |
, strConstDepName |
|
| 1032 |
, strConstName |
|
| 1033 |
, strConstrName |
|
| 1034 |
, strStatus |
|
| 1035 |
, FlgString |
|
| 1036 |
, CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONPERIOD]) |
|
| 1037 |
, CommonMotions.cnvStringCodeFromInt(ConstrCode, "-", 8) |
|
| 1038 |
, OrderNo |
|
| 1039 |
); |
|
| 1053 |
int RowCnt = dgv.Rows.Add((ino++)
|
|
| 1054 |
, strSalesDepName
|
|
| 1055 |
, strSalesName
|
|
| 1056 |
, strConstDepName
|
|
| 1057 |
, strConstName
|
|
| 1058 |
, strConstrName
|
|
| 1059 |
, strStatus
|
|
| 1060 |
, FlgString
|
|
| 1061 |
, CommonMotions.cnvInt(objwrk[(int)GetData.CONSTRUCTIONPERIOD])
|
|
| 1062 |
, CommonMotions.cnvStringCodeFromInt(ConstrCode, "-", 8)
|
|
| 1063 |
, OrderNo
|
|
| 1064 |
);
|
|
| 1040 | 1065 |
|
| 1066 |
// ?Z???F?????? |
|
| 1067 |
CellColorChenge(dgv.Rows[RowCnt], objwrk); |
|
| 1068 |
|
|
| 1041 | 1069 |
// ProgressBar??l???X???? |
| 1042 | 1070 |
ProgressBar.Value = (ino - 1); |
| 1043 | 1071 |
ProgressBar.Update(); |
| ... | ... | |
| 1059 | 1087 |
} |
| 1060 | 1088 |
#endregion |
| 1061 | 1089 |
|
| 1090 |
#region ?Z???F?????? |
|
| 1091 |
/// <summary> |
|
| 1092 |
/// ?Z???F?????? |
|
| 1093 |
/// </summary> |
|
| 1094 |
/// <param name="CurRow"></param> |
|
| 1095 |
private void CellColorChenge(DataGridViewRow CurRow, object[] objCurRec) |
|
| 1096 |
{
|
|
| 1097 |
try |
|
| 1098 |
{
|
|
| 1099 |
switch (m_ExecuteFlg) |
|
| 1100 |
{
|
|
| 1101 |
case (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo: |
|
| 1102 |
// ----- ?H???????\?????Z???F??X |
|
| 1103 |
BaseInfoCellColorChenge(CurRow, objCurRec); |
|
| 1104 |
break; |
|
| 1105 |
} |
|
| 1106 |
} |
|
| 1107 |
catch (Exception ex) |
|
| 1108 |
{
|
|
| 1109 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1110 |
} |
|
| 1111 |
} |
|
| 1112 |
#endregion |
|
| 1113 |
|
|
| 1114 |
#region ?H???????\?????Z???F??X |
|
| 1115 |
/// <summary> |
|
| 1116 |
/// ?H???????\?????Z???F??X |
|
| 1117 |
/// </summary> |
|
| 1118 |
/// <param name="CurRow"></param> |
|
| 1119 |
/// <param name="objCurRec"></param> |
|
| 1120 |
private void BaseInfoCellColorChenge(DataGridViewRow CurRow, object[] objCurRec) |
|
| 1121 |
{
|
|
| 1122 |
try |
|
| 1123 |
{
|
|
| 1124 |
int Status = CommonMotions.cnvInt(objCurRec[(int)GetData.CONSTRUCTIONSTATUSFLG]); |
|
| 1125 |
int nCode1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("??????")).Key;
|
|
| 1126 |
int nCode2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?????o")).Key;
|
|
| 1127 |
|
|
| 1128 |
// ?f?[?^???x?[?X?J?E???g |
|
| 1129 |
int AddGetDataCnt = Enum.GetNames(typeof(GetData)).Length; |
|
| 1130 |
// ?????? |
|
| 1131 |
int EstimanteType = EstimanteType = CommonMotions.cnvInt(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.EstimateType]); |
|
| 1132 |
|
|
| 1133 |
DateTime TargetDate = DateTime.Now; |
|
| 1134 |
Color clrBackColor = Color.White; |
|
| 1135 |
Color clrForeColor = Color.Black; |
|
| 1136 |
if (Status == nCode1) |
|
| 1137 |
{
|
|
| 1138 |
// ----- ?????? |
|
| 1139 |
TargetDate = CommonMotions.cnvDate(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.RequestedDate]); |
|
| 1140 |
} |
|
| 1141 |
else if (Status == nCode2) |
|
| 1142 |
{
|
|
| 1143 |
// ----- ?????o |
|
| 1144 |
TargetDate = CommonMotions.cnvDate(objCurRec[AddGetDataCnt + (int)GetDataAddSQL01.EstimatesSubmittedDate]); |
|
| 1145 |
} |
|
| 1146 |
else |
|
| 1147 |
{
|
|
| 1148 |
// ----- ??O?????????? |
|
| 1149 |
return; |
|
| 1150 |
} |
|
| 1151 |
|
|
| 1152 |
// ???t???1?J??????????????? |
|
| 1153 |
if (TargetDate.AddMonths(1).Date > DateTime.Now.Date) return; |
|
| 1154 |
|
|
| 1155 |
// ?Z???F?I?? |
|
| 1156 |
switch (EstimanteType) |
|
| 1157 |
{
|
|
| 1158 |
case (int)ConstructionBaseInfo.EstimateTypeDef.Normal: |
|
| 1159 |
// ?H????? |
|
| 1160 |
clrBackColor = lblEstimateType01.BackColor; |
|
| 1161 |
clrForeColor = lblEstimateType01.ForeColor; |
|
| 1162 |
break; |
|
| 1163 |
case (int)ConstructionBaseInfo.EstimateTypeDef.Didding: |
|
| 1164 |
// ???D??? |
|
| 1165 |
clrBackColor = lblEstimateType02.BackColor; |
|
| 1166 |
clrForeColor = lblEstimateType02.ForeColor; |
|
| 1167 |
break; |
|
| 1168 |
case (int)ConstructionBaseInfo.EstimateTypeDef.GetBudget: |
|
| 1169 |
// ?\?Z????? |
|
| 1170 |
clrBackColor = lblEstimateType03.BackColor; |
|
| 1171 |
clrForeColor = lblEstimateType03.ForeColor; |
|
| 1172 |
break; |
|
| 1173 |
} |
|
| 1174 |
|
|
| 1175 |
CurRow.Cells[(int)DispColumn.Status].Style.BackColor = clrBackColor; |
|
| 1176 |
CurRow.Cells[(int)DispColumn.Status].Style.ForeColor = clrForeColor; |
|
| 1177 |
} |
|
| 1178 |
catch (Exception ex) |
|
| 1179 |
{
|
|
| 1180 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1181 |
} |
|
| 1182 |
} |
|
| 1183 |
#endregion |
|
| 1184 |
|
|
| 1062 | 1185 |
#region ????H????????W |
| 1063 | 1186 |
/// <summary> |
| 1064 | 1187 |
/// ????H????????W |
| ... | ... | |
| 1267 | 1390 |
ProgressBar.Visible = bDisp; |
| 1268 | 1391 |
ProgressBar.Minimum = 0; |
| 1269 | 1392 |
ProgressBar.Value = 0; |
| 1393 |
if (m_ExecuteFlg == (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo) grpExample1.Visible = !bDisp; |
|
| 1270 | 1394 |
|
| 1271 | 1395 |
btnDataEntry.Visible = !bDisp; |
| 1272 | 1396 |
btnEnd.Visible = !bDisp; |
| ... | ... | |
| 1542 | 1666 |
// ?J??????T?C?Y??????? |
| 1543 | 1667 |
int ColumnCount = 0; |
| 1544 | 1668 |
int TotalWidth = 0; |
| 1545 |
int NotVisibleSize = 0; |
|
| 1546 | 1669 |
for (int i = 0; i < m_CellSize.Length; i++) |
| 1547 | 1670 |
{
|
| 1671 |
DataGridViewColumn wrkCol = dgv.Columns[i]; |
|
| 1672 |
if (!wrkCol.Visible) continue; |
|
| 1673 |
|
|
| 1548 | 1674 |
TotalWidth += m_CellSize[i]; |
| 1549 |
if (dgv.Columns[i].Visible) |
|
| 1550 |
{
|
|
| 1551 |
ColumnCount++; |
|
| 1552 |
} |
|
| 1553 |
else |
|
| 1554 |
{
|
|
| 1555 |
NotVisibleSize += m_CellSize[i]; |
|
| 1556 |
} |
|
| 1675 |
ColumnCount++; |
|
| 1557 | 1676 |
} |
| 1558 | 1677 |
|
| 1559 | 1678 |
// ??????????T?C?Y |
| 1560 |
int formdiff = (dgv.Width - (m_GridWidthSize - NotVisibleSize)); |
|
| 1679 |
//int formdiff = dgv.Width - m_GridWidthSize; |
|
| 1680 |
int formdiff = dgv.Width - TotalWidth; |
|
| 1561 | 1681 |
|
| 1562 | 1682 |
idifference = formdiff / ColumnCount; |
| 1563 | 1683 |
} |
| ... | ... | |
| 1565 | 1685 |
for (int i = 0; i < dgv.ColumnCount; i++) |
| 1566 | 1686 |
{
|
| 1567 | 1687 |
DataGridViewColumn wrkCol = dgv.Columns[i]; |
| 1688 |
if (!wrkCol.Visible) continue; |
|
| 1568 | 1689 |
wrkCol.Width = m_CellSize[i] + idifference; |
| 1569 | 1690 |
} |
| 1570 | 1691 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/FrmMateResEntAux.cs | ||
|---|---|---|
| 817 | 817 |
CommonMotions.chgBackColor(r.Cells[(int)DispColumn.RepayPlanDate], true); |
| 818 | 818 |
CommonMotions.chgBackColor(r.Cells[(int)DispColumn.CommentText], true); |
| 819 | 819 |
|
| 820 |
// 空白行は処理しない |
|
| 821 |
if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.MaterialCount].Value) == 0 |
|
| 822 |
|| CommonMotions.cnvInt(r.Cells[(int)DispColumn.RentCount].Value) == 0) |
|
| 823 |
{
|
|
| 824 |
continue; |
|
| 825 |
} |
|
| 826 |
|
|
| 827 | 820 |
bAns = true; |
| 828 |
if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.MaterialCount].Value) == 0)
|
|
| 821 |
if (CommonMotions.cnvInt(r.Cells[(int)DispColumn.MaterialCount].Value) < 1)
|
|
| 829 | 822 |
{
|
| 830 | 823 |
bAns = false; |
| 831 | 824 |
sErrmsg = "貸出数が入力されていません。"; |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs | ||
|---|---|---|
| 2109 | 2109 |
if (pap.ApprovalStatus == 2) |
| 2110 | 2110 |
{
|
| 2111 | 2111 |
// 最終権限者の場合 |
| 2112 |
if (apm != null && apm.ApprovalAuthority == 1)
|
|
| 2112 |
if (apm != null && apm.ApprovalAuthority == (int)ApprovalMaster.ApprovalAuthorityDef.LastApproval)
|
|
| 2113 | 2113 |
{
|
| 2114 | 2114 |
// 承認済確定 |
| 2115 | 2115 |
nState = (int)ApprovalState.End; |
| branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj | ||
|---|---|---|
| 210 | 210 |
<Compile Include="DataModel\SubContractorJobILink.cs" /> |
| 211 | 211 |
<Compile Include="DataModel\SuppliersMaster.cs" /> |
| 212 | 212 |
<Compile Include="DataModel\SecurityMaster.cs" /> |
| 213 |
<Compile Include="DataModel\TermMasterList.cs" /> |
|
| 213 | 214 |
<Compile Include="DataModel\TranceportDailyData.cs" /> |
| 214 | 215 |
<Compile Include="DataModel\TypeExpensesMaster.cs" /> |
| 215 | 216 |
<Compile Include="DB\IOAccess\IOAttendanceDailyData.cs" /> |
| ... | ... | |
| 433 | 434 |
<Compile Include="DataModel\ApprovalMaster.cs" /> |
| 434 | 435 |
<Compile Include="DataModel\SalesGraphData.cs" /> |
| 435 | 436 |
<Compile Include="DataModel\PreserveSubFormHandle.cs" /> |
| 436 |
<Compile Include="DataModel\TermMasterList.cs" /> |
|
| 437 | 437 |
<Compile Include="DataModel\TermMaster.cs" /> |
| 438 | 438 |
<Compile Include="DataModel\SystemExecute.cs" /> |
| 439 | 439 |
<Compile Include="DataModel\VehicleScheduleData.cs" /> |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.97")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.97")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.98")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.98")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff