リビジョン 358
承認一覧：注文書承認バグ修正
承認対象画面表示に他の画面を見ると承認ボタンが表示されるバグ修正
車両予約：一覧終了時に対象無のメッセージが出るバグ修正
工事詳細台帳：発注金額を使っての計算にバグあり修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs | ||
|---|---|---|
| 158 | 158 |
/// <summary> |
| 159 | 159 |
/// 初期化 |
| 160 | 160 |
/// </summary> |
| 161 |
public static void Initialize()
|
|
| 161 |
public static bool Initialize()
|
|
| 162 | 162 |
{
|
| 163 | 163 |
try |
| 164 | 164 |
{
|
| ... | ... | |
| 169 | 169 |
DBCommon.Instance.Initialize(); |
| 170 | 170 |
|
| 171 | 171 |
// 管理マスタ取得 |
| 172 |
SetSystemMaster(); |
|
| 172 |
if (!SetSystemMaster()) return false; |
|
| 173 |
|
|
| 174 |
return true; |
|
| 173 | 175 |
} |
| 174 | 176 |
catch (Exception ex) |
| 175 | 177 |
{
|
| 176 | 178 |
logger.ErrorFormat("初期化エラー:{0}：{1}", GetMethodName(), ex.Message);
|
| 179 |
return false; |
|
| 177 | 180 |
} |
| 178 | 181 |
} |
| 179 | 182 |
#endregion |
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 208;
|
|
| 17 |
public static int s_SystemVersion = 210;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
|---|---|---|
| 481 | 481 |
|
| 482 | 482 |
#endregion |
| 483 | 483 |
|
| 484 |
#region 編集フラグ |
|
| 484 | 485 |
/// <summary> |
| 485 | 486 |
/// 編集フラグ |
| 486 | 487 |
/// </summary> |
| 487 | 488 |
static int m_EditFlg = (int)CommonDefine.ProcessDataEdit.Reference; |
| 489 |
#endregion |
|
| 488 | 490 |
|
| 489 | 491 |
#region 起動処理 |
| 490 | 492 |
/// <summary> |
| ... | ... | |
| 3889 | 3891 |
FrmVehicleCalendar frm = new FrmVehicleCalendar(); |
| 3890 | 3892 |
try |
| 3891 | 3893 |
{
|
| 3892 |
frm.SelectVehicleCode = CurrentPara.IntExecParameter[0]; |
|
| 3893 |
frm.ToMounth = CurrentPara.IntExecParameter[1]; |
|
| 3894 |
frm.ToMounth = CurrentPara.IntExecParameter[0]; |
|
| 3895 |
frm.SelectVehicleCode = CurrentPara.IntExecParameter[1]; |
|
| 3896 |
frm.DirectFlg = CurrentPara.BoolExecParameter[0]; |
|
| 3894 | 3897 |
|
| 3895 | 3898 |
// フォーム表示 |
| 3896 | 3899 |
frm.ShowDialog(); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs | ||
|---|---|---|
| 508 | 508 |
} |
| 509 | 509 |
else |
| 510 | 510 |
{
|
| 511 |
ConstrName = string.Format("{0}?F????", CommonMotions.cnvString(objwrk[(int)GetDataColumns.ConstructionName]));
|
|
| 511 |
ConstrName = string.Format("{0}?F???\??", CommonMotions.cnvString(objwrk[(int)GetDataColumns.ConstructionName]));
|
|
| 512 | 512 |
} |
| 513 | 513 |
} |
| 514 | 514 |
// ?s?f?[?^?Z?b?g |
| ... | ... | |
| 995 | 995 |
|
| 996 | 996 |
strSQL.Append(" WHERE");
|
| 997 | 997 |
strSQL.Append(" LedgerDetail.SourceCode = A.ConstructionCode");
|
| 998 |
strSQL.AppendFormat(" And LedgerDetail.PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.NoCreate);
|
|
| 998 |
strSQL.AppendFormat(" And LedgerDetail.PurchaseOrderFlg = {0}", (int)ConstructionLedgerDetail.PurOrderFlgDef.Making);
|
|
| 999 |
strSQL.Append(" And LedgerDetail.CompanyCode > 0");
|
|
| 999 | 1000 |
|
| 1000 |
//strSQL.AppendFormat(" WHERE NOT EXISTS(SELECT * FROM PROCESSAPPROVAL APP WHERE APP.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE AND APP.ApprovalCode = {0})", m_ApprovalCode);
|
|
| 1001 |
strSQL.Append(" And NOT EXISTS(Select * From purchaseorderdetail As OdrDe");
|
|
| 1002 |
strSQL.Append(" Inner Join processapprovaldetail As Exe");
|
|
| 1003 |
strSQL.Append(" ON Exe.ConstructionCode = OdrDe.SourceCode");
|
|
| 1004 |
strSQL.AppendFormat(" And Exe.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval);
|
|
| 1005 |
strSQL.Append(" And Exe.LinkCode = OdrDe.SeqNo");
|
|
| 1006 |
strSQL.Append(" Where OdrDe.ConstructionCode = LedgerDetail.SourceCode");
|
|
| 1007 |
strSQL.Append(" And OdrDe.SourceDetailCnt = LedgerDetail.DetailCount)");
|
|
| 1008 |
|
|
| 1001 | 1009 |
strSQL.Append(" AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
|
| 1002 | 1010 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
|
| 1003 | 1011 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG <= {0}", ProgressComplete);
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs | ||
|---|---|---|
| 440 | 440 |
// ???F???`?F?b?N |
| 441 | 441 |
if (!CheckUserAppStat()) return; |
| 442 | 442 |
|
| 443 |
// ???F?????`?F?b?N
|
|
| 443 |
// ???F?????`?F?b?N |
|
| 444 | 444 |
if (!ChkApprovalOrder()) return; |
| 445 | 445 |
|
| 446 | 446 |
// ??????`?F?b?N |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
|---|---|---|
| 1128 | 1128 |
case (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval: // 2:積算予算書承認 |
| 1129 | 1129 |
case (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval: // 3:工事予算書承認 |
| 1130 | 1130 |
case (int)ClsExcute.ApprovalListNo.DRProceedingsApproval: // 7:議事録承認 |
| 1131 |
case (int)ClsExcute.ApprovalListNo.SafetyPatrol: // 13:安全パトロール |
|
| 1131 | 1132 |
break; |
| 1132 | 1133 |
case (int)ClsExcute.ApprovalListNo.PurchaseOrderEntryApproval: // 4:注文書承認 |
| 1133 | 1134 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true); // ----- 直接表示フラグ |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs | ||
|---|---|---|
| 1391 | 1391 |
try |
| 1392 | 1392 |
{
|
| 1393 | 1393 |
// ????}?X?^?? |
| 1394 |
CommonMotions.SetSystemMaster(); |
|
| 1394 |
//CommonMotions.SetSystemMaster();
|
|
| 1395 | 1395 |
|
| 1396 | 1396 |
// ?H?????t???O?i?e?L?X?g?\???j |
| 1397 | 1397 |
SetStatusText(); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs | ||
|---|---|---|
| 359 | 359 |
private string[] s_NegoStr = new string[] { "", "??", "??" };
|
| 360 | 360 |
#endregion |
| 361 | 361 |
|
| 362 |
#region ?O???b?h?J???[???F?G???A |
|
| 363 |
/// <summary> |
|
| 364 |
/// ?O???b?h?J???[???F?G???A |
|
| 365 |
/// </summary> |
|
| 366 |
private Color[] m_GridColor = new Color[] { Color.FromArgb(255, 255, 192) , Color.FromArgb(255, 224, 192) };
|
|
| 362 | 367 |
#endregion |
| 363 | 368 |
|
| 369 |
#endregion |
|
| 370 |
|
|
| 364 | 371 |
#region ??? |
| 365 | 372 |
/// <summary> |
| 366 | 373 |
/// ???????t???O |
| ... | ... | |
| 747 | 754 |
|
| 748 | 755 |
// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
| 749 | 756 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen(); |
| 750 |
if (bApproval) |
|
| 757 |
if (bApproval && !m_SubForm)
|
|
| 751 | 758 |
{
|
| 752 | 759 |
// ?H????????????????????? |
| 753 | 760 |
int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode); |
| ... | ... | |
| 1028 | 1035 |
// ?I???s?????? |
| 1029 | 1036 |
m_BeforeGridRow = dgv.CurrentRow.Index; |
| 1030 | 1037 |
// ?s?I??F???? |
| 1031 |
SelectRowChangeColor(m_BeforeGridRow);
|
|
| 1038 |
SelectRowChangeColor(); |
|
| 1032 | 1039 |
} |
| 1033 | 1040 |
#endregion |
| 1034 | 1041 |
|
| ... | ... | |
| 1249 | 1256 |
IOConstructionBudget BudgetDB = new IOConstructionBudget(); |
| 1250 | 1257 |
try |
| 1251 | 1258 |
{
|
| 1259 |
// ?\???E???F???F??]?E???s???z?`?F?b?N |
|
| 1260 |
if (!CheckApprovalValue()) return; |
|
| 1261 |
|
|
| 1252 | 1262 |
// ??Z?\?Z?f?[?^??????????o?^???? |
| 1253 | 1263 |
string strSQL = BudgetDB.CreatePrimarykeyString(m_ConstructionCode); |
| 1254 | 1264 |
ConstructionBudget DataRec = new ConstructionBudget(); |
| ... | ... | |
| 1302 | 1312 |
{
|
| 1303 | 1313 |
try |
| 1304 | 1314 |
{
|
| 1315 |
// ?\???E???F???F??]?E???s???z?`?F?b?N |
|
| 1316 |
if (!CheckApprovalValue()) return; |
|
| 1317 |
|
|
| 1305 | 1318 |
// ?f?[?^??X?L????f?[?^?o?^ |
| 1306 | 1319 |
if (m_bChengeAns) |
| 1307 | 1320 |
{
|
| ... | ... | |
| 1362 | 1375 |
FrmApprovalScreen frm = new FrmApprovalScreen(); |
| 1363 | 1376 |
try |
| 1364 | 1377 |
{
|
| 1378 |
// ?\???E???F???F??]?E???s???z?`?F?b?N |
|
| 1379 |
if (!CheckApprovalValue()) return; |
|
| 1380 |
|
|
| 1365 | 1381 |
if (MessageBox.Show("????????F??????A???????????H?B", "???F?m?F"
|
| 1366 | 1382 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
| 1367 | 1383 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs | ||
|---|---|---|
| 28 | 28 |
/// </summary> |
| 29 | 29 |
private void InitializeComponent() |
| 30 | 30 |
{
|
| 31 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 32 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 31 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 32 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); |
|
| 40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
| 41 | 41 |
this.label1 = new System.Windows.Forms.Label(); |
| 42 | 42 |
this.btnDataDelete = new System.Windows.Forms.Button(); |
| 43 | 43 |
this.btnDataEntry = new System.Windows.Forms.Button(); |
| 44 | 44 |
this.btnEnd = new System.Windows.Forms.Button(); |
| 45 | 45 |
this.panel1 = new System.Windows.Forms.Panel(); |
| 46 |
this.pnlApprovalButton = new System.Windows.Forms.Panel(); |
|
| 47 |
this.btnOnApproval = new System.Windows.Forms.Button(); |
|
| 48 |
this.btnNotApproval = new System.Windows.Forms.Button(); |
|
| 49 |
this.btnOnHold = new System.Windows.Forms.Button(); |
|
| 46 | 50 |
this.pnlApproval = new System.Windows.Forms.Panel(); |
| 47 | 51 |
this.lblApprovalCount = new System.Windows.Forms.Label(); |
| 48 | 52 |
this.btnPetition = new System.Windows.Forms.Button(); |
| 49 | 53 |
this.btnApproval = new System.Windows.Forms.Button(); |
| 50 |
this.pnlApprovalButton = new System.Windows.Forms.Panel(); |
|
| 51 |
this.btnOnApproval = new System.Windows.Forms.Button(); |
|
| 52 |
this.btnNotApproval = new System.Windows.Forms.Button(); |
|
| 53 |
this.btnOnHold = new System.Windows.Forms.Button(); |
|
| 54 | 54 |
this.lblLabel06 = new System.Windows.Forms.Label(); |
| 55 | 55 |
this.label23 = new System.Windows.Forms.Label(); |
| 56 | 56 |
this.pnlGroup2 = new System.Windows.Forms.Panel(); |
| ... | ... | |
| 118 | 118 |
this.btnOtherProc = new System.Windows.Forms.Button(); |
| 119 | 119 |
this.btnChangeExpenses = new System.Windows.Forms.Button(); |
| 120 | 120 |
this.panel1.SuspendLayout(); |
| 121 |
this.pnlApprovalButton.SuspendLayout(); |
|
| 121 | 122 |
this.pnlApproval.SuspendLayout(); |
| 122 |
this.pnlApprovalButton.SuspendLayout(); |
|
| 123 | 123 |
this.pnlGroup2.SuspendLayout(); |
| 124 | 124 |
this.pnlGroup1.SuspendLayout(); |
| 125 | 125 |
this.panel2.SuspendLayout(); |
| ... | ... | |
| 220 | 220 |
this.panel1.Size = new System.Drawing.Size(1330, 160); |
| 221 | 221 |
this.panel1.TabIndex = 0; |
| 222 | 222 |
// |
| 223 |
// pnlApprovalButton |
|
| 224 |
// |
|
| 225 |
this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
| 226 |
this.pnlApprovalButton.AutoSize = true; |
|
| 227 |
this.pnlApprovalButton.BackColor = System.Drawing.Color.White; |
|
| 228 |
this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 229 |
this.pnlApprovalButton.Controls.Add(this.btnOnApproval); |
|
| 230 |
this.pnlApprovalButton.Controls.Add(this.btnNotApproval); |
|
| 231 |
this.pnlApprovalButton.Controls.Add(this.btnOnHold); |
|
| 232 |
this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0); |
|
| 233 |
this.pnlApprovalButton.Name = "pnlApprovalButton"; |
|
| 234 |
this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34); |
|
| 235 |
this.pnlApprovalButton.TabIndex = 49; |
|
| 236 |
this.pnlApprovalButton.Visible = false; |
|
| 237 |
// |
|
| 238 |
// btnOnApproval |
|
| 239 |
// |
|
| 240 |
this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen; |
|
| 241 |
this.btnOnApproval.Location = new System.Drawing.Point(5, 3); |
|
| 242 |
this.btnOnApproval.Name = "btnOnApproval"; |
|
| 243 |
this.btnOnApproval.Size = new System.Drawing.Size(83, 24); |
|
| 244 |
this.btnOnApproval.TabIndex = 34; |
|
| 245 |
this.btnOnApproval.TabStop = false; |
|
| 246 |
this.btnOnApproval.Text = "承認"; |
|
| 247 |
this.btnOnApproval.UseVisualStyleBackColor = false; |
|
| 248 |
this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click); |
|
| 249 |
// |
|
| 250 |
// btnNotApproval |
|
| 251 |
// |
|
| 252 |
this.btnNotApproval.BackColor = System.Drawing.Color.Red; |
|
| 253 |
this.btnNotApproval.Location = new System.Drawing.Point(171, 3); |
|
| 254 |
this.btnNotApproval.Name = "btnNotApproval"; |
|
| 255 |
this.btnNotApproval.Size = new System.Drawing.Size(83, 24); |
|
| 256 |
this.btnNotApproval.TabIndex = 35; |
|
| 257 |
this.btnNotApproval.TabStop = false; |
|
| 258 |
this.btnNotApproval.Text = "不承認"; |
|
| 259 |
this.btnNotApproval.UseVisualStyleBackColor = false; |
|
| 260 |
this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click); |
|
| 261 |
// |
|
| 262 |
// btnOnHold |
|
| 263 |
// |
|
| 264 |
this.btnOnHold.BackColor = System.Drawing.Color.Yellow; |
|
| 265 |
this.btnOnHold.Location = new System.Drawing.Point(88, 3); |
|
| 266 |
this.btnOnHold.Name = "btnOnHold"; |
|
| 267 |
this.btnOnHold.Size = new System.Drawing.Size(83, 24); |
|
| 268 |
this.btnOnHold.TabIndex = 36; |
|
| 269 |
this.btnOnHold.TabStop = false; |
|
| 270 |
this.btnOnHold.Text = "保留"; |
|
| 271 |
this.btnOnHold.UseVisualStyleBackColor = false; |
|
| 272 |
this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click); |
|
| 273 |
// |
|
| 223 | 274 |
// pnlApproval |
| 224 | 275 |
// |
| 225 | 276 |
this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
| ... | ... | |
| 275 | 326 |
this.btnApproval.UseVisualStyleBackColor = false; |
| 276 | 327 |
this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click); |
| 277 | 328 |
// |
| 278 |
// pnlApprovalButton |
|
| 279 |
// |
|
| 280 |
this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
| 281 |
this.pnlApprovalButton.AutoSize = true; |
|
| 282 |
this.pnlApprovalButton.BackColor = System.Drawing.Color.White; |
|
| 283 |
this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
| 284 |
this.pnlApprovalButton.Controls.Add(this.btnOnApproval); |
|
| 285 |
this.pnlApprovalButton.Controls.Add(this.btnNotApproval); |
|
| 286 |
this.pnlApprovalButton.Controls.Add(this.btnOnHold); |
|
| 287 |
this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0); |
|
| 288 |
this.pnlApprovalButton.Name = "pnlApprovalButton"; |
|
| 289 |
this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34); |
|
| 290 |
this.pnlApprovalButton.TabIndex = 49; |
|
| 291 |
this.pnlApprovalButton.Visible = false; |
|
| 292 |
// |
|
| 293 |
// btnOnApproval |
|
| 294 |
// |
|
| 295 |
this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen; |
|
| 296 |
this.btnOnApproval.Location = new System.Drawing.Point(5, 3); |
|
| 297 |
this.btnOnApproval.Name = "btnOnApproval"; |
|
| 298 |
this.btnOnApproval.Size = new System.Drawing.Size(83, 24); |
|
| 299 |
this.btnOnApproval.TabIndex = 34; |
|
| 300 |
this.btnOnApproval.TabStop = false; |
|
| 301 |
this.btnOnApproval.Text = "承認"; |
|
| 302 |
this.btnOnApproval.UseVisualStyleBackColor = false; |
|
| 303 |
this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click); |
|
| 304 |
// |
|
| 305 |
// btnNotApproval |
|
| 306 |
// |
|
| 307 |
this.btnNotApproval.BackColor = System.Drawing.Color.Red; |
|
| 308 |
this.btnNotApproval.Location = new System.Drawing.Point(171, 3); |
|
| 309 |
this.btnNotApproval.Name = "btnNotApproval"; |
|
| 310 |
this.btnNotApproval.Size = new System.Drawing.Size(83, 24); |
|
| 311 |
this.btnNotApproval.TabIndex = 35; |
|
| 312 |
this.btnNotApproval.TabStop = false; |
|
| 313 |
this.btnNotApproval.Text = "不承認"; |
|
| 314 |
this.btnNotApproval.UseVisualStyleBackColor = false; |
|
| 315 |
this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click); |
|
| 316 |
// |
|
| 317 |
// btnOnHold |
|
| 318 |
// |
|
| 319 |
this.btnOnHold.BackColor = System.Drawing.Color.Yellow; |
|
| 320 |
this.btnOnHold.Location = new System.Drawing.Point(88, 3); |
|
| 321 |
this.btnOnHold.Name = "btnOnHold"; |
|
| 322 |
this.btnOnHold.Size = new System.Drawing.Size(83, 24); |
|
| 323 |
this.btnOnHold.TabIndex = 36; |
|
| 324 |
this.btnOnHold.TabStop = false; |
|
| 325 |
this.btnOnHold.Text = "保留"; |
|
| 326 |
this.btnOnHold.UseVisualStyleBackColor = false; |
|
| 327 |
this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click); |
|
| 328 |
// |
|
| 329 | 329 |
// lblLabel06 |
| 330 | 330 |
// |
| 331 | 331 |
this.lblLabel06.BackColor = System.Drawing.Color.White; |
| ... | ... | |
| 836 | 836 |
| System.Windows.Forms.AnchorStyles.Right))); |
| 837 | 837 |
this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White; |
| 838 | 838 |
this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
| 839 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
| 840 |
dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
|
|
| 841 |
dataGridViewCellStyle11.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 842 |
dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
| 843 |
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
| 844 |
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
| 845 |
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
| 846 |
this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
|
|
| 839 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
| 840 |
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; |
|
| 841 |
dataGridViewCellStyle1.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 842 |
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; |
|
| 843 |
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; |
|
| 844 |
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; |
|
| 845 |
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; |
|
| 846 |
this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; |
|
| 847 | 847 |
this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; |
| 848 | 848 |
this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
| 849 | 849 |
this.Column1, |
| ... | ... | |
| 884 | 884 |
// |
| 885 | 885 |
// Column1 |
| 886 | 886 |
// |
| 887 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
| 888 |
this.Column1.DefaultCellStyle = dataGridViewCellStyle12;
|
|
| 887 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
| 888 |
this.Column1.DefaultCellStyle = dataGridViewCellStyle2; |
|
| 889 | 889 |
this.Column1.Frozen = true; |
| 890 | 890 |
this.Column1.HeaderText = "№"; |
| 891 | 891 |
this.Column1.Name = "Column1"; |
| ... | ... | |
| 937 | 937 |
// |
| 938 | 938 |
// Column5 |
| 939 | 939 |
// |
| 940 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
| 941 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle13;
|
|
| 940 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; |
|
| 941 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle3; |
|
| 942 | 942 |
this.Column5.Frozen = true; |
| 943 | 943 |
this.Column5.HeaderText = "項 目"; |
| 944 | 944 |
this.Column5.Name = "Column5"; |
| ... | ... | |
| 948 | 948 |
// |
| 949 | 949 |
// Column6 |
| 950 | 950 |
// |
| 951 |
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
| 952 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle14;
|
|
| 951 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; |
|
| 952 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle4; |
|
| 953 | 953 |
this.Column6.Frozen = true; |
| 954 | 954 |
this.Column6.HeaderText = "工 事 内 容"; |
| 955 | 955 |
this.Column6.Name = "Column6"; |
| ... | ... | |
| 988 | 988 |
// |
| 989 | 989 |
// Column7 |
| 990 | 990 |
// |
| 991 |
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
| 992 |
dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
|
| 993 |
dataGridViewCellStyle15.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 994 |
dataGridViewCellStyle15.Format = "N0";
|
|
| 995 |
dataGridViewCellStyle15.NullValue = null;
|
|
| 996 |
this.Column7.DefaultCellStyle = dataGridViewCellStyle15;
|
|
| 991 |
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
| 992 |
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); |
|
| 993 |
dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 994 |
dataGridViewCellStyle5.Format = "N0"; |
|
| 995 |
dataGridViewCellStyle5.NullValue = null; |
|
| 996 |
this.Column7.DefaultCellStyle = dataGridViewCellStyle5; |
|
| 997 | 997 |
this.Column7.HeaderText = "積算時見積金額"; |
| 998 | 998 |
this.Column7.Name = "Column7"; |
| 999 | 999 |
this.Column7.ReadOnly = true; |
| ... | ... | |
| 1002 | 1002 |
// |
| 1003 | 1003 |
// Column8 |
| 1004 | 1004 |
// |
| 1005 |
dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
| 1006 |
dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
|
|
| 1007 |
dataGridViewCellStyle16.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1008 |
this.Column8.DefaultCellStyle = dataGridViewCellStyle16;
|
|
| 1005 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
| 1006 |
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); |
|
| 1007 |
dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1008 |
this.Column8.DefaultCellStyle = dataGridViewCellStyle6; |
|
| 1009 | 1009 |
this.Column8.HeaderText = "積算時交渉金額"; |
| 1010 | 1010 |
this.Column8.Name = "Column8"; |
| 1011 | 1011 |
this.Column8.ReadOnly = true; |
| ... | ... | |
| 1014 | 1014 |
// |
| 1015 | 1015 |
// Column11 |
| 1016 | 1016 |
// |
| 1017 |
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
| 1018 |
dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
|
|
| 1019 |
dataGridViewCellStyle17.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1020 |
this.Column11.DefaultCellStyle = dataGridViewCellStyle17;
|
|
| 1017 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
| 1018 |
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); |
|
| 1019 |
dataGridViewCellStyle7.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1020 |
this.Column11.DefaultCellStyle = dataGridViewCellStyle7; |
|
| 1021 | 1021 |
this.Column11.HeaderText = "発注希望金額＊担当者記入"; |
| 1022 | 1022 |
this.Column11.Name = "Column11"; |
| 1023 | 1023 |
this.Column11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
| ... | ... | |
| 1025 | 1025 |
// |
| 1026 | 1026 |
// Column18 |
| 1027 | 1027 |
// |
| 1028 |
dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
| 1029 |
this.Column18.DefaultCellStyle = dataGridViewCellStyle18;
|
|
| 1028 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
| 1029 |
this.Column18.DefaultCellStyle = dataGridViewCellStyle8; |
|
| 1030 | 1030 |
this.Column18.HeaderText = "交渉"; |
| 1031 | 1031 |
this.Column18.Name = "Column18"; |
| 1032 | 1032 |
this.Column18.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
| ... | ... | |
| 1035 | 1035 |
// |
| 1036 | 1036 |
// Column12 |
| 1037 | 1037 |
// |
| 1038 |
dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
| 1039 |
dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
|
| 1040 |
dataGridViewCellStyle19.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1041 |
this.Column12.DefaultCellStyle = dataGridViewCellStyle19;
|
|
| 1038 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
| 1039 |
dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); |
|
| 1040 |
dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1041 |
this.Column12.DefaultCellStyle = dataGridViewCellStyle9; |
|
| 1042 | 1042 |
this.Column12.HeaderText = "実行金額"; |
| 1043 | 1043 |
this.Column12.Name = "Column12"; |
| 1044 | 1044 |
this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
| ... | ... | |
| 1046 | 1046 |
// |
| 1047 | 1047 |
// Column9 |
| 1048 | 1048 |
// |
| 1049 |
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
| 1050 |
dataGridViewCellStyle20.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1051 |
this.Column9.DefaultCellStyle = dataGridViewCellStyle20;
|
|
| 1049 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
| 1050 |
dataGridViewCellStyle10.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
| 1051 |
this.Column9.DefaultCellStyle = dataGridViewCellStyle10;
|
|
| 1052 | 1052 |
this.Column9.HeaderText = "比率(％)"; |
| 1053 | 1053 |
this.Column9.Name = "Column9"; |
| 1054 | 1054 |
this.Column9.ReadOnly = true; |
| ... | ... | |
| 1170 | 1170 |
this.SizeChanged += new System.EventHandler(this.FrmConstructionBudget_SizeChanged); |
| 1171 | 1171 |
this.panel1.ResumeLayout(false); |
| 1172 | 1172 |
this.panel1.PerformLayout(); |
| 1173 |
this.pnlApprovalButton.ResumeLayout(false); |
|
| 1173 | 1174 |
this.pnlApproval.ResumeLayout(false); |
| 1174 |
this.pnlApprovalButton.ResumeLayout(false); |
|
| 1175 | 1175 |
this.pnlGroup2.ResumeLayout(false); |
| 1176 | 1176 |
this.pnlGroup2.PerformLayout(); |
| 1177 | 1177 |
this.pnlGroup1.ResumeLayout(false); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.resx | ||
|---|---|---|
| 120 | 120 |
<metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
| 121 | 121 |
<value>True</value> |
| 122 | 122 |
</metadata> |
| 123 |
<metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
| 124 |
<value>True</value> |
|
| 125 |
</metadata> |
|
| 126 | 123 |
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
| 127 | 124 |
<value>True</value> |
| 128 | 125 |
</metadata> |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs | ||
|---|---|---|
| 930 | 930 |
/// 行を選択色にする |
| 931 | 931 |
/// </summary> |
| 932 | 932 |
/// <param name="CurrentRow"></param> |
| 933 |
private void SelectRowChangeColor(int CurrentRow)
|
|
| 933 |
private void SelectRowChangeColor() |
|
| 934 | 934 |
{
|
| 935 | 935 |
DataGridViewEX dgv = dgvAllDisplay; |
| 936 |
DataGridViewRow CurRow = dgv.Rows[CurrentRow];
|
|
| 936 |
DataGridViewRow CurRow = dgv.Rows[m_BeforeGridRow];
|
|
| 937 | 937 |
|
| 938 | 938 |
// 行の色を変える |
| 939 | 939 |
for (int i = 0; i < dgv.ColumnCount; i++) |
| 940 | 940 |
{
|
| 941 |
dgv.Rows[m_BeforeGridRow].Cells[i].Style.BackColor = s_RowSelectColor; |
|
| 941 |
// エラーセルは色を変えない |
|
| 942 |
if (CurRow.Cells[i].Style.BackColor == CommonDefine.s_clrError) continue; |
|
| 943 |
// 選択色セット |
|
| 944 |
CurRow.Cells[i].Style.BackColor = s_RowSelectColor; |
|
| 942 | 945 |
} |
| 943 | 946 |
} |
| 944 | 947 |
#endregion |
| ... | ... | |
| 1022 | 1025 |
// 行の色を変える |
| 1023 | 1026 |
for (int i = 0; i < (int)GridColumn.BlankFlg; i++) |
| 1024 | 1027 |
{
|
| 1025 |
dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.White; |
|
| 1028 |
if (CurRow.Cells[i].Style.BackColor == CommonDefine.s_clrError) continue; |
|
| 1029 |
CurRow.Cells[i].Style.BackColor = Color.White; |
|
| 1026 | 1030 |
switch (i) |
| 1027 | 1031 |
{
|
| 1028 | 1032 |
// 積算時見積金額 |
| 1029 | 1033 |
case (int)GridColumn.EstimatePrice: |
| 1030 |
dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(192, 255, 255);
|
|
| 1034 |
CurRow.Cells[i].Style.BackColor = Color.FromArgb(192, 255, 255);
|
|
| 1031 | 1035 |
break; |
| 1032 | 1036 |
// 積算時交渉金額 |
| 1033 | 1037 |
case (int)GridColumn.NegotiationPrice: |
| 1034 |
dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(192, 255, 192);
|
|
| 1038 |
CurRow.Cells[i].Style.BackColor = Color.FromArgb(192, 255, 192);
|
|
| 1035 | 1039 |
break; |
| 1036 | 1040 |
// 発注希望金額 |
| 1037 | 1041 |
case (int)GridColumn.HopePrice: |
| 1038 |
dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(255, 255, 192);
|
|
| 1042 |
CurRow.Cells[i].Style.BackColor = Color.FromArgb(255, 255, 192);
|
|
| 1039 | 1043 |
break; |
| 1040 | 1044 |
// 実行金額 |
| 1041 | 1045 |
case (int)GridColumn.ExecPrice: |
| 1042 |
dgv.Rows[CurrentRow].Cells[i].Style.BackColor = Color.FromArgb(255, 224, 192);
|
|
| 1046 |
CurRow.Cells[i].Style.BackColor = Color.FromArgb(255, 224, 192);
|
|
| 1043 | 1047 |
break; |
| 1044 | 1048 |
} |
| 1045 | 1049 |
} |
| ... | ... | |
| 4813 | 4817 |
} |
| 4814 | 4818 |
} |
| 4815 | 4819 |
#endregion |
| 4820 |
|
|
| 4821 |
#region 申請・承認時：希望・実行金額チェック |
|
| 4822 |
/// <summary> |
|
| 4823 |
/// 申請・承認時：希望・実行金額チェック |
|
| 4824 |
/// </summary> |
|
| 4825 |
/// <returns></returns> |
|
| 4826 |
private bool CheckApprovalValue() |
|
| 4827 |
{
|
|
| 4828 |
try |
|
| 4829 |
{
|
|
| 4830 |
int nStart = (int)DataGroup.CommonTempCosts; |
|
| 4831 |
int nComp = (int)DataGroup.DisposeCosts; |
|
| 4832 |
int nHopeCount = (int)GridColumn.HopePrice; |
|
| 4833 |
int nExecCount = (int)GridColumn.ExecPrice; |
|
| 4834 |
bool diffValue = false; |
|
| 4835 |
foreach (DataGridViewRow CurRow in dgvAllDisplay.Rows) |
|
| 4836 |
{
|
|
| 4837 |
// 対象以外は処理しない |
|
| 4838 |
int nGroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value); |
|
| 4839 |
if (nGroupNo < nStart || nComp < nGroupNo) continue; |
|
| 4840 |
|
|
| 4841 |
// データセット |
|
| 4842 |
// 明細チェック |
|
| 4843 |
if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TotalFlg].Value)) continue; |
|
| 4844 |
if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TotalFlg].Value) != 0) continue; |
|
| 4845 |
|
|
| 4846 |
if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.TitleFlg].Value)) continue; |
|
| 4847 |
if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) == 1) continue; |
|
| 4848 |
|
|
| 4849 |
if (CommonMotions.chkObjectIsNull(CurRow.Cells[(int)GridColumn.BlankFlg].Value)) continue; |
|
| 4850 |
if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.BlankFlg].Value) == 1) continue; |
|
| 4851 |
|
|
| 4852 |
// 空白行は処理しない |
|
| 4853 |
if (BlankLine(CurRow.Index)) continue; |
|
| 4854 |
|
|
| 4855 |
// 通常色 |
|
| 4856 |
CurRow.Cells[nHopeCount].Style.BackColor = m_GridColor[0]; |
|
| 4857 |
CurRow.Cells[nExecCount].Style.BackColor = m_GridColor[1]; |
|
| 4858 |
|
|
| 4859 |
int nHopePrice = CommonMotions.cnvInt(CurRow.Cells[nHopeCount].Value); // 発注希望金額 |
|
| 4860 |
int nExecPrice = CommonMotions.cnvInt(CurRow.Cells[nExecCount].Value); // 実行金額 |
|
| 4861 |
|
|
| 4862 |
if (nHopePrice != nExecPrice && nHopePrice > nExecPrice) |
|
| 4863 |
{
|
|
| 4864 |
// エラー色 |
|
| 4865 |
CurRow.Cells[nHopeCount].Style.BackColor = CommonDefine.s_clrError; |
|
| 4866 |
CurRow.Cells[nExecCount].Style.BackColor = CommonDefine.s_clrError; |
|
| 4867 |
diffValue = true; |
|
| 4868 |
} |
|
| 4869 |
} |
|
| 4870 |
|
|
| 4871 |
// 差異チェック |
|
| 4872 |
if(diffValue) |
|
| 4873 |
{
|
|
| 4874 |
if (pnlApproval.Visible) |
|
| 4875 |
{
|
|
| 4876 |
if (MessageBox.Show("発注希望金額と実行金額に差異があります、申請しますか？"
|
|
| 4877 |
, "承認申請エラー" |
|
| 4878 |
, MessageBoxButtons.OKCancel |
|
| 4879 |
, MessageBoxIcon.Error) == DialogResult.Cancel) |
|
| 4880 |
{
|
|
| 4881 |
return false; |
|
| 4882 |
} |
|
| 4883 |
} |
|
| 4884 |
else |
|
| 4885 |
{
|
|
| 4886 |
MessageBox.Show("発注希望金額と実行金額に差異があります、承認できません。"
|
|
| 4887 |
, "承認申請エラー" |
|
| 4888 |
, MessageBoxButtons.OK |
|
| 4889 |
, MessageBoxIcon.Error); |
|
| 4890 |
return false; |
|
| 4891 |
} |
|
| 4892 |
} |
|
| 4893 |
|
|
| 4894 |
return true; |
|
| 4895 |
} |
|
| 4896 |
catch (Exception ex) |
|
| 4897 |
{
|
|
| 4898 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 4899 |
return false; |
|
| 4900 |
} |
|
| 4901 |
} |
|
| 4902 |
#endregion |
|
| 4816 | 4903 |
} |
| 4817 | 4904 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs | ||
|---|---|---|
| 1133 | 1133 |
dataGridViewCellStyle6.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold);
|
| 1134 | 1134 |
this.Column12.DefaultCellStyle = dataGridViewCellStyle6; |
| 1135 | 1135 |
this.Column12.Frozen = true; |
| 1136 |
this.Column12.HeaderText = "実 行 金 額";
|
|
| 1136 |
this.Column12.HeaderText = "予算書実行金額";
|
|
| 1137 | 1137 |
this.Column12.Name = "Column12"; |
| 1138 | 1138 |
this.Column12.ReadOnly = true; |
| 1139 | 1139 |
this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
|---|---|---|
| 2462 | 2462 |
// 合計値取得 |
| 2463 | 2463 |
GetDetailTotal(ref EstimateValue, ref ExecValue, ref PercentValue, ref TotalValue, ref ResultValue, ref MTotal); |
| 2464 | 2464 |
|
| 2465 |
// 実行・発注金額取得 |
|
| 2466 |
long lPurchasePrice = GetLoopBeginValue(); |
|
| 2467 |
|
|
| 2465 | 2468 |
// 予定金額（受注金額－予定金額合計） |
| 2466 |
int EstimatePrice = OrdersPrice - EstimateValue;
|
|
| 2469 |
long EstimatePrice = OrdersPrice - EstimateValue;
|
|
| 2467 | 2470 |
// 実行金額（受注金額－実行金額合計） |
| 2468 |
int ExecPrice = OrdersPrice - ExecValue; |
|
| 2471 |
long ExecPrice = OrdersPrice - ExecValue; |
|
| 2472 |
// 実行・発注金額取得（受注金額－実行・発注金額合計） |
|
| 2473 |
long POrderPrice = OrdersPrice - lPurchasePrice; |
|
| 2469 | 2474 |
|
| 2470 | 2475 |
// 純利益行カウント取得 |
| 2471 | 2476 |
int LineCnt = m_CostsRowCount[(int)CostsRowLine.NetIncomeRowLine]; |
| ... | ... | |
| 2475 | 2480 |
dgv.Rows[LineCnt].Cells[(int)GridColumn.EstimatePrice].Value = EstimatePrice.ToString("#,0");
|
| 2476 | 2481 |
dgv.Rows[LineCnt].Cells[(int)GridColumn.ExecPrice].Value = ExecPrice.ToString("#,0");
|
| 2477 | 2482 |
dgv.Rows[LineCnt].Cells[(int)GridColumn.Percent].Value = CalculattionPercent((double)ExecPrice).ToString("0.00");
|
| 2483 |
dgv.Rows[LineCnt].Cells[(int)GridColumn.OrderPrice].Value = POrderPrice.ToString("#,0");
|
|
| 2478 | 2484 |
} |
| 2479 | 2485 |
catch (Exception ex) |
| 2480 | 2486 |
{
|
| ... | ... | |
| 2483 | 2489 |
} |
| 2484 | 2490 |
#endregion |
| 2485 | 2491 |
|
| 2492 |
#region 実行・発注金額取得 |
|
| 2493 |
/// <summary> |
|
| 2494 |
/// 実行・発注金額取得 |
|
| 2495 |
/// </summary> |
|
| 2496 |
/// <returns></returns> |
|
| 2497 |
private long GetLoopBeginValue() |
|
| 2498 |
{
|
|
| 2499 |
try |
|
| 2500 |
{
|
|
| 2501 |
long lRet = 0; |
|
| 2502 |
|
|
| 2503 |
foreach(DataGridViewRow CurRow in dgvAllDisplay.Rows) |
|
| 2504 |
{
|
|
| 2505 |
int nGroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value); |
|
| 2506 |
|
|
| 2507 |
if (nGroupNo < (int)DataGroup.Expenses || (int)DataGroup.Payroll < nGroupNo) continue; |
|
| 2508 |
|
|
| 2509 |
int nOrderVal = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.OrderPrice].Value); |
|
| 2510 |
int nExecVal = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ExecPrice].Value); |
|
| 2511 |
if (nOrderVal != 0) lRet += nOrderVal; |
|
| 2512 |
else lRet += nExecVal; |
|
| 2513 |
} |
|
| 2514 |
|
|
| 2515 |
return lRet; |
|
| 2516 |
} |
|
| 2517 |
catch (Exception ex) |
|
| 2518 |
{
|
|
| 2519 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 2520 |
return 0; |
|
| 2521 |
} |
|
| 2522 |
} |
|
| 2523 |
#endregion |
|
| 2524 |
|
|
| 2486 | 2525 |
#region 純利益作成 |
| 2487 | 2526 |
/// <summary> |
| 2488 | 2527 |
/// 純利益作成 |
| ... | ... | |
| 3189 | 3228 |
RowData[(int)GridColumn.CompanyCode] = DetailRec.CompanyCode; |
| 3190 | 3229 |
RowData[(int)GridColumn.CompanyName] = DetailRec.CompanyName; |
| 3191 | 3230 |
// 名称・会社名が全てない場合は金額クリア |
| 3192 |
if (DetailRec.FirstString.Length == 0 && DetailRec.SecondString.Length == 0 && DetailRec.CompanyName.Length == 0) |
|
| 3231 |
if (DetailRec.FirstString.Length == 0 |
|
| 3232 |
&& DetailRec.SecondString.Length == 0 |
|
| 3233 |
&& DetailRec.CompanyName.Length == 0) |
|
| 3193 | 3234 |
{
|
| 3194 | 3235 |
RowData[(int)GridColumn.EstimatePrice] = string.Empty; |
| 3195 | 3236 |
RowData[(int)GridColumn.ExecPrice] = string.Empty; |
| ... | ... | |
| 3201 | 3242 |
RowData[(int)GridColumn.ExecPrice] = DetailRec.ExecutionAmount.ToString("#,0");
|
| 3202 | 3243 |
RowData[(int)GridColumn.Percent] = DetailRec.AmountConfigRate.ToString("0.00");
|
| 3203 | 3244 |
|
| 3204 |
// 施工費のみ支払い上限を表示する |
|
| 3205 |
float fSwRate = CommonMotions.cnvFloat(objCurRec[DetailCnt + 3]); |
|
| 3206 |
int swValue = CommonMotions.cnvInt(objCurRec[DetailCnt + 2]); |
|
| 3245 |
// ----- 施工費のみ支払い上限を表示する
|
|
| 3246 |
float fSwRate = CommonMotions.cnvFloat(objCurRec[DetailCnt + 3]); // 発注金額を取得する
|
|
| 3247 |
int swValue = CommonMotions.cnvInt(objCurRec[DetailCnt + 2]); // 発注時法定福利費率を取得する
|
|
| 3207 | 3248 |
if (DetailRec.GroupCount == (int)FrmConstructionLedger.DataGroup.ConstructionCosts |
| 3208 | 3249 |
&& swValue > 0) |
| 3209 | 3250 |
{
|
| ... | ... | |
| 3279 | 3320 |
// 計算が合わなくなるので経費以外はマイナスでも計算する 2017/10/13 |
| 3280 | 3321 |
if (GroupNo != (int)DataGroup.Expenses) |
| 3281 | 3322 |
{ // 経費以外の時のみ支払可能額を計算する
|
| 3282 |
ExecValue = (int)(DetailRec.ExecutionAmount - TotalValue); |
|
| 3323 |
int nCalVal = CommonMotions.cnvInt(RowData[(int)GridColumn.OrderPrice]); |
|
| 3324 |
if (nCalVal == 0) nCalVal = (int)DetailRec.ExecutionAmount; |
|
| 3325 |
ExecValue = nCalVal - (int)TotalValue; |
|
| 3283 | 3326 |
} |
| 3284 | 3327 |
RowData[GridColMax + (int)ColPayTotal.Results] = ExecValue.ToString("#,0");
|
| 3285 | 3328 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.cs | ||
|---|---|---|
| 581 | 581 |
|
| 582 | 582 |
// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
| 583 | 583 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen(); |
| 584 |
if (bApproval) |
|
| 584 |
if (bApproval && !m_SubForm)
|
|
| 585 | 585 |
{
|
| 586 | 586 |
// ?H????????????????????? |
| 587 | 587 |
int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs | ||
|---|---|---|
| 657 | 657 |
|
| 658 | 658 |
// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
| 659 | 659 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen(); |
| 660 |
if (bApproval) |
|
| 660 |
if (bApproval && !m_SubForm)
|
|
| 661 | 661 |
{
|
| 662 | 662 |
// ?H????????????????????? |
| 663 | 663 |
int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs | ||
|---|---|---|
| 22 | 22 |
using ProcessManagement.Forms.ControlsAction; |
| 23 | 23 |
using ProcessManagement.Forms.CustomControls; |
| 24 | 24 |
//*---------------------------- ??Z????????? ------------------------------* |
| 25 |
// 2015/08/12 Ver1.0.0.0 Create Source
|
|
| 25 |
// 2015/08/12 Ver1.0.0.0 Create Source |
|
| 26 | 26 |
// |
| 27 | 27 |
// |
| 28 | 28 |
// |
| ... | ... | |
| 1193 | 1193 |
private void FrmEstimateInput_Load(object sender, EventArgs e) |
| 1194 | 1194 |
{
|
| 1195 | 1195 |
// ????}?X?^?? |
| 1196 |
CommonMotions.SetSystemMaster(); |
|
| 1196 |
//CommonMotions.SetSystemMaster();
|
|
| 1197 | 1197 |
|
| 1198 | 1198 |
//?R???g???[???I?u?W?F?N?g?? |
| 1199 | 1199 |
SetDisplayObject(); |
| ... | ... | |
| 1217 | 1217 |
|
| 1218 | 1218 |
// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
| 1219 | 1219 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen(); |
| 1220 |
if (bApproval) |
|
| 1220 |
if (bApproval && !m_SubForm)
|
|
| 1221 | 1221 |
{
|
| 1222 | 1222 |
// ?H????????????????????? |
| 1223 | 1223 |
int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode); |
| ... | ... | |
| 2199 | 2199 |
m_Canceled = true; |
| 2200 | 2200 |
} |
| 2201 | 2201 |
#endregion |
| 2202 |
|
|
| 2203 |
//private void dgvEntryData_EditingControlShowing(object sender, DataGridViewEditingControlShowingEventArgs e) |
|
| 2204 |
//{
|
|
| 2205 |
// try |
|
| 2206 |
// {
|
|
| 2207 |
// DataGridViewEX dgv = (DataGridViewEX)sender; |
|
| 2208 |
// //??W??????\??????????R???g???[?????? |
|
| 2209 |
// DataGridViewTextBoxEditingControl tb = (DataGridViewTextBoxEditingControl)e.Control; |
|
| 2210 |
|
|
| 2211 |
// if (dgv.CurrentCell.OwningColumn.ReadOnly) return; |
|
| 2212 |
|
|
| 2213 |
// //IME????[?h???X???? |
|
| 2214 |
// switch (dgv.CurrentCell.OwningColumn.Index) |
|
| 2215 |
// {
|
|
| 2216 |
// case (int)GridItemColumn.ItemName: // ???? |
|
| 2217 |
// // ???v???v?O???b?h |
|
| 2218 |
// if (!EqualTotalGridPage(dgv)) tb.ImeMode = ImeMode.On; |
|
| 2219 |
// break; |
|
| 2220 |
// case (int)GridItemColumn.SpecName: // ?K?i?E???@ |
|
| 2221 |
// tb.ImeMode = ImeMode.On; |
|
| 2222 |
// break; |
|
| 2223 |
// case (int)GridItemColumn.UnitName: // ?P?? |
|
| 2224 |
// // ???v???v?O???b?h |
|
| 2225 |
// if (!EqualTotalGridPage(dgv)) tb.ImeMode = ImeMode.On; |
|
| 2226 |
// break; |
|
| 2227 |
// case (int)GridItemColumn.Note: // ???l |
|
| 2228 |
// tb.ImeMode = ImeMode.On; |
|
| 2229 |
// break; |
|
| 2230 |
// default: |
|
| 2231 |
// tb.ImeMode = ImeMode.Disable; |
|
| 2232 |
// break; |
|
| 2233 |
// } |
|
| 2234 |
// } |
|
| 2235 |
// catch (Exception ex) |
|
| 2236 |
// {
|
|
| 2237 |
// logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 2238 |
// } |
|
| 2239 |
//} |
|
| 2240 |
|
|
| 2241 |
//private void dgvEntryData_KeyPress(object sender, KeyPressEventArgs e) |
|
| 2242 |
//{
|
|
| 2243 |
// DataGridViewEX dgv = (DataGridViewEX)sender; |
|
| 2244 |
|
|
| 2245 |
// if (dgv.CurrentCell.OwningColumn.ReadOnly) return; |
|
| 2246 |
// SendKeys.Send("{F2}");
|
|
| 2247 |
//} |
|
| 2248 | 2202 |
} |
| 2249 | 2203 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.cs | ||
|---|---|---|
| 500 | 500 |
|
| 501 | 501 |
// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
| 502 | 502 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen(); |
| 503 |
if (bApproval) |
|
| 503 |
if (bApproval && !m_SubForm)
|
|
| 504 | 504 |
{
|
| 505 | 505 |
// ?H????????????????????? |
| 506 | 506 |
int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs | ||
|---|---|---|
| 309 | 309 |
|
| 310 | 310 |
// 承認画面の「承認対象データを見る」からの起動時は承認ボタンの表示がある |
| 311 | 311 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen(); |
| 312 |
if (bApproval) |
|
| 312 |
if (bApproval && !m_SubForm)
|
|
| 313 | 313 |
{
|
| 314 | 314 |
// 工事案件の管理部署を取得する |
| 315 | 315 |
int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SafetyPatrol/SafetyPatrolAuxiliary.cs | ||
|---|---|---|
| 695 | 695 |
|
| 696 | 696 |
// ???F????u???F???f?[?^??????v?????N????????F?{?^????\????????
|
| 697 | 697 |
bool bApproval = ClsApprovalPermission.ExceApprovalScreen(); |
| 698 |
if (bApproval) |
|
| 698 |
if (bApproval && !m_SubForm)
|
|
| 699 | 699 |
{
|
| 700 | 700 |
// ?H????????????????????? |
| 701 | 701 |
int DepartmentCode = ClsApprovalPermission.GetFromConstructionTheDepartment(m_ConstructionCode); |
| branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmActionCalendar.Designer.cs | ||
|---|---|---|
| 980 | 980 |
this.Controls.Add(this.CalenderTableLayout); |
| 981 | 981 |
this.Controls.Add(this.label1); |
| 982 | 982 |
this.Font = new System.Drawing.Font("ＭＳ 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
| 983 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
|
| 983 | 984 |
this.Margin = new System.Windows.Forms.Padding(4); |
| 984 | 985 |
this.MaximizeBox = false; |
| 985 | 986 |
this.MinimizeBox = false; |
| branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmAddressSearch.designer.cs | ||
|---|---|---|
| 185 | 185 |
this.cmbKen.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 186 | 186 |
this.cmbKen.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 187 | 187 |
this.cmbKen.FormattingEnabled = true; |
| 188 |
this.cmbKen.Location = new System.Drawing.Point(120, 5);
|
|
| 188 |
this.cmbKen.Location = new System.Drawing.Point(120, 7);
|
|
| 189 | 189 |
this.cmbKen.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); |
| 190 | 190 |
this.cmbKen.Name = "cmbKen"; |
| 191 | 191 |
this.cmbKen.Size = new System.Drawing.Size(133, 24); |
| ... | ... | |
| 212 | 212 |
this.cmbCity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 213 | 213 |
this.cmbCity.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 214 | 214 |
this.cmbCity.FormattingEnabled = true; |
| 215 |
this.cmbCity.Location = new System.Drawing.Point(120, 39);
|
|
| 215 |
this.cmbCity.Location = new System.Drawing.Point(120, 41);
|
|
| 216 | 216 |
this.cmbCity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); |
| 217 | 217 |
this.cmbCity.Name = "cmbCity"; |
| 218 | 218 |
this.cmbCity.Size = new System.Drawing.Size(286, 24); |
| ... | ... | |
| 226 | 226 |
this.cmbTown.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
| 227 | 227 |
this.cmbTown.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
| 228 | 228 |
this.cmbTown.FormattingEnabled = true; |
| 229 |
this.cmbTown.Location = new System.Drawing.Point(120, 73);
|
|
| 229 |
this.cmbTown.Location = new System.Drawing.Point(120, 75);
|
|
| 230 | 230 |
this.cmbTown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); |
| 231 | 231 |
this.cmbTown.Name = "cmbTown"; |
| 232 | 232 |
this.cmbTown.Size = new System.Drawing.Size(335, 24); |
| branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVehicleCalendar.cs | ||
|---|---|---|
| 71 | 71 |
/// 処理月 |
| 72 | 72 |
/// </summary> |
| 73 | 73 |
private int m_ToMounth = 0; |
| 74 |
|
|
| 75 |
/// <summary> |
|
| 76 |
/// 直接起動フラグ |
|
| 77 |
/// </summary> |
|
| 78 |
private bool m_DirectFlg = false; |
|
| 74 | 79 |
#endregion |
| 75 | 80 |
|
| 76 | 81 |
#region プロパティ |
| ... | ... | |
| 90 | 95 |
get { return m_ToMounth; }
|
| 91 | 96 |
set { m_ToMounth = value; }
|
| 92 | 97 |
} |
| 98 |
|
|
| 99 |
/// <summary> |
|
| 100 |
/// 直接起動フラグ |
|
| 101 |
/// </summary> |
|
| 102 |
public bool DirectFlg |
|
| 103 |
{
|
|
| 104 |
get { return m_DirectFlg; }
|
|
| 105 |
set { m_DirectFlg = value; }
|
|
| 106 |
} |
|
| 93 | 107 |
#endregion |
| 94 | 108 |
|
| 95 | 109 |
#region コンストラクタ |
| ... | ... | |
| 101 | 115 |
InitializeComponent(); |
| 102 | 116 |
} |
| 103 | 117 |
#endregion |
| 118 |
#region デストラクタ |
|
| 119 |
/// <summary> |
|
| 120 |
/// デストラクタ |
|
| 121 |
/// </summary> |
|
| 122 |
~FrmVehicleCalendar() |
|
| 123 |
{
|
|
| 124 |
try |
|
| 125 |
{
|
|
| 126 |
GC.Collect(); |
|
| 127 |
} |
|
| 128 |
catch (Exception ex) |
|
| 129 |
{
|
|
| 130 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 131 |
} |
|
| 132 |
} |
|
| 133 |
#endregion |
|
| 104 | 134 |
|
| 105 |
#region イベントメソッド
|
|
| 135 |
#region 画面ロード
|
|
| 106 | 136 |
/// <summary> |
| 107 | 137 |
/// 画面ロード |
| 108 | 138 |
/// </summary> |
| ... | ... | |
| 110 | 140 |
/// <param name="e"></param> |
| 111 | 141 |
private void FrmActionCalendar_Load(object sender, EventArgs e) |
| 112 | 142 |
{
|
| 113 |
// コンボボックス初期表示 |
|
| 114 |
InitActionSchduleCombBox(); |
|
| 115 |
// 初期化 |
|
| 116 |
InitCreatePage(); |
|
| 117 |
// カレンダー表示 |
|
| 118 |
DisplayCalender(); |
|
| 143 |
try |
|
| 144 |
{
|
|
| 145 |
// 車両選択画面起動 |
|
| 146 |
if (!m_DirectFlg) |
|
| 147 |
{
|
|
| 148 |
// 車両選択画面起動 |
|
| 149 |
if (!VehicleCodeSelector(ref m_SelectVehicleCode)) |
|
| 150 |
{ // 選択画面より終了時
|
|
| 151 |
m_DirectFlg = true; |
|
| 152 |
this.Close(); |
|
| 153 |
return; |
|
| 154 |
} |
|
| 155 |
} |
|
| 119 | 156 |
|
| 120 |
m_bChengeAns = false; |
|
| 121 |
m_bInit = false; |
|
| 157 |
// コンボボックス初期表示 |
|
| 158 |
InitActionSchduleCombBox(); |
|
| 159 |
|
|
| 160 |
// 初期化 |
|
| 161 |
InitCreatePage(); |
|
| 162 |
|
|
| 163 |
// カレンダー表示 |
|
| 164 |
DisplayCalender(); |
|
| 165 |
|
|
| 166 |
m_bChengeAns = false; |
|
| 167 |
m_bInit = false; |
|
| 168 |
} |
|
| 169 |
catch (Exception ex) |
|
| 170 |
{
|
|
| 171 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 172 |
} |
|
| 122 | 173 |
} |
| 174 |
#endregion |
|
| 123 | 175 |
|
| 176 |
#region ×ボタン押下 |
|
| 124 | 177 |
/// <summary> |
| 125 | 178 |
/// ×ボタン押下 |
| 126 | 179 |
/// </summary> |
| ... | ... | |
| 138 | 191 |
} |
| 139 | 192 |
} |
| 140 | 193 |
// 前プロセスに戻る |
| 141 |
ClsExcute.BackProcess(); |
|
| 194 |
if (m_DirectFlg) ClsExcute.BackProcess();
|
|
| 142 | 195 |
} |
| 196 |
#endregion |
|
| 197 |
|
|
| 198 |
#region データ登録 |
|
| 143 | 199 |
/// <summary> |
| 144 | 200 |
/// データ登録 |
| 145 | 201 |
/// </summary> |
| ... | ... | |
| 178 | 234 |
vsdDB.close(); vsdDB = null; |
| 179 | 235 |
} |
| 180 | 236 |
} |
| 237 |
#endregion |
|
| 238 |
|
|
| 239 |
#region データ削除 |
|
| 181 | 240 |
/// <summary> |
| 182 | 241 |
/// データ削除 |
| 183 | 242 |
/// </summary> |
| ... | ... | |
| 212 | 271 |
asdDB.close(); asdDB = null; |
| 213 | 272 |
} |
| 214 | 273 |
} |
| 274 |
#endregion |
|
| 275 |
|
|
| 276 |
#region 終了ボタン押下 |
|
| 215 | 277 |
/// <summary> |
| 216 | 278 |
/// 終了ボタン押下 |
| 217 | 279 |
/// </summary> |
| ... | ... | |
| 221 | 283 |
{
|
| 222 | 284 |
this.Close(); |
| 223 | 285 |
} |
| 286 |
#endregion |
|
| 287 |
|
|
| 288 |
#region 車両予約一覧年 |
|
| 224 | 289 |
/// <summary> |
| 225 | 290 |
/// 車両予約一覧年 |
| 226 | 291 |
/// </summary> |
| ... | ... | |
| 232 | 297 |
// 車両予約一覧表示 |
| 233 | 298 |
if (cmbActionMonth.Text.Length != 0) DisplayCalender(); |
| 234 | 299 |
} |
| 300 |
#endregion |
|
| 301 |
|
|
| 302 |
#region 車両予約一覧月 |
|
| 235 | 303 |
/// <summary> |
| 236 | 304 |
/// 車両予約一覧月 |
| 237 | 305 |
/// </summary> |
| ... | ... | |
| 243 | 311 |
// 車両予約一覧表示 |
| 244 | 312 |
if (cmbActionYear.Text.Length != 0) DisplayCalender(); |
| 245 | 313 |
} |
| 314 |
#endregion |
|
| 315 |
|
|
| 316 |
#region 車両予約ダブルクリック処理 |
|
| 246 | 317 |
/// <summary> |
| 247 | 318 |
/// 車両予約ダブルクリック処理 |
| 248 | 319 |
/// </summary> |
| ... | ... | |
| 1014 | 1085 |
} |
| 1015 | 1086 |
} |
| 1016 | 1087 |
#endregion |
| 1088 |
|
|
| 1089 |
#region 車両選択画面起動 |
|
| 1090 |
/// <summary> |
|
| 1091 |
/// 車両選択画面起動 |
|
| 1092 |
/// </summary> |
|
| 1093 |
/// <param name="VehicleCode"></param> |
|
| 1094 |
/// <returns></returns> |
|
| 1095 |
private bool VehicleCodeSelector(ref int VehicleCode) |
|
| 1096 |
{
|
|
| 1097 |
FrmVehicleSelector frm = new FrmVehicleSelector(); |
|
| 1098 |
|
|
| 1099 |
try |
|
| 1100 |
{
|
|
| 1101 |
frm.ShowDialog(); |
|
| 1102 |
if (frm.EndButton == DialogResult.Cancel) return false; |
|
| 1103 |
|
|
| 1104 |
VehicleCode = frm.VehicleCode; |
|
| 1105 |
|
|
| 1106 |
return true; |
|
| 1107 |
} |
|
| 1108 |
catch (Exception ex) |
|
| 1109 |
{
|
|
| 1110 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1111 |
return false; |
|
| 1112 |
} |
|
| 1113 |
finally |
|
| 1114 |
{
|
|
| 1115 |
frm.Dispose(); frm = null; |
|
| 1116 |
} |
|
| 1117 |
} |
|
| 1118 |
#endregion |
|
| 1119 |
|
|
| 1017 | 1120 |
} |
| 1018 | 1121 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs | ||
|---|---|---|
| 980 | 980 |
{
|
| 981 | 981 |
try |
| 982 | 982 |
{
|
| 983 |
// 起動チェッククラス初期化 |
|
| 983 |
// 起動チェッククラス初期化（期限マスタ取得のため）
|
|
| 984 | 984 |
m_CheckProc = new ClsSystemOnceExecute(); |
| 985 | 985 |
|
| 986 | 986 |
// ---- 初回起動チェック(毎日最初に起動する人がデータチェックする) |
| ... | ... | |
| 1627 | 1627 |
// ----- 起動プロセス設定 |
| 1628 | 1628 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule); |
| 1629 | 1629 |
|
| 1630 |
// パラメータセット |
|
| 1631 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode); |
|
| 1630 |
// ----- パラメータセット |
|
| 1631 |
// 直接起動フラグセット |
|
| 1632 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(true); |
|
| 1632 | 1633 |
// 処理月取得 |
| 1633 | 1634 |
int iMounth = 0; |
| 1634 | 1635 |
int CurrentColumn = dgv.CurrentCell.ColumnIndex; |
| ... | ... | |
| 1639 | 1640 |
} |
| 1640 | 1641 |
if (iMounth == 0) iMounth = DateTime.Now.Month; |
| 1641 | 1642 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iMounth); |
| 1643 |
// 選択車両コードセット |
|
| 1644 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode); |
|
| 1642 | 1645 |
|
| 1643 | 1646 |
// 処理実行 |
| 1644 | 1647 |
ClsExcute.ProcesscExecute(); |
| branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs | ||
|---|---|---|
| 236 | 236 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.LoginUserData.PersonCode); |
| 237 | 237 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month); |
| 238 | 238 |
break; |
| 239 |
#endregion
|
|
| 239 |
#endregion |
|
| 240 | 240 |
case 3: |
| 241 | 241 |
#region 車両予約入力 |
| 242 |
int VehicleCode = 0; |
|
| 243 |
if (VehicleCodeSelector(ref VehicleCode)) |
|
| 244 |
{
|
|
| 245 |
// 車両予約入力 |
|
| 246 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule); |
|
| 247 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode); |
|
| 248 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month); |
|
| 249 |
} |
|
| 242 |
// 車両予約入力 |
|
| 243 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule); |
|
| 244 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month); |
|
| 245 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(0); // Dummy |
|
| 246 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false); |
|
| 250 | 247 |
break; |
| 251 | 248 |
#endregion |
| 252 | 249 |
case 5: |
| ... | ... | |
| 652 | 649 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.LoginUserData.PersonCode); |
| 653 | 650 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month); |
| 654 | 651 |
break; |
| 655 |
#endregion
|
|
| 652 |
#endregion |
|
| 656 | 653 |
case 3: |
| 657 | 654 |
#region 車両予約入力 |
| 658 |
int VehicleCode = 0; |
|
| 659 |
if (VehicleCodeSelector(ref VehicleCode)) |
|
| 660 |
{
|
|
| 661 |
// 車両予約入力 |
|
| 662 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule); |
|
| 663 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(VehicleCode); |
|
| 664 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month); |
|
| 665 |
} |
|
| 655 |
// 車両予約入力 |
|
| 656 |
NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.VehicleSchdule); |
|
| 657 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(DateTime.Now.Month); |
|
| 658 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(0); // Dummy |
|
| 659 |
ClsExcute.ProcControlPara[NowPoint].BoolExecParameter.Add(false); |
|
| 666 | 660 |
break; |
| 667 | 661 |
#endregion |
| 668 | 662 |
case 5: |
| branches/src/ProcessManagement/ProcessManagement/Program.cs | ||
|---|---|---|
| 42 | 42 |
Application.SetCompatibleTextRenderingDefault(false); |
| 43 | 43 |
|
| 44 | 44 |
// 共通クラス初期化 |
| 45 |
CommonMotions.Initialize();
|
|
| 45 |
if (!CommonMotions.Initialize()) return;
|
|
| 46 | 46 |
|
| 47 | 47 |
//// ファイルタイムスタンプチェック |
| 48 | 48 |
//if (!ClsUpDate.ProgramTimeStampCheck()) |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.1.208")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.208")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.1.210")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.210")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff