プロジェクト

全般

プロフィール

リビジョン 481

堀内ほぼ5年前に追加

請求処理:工事台帳への書込みタイミングを承認時から書込み時へ変更

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs
65 65

  
66 66
                    case (int)ClsExcute.ApprovalListNo.OrderRequestApproval:
67 67
                        //  請求承認を承認時に工事詳細台帳請求金額セットする
68
                        CaretaBillingLedgerData();
68
                        //CaretaBillingLedgerData();
69 69
                        break;
70 70

  
71 71
                    case (int)ClsExcute.ApprovalListNo.SafetyPatrolApproval:
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqBillingStatInput/FrmBillingStatInput.designer.cs
150 150
            this.label7.Name = "label7";
151 151
            this.label7.Size = new System.Drawing.Size(114, 25);
152 152
            this.label7.TabIndex = 39;
153
            this.label7.Text = "郵 送 日";
153
            this.label7.Text = "提 出 日";
154 154
            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
155 155
            // 
156 156
            // label2
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatus.designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = 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.btnEnd = new System.Windows.Forms.Button();
45 45
            this.label1 = new System.Windows.Forms.Label();
46 46
            this.btnDataUpDate = new System.Windows.Forms.Button();
......
57 57
            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
58 58
            this.label2 = new System.Windows.Forms.Label();
59 59
            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
60
            this.btnHelp = new System.Windows.Forms.Button();
60 61
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61 62
            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
62 63
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
70 71
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
71 72
            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
72 73
            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
73
            this.btnHelp = new System.Windows.Forms.Button();
74 74
            this.groupBox1.SuspendLayout();
75 75
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
76 76
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
......
282 282
            this.dgvMaster.AllowUserToDeleteRows = false;
283 283
            this.dgvMaster.AllowUserToResizeColumns = false;
284 284
            this.dgvMaster.AllowUserToResizeRows = false;
285
            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
286
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
285
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
286
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
287 287
            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
288 288
            | System.Windows.Forms.AnchorStyles.Left) 
289 289
            | System.Windows.Forms.AnchorStyles.Right)));
290 290
            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
291 291
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
292
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
293
            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
294
            dataGridViewCellStyle15.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
295
            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
296
            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
297
            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
298
            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
299
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
292
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
293
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
294
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
295
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
296
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
297
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
298
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
299
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
300 300
            this.dgvMaster.ColumnHeadersHeight = 24;
301 301
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
302 302
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
313 313
            this.Column5,
314 314
            this.Column13,
315 315
            this.Column11});
316
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
317
            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;
318
            dataGridViewCellStyle26.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
319
            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText;
320
            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
321
            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
322
            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
323
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle26;
316
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
317
            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
318
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
319
            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
320
            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
321
            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
322
            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
323
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
324 324
            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
325 325
            this.dgvMaster.EnableHeadersVisualStyles = false;
326 326
            this.dgvMaster.Location = new System.Drawing.Point(8, 101);
......
337 337
            this.dgvMaster.SelectionChanged += new System.EventHandler(this.dgvMaster_SelectionChanged);
338 338
            this.dgvMaster.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvMaster_MouseUp);
339 339
            // 
340
            // btnHelp
341
            // 
342
            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
343
            this.btnHelp.BackColor = System.Drawing.Color.Black;
344
            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
345
            this.btnHelp.ForeColor = System.Drawing.Color.White;
346
            this.btnHelp.Location = new System.Drawing.Point(1249, 0);
347
            this.btnHelp.Name = "btnHelp";
348
            this.btnHelp.Size = new System.Drawing.Size(30, 30);
349
            this.btnHelp.TabIndex = 116;
350
            this.btnHelp.TabStop = false;
351
            this.btnHelp.Text = "?";
352
            this.btnHelp.UseVisualStyleBackColor = false;
353
            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
354
            // 
340 355
            // Column1
341 356
            // 
342
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
343
            this.Column1.DefaultCellStyle = dataGridViewCellStyle16;
357
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
358
            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
344 359
            this.Column1.HeaderText = "№";
345 360
            this.Column1.Name = "Column1";
346 361
            this.Column1.ReadOnly = true;
......
350 365
            // 
351 366
            // Column12
352 367
            // 
353
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
354
            this.Column12.DefaultCellStyle = dataGridViewCellStyle17;
368
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
369
            this.Column12.DefaultCellStyle = dataGridViewCellStyle4;
355 370
            this.Column12.HeaderText = "請求月";
356 371
            this.Column12.Name = "Column12";
357 372
            this.Column12.ReadOnly = true;
......
361 376
            // 
362 377
            // Column8
363 378
            // 
364
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
365
            dataGridViewCellStyle18.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
366
            this.Column8.DefaultCellStyle = dataGridViewCellStyle18;
379
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
380
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
381
            this.Column8.DefaultCellStyle = dataGridViewCellStyle5;
367 382
            this.Column8.HeaderText = "発 給 日";
368 383
            this.Column8.Name = "Column8";
369 384
            this.Column8.ReadOnly = true;
......
373 388
            // 
374 389
            // Column10
375 390
            // 
376
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
377
            this.Column10.DefaultCellStyle = dataGridViewCellStyle19;
391
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
392
            this.Column10.DefaultCellStyle = dataGridViewCellStyle6;
378 393
            this.Column10.HeaderText = "部  署";
379 394
            this.Column10.Name = "Column10";
380 395
            this.Column10.ReadOnly = true;
......
384 399
            // 
385 400
            // Column6
386 401
            // 
387
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
388
            this.Column6.DefaultCellStyle = dataGridViewCellStyle20;
402
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
403
            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
389 404
            this.Column6.HeaderText = "担 当 者";
390 405
            this.Column6.Name = "Column6";
391 406
            this.Column6.ReadOnly = true;
......
396 411
            // 
397 412
            // Column4
398 413
            // 
399
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
400
            this.Column4.DefaultCellStyle = dataGridViewCellStyle21;
414
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
415
            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
401 416
            this.Column4.HeaderText = "宛 名";
402 417
            this.Column4.Name = "Column4";
403 418
            this.Column4.ReadOnly = true;
......
416 431
            // 
417 432
            // Column3
418 433
            // 
419
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
420
            dataGridViewCellStyle22.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
421
            this.Column3.DefaultCellStyle = dataGridViewCellStyle22;
434
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
435
            dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
436
            this.Column3.DefaultCellStyle = dataGridViewCellStyle9;
422 437
            this.Column3.HeaderText = "請求金額";
423 438
            this.Column3.Name = "Column3";
424 439
            this.Column3.ReadOnly = true;
......
428 443
            // 
429 444
            // Column2
430 445
            // 
431
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
432
            this.Column2.DefaultCellStyle = dataGridViewCellStyle23;
446
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
447
            this.Column2.DefaultCellStyle = dataGridViewCellStyle10;
433 448
            this.Column2.HeaderText = "工事コード";
434 449
            this.Column2.Name = "Column2";
435 450
            this.Column2.ReadOnly = true;
......
440 455
            // 
441 456
            // Column9
442 457
            // 
443
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
444
            dataGridViewCellStyle24.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
445
            this.Column9.DefaultCellStyle = dataGridViewCellStyle24;
458
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
459
            dataGridViewCellStyle11.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
460
            this.Column9.DefaultCellStyle = dataGridViewCellStyle11;
446 461
            this.Column9.HeaderText = "請求承認日";
447 462
            this.Column9.Name = "Column9";
448 463
            this.Column9.ReadOnly = true;
......
453 468
            // 
454 469
            // Column5
455 470
            // 
456
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
457
            dataGridViewCellStyle25.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
458
            this.Column5.DefaultCellStyle = dataGridViewCellStyle25;
459
            this.Column5.HeaderText = "郵 送 日";
471
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
472
            dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
473
            this.Column5.DefaultCellStyle = dataGridViewCellStyle12;
474
            this.Column5.HeaderText = "提 出 日";
460 475
            this.Column5.Name = "Column5";
461 476
            this.Column5.ReadOnly = true;
462 477
            this.Column5.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
482 497
            this.Column11.Visible = false;
483 498
            this.Column11.Width = 160;
484 499
            // 
485
            // btnHelp
486
            // 
487
            this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
488
            this.btnHelp.BackColor = System.Drawing.Color.Black;
489
            this.btnHelp.Font = new System.Drawing.Font("MS UI Gothic", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
490
            this.btnHelp.ForeColor = System.Drawing.Color.White;
491
            this.btnHelp.Location = new System.Drawing.Point(1249, 0);
492
            this.btnHelp.Name = "btnHelp";
493
            this.btnHelp.Size = new System.Drawing.Size(30, 30);
494
            this.btnHelp.TabIndex = 116;
495
            this.btnHelp.TabStop = false;
496
            this.btnHelp.Text = "?";
497
            this.btnHelp.UseVisualStyleBackColor = false;
498
            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
499
            // 
500 500
            // FrmReqBillingStatus
501 501
            // 
502 502
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
549 549
        private System.Windows.Forms.RadioButton radioButton2;
550 550
        private System.Windows.Forms.RadioButton radioButton1;
551 551
        private System.Windows.Forms.Label lblCellTotal;
552
        private System.Windows.Forms.Button btnHelp;
552 553
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
553 554
        private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
554 555
        private System.Windows.Forms.DataGridViewTextBoxColumn Column8;
......
562 563
        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
563 564
        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
564 565
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
565
        private System.Windows.Forms.Button btnHelp;
566 566
    }
567 567
}
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.cs
643 643
                 }
644 644
                return;
645 645
            }
646
            m_bDirty = true;
646 647
        }
647 648
        #endregion
648 649

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInputAuxiliary.cs
1390 1390
                                                                    .Sum(y => CommonMotions.cnvLong(y.Cells[nCol].Value));
1391 1391

  
1392 1392
                // 請求金額有は正常終了
1393
                if (lTotal > 0) return true;
1393
                //if (lTotal > 0) return true;
1394 1394

  
1395
                // 請求金額0以下はエラー
1396
                for (int i = ((int)HeaderRowIndex.BillingDate + 1); i < dgv.RowCount; i++)
1397
                {
1398
                    DataGridViewRow CurRow = dgv.Rows[i];
1395
                //// 請求金額0以下はエラー
1396
                //for (int i = ((int)HeaderRowIndex.BillingDate + 1); i < dgv.RowCount; i++)
1397
                //{
1398
                //    DataGridViewRow CurRow = dgv.Rows[i];
1399 1399

  
1400
                    int nDgvKind = CommonMotions.cnvInt(CurRow.Cells[(int)ColumnName1.DgvKind].Value);
1401
                    if (nDgvKind == (int)dgvKind.Header || nDgvKind == (int)dgvKind.Footer) continue;
1400
                //    int nDgvKind = CommonMotions.cnvInt(CurRow.Cells[(int)ColumnName1.DgvKind].Value);
1401
                //    if (nDgvKind == (int)dgvKind.Header || nDgvKind == (int)dgvKind.Footer) continue;
1402 1402

  
1403
                    CurRow.Cells[nCol].Style.BackColor = Color.Red;
1404
                }
1403
                //    CurRow.Cells[nCol].Style.BackColor = Color.Red;
1404
                //}
1405 1405

  
1406
                ShowMessageBox("請求金額を入力してください。", "入力エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
1407
                return false;
1406
                //ShowMessageBox("請求金額を入力してください。", "入力エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
1407
                //return false;
1408 1408

  
1409
                return true;
1409 1410
            }
1410 1411
            catch (Exception ex)
1411 1412
            {
......
2564 2565
                        SetAmount((int)ColumnName1.ConstrAmount, trow, lAmount);
2565 2566

  
2566 2567
                        // 消費税
2567
                        lAmount = 0;
2568
                        for (int i = 0; i < m_nMaxOrderNo; i++)
2569
                        {
2570
                            Dictionary<int, List<RequestDataDetail>> dic = m_lstRequestDataDetail[i];
2568
                        //lAmount = 0;
2569
                        //for (int i = 0; i < m_nMaxOrderNo; i++)
2570
                        //{
2571
                        //    Dictionary<int, List<RequestDataDetail>> dic = m_lstRequestDataDetail[i];
2571 2572

  
2572
                            if (dic.TryGetValue(ReqDetail.ConstructionCode, out List<RequestDataDetail> wrklst))
2573
                            {
2574
                                if (dic == null) break;
2575
                                lAmount += wrklst.Sum(y => y.TaxAmount);
2576
                            }
2577
                        }
2578
                        if (lAmount == 0)
2573
                        //    if (dic.TryGetValue(ReqDetail.ConstructionCode, out List<RequestDataDetail> wrklst))
2574
                        //    {
2575
                        //        if (dic == null) break;
2576
                        //        lAmount += wrklst.Sum(y => y.TaxAmount);
2577
                        //    }
2578
                        //}
2579
                        //if (lAmount == 0)
2579 2580
                            lAmount = (long)inf.OrdersDecisionPriceInTax - (long)inf.OrdersDecisionPrice;
2580 2581
                        SetAmount((int)ColumnName1.ConstrAmount, trow + 1, lAmount);
2581 2582

  
......
3626 3627
            IORequestHead ioReqHead = new IORequestHead();
3627 3628
            IORequestData ioReqData = new IORequestData();
3628 3629
            IORequestDataDetail ioReqDetail = new IORequestDataDetail();
3630
            IOConstructionLedgerExcute ioLedger = new IOConstructionLedgerExcute();
3629 3631

  
3630 3632
            ioReqHead.connect(); ioReqHead.beginTran();
3631 3633
            ioReqData.connect(); ioReqData.beginTran();
3632 3634
            ioReqDetail.connect(); ioReqDetail.beginTran();
3635
            ioLedger.connect(); ioLedger.beginTran();
3633 3636

  
3634
            RequestHead ReqHead = m_lstRequestHead[m_nMaxOrderNo - 1];
3637
             RequestHead ReqHead = m_lstRequestHead[m_nMaxOrderNo - 1];
3635 3638

  
3636 3639
            bool bRet = true;
3637 3640
            try
......
3782 3785
                    return bRet;
3783 3786
                }
3784 3787

  
3788
                // 台帳金額加算
3789
                if(!UpdateLedger(ioLedger, ioReqHead))
3790
                {
3791
                    MessageBox.Show("工事台帳更新エラー"
3792
                                    , "登録エラー"
3793
                                    , MessageBoxButtons.OK
3794
                                    , MessageBoxIcon.Error);
3795
                    bRet = false;
3796
                    return bRet;
3797
                }
3798

  
3785 3799
                // コミット
3786 3800
                ioReqHead.commit();
3787 3801
                ioReqData.commit();
3788 3802
                ioReqDetail.commit();
3803
                ioLedger.commit();
3789 3804

  
3790 3805
                return true;
3791 3806
            }
......
3801 3816
                    ioReqHead.rollback();
3802 3817
                    ioReqData.rollback();
3803 3818
                    ioReqDetail.rollback();
3819
                    ioLedger.rollback();
3804 3820
                }
3805 3821

  
3806 3822
                ioReqHead.close(); ioReqHead = null;
3807 3823
                ioReqData.close(); ioReqData = null;
3808 3824
                ioReqDetail.close(); ioReqDetail = null;
3825
                ioLedger.close(); ioLedger = null;
3809 3826
            }
3810 3827
        }
3811 3828
        #endregion
3812 3829

  
3830
        #region 工事台帳更新処理
3831
        /// <summary>
3832
        /// 工事台帳更新処理
3833
        /// </summary>
3834
        /// <param name="ioLedger"></param>
3835
        /// <returns></returns>
3836
        private bool UpdateLedger(IOConstructionLedgerExcute ioLedger, IORequestHead ioReqHead)
3837
        {
3838
            try
3839
            {
3840
                int tcol = m_nMaxOrderNo + (int)ColumnName1.Sum;
3841
                DateTime dtRequest = CommonMotions.cnvDate(dgv1.Rows[(int)HeaderRowIndex.BillingDate].Cells[tcol].Value);
3842
                int ColPoint = ClsChangeLedgerData.CalcTargetMonthToColumn(ioLedger, false, m_ConstructionCode, dtRequest);
3843

  
3844
                StringBuilder strSQL = new StringBuilder();
3845
                strSQL.Append(ioLedger.CreatePrimarykeyString(m_ConstructionCode
3846
                                                                , (int)FrmConstructionLedger.DataGroup.BillingAmount
3847
                                                                , 0
3848
                                                                , ColPoint));
3849
                // 対象データ削除
3850
                ioLedger.DeleteAction(strSQL.ToString(), false);
3851

  
3852
                // 請求金額取得
3853
                strSQL.Clear();
3854
                strSQL.Append("Select");
3855
                strSQL.Append(" SUM(REQUESTAMOUNT)");
3856
                strSQL.Append(" From REQUESTHEAD");
3857
                strSQL.AppendFormat(" Where REQCONSTRUCTIONCODE = {0}", m_ConstructionCode);
3858
                strSQL.AppendFormat(" And REQUESTMONTH = {0}{1}", dtRequest.Year, dtRequest.Month.ToString("00"));
3859
                ArrayList ReqData = new ArrayList();
3860
                if (!ioReqHead.ExecuteReader(strSQL.ToString(), ref ReqData, false)) return false;
3861
                if (ReqData.Count < 1) return false;
3862

  
3863
                object[] objRec = (object[])ReqData[0];
3864
                long lValue = CommonMotions.cnvLong(objRec[0]);
3865
                if (lValue == 0) return true;
3866

  
3867
                ConstructionLedgerExcute DataRec = new ConstructionLedgerExcute();
3868
                DataRec.ConstructionCode = m_ConstructionCode;
3869
                DataRec.GroupCount = (int)FrmConstructionLedger.DataGroup.BillingAmount;
3870
                //DataRec.LineCount
3871
                DataRec.ColumnCount = ColPoint;
3872
                DataRec.PaymentAmount = lValue;
3873
                DataRec.TargetMonth = dtRequest.BeginOfMonth();
3874
                if (!ioLedger.InsertAction(DataRec, false)) return false;
3875

  
3876
                return true;
3877
            }
3878
            catch (Exception ex)
3879
            {
3880
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
3881
                return false;
3882
            }
3883
        }
3884
        #endregion
3885

  
3813 3886
        #region 請求データリストの設定
3814 3887
        /// <summary>
3815 3888
        /// 請求データリストの設定
......
4568 4641
                if (!CheckApprovalOrder()) return false;
4569 4642

  
4570 4643
                // 請求データが無い場合は登録する
4571
                m_bDirty = CheckDataExists();
4644
                //m_bDirty = CheckDataExists();
4572 4645

  
4573
                // データ変更有時はデータ登録
4574
                if (m_bDirty)
4575
                {
4576
                    if (ShowMessageBox("データが保存されます。よろしいでしょうか?"
4577
                                        , "保存確認"
4578
                                        , MessageBoxButtons.YesNo
4579
                                        , MessageBoxIcon.Information) == DialogResult.No)
4580
                    {
4581
                        return false;
4582
                    }
4583
                    // データ保存
4584
                    if (!AcceptData()) return false;
4585
                }
4646
                // データ保存
4647
                if (!AcceptData()) return false;
4586 4648

  
4587 4649
                // 起動番号
4588 4650
                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);

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