プロジェクト

全般

プロフィール

リビジョン 268

堀内7年以上前に追加

協力者マスタ、業者区分バグ修正
台帳一覧イベント修正
ソースセミコロン2重を修正

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMConstructionTypeMaster.cs
489 489
        /// <returns>Where文字列</returns>
490 490
        public string CreatePrimarykeyString(int TypeCode)
491 491
        {
492
            StringBuilder strWork = new StringBuilder(); ;
492
            StringBuilder strWork = new StringBuilder();
493 493
            try
494 494
            {
495 495
                strWork.AppendFormat(" Where TypeCode = {0}", TypeCode);
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMHolidayCalender.cs
295 295
        /// <returns>Where文字列</returns>
296 296
        public string CreatePrimarykeyString(DateTime Holiday)
297 297
        {
298
            StringBuilder strWork = new StringBuilder(); ;
298
            StringBuilder strWork = new StringBuilder();
299 299
            try
300 300
            {
301 301
                strWork.AppendFormat(" Where Holiday = DATE_FORMAT('{0}','%Y/%m/%d')", Holiday.ToShortDateString());
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMSecurity.cs
432 432
        /// <returns>Where文字列</returns>
433 433
        public string CreatePrimarykeyString(int SecurityCode)
434 434
        {
435
            StringBuilder strWork = new StringBuilder(); ;
435
            StringBuilder strWork = new StringBuilder();
436 436
            try
437 437
            {
438 438
                strWork.AppendFormat(" Where SecCode = {0}", SecurityCode);
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORequestOrderDate.cs
85 85
        public bool SelectAction(string AddSQLString, ref List<RequestOrderDate> data, bool bConnect = true)
86 86
        {
87 87
            // インターフェース
88
            StringBuilder strcmd = new StringBuilder(); ;
88
            StringBuilder strcmd = new StringBuilder();
89 89
            ArrayList arData = new ArrayList();
90 90

  
91 91
            try
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
51 51
            OrderNo,
52 52
        }
53 53

  
54
        #region ?R???g???[???C?x???g??`
55
        /// <summary>
56
        /// ?R???g???[???C?x???g??`
57
        /// </summary>
58
        private enum EventDef
59
        {
60
            ConstPro = 1,
61
            Department = 1 << 1,
62
            Person = 1 << 2,
63
        }
54 64
        #endregion
55 65

  
66
        #endregion
67

  
56 68
        #region ???
57 69

  
58 70
        /// <summary>
......
211 223
            // ?R???{?{?b?N?X?????\??
212 224
            InitCombBox();
213 225

  
214
            // ?C?x???g?Z?b?g
215
            SetControlEvent();
216

  
217 226
            // ?\???X?^?C?????X
218 227
            InitDisplayStyle();
219 228

  
220 229
            // ???O?C?????Z?b?g
221 230
            InitDepPersonCode();
222 231

  
232
            // ?C?x???g?Z?b?g
233
            SetControlEvent((int)EventDef.ConstPro | (int)EventDef.Person | (int)EventDef.Person);
234

  
223 235
            // ?????\??
224 236
            InitDataLoad();
225 237

  
......
290 302
        }
291 303
        #endregion
292 304

  
293
        #region ?R???{?{?b?N?X???C?x???g?Z?b?g
294
        /// <summary>
295
        /// ?R???{?{?b?N?X???C?x???g?Z?b?g
296
        /// </summary>
297
        private void SetControlEvent()
298
        {
299
            try
300
            {
301
                numUDConstPro.ValueChanged += new System.EventHandler(numUDConstPro_ValueChanged);
302
                cmbDepartment.SelectedIndexChanged += new System.EventHandler(cmbDepartment_SelectedIndexChanged);
303
                cmbConstructionPerson.SelectedIndexChanged += new System.EventHandler(cmbConstructionPerson_SelectedIndexChanged);
304
                this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
305
                this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
306
            }
307
            catch (Exception ex)
308
            {
309
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
310
            }
311
        }
312
        #endregion
313

  
314 305
        #region ?c????R???{?{?b?N?X??X
315 306
        /// <summary>
316 307
        /// ?c?????X
......
324 315
            // ?R???{?{?b?N?X?Z?b?g
325 316
            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
326 317
            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
318
            SubControlEvent((int)EventDef.Department | (int)EventDef.Person);
327 319
            SetcmbDepartment();
328 320
            SetcmbPersons();
329 321
            cmbDepartment.SelectedValue = DepCode;
330 322
            cmbConstructionPerson.SelectedValue = PerCode;
323
            SetControlEvent((int)EventDef.Department | (int)EventDef.Person);
331 324

  
332 325
            // ?f?[?^?\??
333 326
            DataDisplay();
......
339 332
        {
340 333
            if (m_initDataLoad) return;
341 334

  
335
            SubControlEvent((int)EventDef.Person);
342 336
            // ?S????R???{?{?b?N?X??X
343 337
            SetcmbPersons();
338
            SetControlEvent((int)EventDef.Person);
344 339

  
345 340
            // ?f?[?^?\??
346 341
            DataDisplay();
......
353 348
        {
354 349
            if (m_initDataLoad) return;
355 350

  
351
            SubControlEvent((int)EventDef.Department);
356 352
            // ?S????I?????????I????????
357 353
            SetPerosonToDepartment();
354
            SetControlEvent((int)EventDef.Department);
358 355

  
359 356
            // ?f?[?^?\??
360 357
            DataDisplay();
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = 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 dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
44 44
            this.btnDataEntry = new System.Windows.Forms.Button();
45 45
            this.btnEnd = new System.Windows.Forms.Button();
46 46
            this.label1 = new System.Windows.Forms.Label();
......
58 58
            this.lblProcessTitil = new System.Windows.Forms.Label();
59 59
            this.btnDataUpDate = new System.Windows.Forms.Button();
60 60
            this.btnDataCopy = new System.Windows.Forms.Button();
61
            this.ProgressBar = new System.Windows.Forms.ProgressBar();
61 62
            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
62 63
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
63 64
            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
299 300
            this.btnDataCopy.UseVisualStyleBackColor = false;
300 301
            this.btnDataCopy.Click += new System.EventHandler(this.btnDataCopy_Click);
301 302
            // 
303
            // ProgressBar
304
            // 
305
            this.ProgressBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
306
            this.ProgressBar.Location = new System.Drawing.Point(10, 619);
307
            this.ProgressBar.Name = "ProgressBar";
308
            this.ProgressBar.Size = new System.Drawing.Size(388, 30);
309
            this.ProgressBar.TabIndex = 31;
310
            this.ProgressBar.Visible = false;
311
            // 
302 312
            // dgvMaster
303 313
            // 
304 314
            this.dgvMaster.AllowUserToAddRows = false;
305 315
            this.dgvMaster.AllowUserToDeleteRows = false;
306 316
            this.dgvMaster.AllowUserToResizeColumns = false;
307 317
            this.dgvMaster.AllowUserToResizeRows = false;
308
            dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
309
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle27;
318
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
319
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
310 320
            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
311 321
            | System.Windows.Forms.AnchorStyles.Left) 
312 322
            | System.Windows.Forms.AnchorStyles.Right)));
313 323
            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
314 324
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
315
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
316
            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
317
            dataGridViewCellStyle28.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
318
            dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText;
319
            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight;
320
            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
321
            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
322
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
325
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
326
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
327
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
328
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
329
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
330
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
331
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
332
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
323 333
            this.dgvMaster.ColumnHeadersHeight = 24;
324 334
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
325 335
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
334 344
            this.Column3,
335 345
            this.Column2,
336 346
            this.Column11});
337
            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
338
            dataGridViewCellStyle39.BackColor = System.Drawing.SystemColors.Window;
339
            dataGridViewCellStyle39.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
340
            dataGridViewCellStyle39.ForeColor = System.Drawing.SystemColors.ControlText;
341
            dataGridViewCellStyle39.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
342
            dataGridViewCellStyle39.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
343
            dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
344
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle39;
347
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
348
            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
349
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
350
            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
351
            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
352
            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
353
            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
354
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
345 355
            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
346 356
            this.dgvMaster.Location = new System.Drawing.Point(10, 103);
347 357
            this.dgvMaster.MultiSelect = false;
......
357 367
            // 
358 368
            // Column1
359 369
            // 
360
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
361
            this.Column1.DefaultCellStyle = dataGridViewCellStyle29;
370
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
371
            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
362 372
            this.Column1.Frozen = true;
363 373
            this.Column1.HeaderText = "№";
364 374
            this.Column1.Name = "Column1";
......
369 379
            // 
370 380
            // Column9
371 381
            // 
372
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
373
            this.Column9.DefaultCellStyle = dataGridViewCellStyle30;
382
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
383
            this.Column9.DefaultCellStyle = dataGridViewCellStyle4;
374 384
            this.Column9.Frozen = true;
375 385
            this.Column9.HeaderText = "営業部署";
376 386
            this.Column9.Name = "Column9";
......
380 390
            // 
381 391
            // Column5
382 392
            // 
383
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
384
            this.Column5.DefaultCellStyle = dataGridViewCellStyle31;
393
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
394
            this.Column5.DefaultCellStyle = dataGridViewCellStyle5;
385 395
            this.Column5.Frozen = true;
386 396
            this.Column5.HeaderText = "営業担当者";
387 397
            this.Column5.Name = "Column5";
......
392 402
            // 
393 403
            // Column10
394 404
            // 
395
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
396
            this.Column10.DefaultCellStyle = dataGridViewCellStyle32;
405
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
406
            this.Column10.DefaultCellStyle = dataGridViewCellStyle6;
397 407
            this.Column10.Frozen = true;
398 408
            this.Column10.HeaderText = "工事部署";
399 409
            this.Column10.Name = "Column10";
......
403 413
            // 
404 414
            // Column6
405 415
            // 
406
            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
407
            this.Column6.DefaultCellStyle = dataGridViewCellStyle33;
416
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
417
            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
408 418
            this.Column6.Frozen = true;
409 419
            this.Column6.HeaderText = "工事担当者";
410 420
            this.Column6.Name = "Column6";
......
415 425
            // 
416 426
            // Column4
417 427
            // 
418
            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
419
            this.Column4.DefaultCellStyle = dataGridViewCellStyle34;
428
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
429
            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
420 430
            this.Column4.Frozen = true;
421 431
            this.Column4.HeaderText = "工 事 名 称";
422 432
            this.Column4.Name = "Column4";
......
427 437
            // 
428 438
            // Column7
429 439
            // 
430
            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
431
            this.Column7.DefaultCellStyle = dataGridViewCellStyle35;
440
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
441
            this.Column7.DefaultCellStyle = dataGridViewCellStyle9;
432 442
            this.Column7.Frozen = true;
433 443
            this.Column7.HeaderText = "施工状態";
434 444
            this.Column7.Name = "Column7";
......
439 449
            // 
440 450
            // Column8
441 451
            // 
442
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
443
            this.Column8.DefaultCellStyle = dataGridViewCellStyle36;
452
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
453
            this.Column8.DefaultCellStyle = dataGridViewCellStyle10;
444 454
            this.Column8.Frozen = true;
445 455
            this.Column8.HeaderText = "印刷";
446 456
            this.Column8.Name = "Column8";
......
451 461
            // 
452 462
            // Column3
453 463
            // 
454
            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
455
            this.Column3.DefaultCellStyle = dataGridViewCellStyle37;
464
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
465
            this.Column3.DefaultCellStyle = dataGridViewCellStyle11;
456 466
            this.Column3.Frozen = true;
457 467
            this.Column3.HeaderText = "営業期";
458 468
            this.Column3.Name = "Column3";
......
464 474
            // 
465 475
            // Column2
466 476
            // 
467
            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
468
            this.Column2.DefaultCellStyle = dataGridViewCellStyle38;
477
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
478
            this.Column2.DefaultCellStyle = dataGridViewCellStyle12;
469 479
            this.Column2.Frozen = true;
470 480
            this.Column2.HeaderText = "工事コード";
471 481
            this.Column2.Name = "Column2";
......
493 503
            this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
494 504
            this.BackColor = System.Drawing.Color.Black;
495 505
            this.ClientSize = new System.Drawing.Size(1280, 657);
506
            this.Controls.Add(this.ProgressBar);
496 507
            this.Controls.Add(this.btnDataCopy);
497 508
            this.Controls.Add(this.lblProcessTitil);
498 509
            this.Controls.Add(this.groupBox1);
......
551 562
        private System.Windows.Forms.DataGridViewTextBoxColumn Column3;
552 563
        private System.Windows.Forms.DataGridViewTextBoxColumn Column2;
553 564
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
565
        private System.Windows.Forms.ProgressBar ProgressBar;
554 566
    }
555 567
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
898 898
            try
899 899
            {
900 900
                DataGridView dgv = dgvMaster;
901
                ProgressBar.Maximum = arData.Count;
901 902

  
902 903
                // ?f?[?^?\??
903 904
                int ino = 1;
......
968 969
                                        , OrderNo
969 970
                                        );
970 971

  
972
                    // ProgressBar??l???X????
973
                    ProgressBar.Value = (ino - 1);
974
                    ProgressBar.Update();
971 975
                }
976

  
977
                // ProgressBar??l???X????
978
                ProgressBar.Value = ProgressBar.Maximum;
979
                ProgressBar.Update();
980

  
972 981
            }
973 982
            catch (Exception ex)
974 983
            {
......
1056 1065
        }
1057 1066
        #endregion
1058 1067

  
1068
        #region ?R???g???[???C?x???g???????
1069
        /// <summary>
1070
        /// ?R???g???[???C?x???g???????
1071
        /// </summary>
1072
        /// <param name="EventCon"></param>
1073
        private void SetControlEvent(int EventCon)
1074
        {
1075
            try
1076
            {
1077
                if ((EventCon | (int)EventDef.ConstPro) != 0)
1078
                {
1079
                    numUDConstPro.ValueChanged += new System.EventHandler(numUDConstPro_ValueChanged);
1080
                }
1081
                if ((EventCon | (int)EventDef.Department) != 0)
1082
                {
1083
                    cmbDepartment.SelectedIndexChanged += new System.EventHandler(cmbDepartment_SelectedIndexChanged);
1084
                }
1085
                if ((EventCon | (int)EventDef.Person) != 0)
1086
                {
1087
                    this.radioButton1.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
1088
                    this.radioButton2.CheckedChanged += new System.EventHandler(this.radioButton_CheckedChanged);
1089
                    cmbConstructionPerson.SelectedIndexChanged += new System.EventHandler(cmbConstructionPerson_SelectedIndexChanged);
1090
                }
1091
            }
1092
            catch (Exception ex)
1093
            {
1094
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1095
            }
1096
        }
1097
        #endregion
1098

  
1099
        #region ?R???g???[???C?x???g??????
1100
        /// <summary>
1101
        /// ?R???g???[???C?x???g??????
1102
        /// </summary>
1103
        /// <param name="EventCon"></param>
1104
        private void SubControlEvent(int EventCon)
1105
        {
1106
            try
1107
            {
1108

  
1109
                if ((EventCon | (int)EventDef.ConstPro) != 0)
1110
                {
1111
                    numUDConstPro.ValueChanged -= new System.EventHandler(numUDConstPro_ValueChanged);
1112
                }
1113
                if ((EventCon | (int)EventDef.Department) != 0)
1114
                {
1115
                    cmbDepartment.SelectedIndexChanged -= new System.EventHandler(cmbDepartment_SelectedIndexChanged);
1116
                }
1117
                if ((EventCon | (int)EventDef.Person) != 0)
1118
                {
1119
                    this.radioButton1.CheckedChanged -= new System.EventHandler(this.radioButton_CheckedChanged);
1120
                    this.radioButton2.CheckedChanged -= new System.EventHandler(this.radioButton_CheckedChanged);
1121
                    cmbConstructionPerson.SelectedIndexChanged -= new System.EventHandler(cmbConstructionPerson_SelectedIndexChanged);
1122
                }
1123
            }
1124
            catch (Exception ex)
1125
            {
1126
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1127
            }
1128
        }
1129
        #endregion
1130

  
1131
        #region ?v???O???X?o?[?\??????
1132
        /// <summary>
1133
        /// ?v???O???X?o?[?\??????
1134
        /// </summary>
1135
        /// <param name="bDisp"></param>
1136
        private void DisplayControlProgressBar(bool bDisp)
1137
        {
1138
            try
1139
            {
1140
                ProgressBar.Visible = bDisp;
1141
                ProgressBar.Minimum = 0;
1142
                ProgressBar.Value = 0;
1143

  
1144
                btnDataEntry.Visible = !bDisp;
1145
                btnEnd.Visible = !bDisp;
1146
                btnDataCopy.Visible = !bDisp;
1147
                btnDataUpDate.Visible = !bDisp;
1148

  
1149
                numUDConstPro.Enabled = !bDisp;
1150
                cmbDepartment.Enabled = !bDisp;
1151
                cmbConstructionPerson.Enabled = !bDisp;
1152
                radioButton1.Enabled = !bDisp;
1153
                radioButton2.Enabled = !bDisp;
1154

  
1155
                this.Update();
1156
            }
1157
            catch (Exception ex)
1158
            {
1159
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1160
            }
1161
        }
1162
        #endregion
1163

  
1059 1164
        #region ?f?[?^?\??????
1060 1165
        /// <summary>
1061 1166
        /// ???f?[?^?\??????
......
1066 1171
            try
1067 1172
            {
1068 1173
                foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) wrkCol.SortMode = DataGridViewColumnSortMode.NotSortable;
1174

  
1069 1175
                dgvMaster.Rows.Clear();
1176
                // ?v???O???X?o?[?\??????
1177
                DisplayControlProgressBar(true);
1178

  
1070 1179
                StringBuilder strSQL = new StringBuilder();
1071 1180
                // SQL??
1072 1181
                CreateInitSQL(ref strSQL);
1182

  
1073 1183
                ArrayList arData = new ArrayList();
1074 1184
                // ?H????{????
1075 1185
                if (cbiDB.ExecuteReader(strSQL.ToString(), ref arData))
......
1100 1210
                cbiDB.close(); cbiDB = null;
1101 1211
                if (CommonDefine.s_MaxInitLineCount > dgvMaster.RowCount)
1102 1212
                    dgvMaster.RowCount += (CommonDefine.s_MaxInitLineCount - dgvMaster.RowCount);
1213
                DisplayControlProgressBar(false);
1103 1214
            }
1104 1215
        }
1105 1216
        #endregion
......
1628 1739
            }
1629 1740
        }
1630 1741
        #endregion
1631

  
1632 1742
    }
1633 1743
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
2193 2193
            IOMPersonInCharge picDB = new IOMPersonInCharge();
2194 2194
            try
2195 2195
            {
2196
                List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
2196
                List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
2197 2197
                // ?S????}?X?^??????????
2198 2198
                string strSQL = string.Format(" Where DepartmentCode = {0}", DepartmentCode);
2199 2199
                strSQL += " AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC";
......
2237 2237
        private bool SetInitcmbPersonInCharge()
2238 2238
        {
2239 2239
            IOMPersonInCharge picDB = new IOMPersonInCharge();
2240
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
2240
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
2241 2241
            try
2242 2242
            {
2243 2243
                // ?S????}?X?^??????????
......
2293 2293
        {
2294 2294
            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
2295 2295
            IOMPersonInCharge picDB = new IOMPersonInCharge();
2296
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
2296
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
2297 2297
            try
2298 2298
            {
2299 2299
                if (TransferCode == 0)
......
2409 2409
        private void SetcmbTransferConstructionCombBox()
2410 2410
        {
2411 2411
            IOMPersonInCharge picDB = new IOMPersonInCharge();
2412
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
2412
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
2413 2413
            IOMDepartment dmDB = new IOMDepartment();
2414 2414
            List<DepartmentMaster> dmList = new List<DepartmentMaster>();
2415 2415
            try
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
2126 2126
            RowData[(int)GridColumn.CompanyCode] = CompanyCode;
2127 2127
            RowData[(int)GridColumn.CompanyName] = CompanyName;
2128 2128
            RowData[(int)GridColumn.EstimatePrice] = SumaryValue.ToString("#,0");
2129
            RowData[(int)GridColumn.NegotiationPrice] = "0"; ;
2129
            RowData[(int)GridColumn.NegotiationPrice] = "0";
2130 2130
            RowData[(int)GridColumn.HopePrice] = SumaryValue.ToString("#,0");
2131 2131
            RowData[(int)GridColumn.ExecPrice] = SumaryValue.ToString("#,0");
2132 2132
            RowData[(int)GridColumn.Percent] = CalculattionPercent((double)SumaryValue).ToString("0.00");
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmSelectPerson.cs
285 285
        private bool SetInitcmbPersonInCharge()
286 286
        {
287 287
            IOMPersonInCharge picDB = new IOMPersonInCharge();
288
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
288
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
289 289
            try
290 290
            {
291 291
                // 担当者マスタを検索する
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs
179 179
        private static int s_CurrentProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionLedgerList;
180 180
        #endregion
181 181

  
182
        #region ?R???g???[???C?x???g??`
183
        /// <summary>
184
        /// ?R???g???[???C?x???g??`
185
        /// </summary>
186
        private enum EventDef
187
        {
188
            ConstPro = 1,
189
            Department = 1 << 1,
190
            Person = 1 << 2,
191
        }
182 192
        #endregion
183 193

  
194
        #endregion
195

  
184 196
        #region ???
185 197
        /// <summary>
186 198
        /// ?t?B?[???h?l????t???O
......
470 482
            InitDepPersonCode();
471 483

  
472 484
            // ?R???{?{?b?N?X???C?x???g?Z?b?g
473
            SetControlEvent();
485
            SetControlEvent((int)EventDef.ConstPro | (int)EventDef.Person | (int)EventDef.Person);
474 486

  
475 487
            // ?????\??
476 488
            InitDataLoad();
......
479 491
        }
480 492
        #endregion
481 493

  
482
        #region ?R???{?{?b?N?X???C?x???g?Z?b?g
483
        /// <summary>
484
        /// ?R???{?{?b?N?X???C?x???g?Z?b?g
485
        /// </summary>
486
        private void SetControlEvent()
487
        {
488
            try
489
            {
490
                numUDConstPro.ValueChanged += new System.EventHandler(numUDConstPro_ValueChanged);
491
                cmbDepartment.SelectedIndexChanged += new System.EventHandler(cmbDepartment_SelectedIndexChanged);
492
                cmbConstructionPerson.SelectedIndexChanged += new System.EventHandler(cmbConstructionPerson_SelectedIndexChanged);
493
            }
494
            catch (Exception ex)
495
            {
496
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
497
            }
498
        }
499
        #endregion
500

  
501 494
        #region ?Z???_?u???N???b?N
502 495
        /// <summary>
503 496
        /// ?Z???_?u???N???b?N
......
580 573
            // ?R???{?{?b?N?X?Z?b?g
581 574
            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
582 575
            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
576
            SubControlEvent((int)EventDef.Department | (int)EventDef.Person);
583 577
            SetcmbDepartment();
584 578
            SetcmbPersons();
585 579
            cmbDepartment.SelectedValue = DepCode;
586 580
            cmbConstructionPerson.SelectedValue = PerCode;
581
            SetControlEvent((int)EventDef.Department | (int)EventDef.Person);
587 582

  
588 583
            // ?f?[?^?\??
589 584
            DataDisplay();
......
600 595
        {
601 596
            if (m_initDataLoad) return;
602 597

  
598
            SubControlEvent((int)EventDef.Person);
603 599
            // ?S????R???{?{?b?N?X??X
604 600
            SetcmbPersons();
601
            SetControlEvent((int)EventDef.Person);
605 602

  
606 603
            // ?f?[?^?\??
607 604
            DataDisplay();
......
618 615
        {
619 616
            if (m_initDataLoad) return;
620 617

  
618
            SubControlEvent((int)EventDef.Department);
621 619
            // ?S????I?????????I????????
622 620
            SetPerosonToDepartment();
623 621

  
624
            // ?f?[?^?\??
625
            DataDisplay();
626 622
            // ????????????N????S?????X???p?????[?^??X
627 623
            if (!m_FirstStartFlg)
628 624
            {
629 625
                m_FirstStartPersonCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
630 626
            }
627
            SetControlEvent((int)EventDef.Department);
631 628

  
632 629
            // ?f?[?^?\??
633 630
            DataDisplay();
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
80 80
        }
81 81
        #endregion
82 82

  
83
        #region ?R???g???[???C?x???g???????
84
        /// <summary>
85
        /// ?R???g???[???C?x???g???????
86
        /// </summary>
87
        /// <param name="EventCon"></param>
88
        private void SetControlEvent(int EventCon)
89
        {
90
            try
91
            {
92
                if ((EventCon | (int)EventDef.ConstPro) != 0)
93
                {
94
                    numUDConstPro.ValueChanged += new System.EventHandler(numUDConstPro_ValueChanged);
95
                }
96
                if ((EventCon | (int)EventDef.Department) != 0)
97
                {
98
                    cmbDepartment.SelectedIndexChanged += new System.EventHandler(cmbDepartment_SelectedIndexChanged);
99
                }
100
                if ((EventCon | (int)EventDef.Person) != 0)
101
                {
102
                    cmbConstructionPerson.SelectedIndexChanged += new System.EventHandler(cmbConstructionPerson_SelectedIndexChanged);
103
                }
104
            }
105
            catch (Exception ex)
106
            {
107
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
108
            }
109
        }
110
        #endregion
111

  
112
        #region ?R???g???[???C?x???g??????
113
        /// <summary>
114
        /// ?R???g???[???C?x???g??????
115
        /// </summary>
116
        /// <param name="EventCon"></param>
117
        private void SubControlEvent(int EventCon)
118
        {
119
            try
120
            {
121

  
122
                if ((EventCon | (int)EventDef.ConstPro) != 0)
123
                {
124
                    numUDConstPro.ValueChanged -= new System.EventHandler(numUDConstPro_ValueChanged);
125
                }
126
                if ((EventCon | (int)EventDef.Department) != 0)
127
                {
128
                    cmbDepartment.SelectedIndexChanged -= new System.EventHandler(cmbDepartment_SelectedIndexChanged);
129
                }
130
                if ((EventCon | (int)EventDef.Person) != 0)
131
                {
132
                    cmbConstructionPerson.SelectedIndexChanged -= new System.EventHandler(cmbConstructionPerson_SelectedIndexChanged);
133
                }
134
            }
135
            catch (Exception ex)
136
            {
137
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
138
            }
139
        }
140
        #endregion
141

  
83 142
        #region ???v???Z?X?N??
84 143
        /// <summary>
85 144
        /// ?H???????N??????v???Z?X?I??????
......
761 820
        }
762 821
        #endregion
763 822

  
823
        #region ?v???O???X?o?[?\??????
824
        /// <summary>
825
        /// ?v???O???X?o?[?\??????
826
        /// </summary>
827
        /// <param name="bDisp"></param>
828
        private void DisplayControlProgressBar(bool bDisp)
829
        {
830
            try
831
            {
832
                ProgressBar.Visible = bDisp;
833
                ProgressBar.Minimum = 0;
834
                ProgressBar.Value = 0;
835

  
836
                btnEnd.Visible = !bDisp;
837
                btnLedgerStatus.Visible = !bDisp;
838

  
839
                numUDConstPro.Enabled = !bDisp;
840
                cmbDepartment.Enabled = !bDisp;
841
                cmbConstructionPerson.Enabled = !bDisp;
842

  
843
                this.Update();
844
            }
845
            catch (Exception ex)
846
            {
847
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
848
            }
849
        }
850
        #endregion
851

  
764 852
        #region ???f?[?^?\??????
765 853
        /// <summary>
766 854
        /// ???f?[?^?\??????
......
777 865
                dgv.SuspendLayout();
778 866
                dgv.Rows.Clear();
779 867

  
780
                // ?v???O???X?o?[??Z?b?g
781
                prgber.Visible = true;
782
                prgber.Minimum = 0;
868
                // ?v???O???X?o?[?\??????
869
                DisplayControlProgressBar(true);
870

  
871
                // ?v???O???X?o?[??MAX??K????10???Z?b?g????
783 872
                prgber.Maximum = 10;
784
                prgber.Value = 0;
785 873

  
786 874
                StringBuilder strSQL = new StringBuilder();
787 875
                // SQL??
......
1000 1088
                dgv.ResumeLayout();
1001 1089

  
1002 1090
                // ProgressBar??l???X????
1003
                prgber.Value = prgber.Maximum;
1004
                prgber.Update();
1005
                prgber.Visible = false;
1091
                DisplayControlProgressBar(false);
1006 1092
            }
1007 1093
        }
1008 1094
        #endregion
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSerarch/FrmConstrSerarchAux.cs
169 169
                // ステータスでの検索条件を追加する
170 170
                strSQL.Append(CreateStatusSQL(CreateStatusList()));
171 171
                
172
                // メニューの見積り系は追加処理
172
                // その他SQLの条件追加処理
173 173
                strSQL.Append(CreateOhterSQL());
174 174

  
175 175
                strSQL.Append(" Group By DATE_FORMAT(Base.EstimatesSubmittedDate, '%Y%m')");
......
206 206
        }
207 207
        #endregion
208 208

  
209
        #region その他の処理SQL作成
209
        #region その他SQLの条件追加処理
210 210
        /// <summary>
211
        /// その他の処理SQL作成
211
        /// その他SQLの条件追加処理
212 212
        /// </summary>
213 213
        /// <returns></returns>
214 214
        private string CreateOhterSQL()
......
216 216
            StringBuilder strSQL = new StringBuilder();
217 217
            try
218 218
            {
219
                // メニューの見積り系は追加処理
220 219
                switch (m_ProcessNo)
221 220
                {
222 221
                    case (int)ClsExcute.ProcessExecuteNo.MainMenu:
223
                        int EstType = -1;
224
                        switch (m_ProcessTabCnt)
225
                        {
226
                            case (int)FrmMenu.TabNameEnum.Tenders:
227
                                // 入札案件一覧情報表示
228
                                EstType = (int)ConstructionBaseInfo.EstimateTypeDef.Didding;
229
                                break;
230
                            case (int)FrmMenu.TabNameEnum.BudgetUpProjects:
231
                                // 予算取り案件一覧情報表示
232
                                EstType = (int)ConstructionBaseInfo.EstimateTypeDef.GetBudget;
233
                                break;
234
                            case (int)FrmMenu.TabNameEnum.SalesInProjects:
235
                                // 工事案件一覧情報表示
236
                                EstType = (int)ConstructionBaseInfo.EstimateTypeDef.Normal;
237
                                break;
238
                            default:
239
                                break;
240
                        }
241
                        if (EstType > 0) strSQL.AppendFormat(" And EstimateType = {0}", EstType);
222
                        // メニュー見積り系条件追加SQL
223
                        OhterSQLMenu(ref strSQL);
242 224
                        break;
243 225
                    default:
244 226
                        break;
......
254 236
        }
255 237
        #endregion
256 238

  
239
        #region メニュー見積り系条件追加SQL
240
        /// <summary>
241
        /// メニュー見積り系条件追加SQL
242
        /// </summary>
243
        /// <param name="strSQL"></param>
244
        private void OhterSQLMenu(ref StringBuilder strSQL)
245
        {
246
            try
247
            {
248
                // メニューの見積り系は追加処理
249
                int EstType = -1;
250
                switch (m_ProcessTabCnt)
251
                {
252
                    case (int)FrmMenu.TabNameEnum.Tenders:
253
                        // 入札案件一覧情報表示
254
                        EstType = (int)ConstructionBaseInfo.EstimateTypeDef.Didding;
255
                        break;
256
                    case (int)FrmMenu.TabNameEnum.BudgetUpProjects:
257
                        // 予算取り案件一覧情報表示
258
                        EstType = (int)ConstructionBaseInfo.EstimateTypeDef.GetBudget;
259
                        break;
260
                    case (int)FrmMenu.TabNameEnum.SalesInProjects:
261
                        // 工事案件一覧情報表示
262
                        EstType = (int)ConstructionBaseInfo.EstimateTypeDef.Normal;
263
                        break;
264
                    default:
265
                        break;
266
                }
267
                if (EstType < 1) return;
268

  
269
                strSQL.AppendFormat(" And Base.EstimateType = {0}", EstType);
270
            }
271
            catch (Exception ex)
272
            {
273
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(), ex.Message, strSQL);
274
            }
275
        }
276
        #endregion
277

  
257 278
        #region ステータス選択SQL作成
258 279
        /// <summary>
259 280
        /// ステータス選択SQL作成
......
281 302
                                strSQL.AppendFormat(" AND Base.ConstructionStatusFlg < {0})", StatusList[1]);
282 303
                                break;
283 304
                            default:
284
                                strSQL.Append(" And (ConstructionStatusFlg In (");
305
                                strSQL.Append(" And (Base.ConstructionStatusFlg In (");
285 306

  
286 307
                                for (int i = 0; i < StatusList.Count; i++)
287 308
                                {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmNewOrContinueCopy.cs
677 677
        private bool SetcmbPersons()
678 678
        {
679 679
            IOMPersonInCharge picDB = new IOMPersonInCharge();
680
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
680
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
681 681
            try
682 682
            {
683 683
                cmbSalesPerson.DataSource = null;
......
1232 1232
                // データセット
1233 1233
                ConstructionProgressDate Rec = new ConstructionProgressDate();
1234 1234
                Rec.ConstructionCode = ConstructionCode;
1235
                Rec.ConstructionStatusFlg = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("依頼受け中")).Key; ;
1235
                Rec.ConstructionStatusFlg = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("依頼受け中")).Key;
1236 1236
                Rec.PreviousStatusFlg = 0;
1237 1237
                Rec.ChangeDate = DateTime.Now;
1238 1238
                Rec.ChangePersonCode = CommonMotions.LoginUserData.PersonCode;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs
701 701
            try
702 702
            {
703 703
                // 工事番号・名称取得
704
                string strSQL = BaseDetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); ;
704
                string strSQL = BaseDetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
705 705
                ConstructionBaseInfoDetail BaseDetailRec = new ConstructionBaseInfoDetail();
706 706
                if (!BaseDetailDB.SelectAction(strSQL, ref BaseDetailRec)) return false;
707 707
                
......
2222 2222
                string Quantity = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn3.Quantity].Value);
2223 2223
                // 資材名・数量が無い場合は登録しない
2224 2224
                if (FeildEmptyCheck(Materials, Quantity)) return true;
2225
                //if (Materials.Length == 0 && Quantity.Length == 0) return true; ;
2225
                //if (Materials.Length == 0 && Quantity.Length == 0) return true;
2226 2226

  
2227 2227
                bool bRet = true;
2228 2228
                bool bAns = true;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs
613 613

  
614 614
                dgvAllDisplay.Rows[iAddLine].Cells[(int)DispGridColumn.GroupCount].Value = GroupFlg;
615 615
                dgvAllDisplay.Rows[iAddLine].Cells[(int)DispGridColumn.EstimatePrice].Value = EstimatePrice.ToString("#,0");
616
                dgvAllDisplay.Rows[iAddLine].Cells[(int)DispGridColumn.NegotiationPrice].Value = NegotiationPrice.ToString("#,0"); ;
616
                dgvAllDisplay.Rows[iAddLine].Cells[(int)DispGridColumn.NegotiationPrice].Value = NegotiationPrice.ToString("#,0");
617 617
                dgvAllDisplay.Rows[iAddLine].Cells[(int)DispGridColumn.FirstString].Value = TotalName;
618 618
                dgvAllDisplay.Rows[iAddLine].Cells[(int)DispGridColumn.TotalFlg].Value = TotalType;
619 619

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs
228 228
        {
229 229
            try
230 230
            {
231
                StringBuilder strRet = new StringBuilder(); ;
231
                StringBuilder strRet = new StringBuilder();
232 232

  
233 233
                int DepartmentCode = GetDepartmentCode();
234 234
                if (DepartmentCode == 0) return strRet.ToString();
......
1034 1034
                // ????????
1035 1035
                strSQL.AppendFormat(" WHERE LEDGERFLG = {0}", (int)PersonInChargeMaster.LedgerDivNoDef.CalcTarget);
1036 1036
                strSQL.Append(" AND (DEPARTMENTCODE");
1037
                StringBuilder strSubSQL = new StringBuilder(); ;
1037
                StringBuilder strSubSQL = new StringBuilder();
1038 1038
                if (DepartmentCode == 0)
1039 1039
                {
1040 1040
                    // ?Q??????}?X?^????????
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/CreateNewTabPage.cs
1080 1080
                NewPage.PageTextBox.Location = new System.Drawing.Point(1180, 8);
1081 1081
                NewPage.PageTextBox.Name = string.Format("NewPagePageTextBox{0}", PageCount);
1082 1082
                NewPage.PageTextBox.Size = new System.Drawing.Size(114, 23);
1083
                NewPage.PageTextBox.TextAlign = HorizontalAlignment.Right; ;
1083
                NewPage.PageTextBox.TextAlign = HorizontalAlignment.Right;
1084 1084
                NewPage.PageTextBox.TabIndex = 0;
1085 1085
                NewPage.PageTextBox.Enter += new System.EventHandler(this.txtBoxS001_Enter);
1086 1086
                NewPage.PageTextBox.TextChanged += new System.EventHandler(this.txtBox_TextChanged);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmPurchaseOrderEntryAuxiliary.cs
2648 2648
        private bool SetInitcmbPersonInCharge(PurchaseOrderInputPage inputpage)
2649 2649
        {
2650 2650
            IOMPersonInCharge picDB = new IOMPersonInCharge();
2651
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
2651
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
2652 2652
            try
2653 2653
            {
2654 2654
                // 担当者マスタを検索する
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseStatusInput/FrmPurchaseStatusInputAuxiliary.cs
382 382
                    if (CommonMotions.cnvString(wrkRow.Cells[(int)DispColumn.CompanyName].Value).Length == 0) continue;
383 383

  
384 384
                    // ?X?????`?F?b?N
385
                    bAns = true; ;
385
                    bAns = true;
386 386
                    workCell = CommonMotions.cnvString(wrkRow.Cells[(int)DispColumn.MailingDate].Value);
387 387
                    if (workCell.Length != 0)
388 388
                    {
......
393 393
                    bRet &= bAns;
394 394

  
395 395
                    // ??????`?F?b?N
396
                    bAns = true; ;
396
                    bAns = true;
397 397
                    workCell = CommonMotions.cnvString(wrkRow.Cells[(int)DispColumn.ReturnDate].Value);
398 398
                    if (workCell.Length != 0)
399 399
                    {
......
404 404
                    bRet &= bAns;
405 405

  
406 406
                    // ????m?F???`?F?b?N
407
                    bAns = true; ;
407
                    bAns = true;
408 408
                    workCell = CommonMotions.cnvString(wrkRow.Cells[(int)DispColumn.ReturnCheckDate].Value);
409 409
                    if (workCell.Length != 0)
410 410
                    {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs
536 536
            {
537 537
                foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) wrkCol.SortMode = DataGridViewColumnSortMode.NotSortable;
538 538
                dgvMaster.Rows.Clear();
539
                StringBuilder strSQL = new StringBuilder(); ;
539
                StringBuilder strSQL = new StringBuilder();
540 540
                // SQL??
541 541
                CreateInitSQL(ref strSQL);
542 542
                ArrayList arData = new ArrayList();
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmEntryDeposit.cs
607 607
                   (tcol == (int)DispColumn.depositAmountBill))                // 入金金額(手形)
608 608
                {
609 609
                    // カンマは一旦削除して文字列を取得
610
                    string str = e.FormattedValue.ToString().Replace(",", string.Empty); ;
610
                    string str = e.FormattedValue.ToString().Replace(",", string.Empty);
611 611

  
612 612
                    // 不要な空白は削除
613 613
                    str.Trim();
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.cs
693 693
            if (nType == (int)EditType.Amount)
694 694
            {
695 695
                // カンマは一旦削除して文字列を取得
696
                string str = e.FormattedValue.ToString().Replace(",", string.Empty); ;
696
                string str = e.FormattedValue.ToString().Replace(",", string.Empty);
697 697

  
698 698
                // 不要な空白は削除
699 699
                str.Trim();
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs
2175 2175
               (tcol == (int)DispColumn.DifferentAmount))                   // 次回繰越
2176 2176
            {
2177 2177
                // カンマは一旦削除して文字列を取得
2178
                string str = e.FormattedValue.ToString().Replace(",", string.Empty); ;
2178
                string str = e.FormattedValue.ToString().Replace(",", string.Empty);
2179 2179

  
2180 2180
                // 不要な空白は削除
2181 2181
                str.Trim();
branches/src/ProcessManagement/ProcessManagement/Forms/Master/AlwaysEmployment/AlwaysEmployment.cs
688 688
                // 担当者マスタ取得SQL
689 689
                string strSql = string.Format(" Where EmployeeClassFlg = {0} And DeleteFlg = 0 Order By DisplayOrder ASC", (int)PersonInChargeMaster.EmployeeClassFlgDef.OutSource);
690 690
                // グリッドの行を0に戻す
691
                dgvMaster.Rows.Clear(); ;
691
                dgvMaster.Rows.Clear();
692 692
                // 担当者マスタ取得
693 693
                if (!picDB.SelectAction(strSql, ref pic)) return false;
694 694

  
branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs
257 257
                strSql.AppendFormat(" And DeleteFlg = {0}", Delflg);
258 258
                strSql.Append(" Order By DisplayOrder ASC");
259 259
                // グリッドの行を0に戻す
260
                dgvMaster.Rows.Clear(); ;
260
                dgvMaster.Rows.Clear();
261 261
                // 担当者マスタ取得
262 262
                if (!picDB.SelectAction(strSql.ToString(), ref pic)) return false;
263 263

  
branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractor.cs
897 897
                if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
898 898

  
899 899
                // 支払区分検索条件取得
900
                string ThirdSQL = GetSqlFromcmbLabour(); ;
900
                string ThirdSQL = GetSqlFromcmbLabour();
901 901
                if (ThirdSQL.Length != 0) strSQL += string.Format("{0} {1}", s_SQLAND, ThirdSQL);
902 902

  
903 903
                strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
......
939 939
                if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
940 940

  
941 941
                // 支払区分検索条件取得
942
                string ThirdSQL = GetSqlFromcmbLabour(); ;
942
                string ThirdSQL = GetSqlFromcmbLabour();
943 943
                if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL);
944 944

  
945 945
                strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
......
981 981
                if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND,SecondSQL);
982 982

  
983 983
                // 50音検索条件取得
984
                string ThirdSQL = GetSqlFromcmbJapaneseSyllabary(); ;
984
                string ThirdSQL = GetSqlFromcmbJapaneseSyllabary();
985 985
                if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL);
986 986

  
987 987
                strSQL += string.Format("{0} DeleteFlg = 0 Order By labourKind DESC, DisplayOrder ASC", s_SQLAND);
branches/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractorAuxiliary.cs
180 180
        {
181 181
            try
182 182
            {
183
                int Value = CommonMotions.cnvInt(cmbLabour.SelectedValue);
183
                int Value = -1;
184
                if (!CommonMotions.chkObjectIsNull(cmbLabour.SelectedValue))
185
                    Value = CommonMotions.cnvInt(cmbLabour.SelectedValue);
184 186
                if (Value < 0) return string.Empty;
185 187

  
186 188
                return string.Format("labourKind = {0}", CommonMotions.cnvInt(cmbLabour.SelectedValue));
......
1041 1043
            IOMSubContractorItem itemDB = new IOMSubContractorItem();
1042 1044
            try
1043 1045
            {
1046
                cmbItemType.DataSource = null;
1047
                cmbItemType.Items.Clear();
1048
                cmbItemType.Text = "";
1049

  
1044 1050
                List<SubContractorItemMaster> itemList = new List<SubContractorItemMaster>();
1045 1051

  
1046 1052
                string strSQL = " Order By DisplayOrder";
......
1079 1085
            IOMSubContractor sbDB = new IOMSubContractor();
1080 1086
            try
1081 1087
            {
1088
                cmbJapaneseSyllabary.DataSource = null;
1089
                cmbJapaneseSyllabary.Items.Clear();
1090
                cmbJapaneseSyllabary.Text = "";
1091

  
1082 1092
                string strSQL = "Select Distinct JapaneseSyllabary From SubContractorMaster WHERE DELETEFLG = 0 Order By JapaneseSyllabary";
1083 1093
                ArrayList arData = new ArrayList();
1084 1094
                if (!sbDB.ExecuteReader(strSQL, ref arData)) return;
......
1114 1124
        {
1115 1125
            try
1116 1126
            {
1127
                cmbLabour.DataSource = null;
1128
                cmbLabour.Items.Clear();
1129
                cmbLabour.Text = "";
1117 1130

  
1118 1131
                // データセット
1119 1132
                List<KeyValuePair<int, string>> DataList = new List<KeyValuePair<int, string>>();
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmMessageBoardWriter.cs
521 521
        private bool SetlstPersonInCharge()
522 522
        {
523 523
            IOMPersonInCharge picDB = new IOMPersonInCharge();
524
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>(); ;
524
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
525 525
            IOMDepartment dmDB = new IOMDepartment();
526 526
            List<DepartmentMaster> dmList = new List<DepartmentMaster>();
527 527
            try
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmSubconstractorDiag.cs
537 537
                if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
538 538

  
539 539
                // 支払区分検索条件取得
540
                string ThirdSQL = GetSqlFromcmbLabour(); ;
540
                string ThirdSQL = GetSqlFromcmbLabour();
541 541
                if (ThirdSQL.Length != 0) strSQL += string.Format("{0} {1}", s_SQLAND, ThirdSQL);
542 542

  
543 543
                strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
......
604 604
                //if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
605 605

  
606 606
                //// 50音検索条件取得
607
                //string ThirdSQL = GetSqlFromcmbJapaneseSyllabary(); ;
607
                //string ThirdSQL = GetSqlFromcmbJapaneseSyllabary();
608 608
                //if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL);
609 609

  
610 610
                //strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
......
671 671
                if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
672 672

  
673 673
                // 支払区分検索条件取得
674
                string ThirdSQL = GetSqlFromcmbLabour(); ;
674
                string ThirdSQL = GetSqlFromcmbLabour();
675 675
                if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL);
676 676

  
677 677
                strSQL += string.Format("{0} DeleteFlg = 0 Order By DisplayOrder ASC", s_SQLAND);
......
1274 1274
            if (SecondSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, SecondSQL);
1275 1275

  
1276 1276
            // 50音検索条件取得
1277
            string ThirdSQL = GetSqlFromcmbJapaneseSyllabary(); ;
1277
            string ThirdSQL = GetSqlFromcmbJapaneseSyllabary();
1278 1278
            if (ThirdSQL.Length != 0) strSQL += string.Format(" {0} {1}", s_SQLAND, ThirdSQL);
1279 1279

  
1280 1280
            strSQL += string.Format("{0} DeleteFlg = 0 Order By labourKind DESC, DisplayOrder ASC", s_SQLAND);
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmVehicleCalendar.cs
259 259
                string arrayName = lblName.Name;
260 260
                string compere = FixLableName[0];
261 261
                int ArrayCnt = 0;
262
                bool ampm = false; ;
262
                bool ampm = false;
263 263
                // 午前の表示
264 264
                if (arrayName.Contains(FixLableName[0])) 
265 265
                {
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
4471 4471
                int BillComp = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("請求完了")).Key;
4472 4472
                // ----- SQL作成
4473 4473
                // 増減工事の増減分を取得する
4474
                StringBuilder strSQL1 = new StringBuilder(); ;
4474
                StringBuilder strSQL1 = new StringBuilder();
4475 4475
                strSQL1.Append("(SELECT A.ConstructionCode, A.ConstructionPeriod, B.DETAILNO, B.DETAILSTRING, A.ConstructionStatusFlg,");
4476 4476
                strSQL1.Append(" A.EstimatesSubmitDeadline, C.PERSONNAME, D.PERSONNAME, E.PERSONNAME, F.PERSONNAME, D.DepartmentCode,");
4477 4477
                strSQL1.Append(" G.APPROVALCODE, IFNULL(G.APPROVALSTATUS, -1), TRUNCATE(A.ConstructionCode / 100, 0), MOD(A.ConstructionCode ,100), A.*");
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.0.78")]
36
[assembly: AssemblyFileVersion("1.0.0.78")]
35
[assembly: AssemblyVersion("1.0.0.79")]
36
[assembly: AssemblyFileVersion("1.0.0.79")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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