プロジェクト

全般

プロフィール

リビジョン 319

堀内ほぼ7年前に追加

工事情報入力:検査是正完了日ロック修正
DataGridView バックグラウンド、白に統一
工事予算書仮設費目安をタイトルに表示
請求まとめ修正中

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 140;
17
        public static int s_SystemVersion = 142;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
1326 1326
                }
1327 1327
                else
1328 1328
                {
1329
                    // キー項目取得条件作成
1330
                    strSQL.Clear();
1331
                    strSQL.Append(DetailDB.CreatePrimarykeyString(ExcuteRec.ConstructionCode, ExcuteRec.GroupCount));
1332

  
1333

  
1334
                    // 明細データも実行データも存在しない
1335 1329
                    if (ExecList.Count < 1)
1336 1330
                    {
1331
                        // ----- 存在しない場合は明細データを作る
1332
                        // キー項目取得条件作成
1333
                        strSQL.Clear();
1334
                        strSQL.Append(DetailDB.CreatePrimarykeyString(ExcuteRec.ConstructionCode, ExcuteRec.GroupCount));
1337 1335
                        // データがない場合は新規行番号を取得する
1338 1336
                        ExcuteRec.LineCount = DetailDB.SelectMaxLineCount(strSQL.ToString(), false) + 1;
1339 1337
                        // データがない場合は新規明細番号を取得する
......
1345 1343
                            return false;
1346 1344
                        }
1347 1345
                    }
1348
                    DetailRec.LineCount = ExcuteRec.LineCount;
1346
                    else
1347
                    {
1348
                        // ----- 存在する場合は明細データを更新
1349
                        // 請求内容の更新
1350
                        if (!DetailDB.UpdateFeild(DetailRec.ConstructionCode
1351
                                                    ,(int)IOConstructionLedgerDetail.TableColumn.SecondString
1352
                                                    , DetailRec.SecondString
1353
                                                    , DetailRec.GroupCount
1354
                                                    , DetailRec.LineCount
1355
                                                    , false))
1356
                        {
1357
                            return false;
1358
                        }
1359
                    }
1349 1360

  
1350 1361
                    // 実行データ新規作成
1351 1362
                    if (!ExecDB.InsertAction(ExcuteRec, false))
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingData.cs
226 226

  
227 227
                strcmd.Append(" SET");
228 228

  
229
                strcmd.AppendFormat(" BillPrice = {0}", data.BillPrice.ToString());
229
                strcmd.AppendFormat(" CompanyCode = {0}", data.CompanyCode);
230
                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
231
                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
232
                strcmd.AppendFormat(", BillPrice = {0}", data.BillPrice.ToString());
230 233

  
231 234
                strcmd.Append(", UpdateDate = NOW()");
232 235
                strcmd.Append(AddSQLString);
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBillingDataDetail.cs
261 261

  
262 262
                strcmd.Append(" SET");
263 263

  
264
                strcmd.AppendFormat("  ConstructionCode = {0}", data.ConstructionCode.ToString());
264
                strcmd.AppendFormat(" CompanyCode = {0}", data.CompanyCode);
265
                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
266
                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
267
                strcmd.AppendFormat(", LineCount = {0}", data.LineCount);
268
                strcmd.AppendFormat(", ConstructionCode = {0}", data.ConstructionCode.ToString());
265 269
                strcmd.AppendFormat(", ConstructionRowCnt = {0}", data.ConstructionRowCnt.ToString());
266 270
                strcmd.AppendFormat(", ConstructionColCnt = {0}", data.ConstructionColCnt.ToString());
267 271
                strcmd.AppendFormat(", FieldName = '{0}'", data.FieldName);
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentApprovalInfo.cs
300 300

  
301 301
                strcmd.Append(" SET");
302 302

  
303
                strcmd.AppendFormat(" ApprovalPerson = {0}", data.ApprovalPerson.ToString());
304
                strcmd.AppendFormat(",ApprovalPersonName = '{0}'", data.ApprovalPersonName);
305
                strcmd.AppendFormat(",ApprovalAuthority = {0}", data.ApprovalAuthority.ToString());
306
                strcmd.AppendFormat(",ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
303
                strcmd.AppendFormat("  CompanyCode = {0}", data.CompanyCode);
304
                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
305
                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
306
                strcmd.AppendFormat(", LineCount = {0}", data.LineCount);
307
                strcmd.AppendFormat(", ApprovalNo = {0}", data.ApprovalNo);
308
                strcmd.AppendFormat(", ApprovalPerson = {0}", data.ApprovalPerson);
309
                strcmd.AppendFormat(", ApprovalPersonName = '{0}'", data.ApprovalPersonName);
310
                strcmd.AppendFormat(", ApprovalAuthority = {0}", data.ApprovalAuthority);
311
                strcmd.AppendFormat(", ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
307 312

  
308 313
                strcmd.Append(", UpdateDate = NOW()");
309 314
                strcmd.Append(AddSQLString);
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPaymentDataDetail.cs
275 275

  
276 276
                strcmd.Append(" SET");
277 277

  
278
                strcmd.AppendFormat(" BillPrice = {0}", data.BillPrice.ToString());
279
                strcmd.AppendFormat(",DiscountPrice = {0}", data.DiscountPrice.ToString());
280
                strcmd.AppendFormat(",OffsetPrice = {0}", data.OffsetPrice.ToString());
281
                strcmd.AppendFormat(",NextCoPrice = {0}", data.NextCoPrice.ToString());
282
                strcmd.AppendFormat(",HighwPrice = {0}", data.HighwPrice.ToString());
283
                strcmd.AppendFormat(",HardwPrice = {0}", data.HardwPrice.ToString());
284
                strcmd.AppendFormat(",IndsWasteTax = {0}", data.IndsWasteTax.ToString());
285
                strcmd.AppendFormat(",CnstrPrice = {0}", data.CnstrPrice.ToString());
286
                strcmd.AppendFormat(",CnstrPriceExist = {0}", data.CnstrPriceExist.ToString());
287
                strcmd.AppendFormat(",ApprovalPersonCode = {0}", data.ApprovalPersonCode.ToString());
288
                strcmd.AppendFormat(",ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
289
                strcmd.AppendFormat(",ApprovalEndFlg = {0}", data.ApprovalEndFlg.ToString());
278
                strcmd.AppendFormat("  CompanyCode = {0}", data.CompanyCode);
279
                strcmd.AppendFormat(", TargetDate = {0}", data.TargetDate);
280
                strcmd.AppendFormat(", SeqNo = {0}", data.SeqNo);
281
                strcmd.AppendFormat(", LineCount = {0}", data.LineCount);
282
                strcmd.AppendFormat(", BillPrice = {0}", data.BillPrice.ToString());
283
                strcmd.AppendFormat(", DiscountPrice = {0}", data.DiscountPrice.ToString());
284
                strcmd.AppendFormat(", OffsetPrice = {0}", data.OffsetPrice.ToString());
285
                strcmd.AppendFormat(", NextCoPrice = {0}", data.NextCoPrice.ToString());
286
                strcmd.AppendFormat(", HighwPrice = {0}", data.HighwPrice.ToString());
287
                strcmd.AppendFormat(", HardwPrice = {0}", data.HardwPrice.ToString());
288
                strcmd.AppendFormat(", IndsWasteTax = {0}", data.IndsWasteTax.ToString());
289
                strcmd.AppendFormat(", CnstrPrice = {0}", data.CnstrPrice.ToString());
290
                strcmd.AppendFormat(", CnstrPriceExist = {0}", data.CnstrPriceExist.ToString());
291
                strcmd.AppendFormat(", ApprovalPersonCode = {0}", data.ApprovalPersonCode.ToString());
292
                strcmd.AppendFormat(", ApprovalDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.ApprovalDate.ToShortDateString());
293
                strcmd.AppendFormat(", ApprovalEndFlg = {0}", data.ApprovalEndFlg.ToString());
290 294

  
291 295
                strcmd.Append(", UpdateDate = NOW()");
292 296
                strcmd.Append(AddSQLString);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs
142 142
            this.dgvEntryData.AllowUserToDeleteRows = false;
143 143
            this.dgvEntryData.AllowUserToResizeColumns = false;
144 144
            this.dgvEntryData.AllowUserToResizeRows = false;
145
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
145
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.White;
146 146
            this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
147 147
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
148 148
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.Black;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs
152 152
            this.dgvEntryData.AllowUserToDeleteRows = false;
153 153
            this.dgvEntryData.AllowUserToResizeColumns = false;
154 154
            this.dgvEntryData.AllowUserToResizeRows = false;
155
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
155
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.White;
156 156
            this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
157 157
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
158 158
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.Black;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
780 780
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // 82:??????????
781 781
                        { false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false, false},    // 83:?????\???
782 782
                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 84:???????s??
783
                        { false, false, false, false, false, false, false, false, false, true,  false, false, false, false, false, false, false, false},    // 85:??????????????
783
                        { false, false, false, false, false, false, false, false, false, true,  true,  false, false, false, false, false, false, false},    // 85:??????????????
784 784

  
785 785
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 1:?????t???O
786 786
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 2:?????t???O ?????g?p
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs
1698 1698
            }
1699 1699
        }
1700 1700
        #endregion
1701

  
1702
        #region ?Z???`????
1703
        /// <summary>
1704
        /// ?Z???`????
1705
        /// </summary>
1706
        /// <param name="sender"></param>
1707
        /// <param name="e"></param>
1708
        private void dgvAllDisplay_CellPainting(object sender, DataGridViewCellPaintingEventArgs e)
1709
        {
1710
            // ??????????
1711
            DrawTitlePaining(e);
1712
        }
1713
        #endregion
1701 1714
    }
1702 1715
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs
45 45
            this.btnDataEntry = new System.Windows.Forms.Button();
46 46
            this.btnEnd = new System.Windows.Forms.Button();
47 47
            this.panel1 = new System.Windows.Forms.Panel();
48
            this.pnlApproval = new System.Windows.Forms.Panel();
49
            this.lblApprovalCount = new System.Windows.Forms.Label();
50
            this.btnPetition = new System.Windows.Forms.Button();
51
            this.btnApproval = new System.Windows.Forms.Button();
52
            this.pnlApprovalButton = new System.Windows.Forms.Panel();
53
            this.btnOnApproval = new System.Windows.Forms.Button();
54
            this.btnNotApproval = new System.Windows.Forms.Button();
55
            this.btnOnHold = new System.Windows.Forms.Button();
48 56
            this.lblLabel06 = new System.Windows.Forms.Label();
49 57
            this.label23 = new System.Windows.Forms.Label();
50 58
            this.pnlGroup2 = new System.Windows.Forms.Panel();
......
66 74
            this.label19 = new System.Windows.Forms.Label();
67 75
            this.label21 = new System.Windows.Forms.Label();
68 76
            this.label15 = new System.Windows.Forms.Label();
69
            this.pnlApproval = new System.Windows.Forms.Panel();
70
            this.lblApprovalCount = new System.Windows.Forms.Label();
71
            this.btnPetition = new System.Windows.Forms.Button();
72
            this.btnApproval = new System.Windows.Forms.Button();
73 77
            this.label18 = new System.Windows.Forms.Label();
74
            this.pnlApprovalButton = new System.Windows.Forms.Panel();
75
            this.btnOnApproval = new System.Windows.Forms.Button();
76
            this.btnNotApproval = new System.Windows.Forms.Button();
77
            this.btnOnHold = new System.Windows.Forms.Button();
78 78
            this.label17 = new System.Windows.Forms.Label();
79 79
            this.label16 = new System.Windows.Forms.Label();
80 80
            this.lblConstructionCodelabel = new System.Windows.Forms.Label();
......
95 95
            this.btnLineAdd = new System.Windows.Forms.Button();
96 96
            this.panel2 = new System.Windows.Forms.Panel();
97 97
            this.lblCellTotal = new System.Windows.Forms.Label();
98
            this.btnDispDown = new System.Windows.Forms.Button();
99
            this.btnDispUp = new System.Windows.Forms.Button();
100
            this.btnOtherProc = new System.Windows.Forms.Button();
101
            this.btnChangeExpenses = new System.Windows.Forms.Button();
98 102
            this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
99 103
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
100 104
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
115 119
            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
116 120
            this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn();
117 121
            this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn();
118
            this.btnDispDown = new System.Windows.Forms.Button();
119
            this.btnDispUp = new System.Windows.Forms.Button();
120
            this.btnOtherProc = new System.Windows.Forms.Button();
121
            this.btnChangeExpenses = new System.Windows.Forms.Button();
122 122
            this.panel1.SuspendLayout();
123
            this.pnlApproval.SuspendLayout();
124
            this.pnlApprovalButton.SuspendLayout();
123 125
            this.pnlGroup2.SuspendLayout();
124 126
            this.pnlGroup1.SuspendLayout();
125
            this.pnlApproval.SuspendLayout();
126
            this.pnlApprovalButton.SuspendLayout();
127 127
            this.panel2.SuspendLayout();
128 128
            ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
129 129
            this.SuspendLayout();
......
221 221
            this.panel1.Size = new System.Drawing.Size(1330, 160);
222 222
            this.panel1.TabIndex = 0;
223 223
            // 
224
            // pnlApproval
225
            // 
226
            this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
227
            this.pnlApproval.AutoSize = true;
228
            this.pnlApproval.BackColor = System.Drawing.Color.White;
229
            this.pnlApproval.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
230
            this.pnlApproval.Controls.Add(this.lblApprovalCount);
231
            this.pnlApproval.Controls.Add(this.btnPetition);
232
            this.pnlApproval.Controls.Add(this.btnApproval);
233
            this.pnlApproval.Location = new System.Drawing.Point(1057, 0);
234
            this.pnlApproval.Name = "pnlApproval";
235
            this.pnlApproval.Size = new System.Drawing.Size(262, 34);
236
            this.pnlApproval.TabIndex = 48;
237
            // 
238
            // lblApprovalCount
239
            // 
240
            this.lblApprovalCount.BackColor = System.Drawing.Color.Black;
241
            this.lblApprovalCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
242
            this.lblApprovalCount.ForeColor = System.Drawing.Color.White;
243
            this.lblApprovalCount.Location = new System.Drawing.Point(205, 3);
244
            this.lblApprovalCount.Name = "lblApprovalCount";
245
            this.lblApprovalCount.Size = new System.Drawing.Size(50, 24);
246
            this.lblApprovalCount.TabIndex = 1;
247
            this.lblApprovalCount.Text = "4/5";
248
            this.lblApprovalCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
249
            // 
250
            // btnPetition
251
            // 
252
            this.btnPetition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
253
            | System.Windows.Forms.AnchorStyles.Right)));
254
            this.btnPetition.BackColor = System.Drawing.Color.White;
255
            this.btnPetition.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
256
            this.btnPetition.ForeColor = System.Drawing.Color.Red;
257
            this.btnPetition.Location = new System.Drawing.Point(3, 3);
258
            this.btnPetition.Name = "btnPetition";
259
            this.btnPetition.Size = new System.Drawing.Size(100, 24);
260
            this.btnPetition.TabIndex = 12;
261
            this.btnPetition.Text = "未申請";
262
            this.btnPetition.UseVisualStyleBackColor = false;
263
            this.btnPetition.Click += new System.EventHandler(this.btnPetition_Click);
264
            // 
265
            // btnApproval
266
            // 
267
            this.btnApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
268
            this.btnApproval.BackColor = System.Drawing.Color.White;
269
            this.btnApproval.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
270
            this.btnApproval.ForeColor = System.Drawing.Color.Red;
271
            this.btnApproval.Location = new System.Drawing.Point(104, 3);
272
            this.btnApproval.Name = "btnApproval";
273
            this.btnApproval.Size = new System.Drawing.Size(100, 24);
274
            this.btnApproval.TabIndex = 12;
275
            this.btnApproval.Text = "未承認";
276
            this.btnApproval.UseVisualStyleBackColor = false;
277
            this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click);
278
            // 
279
            // pnlApprovalButton
280
            // 
281
            this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
282
            this.pnlApprovalButton.AutoSize = true;
283
            this.pnlApprovalButton.BackColor = System.Drawing.Color.White;
284
            this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
285
            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
286
            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
287
            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
288
            this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0);
289
            this.pnlApprovalButton.Name = "pnlApprovalButton";
290
            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
291
            this.pnlApprovalButton.TabIndex = 49;
292
            this.pnlApprovalButton.Visible = false;
293
            // 
294
            // btnOnApproval
295
            // 
296
            this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen;
297
            this.btnOnApproval.Location = new System.Drawing.Point(5, 3);
298
            this.btnOnApproval.Name = "btnOnApproval";
299
            this.btnOnApproval.Size = new System.Drawing.Size(83, 24);
300
            this.btnOnApproval.TabIndex = 34;
301
            this.btnOnApproval.TabStop = false;
302
            this.btnOnApproval.Text = "承認";
303
            this.btnOnApproval.UseVisualStyleBackColor = false;
304
            this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click);
305
            // 
306
            // btnNotApproval
307
            // 
308
            this.btnNotApproval.BackColor = System.Drawing.Color.Red;
309
            this.btnNotApproval.Location = new System.Drawing.Point(171, 3);
310
            this.btnNotApproval.Name = "btnNotApproval";
311
            this.btnNotApproval.Size = new System.Drawing.Size(83, 24);
312
            this.btnNotApproval.TabIndex = 35;
313
            this.btnNotApproval.TabStop = false;
314
            this.btnNotApproval.Text = "不承認";
315
            this.btnNotApproval.UseVisualStyleBackColor = false;
316
            this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click);
317
            // 
318
            // btnOnHold
319
            // 
320
            this.btnOnHold.BackColor = System.Drawing.Color.Yellow;
321
            this.btnOnHold.Location = new System.Drawing.Point(88, 3);
322
            this.btnOnHold.Name = "btnOnHold";
323
            this.btnOnHold.Size = new System.Drawing.Size(83, 24);
324
            this.btnOnHold.TabIndex = 36;
325
            this.btnOnHold.TabStop = false;
326
            this.btnOnHold.Text = "保留";
327
            this.btnOnHold.UseVisualStyleBackColor = false;
328
            this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click);
329
            // 
224 330
            // lblLabel06
225 331
            // 
226 332
            this.lblLabel06.BackColor = System.Drawing.Color.White;
......
473 579
            this.label15.TabIndex = 36;
474 580
            this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
475 581
            // 
476
            // pnlApproval
477
            // 
478
            this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
479
            this.pnlApproval.AutoSize = true;
480
            this.pnlApproval.BackColor = System.Drawing.Color.White;
481
            this.pnlApproval.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
482
            this.pnlApproval.Controls.Add(this.lblApprovalCount);
483
            this.pnlApproval.Controls.Add(this.btnPetition);
484
            this.pnlApproval.Controls.Add(this.btnApproval);
485
            this.pnlApproval.Location = new System.Drawing.Point(1057, 0);
486
            this.pnlApproval.Name = "pnlApproval";
487
            this.pnlApproval.Size = new System.Drawing.Size(262, 34);
488
            this.pnlApproval.TabIndex = 48;
489
            // 
490
            // lblApprovalCount
491
            // 
492
            this.lblApprovalCount.BackColor = System.Drawing.Color.Black;
493
            this.lblApprovalCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
494
            this.lblApprovalCount.ForeColor = System.Drawing.Color.White;
495
            this.lblApprovalCount.Location = new System.Drawing.Point(205, 3);
496
            this.lblApprovalCount.Name = "lblApprovalCount";
497
            this.lblApprovalCount.Size = new System.Drawing.Size(50, 24);
498
            this.lblApprovalCount.TabIndex = 1;
499
            this.lblApprovalCount.Text = "4/5";
500
            this.lblApprovalCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
501
            // 
502
            // btnPetition
503
            // 
504
            this.btnPetition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
505
            | System.Windows.Forms.AnchorStyles.Right)));
506
            this.btnPetition.BackColor = System.Drawing.Color.White;
507
            this.btnPetition.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
508
            this.btnPetition.ForeColor = System.Drawing.Color.Red;
509
            this.btnPetition.Location = new System.Drawing.Point(3, 3);
510
            this.btnPetition.Name = "btnPetition";
511
            this.btnPetition.Size = new System.Drawing.Size(100, 24);
512
            this.btnPetition.TabIndex = 12;
513
            this.btnPetition.Text = "未申請";
514
            this.btnPetition.UseVisualStyleBackColor = false;
515
            this.btnPetition.Click += new System.EventHandler(this.btnPetition_Click);
516
            // 
517
            // btnApproval
518
            // 
519
            this.btnApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
520
            this.btnApproval.BackColor = System.Drawing.Color.White;
521
            this.btnApproval.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
522
            this.btnApproval.ForeColor = System.Drawing.Color.Red;
523
            this.btnApproval.Location = new System.Drawing.Point(104, 3);
524
            this.btnApproval.Name = "btnApproval";
525
            this.btnApproval.Size = new System.Drawing.Size(100, 24);
526
            this.btnApproval.TabIndex = 12;
527
            this.btnApproval.Text = "未承認";
528
            this.btnApproval.UseVisualStyleBackColor = false;
529
            this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click);
530
            // 
531 582
            // label18
532 583
            // 
533 584
            this.label18.BackColor = System.Drawing.Color.SandyBrown;
......
539 590
            this.label18.Text = "着 工 日";
540 591
            this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
541 592
            // 
542
            // pnlApprovalButton
543
            // 
544
            this.pnlApprovalButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
545
            this.pnlApprovalButton.AutoSize = true;
546
            this.pnlApprovalButton.BackColor = System.Drawing.Color.White;
547
            this.pnlApprovalButton.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
548
            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
549
            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
550
            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
551
            this.pnlApprovalButton.Location = new System.Drawing.Point(1057, 0);
552
            this.pnlApprovalButton.Name = "pnlApprovalButton";
553
            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
554
            this.pnlApprovalButton.TabIndex = 49;
555
            this.pnlApprovalButton.Visible = false;
556
            // 
557
            // btnOnApproval
558
            // 
559
            this.btnOnApproval.BackColor = System.Drawing.Color.MediumSpringGreen;
560
            this.btnOnApproval.Location = new System.Drawing.Point(5, 3);
561
            this.btnOnApproval.Name = "btnOnApproval";
562
            this.btnOnApproval.Size = new System.Drawing.Size(83, 24);
563
            this.btnOnApproval.TabIndex = 34;
564
            this.btnOnApproval.TabStop = false;
565
            this.btnOnApproval.Text = "承認";
566
            this.btnOnApproval.UseVisualStyleBackColor = false;
567
            this.btnOnApproval.Click += new System.EventHandler(this.btnOnApproval_Click);
568
            // 
569
            // btnNotApproval
570
            // 
571
            this.btnNotApproval.BackColor = System.Drawing.Color.Red;
572
            this.btnNotApproval.Location = new System.Drawing.Point(171, 3);
573
            this.btnNotApproval.Name = "btnNotApproval";
574
            this.btnNotApproval.Size = new System.Drawing.Size(83, 24);
575
            this.btnNotApproval.TabIndex = 35;
576
            this.btnNotApproval.TabStop = false;
577
            this.btnNotApproval.Text = "不承認";
578
            this.btnNotApproval.UseVisualStyleBackColor = false;
579
            this.btnNotApproval.Click += new System.EventHandler(this.btnNotApproval_Click);
580
            // 
581
            // btnOnHold
582
            // 
583
            this.btnOnHold.BackColor = System.Drawing.Color.Yellow;
584
            this.btnOnHold.Location = new System.Drawing.Point(88, 3);
585
            this.btnOnHold.Name = "btnOnHold";
586
            this.btnOnHold.Size = new System.Drawing.Size(83, 24);
587
            this.btnOnHold.TabIndex = 36;
588
            this.btnOnHold.TabStop = false;
589
            this.btnOnHold.Text = "保留";
590
            this.btnOnHold.UseVisualStyleBackColor = false;
591
            this.btnOnHold.Click += new System.EventHandler(this.btnOnHold_Click);
592
            // 
593 593
            // label17
594 594
            // 
595 595
            this.label17.BackColor = System.Drawing.Color.White;
......
827 827
            this.lblCellTotal.Size = new System.Drawing.Size(0, 13);
828 828
            this.lblCellTotal.TabIndex = 36;
829 829
            // 
830
            // btnDispDown
831
            // 
832
            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
833
            this.btnDispDown.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
834
            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
835
            this.btnDispDown.Name = "btnDispDown";
836
            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
837
            this.btnDispDown.TabIndex = 42;
838
            this.btnDispDown.TabStop = false;
839
            this.btnDispDown.Text = "▼";
840
            this.btnDispDown.UseVisualStyleBackColor = true;
841
            this.btnDispDown.Visible = false;
842
            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
843
            // 
844
            // btnDispUp
845
            // 
846
            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
847
            this.btnDispUp.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
848
            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
849
            this.btnDispUp.Name = "btnDispUp";
850
            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
851
            this.btnDispUp.TabIndex = 41;
852
            this.btnDispUp.TabStop = false;
853
            this.btnDispUp.Text = "▲";
854
            this.btnDispUp.UseVisualStyleBackColor = true;
855
            this.btnDispUp.Visible = false;
856
            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
857
            // 
858
            // btnOtherProc
859
            // 
860
            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
861
            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
862
            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
863
            this.btnOtherProc.Name = "btnOtherProc";
864
            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
865
            this.btnOtherProc.TabIndex = 95;
866
            this.btnOtherProc.TabStop = false;
867
            this.btnOtherProc.Text = "他の画面へ";
868
            this.btnOtherProc.UseVisualStyleBackColor = false;
869
            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
870
            // 
871
            // btnChangeExpenses
872
            // 
873
            this.btnChangeExpenses.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
874
            this.btnChangeExpenses.BackColor = System.Drawing.Color.Gold;
875
            this.btnChangeExpenses.Font = new System.Drawing.Font("MS 明朝", 9.75F, System.Drawing.FontStyle.Bold);
876
            this.btnChangeExpenses.Location = new System.Drawing.Point(223, 656);
877
            this.btnChangeExpenses.Name = "btnChangeExpenses";
878
            this.btnChangeExpenses.Size = new System.Drawing.Size(130, 30);
879
            this.btnChangeExpenses.TabIndex = 103;
880
            this.btnChangeExpenses.Text = "経費変更";
881
            this.btnChangeExpenses.UseVisualStyleBackColor = false;
882
            this.btnChangeExpenses.Visible = false;
883
            this.btnChangeExpenses.Click += new System.EventHandler(this.btnChangeExpenses_Click);
884
            // 
830 885
            // dgvAllDisplay
831 886
            // 
832 887
            this.dgvAllDisplay.AllowUserToAddRows = false;
......
836 891
            this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
837 892
            | System.Windows.Forms.AnchorStyles.Left) 
838 893
            | System.Windows.Forms.AnchorStyles.Right)));
839
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
894
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
840 895
            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
841 896
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
842 897
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
......
878 933
            this.dgvAllDisplay.TabIndex = 1;
879 934
            this.dgvAllDisplay.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellDoubleClick);
880 935
            this.dgvAllDisplay.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellEnter);
936
            this.dgvAllDisplay.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(this.dgvAllDisplay_CellPainting);
881 937
            this.dgvAllDisplay.CellValueChanged += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellValueChanged);
882 938
            this.dgvAllDisplay.SelectionChanged += new System.EventHandler(this.dgvAllDisplay_SelectionChanged);
883 939
            this.dgvAllDisplay.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvAllDisplay_KeyDown);
......
1087 1143
            this.Column17.Visible = false;
1088 1144
            this.Column17.Width = 5;
1089 1145
            // 
1090
            // btnDispDown
1091
            // 
1092
            this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
1093
            this.btnDispDown.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1094
            this.btnDispDown.Location = new System.Drawing.Point(1300, 418);
1095
            this.btnDispDown.Name = "btnDispDown";
1096
            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
1097
            this.btnDispDown.TabIndex = 42;
1098
            this.btnDispDown.TabStop = false;
1099
            this.btnDispDown.Text = "▼";
1100
            this.btnDispDown.UseVisualStyleBackColor = true;
1101
            this.btnDispDown.Visible = false;
1102
            this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click);
1103
            // 
1104
            // btnDispUp
1105
            // 
1106
            this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
1107
            this.btnDispUp.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1108
            this.btnDispUp.Location = new System.Drawing.Point(1300, 354);
1109
            this.btnDispUp.Name = "btnDispUp";
1110
            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
1111
            this.btnDispUp.TabIndex = 41;
1112
            this.btnDispUp.TabStop = false;
1113
            this.btnDispUp.Text = "▲";
1114
            this.btnDispUp.UseVisualStyleBackColor = true;
1115
            this.btnDispUp.Visible = false;
1116
            this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click);
1117
            // 
1118
            // btnOtherProc
1119
            // 
1120
            this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
1121
            this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen;
1122
            this.btnOtherProc.Location = new System.Drawing.Point(7, 656);
1123
            this.btnOtherProc.Name = "btnOtherProc";
1124
            this.btnOtherProc.Size = new System.Drawing.Size(160, 30);
1125
            this.btnOtherProc.TabIndex = 95;
1126
            this.btnOtherProc.TabStop = false;
1127
            this.btnOtherProc.Text = "他の画面へ";
1128
            this.btnOtherProc.UseVisualStyleBackColor = false;
1129
            this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click);
1130
            // 
1131
            // btnChangeExpenses
1132
            // 
1133
            this.btnChangeExpenses.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
1134
            this.btnChangeExpenses.BackColor = System.Drawing.Color.Gold;
1135
            this.btnChangeExpenses.Font = new System.Drawing.Font("MS 明朝", 9.75F, System.Drawing.FontStyle.Bold);
1136
            this.btnChangeExpenses.Location = new System.Drawing.Point(223, 656);
1137
            this.btnChangeExpenses.Name = "btnChangeExpenses";
1138
            this.btnChangeExpenses.Size = new System.Drawing.Size(130, 30);
1139
            this.btnChangeExpenses.TabIndex = 103;
1140
            this.btnChangeExpenses.Text = "経費変更";
1141
            this.btnChangeExpenses.UseVisualStyleBackColor = false;
1142
            this.btnChangeExpenses.Visible = false;
1143
            this.btnChangeExpenses.Click += new System.EventHandler(this.btnChangeExpenses_Click);
1144
            // 
1145 1146
            // FrmConstructionBudget
1146 1147
            // 
1147 1148
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
1175 1176
            this.SizeChanged += new System.EventHandler(this.FrmConstructionBudget_SizeChanged);
1176 1177
            this.panel1.ResumeLayout(false);
1177 1178
            this.panel1.PerformLayout();
1179
            this.pnlApproval.ResumeLayout(false);
1180
            this.pnlApprovalButton.ResumeLayout(false);
1178 1181
            this.pnlGroup2.ResumeLayout(false);
1179 1182
            this.pnlGroup2.PerformLayout();
1180 1183
            this.pnlGroup1.ResumeLayout(false);
1181 1184
            this.pnlGroup1.PerformLayout();
1182
            this.pnlApproval.ResumeLayout(false);
1183
            this.pnlApprovalButton.ResumeLayout(false);
1184 1185
            this.panel2.ResumeLayout(false);
1185 1186
            this.panel2.PerformLayout();
1186 1187
            ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
......
1242 1243
        private System.Windows.Forms.RadioButton radioButton1;
1243 1244
        private System.Windows.Forms.RadioButton radioButton5;
1244 1245
        private System.Windows.Forms.RadioButton radioButton4;
1246
        private System.Windows.Forms.Label label9;
1247
        private System.Windows.Forms.TextBox textBox2;
1248
        private System.Windows.Forms.RadioButton radioButton6;
1249
        private System.Windows.Forms.Panel pnlGroup1;
1250
        private System.Windows.Forms.Panel pnlGroup2;
1251
        private System.Windows.Forms.Label lblLabel06;
1252
        private System.Windows.Forms.Label label23;
1253
        private System.Windows.Forms.Button btnChangeExpenses;
1245 1254
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
1246 1255
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
1247 1256
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
......
1261 1270
        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
1262 1271
        private System.Windows.Forms.DataGridViewTextBoxColumn Column16;
1263 1272
        private System.Windows.Forms.DataGridViewTextBoxColumn Column17;
1264
        private System.Windows.Forms.Label label9;
1265
        private System.Windows.Forms.TextBox textBox2;
1266
        private System.Windows.Forms.RadioButton radioButton6;
1267
        private System.Windows.Forms.Panel pnlGroup1;
1268
        private System.Windows.Forms.Panel pnlGroup2;
1269
        private System.Windows.Forms.Label lblLabel06;
1270
        private System.Windows.Forms.Label label23;
1271
        private System.Windows.Forms.Button btnChangeExpenses;
1272 1273
    }
1273 1274
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
27 27
        {
28 28
            try
29 29
            {
30
                DataGridView dgv = dgvAllDisplay;
30 31
                // 初期サイズ保持
31 32
                m_FormWidthSize = this.Width;
32
                m_GridWidthSize = dgvAllDisplay.Width;
33
                m_GridWidthSize = dgv.Width;
33 34
                m_WindowWidth = this.Width;
34 35
                m_WindowHeight = this.Height;
35 36

  
36 37
                // グリッドカラム幅取得
37
                int ColCount = dgvAllDisplay.ColumnCount;
38
                int ColCount = dgv.ColumnCount;
38 39
                m_CellSize = new int[ColCount];
39
                foreach (DataGridViewColumn wrkCell in dgvAllDisplay.Columns)
40
                foreach (DataGridViewColumn wrkCell in dgv.Columns)
40 41
                {
41 42
                    m_CellSize[wrkCell.Index] = wrkCell.Width;
42 43
                }
......
697 698

  
698 699
                // 表示した行を書込み禁止にする
699 700
                dgv.Rows[rowcnt].ReadOnly = true;
701

  
702
                // 自社施工はタイトル行カスタマイズ
703
                if (TitleNo == (int)FrmConstructionBudget.DataGroup.MyConstruction)
704
                {
705
                    SetCustomTitle(dgv.Rows[rowcnt]);
706
                }
700 707
            }
701 708
            catch (System.Exception ex)
702 709
            {
......
705 712
        }
706 713
        #endregion
707 714

  
715
        #region タイトル行カスタマイズ
716
        /// <summary>
717
        /// タイトル行カスタマイズ
718
        /// </summary>
719
        /// <param name="CustomRow"></param>
720
        private void SetCustomTitle(DataGridViewRow CustomRow)
721
        {
722
            try
723
            {
724
                // 自社施工の時はタイトルをカスタマイズする
725
                CustomRow.Cells[(int)GridColumn.TextName].Value = "※仮設費は工事受注金額の5%程度が目安です";
726
                CustomRow.Cells[(int)GridColumn.TextName].Style.ForeColor = Color.Red;
727

  
728
                int nParcent = 4;
729
                int nOrderValue = CommonMotions.cnvInt(label6.Text);
730
                double nDispValue = 0;
731
                for (int ix = (int)GridColumn.EstimatePrice; ix < (int)GridColumn.Percent; ix++)
732
                {
733
                    switch (ix)
734
                    {
735
                        case (int)GridColumn.EstimatePrice:          // 積算時見積金額
736
                            nDispValue = nOrderValue * (nParcent / 100.0);
737
                            break;
738
                        case (int)GridColumn.NegotiationPrice:       // 積算時交渉金額
739
                        case (int)GridColumn.HopePrice:              // 発注希望金額
740
                        case (int)GridColumn.ExecPrice:              // 実行金額
741
                            nParcent++;
742
                            nDispValue = nOrderValue * (nParcent / 100.0);
743
                            break;
744
                        case (int)GridColumn.Negotiation:            // 交渉フラグ
745
                            break;
746
                    }
747
                    if ((int)GridColumn.Negotiation == ix) continue;
748

  
749
                    CustomRow.Cells[ix].Value = string.Format("{0}%) {1}", nParcent, CommonMotions.cnvRound(nDispValue).ToString("#,0"));
750
                    CustomRow.Cells[ix].Style.ForeColor = Color.Red;
751
                    CustomRow.Cells[ix].Style.Font = new System.Drawing.Font("Century", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
752
                }
753

  
754
            }
755
            catch (System.Exception ex)
756
            {
757
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
758
            }
759
        }
760
        #endregion
761

  
762
        #region セル結合描画処理
763
        /// <summary>
764
        /// セル結合描画処理
765
        /// </summary>
766
        /// <param name="e"></param>
767
        private void DrawTitlePaining(DataGridViewCellPaintingEventArgs e)
768
        {
769
            try
770
            {
771
                if (e.RowIndex < 0) return;
772
                int nRowCnt = e.RowIndex;
773
                int nColCnt = e.ColumnIndex;
774
                DataGridView dgv = dgvAllDisplay;
775
                DataGridViewRow CurRow = dgv.Rows[nRowCnt];
776

  
777
                // 自社施工タイトル以外は処理しない
778
                int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value);
779
                if (GroupNo != (int)FrmConstructionBudget.DataGroup.MyConstruction) return;
780
                if (CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.TitleFlg].Value) != 1) return;
781

  
782
                // 積算時見積金額~構成比率を結合
783
                bool bDraw = true;
784
                switch (nColCnt)
785
                {
786
                    case (int)GridColumn.TextName:               // 工事内容名称
787
                        e.AdvancedBorderStyle.Left = DataGridViewAdvancedCellBorderStyle.Single;
788

  
789

  
790
                        Rectangle rect = e.CellBounds;
791
                        rect.Width += dgv.Columns[(int)GridColumn.CompanyName].Width;
792

  
793
                        rect.X--;
794
                        rect.Y--;
795
                        e.Graphics.FillRectangle(new SolidBrush(e.CellStyle.BackColor), rect);
796
                        e.Graphics.DrawRectangle(new Pen(dgv.GridColor), rect);
797
                        TextRenderer.DrawText(e.Graphics,
798
                                                e.FormattedValue.ToString(),
799
                                                e.CellStyle.Font, rect, e.CellStyle.ForeColor,
800
                                                TextFormatFlags.HorizontalCenter | TextFormatFlags.Bottom);
801
                        break;
802
                    case (int)GridColumn.CompanyType:            // 協力業者コードタイプ
803
                    case (int)GridColumn.CompanyCode:            // 協力業者コード
804
                        break;
805
                    case (int)GridColumn.CompanyName:            // 協力業者名称
806
                        e.AdvancedBorderStyle.Left = DataGridViewAdvancedCellBorderStyle.None;
807
                        break;
808
                    default:
809
                        bDraw = false;
810
                        break;
811
                }
812
                if (bDraw) e.Handled = true;
813
            }
814
            catch (System.Exception ex)
815
            {
816
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
817
            }
818
        }
819
        #endregion
820

  
708 821
        #region 行の入力ロック
709 822
        /// <summary>
710 823
        /// 行のロックを制御する
......
1823 1936
                    CreateDataRow(RowData);
1824 1937
                    icnt++;
1825 1938
                }
1826
                // 空白行
1827
                AddEmptyRow();
1828 1939

  
1829 1940
                return true;
1830 1941
            }
......
1836 1947
            finally
1837 1948
            {
1838 1949
                DetailDB.close(); DetailDB = null;
1950

  
1951
                // 空白行
1952
                AddEmptyRow();
1839 1953
            }
1840 1954
        }
1841 1955
        #endregion
......
1888 2002
                    icnt++;
1889 2003
                }
1890 2004

  
1891
                // 空白行
1892
                AddEmptyRow();
1893

  
1894 2005
                return true;
1895 2006
            }
1896 2007
            catch (Exception ex)
......
1901 2012
            finally
1902 2013
            {
1903 2014
                DetailDB.close(); DetailDB = null;
2015

  
2016
                // 空白行
2017
                AddEmptyRow();
1904 2018
            }
1905 2019
        }
1906 2020
        #endregion
......
1982 2096
                    icnt++;
1983 2097
                }
1984 2098

  
1985
                // 空白行
1986
                AddEmptyRow();
1987

  
1988 2099
                return true;
1989 2100
            }
1990 2101
            catch (Exception ex)
......
1995 2106
            finally
1996 2107
            {
1997 2108
                DetailDB.close(); DetailDB = null;
2109

  
2110
                // 空白行
2111
                AddEmptyRow();
1998 2112
            }
1999 2113
        }
2000 2114
        #endregion
......
2093 2207
                    // 行表示
2094 2208
                    SetOutSourceCosts_Estimate_Row(icnt, ComponentName, ItemName, BreakCode, CompanyName, dSumaryWork);
2095 2209
                }
2096
                // 空白行にする
2097
                AddEmptyRow();
2098 2210

  
2099 2211
                return true;
2100 2212
            }
......
2106 2218
            finally
2107 2219
            {
2108 2220
                DetailDB.close(); DetailDB = null;
2221

  
2222
                // 空白行にする
2223
                AddEmptyRow();
2109 2224
            }
2110 2225
        }
2111 2226
        #endregion
......
2209 2324
                    icnt++;
2210 2325
                }
2211 2326

  
2212
                // 空白行
2213
                AddEmptyRow();
2214

  
2215 2327
                return true;
2216 2328
            }
2217 2329
            catch (Exception ex)
......
2222 2334
            finally
2223 2335
            {
2224 2336
                DetailDB.close(); DetailDB = null;
2337

  
2338
                // 空白行
2339
                AddEmptyRow();
2225 2340
            }
2226 2341
        }
2227 2342
        #endregion
......
2283 2398
                    icnt++;
2284 2399
                }
2285 2400

  
2286
                // 空白行
2287
                AddEmptyRow();
2288

  
2289 2401
                return true;
2290 2402
            }
2291 2403
            catch (Exception ex)
......
2296 2408
            finally
2297 2409
            {
2298 2410
                DetailDB.close(); DetailDB = null;
2411

  
2412
                // 空白行
2413
                AddEmptyRow();
2299 2414
            }
2300 2415
        }
2301 2416
        #endregion
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs
788 788
            this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
789 789
            | System.Windows.Forms.AnchorStyles.Left) 
790 790
            | System.Windows.Forms.AnchorStyles.Right)));
791
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
791
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
792 792
            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
793 793
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
794 794
            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
2572 2572
                        TotalValue += (int)ExcRec.PaymentAmount;
2573 2573
                        break;
2574 2574
                    }
2575
                    //int i = ExcRec.ColumnCount;
2576
                    //RowData[i] = ExcRec.PaymentAmount.ToString("#,0");
2577
                    //TotalValue += (int)ExcRec.PaymentAmount;
2578 2575
                }
2579 2576

  
2580 2577
                // 合計欄位置取得
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs
765 765
            this.dataGridViewEX4.AllowUserToResizeRows = false;
766 766
            this.dataGridViewEX4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
767 767
            | System.Windows.Forms.AnchorStyles.Right)));
768
            this.dataGridViewEX4.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
768
            this.dataGridViewEX4.BackgroundColor = System.Drawing.Color.White;
769 769
            this.dataGridViewEX4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
770 770
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
771 771
            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
......
883 883
            this.dataGridViewEX3.AllowUserToResizeRows = false;
884 884
            this.dataGridViewEX3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
885 885
            | System.Windows.Forms.AnchorStyles.Right)));
886
            this.dataGridViewEX3.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
886
            this.dataGridViewEX3.BackgroundColor = System.Drawing.Color.White;
887 887
            this.dataGridViewEX3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
888 888
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
889 889
            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
......
1037 1037
            this.dataGridViewEX2.AllowUserToResizeRows = false;
1038 1038
            this.dataGridViewEX2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
1039 1039
            | System.Windows.Forms.AnchorStyles.Right)));
1040
            this.dataGridViewEX2.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
1040
            this.dataGridViewEX2.BackgroundColor = System.Drawing.Color.White;
1041 1041
            this.dataGridViewEX2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1042 1042
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1043 1043
            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
......
1244 1244
            this.dataGridViewEX1.AllowUserToResizeRows = false;
1245 1245
            this.dataGridViewEX1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
1246 1246
            | System.Windows.Forms.AnchorStyles.Right)));
1247
            this.dataGridViewEX1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
1247
            this.dataGridViewEX1.BackgroundColor = System.Drawing.Color.White;
1248 1248
            this.dataGridViewEX1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1249 1249
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1250 1250
            dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
......
1483 1483
            this.dgvAllDisplay.AllowUserToResizeRows = false;
1484 1484
            this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
1485 1485
            | System.Windows.Forms.AnchorStyles.Right)));
1486
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
1486
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
1487 1487
            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1488 1488
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1489 1489
            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.designer.cs
31 31
        private void InitializeComponent()
32 32
        {
33 33
            this.components = new System.ComponentModel.Container();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
40 40
            this.label1 = new System.Windows.Forms.Label();
41 41
            this.btnDataDelete = new System.Windows.Forms.Button();
42 42
            this.btnDataEntry = new System.Windows.Forms.Button();
......
583 583
            this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
584 584
            | System.Windows.Forms.AnchorStyles.Left) 
585 585
            | System.Windows.Forms.AnchorStyles.Right)));
586
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
586
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
587 587
            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
588
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
589
            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
590
            dataGridViewCellStyle7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
591
            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
592
            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
593
            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
594
            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
595
            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
588
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
589
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
590
            dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
591
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
592
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
593
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
594
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
595
            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
596 596
            this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
597 597
            this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
598 598
            this.Column1,
......
626 626
            // 
627 627
            // Column1
628 628
            // 
629
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
630
            this.Column1.DefaultCellStyle = dataGridViewCellStyle8;
629
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
630
            this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
631 631
            this.Column1.Frozen = true;
632 632
            this.Column1.HeaderText = "№";
633 633
            this.Column1.Name = "Column1";
......
683 683
            // 
684 684
            // Column5
685 685
            // 
686
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
687
            this.Column5.DefaultCellStyle = dataGridViewCellStyle9;
686
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
687
            this.Column5.DefaultCellStyle = dataGridViewCellStyle3;
688 688
            this.Column5.Frozen = true;
689 689
            this.Column5.HeaderText = "項  目・協力会社";
690 690
            this.Column5.Name = "Column5";
......
694 694
            // 
695 695
            // Column6
696 696
            // 
697
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
698
            this.Column6.DefaultCellStyle = dataGridViewCellStyle10;
697
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
698
            this.Column6.DefaultCellStyle = dataGridViewCellStyle4;
699 699
            this.Column6.Frozen = true;
700 700
            this.Column6.HeaderText = "内     容";
701 701
            this.Column6.Name = "Column6";
......
705 705
            // 
706 706
            // Column7
707 707
            // 
708
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
709
            dataGridViewCellStyle11.NullValue = null;
710
            this.Column7.DefaultCellStyle = dataGridViewCellStyle11;
708
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
709
            dataGridViewCellStyle5.NullValue = null;
710
            this.Column7.DefaultCellStyle = dataGridViewCellStyle5;
711 711
            this.Column7.HeaderText = "見積時金額";
712 712
            this.Column7.Name = "Column7";
713 713
            this.Column7.ReadOnly = true;
......
717 717
            // 
718 718
            // Column8
719 719
            // 
720
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
721
            this.Column8.DefaultCellStyle = dataGridViewCellStyle12;
720
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
721
            this.Column8.DefaultCellStyle = dataGridViewCellStyle6;
722 722
            this.Column8.HeaderText = "交渉時金額";
723 723
            this.Column8.Name = "Column8";
724 724
            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.resx
123 123
  <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
124 124
    <value>True</value>
125 125
  </metadata>
126
  <metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127
    <value>True</value>
128
  </metadata>
129 126
  <metadata name="Column14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130 127
    <value>True</value>
131 128
  </metadata>
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.designer.cs
779 779
            this.dgvEntryData.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
780 780
            | System.Windows.Forms.AnchorStyles.Left) 
781 781
            | System.Windows.Forms.AnchorStyles.Right)));
782
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
782
            this.dgvEntryData.BackgroundColor = System.Drawing.Color.White;
783 783
            this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
784 784
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
785 785
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.ControlDark;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
197 197
                newpage.EntryDGV.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
198 198
                | System.Windows.Forms.AnchorStyles.Left)
199 199
                | System.Windows.Forms.AnchorStyles.Right)));
200
                newpage.EntryDGV.BackgroundColor = Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
200
                newpage.EntryDGV.BackgroundColor = Color.White;
201 201
                newpage.EntryDGV.BorderStyle = BorderStyle.Fixed3D;
202 202
                newpage.EntryCellStyle[0].Alignment = DataGridViewContentAlignment.MiddleCenter;
203 203
                newpage.EntryCellStyle[0].BackColor = SystemColors.Control;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedings.designer.cs
682 682
            this.dgvPerson.AllowUserToResizeColumns = false;
683 683
            this.dgvPerson.AllowUserToResizeRows = false;
684 684
            this.dgvPerson.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
685
            this.dgvPerson.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
685
            this.dgvPerson.BackgroundColor = System.Drawing.Color.White;
686 686
            this.dgvPerson.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
687 687
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
688 688
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
......
828 828
            this.dgvAllDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
829 829
            | System.Windows.Forms.AnchorStyles.Left) 
830 830
            | System.Windows.Forms.AnchorStyles.Right)));
831
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
831
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.White;
832 832
            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
833 833
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
834 834
            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs
183 183
                NewPage.Group4DataGridView.AllowUserToDeleteRows = false;
184 184
                NewPage.Group4DataGridView.AllowUserToResizeColumns = false;
185 185
                NewPage.Group4DataGridView.AllowUserToResizeRows = false;
186
                NewPage.Group4DataGridView.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
186
                NewPage.Group4DataGridView.BackgroundColor = System.Drawing.Color.White;
187 187
                NewPage.Group4DataGridView.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
188 188
                NewPage.Group4DataGridView.ColumnHeadersDefaultCellStyle = NewPage.Group4CellDefaultStyle;
189 189
                NewPage.Group4DataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
......
898 898
                wrkGrid.AllowUserToDeleteRows = false;
899 899
                wrkGrid.AllowUserToResizeColumns = false;
900 900
                wrkGrid.AllowUserToResizeRows = false;
901
                wrkGrid.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
901
                wrkGrid.BackgroundColor = System.Drawing.Color.White;
902 902
                wrkGrid.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
903 903
                wrkGrid.ColumnHeadersDefaultCellStyle = NewPage.Group1CellDefaultStyle;
904 904
                wrkGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
944 944
        {
945 945
            if (m_initDataLoad) return;
946 946

  
947
            DispShowView();
947
            if (!DispShowView())
948
            {
949
                // ??X?????????????
950
                rdbCompany.CheckedChanged -= new System.EventHandler(this.rdbCompany_CheckedChanged);
951
                if (rdbCompany.Checked) rdbCompany.Checked = false;
952
                else rdbCompany.Checked = true;
953
                rdbCompany.CheckedChanged += new System.EventHandler(this.rdbCompany_CheckedChanged);
954
            }
948 955
        }
949 956
        #endregion
950 957

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
64 64
        /// </summary>
65 65
        /// <param name="sender"></param>
66 66
        /// <param name="e"></param>
67
        private void DispShowView()
67
        private bool DispShowView()
68 68
        {
69
            if (m_bChengeAns == true)
69
            try
70 70
            {
71
                if (MessageBox.Show("?f?[?^???X?????????A?o?^??????????X??????????????H?B", "?m?F"
72
                    , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
71
                if (m_bChengeAns == true)
73 72
                {
74
                    return;
73
                    if (MessageBox.Show("?f?[?^???X?????????A?o?^??????????X??????????????H?B", "?m?F"
74
                        , MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No)
75
                    {
76
                        return false;
77
                    }
75 78
                }
76
            }
77 79

  
78
            showView();
79
            SetColumnID();
80
            controlButton();
80
                showView();
81
                SetColumnID();
82
                controlButton();
81 83

  
82
            // ?\??
83
            InitDataLoad();
84
            DispGridData();
84
                // ?\??
85
                InitDataLoad();
86
                DispGridData();
87

  
88
                return true;
89
            }
90
            catch (Exception ex)
91
            {
92
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
93
                return false;
94
            }
85 95
        }
86 96
        #endregion
87 97

  
......
1175 1185
            FrmConstructionLedger frm2 = new FrmConstructionLedger();
1176 1186
            DataGridView dgv = getShowingView();
1177 1187
            DataGridViewRow CurRow = dgv.CurrentRow;
1188
            IOConstructionBaseInfo IoCbi = new IOConstructionBaseInfo();
1178 1189
            try
1179 1190
            {
1180 1191
                // ???F????????????
......
1218 1229

  
1219 1230
                int[] nRowCol = new int[2];
1220 1231
                Array.Clear(nRowCol, 0, nRowCol.Length);
1232
                int nNewMakeRowIndex = -1;
1233
                if (nConstrCode > 0 && selRec.CompanyCode > 0)
1234
                {
1235
                    // ???E?H??????????????s??I??
1236
                    if (!DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol)) return;
1237
                }
1238

  
1221 1239
                if (rdbCompany.Checked)
1222 1240
                {
1223 1241
                    // ----- ???
1224
                    InsdgvCompany2Company(selRec, nRowCol);
1242
                    InsdgvCompany2Company(selRec, nRowCol, ref nNewMakeRowIndex);
1225 1243
                }
1226 1244
                else
1227 1245
                {
1228
                    // ???s????O????\??
1229
                    if (selRec.CompanyCode > 0)
1230
                    {
1231
                        // ?????s??I??
1232
                        DispSelectLedger(selRec.CompanyCode, nConstrCode, frm2, ref nRowCol);
1233
                    }
1234 1246
                    // ----- ????
1235
                    InsdgvProject2Project(selRec, nRowCol);
1247
                    InsdgvProject2Project(selRec, nRowCol, ref nNewMakeRowIndex);
1236 1248
                }
1249

  
1250
                if (nConstrCode > 0 && selRec.CompanyCode > 0)
1251
                {   // ----- ?s??????????????
1252
                    // ???????X???E??????????E?\?Z????l??
1253
                    SetMaruBatsuKigou(dgv, IoCbi, frm.ConstructionCode, nNewMakeRowIndex);
1254
                }
1255
                m_bChengeAns = true;
1237 1256
            }
1238 1257
            catch (System.Exception ex)
1239 1258
            {
......
1243 1262
            {
1244 1263
                frm.Dispose(); frm = null;
1245 1264
                frm2.Dispose(); frm2 = null;
1265
                IoCbi.close(); IoCbi = null;
1246 1266
            }
1247 1267
        }
1248 1268
        #endregion
......
1252 1272
        /// ???O???b?h?????????
1253 1273
        /// </summary>
1254 1274
        /// <param name="selRec"></param>
1255
        private void InsdgvCompany2Company(SubContractorMaster selRec, int[] nRowCol)
1275
        private void InsdgvCompany2Company(SubContractorMaster selRec, int[] nRowCol, ref int nNewMakeRowIndex)
1256 1276
        {
1257 1277
            DataGridView dgv = getShowingView();
1258
            int No = 0;
1278
            DataGridViewRow CurRow = dgv.CurrentRow;
1279
            int MakeIndex = -1;
1259 1280
            try
1260 1281
            {
1282
                // ?s???s????I????
1283
                int nRowCompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
1284
                string strRowCompName = CommonMotions.cnvString(CurRow.Cells[m_CompanyNM_Column].Value);
1285
                if (nRowCompCode == 0 && strRowCompName.Equals(s_UnknownString) && selRec.CompanyCode != 0)
1286
                {
1287
                    CurRow.Cells[m_Company_DispColumn].Value = selRec.CompanyCode;
1288
                    CurRow.Cells[m_CompanyNM_Column].Value = selRec.CompanyName;
1289
                    CurRow.Cells[(int)DispColumn.CompanyDispOrder].Value = selRec.DisplayOrder;
1290
                    if (cnvRowState(CurRow.Cells[(int)DispColumn.RowState].Value) == DataRowState.Unchanged)
1291
                        CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
1292

  
1293
                    ResetNo();
1294
                    m_bChengeAns = true;
1295
                    return;
1296
                }
1297

  
1261 1298
                // ?_?C?A???O??I???????????????????????
1262
                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
1299
                DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == selRec.CompanyCode
1263 1300
                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
1301
                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.????
1264 1302
                                                                                && cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
1265 1303
                                                                            .ToArray();
1266
                bool bInsertRow = true;
1267
                if (rows.Count() > 1) bInsertRow = false;
1268 1304

  
1269 1305
                // No?l
1270 1306
                string cell = dgv.Rows.Cast<DataGridViewRow>().Where(x => cnvRowState(x.Cells[(int)DispColumn.RowState].Value) != DataRowState.Deleted)
1271 1307
                                                              .Max(y => (string)y.Cells[(int)DispColumn.No].Value.ToString());
1308
                int No = 0;
1272 1309
                if (cell == null)
1273 1310
                {
1274 1311
                    No = 1;
......
1278 1315
                    No = CommonMotions.cnvInt(cell) + 1;
1279 1316
                }
1280 1317

  
1281
                int MakeIndex = -1;
1282 1318
                MakeIndex = SearchRowIndexCompany(selRec.CompanyCode, true);
1283 1319

  
1284
                // ????\?????????????A???v?s????s??????????
1285
                if (!bInsertRow)
1286
                {
1287
                    MakeIndex -= (int)RowsTypeDef.???v;
1288
                }
1289

  
1290 1320
                // ?f?[?^????s
1291 1321
                MakeNewRow(selRec.CompanyCode, selRec.CompanyName, 0, No, nRowCol, ref MakeIndex, -1, MakeIndex, string.Empty);
1292 1322
                dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = selRec.DisplayOrder;
1293 1323
                dgv.Rows[MakeIndex].Cells[(int)DispColumn.RowState].Value = DataRowState.Added;
1294 1324

  
1295
                if (bInsertRow)
1325
                if (rows.Count() < 1)
1296 1326
                {
1297 1327
                    MakeIndex++;
1298 1328
                    // ???v?s???
......
1307 1337
            {
1308 1338
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1309 1339
            }
1340
            finally
1341
            {
1342
                nNewMakeRowIndex = MakeIndex;
1343
            }
1310 1344
        }
1311 1345
        #endregion
1312 1346

  
......
1315 1349
        /// ????O???b?h?????????
1316 1350
        /// </summary>
1317 1351
        /// <param name="selRec"></param>
1318
        private void InsdgvProject2Project(SubContractorMaster selRec, int[] nRowCol)
1352
        private void InsdgvProject2Project(SubContractorMaster selRec, int[] nRowCol, ref int nNewMakeRowIndex)
1319 1353
        {
1320 1354
            DataGridView dgv = getShowingView();
1321 1355
            DataGridViewRow CurRow = dgv.CurrentRow;
......
1323 1357
            int MakeIndex = -1;
1324 1358
            try
1325 1359
            {
1360
                int nRowCompCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value);
1361
                string strRowCompName = CommonMotions.cnvString(CurRow.Cells[m_CompanyNM_Column].Value);
1362
                // ----- ?s???s???I??
1363
                if (nRowCompCode == 0 && strRowCompName.Equals(s_UnknownString) && selRec.CompanyCode != 0)
1364
                {
1365
                    // ?s???s?????I??????????Z?b?g????
1366
                    CurRow.Cells[m_Company_DispColumn].Value = selRec.CompanyCode;
1367
                    CurRow.Cells[m_CompanyNM_Column].Value = selRec.CompanyName;
1368
                    if (cnvRowState(CurRow.Cells[(int)DispColumn.RowState].Value) == DataRowState.Unchanged)
1369
                    {
1370
                        CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
1371
                    }
1372
                    ResetNo();
1373

  
1374
                    m_bChengeAns = true;
1375
                    return;
1376
                }
1377

  
1326 1378
                // ?H???R?[?h??
1327 1379
                int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
1328 1380
                if (nConstrCode < 1) return;
......
1349 1401

  
1350 1402
                // ?I??????????H??????????????
1351 1403
                DataGridViewRow[] SelRows = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[m_Genba_Column].Value) == nConstrCode
1352
                                                                                && CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
1404
                                                                                && CommonMotions.cnvInt(x.Cells[m_Company_DispColumn].Value) == selRec.CompanyCode
1353 1405
                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == (int)RowVisibleDef.Visible
1354 1406
                                                                                && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.????)
1355
                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_Column].Value))
1407
                                                                            .OrderBy(y => CommonMotions.cnvInt(y.Cells[m_Company_DispColumn].Value))
1356 1408
                                                                            .ToArray();
1357 1409

  
1358
                bool bLastAdd = true;
1359
                if (SelRows.Count() > 0) bLastAdd = false;
1360

  
1361
                if (s_UnknownString.Equals(CommonMotions.cnvString(CurRow.Cells[m_CompanyNM_Column].Value)))
1410
                // ----- ???s???I??
1411
                if (SelRows.Count() < 1)
1362 1412
                {
1363
                    // ----- ?s???s???I??
1364
                    if (selRec.CompanyCode > 0)
1365
                    {
1366
                        // ?s???s?????I??????????Z?b?g????
1367
                        MakeIndex = CurRow.Index;
1368
                        CurRow.Cells[m_Company_DispColumn].Value = selRec.CompanyCode;
1369
                        CurRow.Cells[m_CompanyNM_Column].Value = selRec.CompanyName;
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

他の形式にエクスポート: Unified diff