プロジェクト

全般

プロフィール

リビジョン 92

山内7年以上前に追加

請求管理(修正分)

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmRegField.cs
82 82
        }
83 83
        #endregion
84 84

  
85
        #region フォーム初期化
85
        #region コンストラクタ
86 86
        /// <summary>
87
        /// フォーム初期化
87
        /// コンストラクタ
88 88
        /// </summary>
89 89
        public FrmRegField()
90 90
        {
......
107 107
        }
108 108
        #endregion
109 109

  
110
        #region キーを作成する
110
        #region キーNoを作成する
111 111
        /// <summary>
112 112
        /// キーを作成する
113 113
        /// </summary>
114
        /// <param name="nSeqNo"></param>
115
        /// <param name="nLineCount"></param>
116
        /// <returns></returns>
114
        /// <param name="nSeqNo">連番</param>
115
        /// <param name="nLineCount">行番号</param>
116
        /// <returns>キーNo(ハッシュテーブル用キー)</returns>
117 117
        private int getKeyNo(int nSeqNo, int nLineCount)
118 118
        {
119 119
            int nKeyNo = nSeqNo * 100 + nLineCount;
......
126 126
        /// <summary>
127 127
        /// 該当工事既存判定
128 128
        /// </summary>
129
        /// <param name="nConstructionCode"></param>
130
        /// <returns></returns>
129
        /// <param name="nConstructionCode">工事番号</param>
130
        /// <returns>判定結果</returns>
131 131
        private bool isExistConstructionRow(int nConstructionCode)
132 132
        {
133 133
            foreach (DataGridViewRow r in m_HtGridRowConstructionCode.Values)
......
146 146
        /// <summary>
147 147
        /// 行を取得
148 148
        /// </summary>
149
        /// <param name="nKeyNo"></param>
150
        /// <returns></returns>
149
        /// <param name="nKeyNo">キーNo</param>
150
        /// <returns>データグリッドビュの対象行</returns>
151 151
        private DataGridViewRow GetConstructionRow(int nKeyNo)
152 152
        {
153 153

  
......
607 607

  
608 608
        #endregion
609 609

  
610
        #region セル編集モード開始
610 611
        /// <summary>
611
        /// CellBeginEdit
612
        /// セルの編集モード開始
612 613
        /// </summary>
613 614
        /// <param name="sender"></param>
614 615
        /// <param name="e"></param>
......
623 624

  
624 625
            }
625 626
        }
627
        #endregion
626 628

  
629
        #region セルフォーマッティング
627 630
        /// <summary>
628
        /// CellFormatting
631
        /// セルフォーマッティング
629 632
        /// </summary>
630 633
        /// <param name="sender"></param>
631 634
        /// <param name="e"></param>
......
659 662
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
660 663
            }
661 664
        }
665
        #endregion
662 666
    }
663 667
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRegField.cs
105 105
        #endregion
106 106

  
107 107
        #region コンストラクタ
108
        // フォーム初期化
108
        /// <summary>
109
        /// コンストラクタ
110
        /// </summary>
109 111
        public FrmSelectRegField()
110 112
        {
111 113
            InitializeComponent();
......
113 115
        #endregion
114 116

  
115 117
        #region フォームロード
116
        // フォームロード
118
        /// <summary>
119
        /// フォームロード
120
        /// </summary>
121
        /// <param name="sender"></param>
122
        /// <param name="e"></param>
117 123
        private void FrmRegField_Load(object sender, EventArgs e)
118 124
        {
119 125
            //フォームサイズ固定
......
128 134
        #endregion
129 135

  
130 136
        #region 現場追加ボタン押下
131
        // 現場追加ボタン押下
137
        /// <summary>
138
        /// 現場追加ボタン押下
139
        /// </summary>
140
        /// <param name="sender"></param>
141
        /// <param name="e"></param>
132 142
        private void btnAdd_Click(object sender, EventArgs e)
133 143
        {
134 144
            try
......
157 167
        #endregion
158 168

  
159 169
        #region 現場削除ボタン押下
160
        // 現場削除ボタン押下
170
        /// <summary>
171
        /// 現場削除ボタン押下
172
        /// </summary>
173
        /// <param name="sender"></param>
174
        /// <param name="e"></param>
161 175
        private void btnDelete_Click(object sender, EventArgs e)
162 176
        {
163 177
            try
......
168 182
                dgv1.CellValueChanged -= dgv1_CellValueChanged;
169 183
                dgv1.SelectionChanged -= dgv1_SelectionChanged;
170 184

  
185
                // ダミー行の削除
186
                RemoveDummyLine();
187

  
171 188
                // 内部データを更新
172 189
                foreach (MyFieldData MyData in m_lstMyField)
173 190
                {
......
190 207
                // 行番号を再付番
191 208
                for (int rowIndex = 2; rowIndex < dgv1.RowCount; rowIndex++)
192 209
                {
193
                    dgv1.Rows[rowIndex].Cells[(int)ColumnIndex.No].Value = rowIndex + 1;
210
                    dgv1.Rows[rowIndex].Cells[(int)ColumnIndex.No].Value = rowIndex - 1;
194 211
                }
195 212

  
213
                // ダミー行追加
214
                AddDummyLine();
215

  
196 216
                // イベントハンドラ再登録
197 217
                dgv1.CellValueChanged += dgv1_CellValueChanged;
198 218
                dgv1.SelectionChanged += dgv1_SelectionChanged;
......
206 226
        #endregion
207 227

  
208 228
        #region 登録ボタン押下
209
        // 登録ボタン押下
229
        /// <summary>
230
        /// 登録ボタン押下
231
        /// </summary>
232
        /// <param name="sender"></param>
233
        /// <param name="e"></param>
210 234
        private void btnAccept_Click(object sender, EventArgs e)
211 235
        {
212 236
            try
......
223 247
        #endregion
224 248

  
225 249
        #region 終了ボタン押下
226
        // 終了ボタン押下
250
        /// <summary>
251
        /// 終了ボタン押下
252
        /// </summary>
253
        /// <param name="sender"></param>
254
        /// <param name="e"></param>
227 255
        private void btnEnd_Click(object sender, EventArgs e)
228 256
        {
229 257
            try
......
239 267
        #endregion
240 268

  
241 269
        #region 一覧選択行変更時処理
242
        // 一覧選択行変更時処理
270
        /// <summary>
271
        /// 一覧選択行変更時処理
272
        /// </summary>
273
        /// <param name="sender"></param>
274
        /// <param name="e"></param>
243 275
        private void dgv1_SelectionChanged(object sender, EventArgs e)
244 276
        {
245 277
            try
......
267 299
        #endregion
268 300

  
269 301
        #region Gridセル値変更時処理
270
        // Gridセル値変更時処理
302
        /// <summary>
303
        /// Gridセル値変更時処理
304
        /// </summary>
305
        /// <param name="sender"></param>
306
        /// <param name="e"></param>
271 307
        private void dgv1_CellValueChanged(object sender, DataGridViewCellEventArgs e)
272 308
        {
273 309
            try
......
300 336
        #endregion
301 337

  
302 338
        #region 発注者名表示
303
        // 発注者名表示
339
        /// <summary>
340
        /// 発注者名表示
341
        /// </summary>
304 342
        private void DispOrdersName()
305 343
        {
306 344
            IOMOrderers IoOm = new IOMOrderers();
......
377 415
        #endregion
378 416

  
379 417
        #region 不明金額の再計算および表示
380
        // 不明金額の再計算および表示
418
        /// <summary>
419
        /// 不明金額の再計算および表示
420
        /// </summary>
381 421
        private void CalcUnknownBillPrice()
382 422
        {
383 423
            try
......
410 450
        #endregion
411 451

  
412 452
        #region 現場一覧表表示
413
        // 現場一覧表表示
453
        /// <summary>
454
        /// 現場一覧表表示
455
        /// </summary>
414 456
        private void ItemListDisplay()
415 457
        {
416 458
            try
......
463 505
                    }
464 506
                }
465 507

  
508
                // ダミー行追加
509
                AddDummyLine();
510

  
466 511
                // 不明の行を追加
467 512
                dgv2.Rows.Add(0, 0, "", "不明", 0);
468 513

  
......
482 527
        #endregion
483 528

  
484 529
        #region 現場登録ダイアログクローズ通知
485
        // 現場登録ダイアログクローズ通知
530
        /// <summary>
531
        /// 現場登録ダイアログクローズ通知
532
        /// </summary>
533
        /// <param name="sender"></param>
534
        /// <param name="e"></param>
486 535
        private void NotifyEditFld_FormClosed(object sender, FormClosedEventArgs e)
487 536
        {
488 537
            FrmSelectRequest f = (FrmSelectRequest)sender;
......
495 544

  
496 545
                if (f.m_lstAddFldData.Count() == 0) return;
497 546

  
547
                // 一旦ダミー行は削除
548
                RemoveDummyLine();
549

  
498 550
                // 現場追加あり
499 551
                foreach(FrmSelectRequest.AddFldData AddInfo in f.m_lstAddFldData)
500 552
                {
......
546 598
                // 不明行を再計算して表示
547 599
                CalcUnknownBillPrice();
548 600

  
601
                // ダミー行追加
602
                AddDummyLine();
603

  
549 604
                // イベントハンドラ再登録
550 605
                dgv1.CellValueChanged += dgv1_CellValueChanged;
551 606
                dgv1.SelectionChanged += dgv1_SelectionChanged;
......
558 613
        }
559 614
        #endregion
560 615

  
616
        #region ダミー行の追加
617
        /// <summary>
618
        /// ダミー行の追加
619
        /// </summary>
620
        private void AddDummyLine()
621
        {
622
            int dgvRowCount = dgv1.Rows.Count;
623

  
624
            // 8行以上あり場合は、ダミー行は不要
625
            if( dgvRowCount > 7){
626
                return ;
627
            }
628

  
629
            // ダミー行を追加
630
            for (int i = 0; i < 8 - dgvRowCount; i++)
631
            {
632
                // ダミー行(読み取り専用だけtrue)
633
                dgv1.Rows.Add("", "", "", "", "", true);
634
            }
635

  
636
            return;
637
        }
638
        #endregion
639

  
640
        #region ダミー行の削除
641
        /// <summary>
642
        /// ダミー行の削除
643
        /// </summary>
644
        private void RemoveDummyLine()
645
        {
646
            int dgvRowCount = dgv1.Rows.Count;
647

  
648
            for (int i = dgvRowCount - 1; i >= 0; i--)
649
            {
650
                // 工事番号列が空の場合
651
                if (dgv1[(int)ColumnIndex.ConstructionCode, i].Value.ToString() == string.Empty)
652
                {
653
                    dgv1.Rows.RemoveAt(i);
654
                }
655
                else
656
                {
657
                    // ダミー行は後ろに配置するのでダミー以外が来たらそれ以前は評価不要
658
                    break;
659
                }                 
660
            }
661
            return;
662
        }
663
        #endregion
664

  
561 665
    }
562 666
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirm.cs
522 522
                ///////////////////////////////////////////////////////////////////////////
523 523

  
524 524
                // 営業期
525
                int iBusinessPeriod = CommonMotions.SystemMasterData.BusinessPeriod;
525
                int minval = 0;
526
                int maxval = 0;
526 527

  
528
                CommonMotions.GetPeriodYear(ref minval, ref maxval);
529

  
527 530
                // 最大営業期(現在の営業期)
528
                numericUpDown2.Maximum = iBusinessPeriod;
531
                numericUpDown2.Maximum = maxval;
529 532
                // 最小営業期(現在の営業期-過去年数)
530
                numericUpDown2.Minimum = iBusinessPeriod - m_TargetPeriod;
533
                numericUpDown2.Minimum = minval;
531 534
                // 初期値は最大営業期
532
                numericUpDown2.Value = iBusinessPeriod;
535
                numericUpDown2.Value = maxval;
533 536

  
534 537

  
535 538
                // 対象月
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.Designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
52
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
53
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
54
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
55
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
56
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
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 dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
52
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
53
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
54
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
55
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
56
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
57 57
            this.label3 = new System.Windows.Forms.Label();
58 58
            this.panel1 = new System.Windows.Forms.Panel();
59
            this.button1 = new System.Windows.Forms.Button();
59 60
            this.btnShow = new System.Windows.Forms.Button();
60 61
            this.cbTargetMonth = new System.Windows.Forms.ComboBox();
61 62
            this.label2 = new System.Windows.Forms.Label();
......
65 66
            this.btnAddFld = new System.Windows.Forms.Button();
66 67
            this.Registration = new System.Windows.Forms.Button();
67 68
            this.btnEnd = new System.Windows.Forms.Button();
68
            this.button1 = new System.Windows.Forms.Button();
69 69
            this.EditStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
70 70
            this.No = new System.Windows.Forms.DataGridViewTextBoxColumn();
71 71
            this.OrderersDivision = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
174 174
            this.panel1.Size = new System.Drawing.Size(1399, 61);
175 175
            this.panel1.TabIndex = 1;
176 176
            // 
177
            // button1
178
            // 
179
            this.button1.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
180
            this.button1.Location = new System.Drawing.Point(850, 23);
181
            this.button1.Name = "button1";
182
            this.button1.Size = new System.Drawing.Size(60, 23);
183
            this.button1.TabIndex = 3;
184
            this.button1.Text = "・・・";
185
            this.button1.UseVisualStyleBackColor = true;
186
            this.button1.Click += new System.EventHandler(this.button1_Click);
187
            // 
177 188
            // btnShow
178 189
            // 
179 190
            this.btnShow.BackColor = System.Drawing.Color.Blue;
......
219 230
            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
220 231
            | System.Windows.Forms.AnchorStyles.Left) 
221 232
            | System.Windows.Forms.AnchorStyles.Right)));
222
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
223
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
224
            dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
225
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
226
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
227
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
228
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
229
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
233
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
234
            dataGridViewCellStyle27.BackColor = System.Drawing.SystemColors.Control;
235
            dataGridViewCellStyle27.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
236
            dataGridViewCellStyle27.ForeColor = System.Drawing.SystemColors.WindowText;
237
            dataGridViewCellStyle27.SelectionBackColor = System.Drawing.SystemColors.Highlight;
238
            dataGridViewCellStyle27.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
239
            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
240
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle27;
230 241
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
231 242
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
232 243
            this.EditStatus,
......
384 395
            this.btnEnd.UseVisualStyleBackColor = false;
385 396
            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
386 397
            // 
387
            // button1
388
            // 
389
            this.button1.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
390
            this.button1.Location = new System.Drawing.Point(850, 23);
391
            this.button1.Name = "button1";
392
            this.button1.Size = new System.Drawing.Size(60, 23);
393
            this.button1.TabIndex = 3;
394
            this.button1.Text = "・・・";
395
            this.button1.UseVisualStyleBackColor = true;
396
            this.button1.Click += new System.EventHandler(this.button1_Click);
397
            // 
398 398
            // EditStatus
399 399
            // 
400
            this.EditStatus.Frozen = true;
400 401
            this.EditStatus.HeaderText = "■編集状態";
401 402
            this.EditStatus.Name = "EditStatus";
402 403
            this.EditStatus.Visible = false;
403 404
            // 
404 405
            // No
405 406
            // 
406
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
407
            this.No.DefaultCellStyle = dataGridViewCellStyle2;
407
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
408
            this.No.DefaultCellStyle = dataGridViewCellStyle28;
409
            this.No.Frozen = true;
408 410
            this.No.HeaderText = "No.";
409 411
            this.No.Name = "No";
410 412
            this.No.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
412 414
            // 
413 415
            // OrderersDivision
414 416
            // 
417
            this.OrderersDivision.Frozen = true;
415 418
            this.OrderersDivision.HeaderText = "■発注者区分";
416 419
            this.OrderersDivision.Name = "OrderersDivision";
417 420
            this.OrderersDivision.Visible = false;
418 421
            // 
419 422
            // OrderersCode
420 423
            // 
424
            this.OrderersCode.Frozen = true;
421 425
            this.OrderersCode.HeaderText = "■発注者コード";
422 426
            this.OrderersCode.Name = "OrderersCode";
423 427
            this.OrderersCode.Visible = false;
424 428
            // 
425 429
            // SeqNo
426 430
            // 
431
            this.SeqNo.Frozen = true;
427 432
            this.SeqNo.HeaderText = "■連番";
428 433
            this.SeqNo.Name = "SeqNo";
429 434
            this.SeqNo.Visible = false;
430 435
            // 
431 436
            // LineCount
432 437
            // 
438
            this.LineCount.Frozen = true;
433 439
            this.LineCount.HeaderText = "■行番号";
434 440
            this.LineCount.Name = "LineCount";
435 441
            this.LineCount.Visible = false;
436 442
            // 
437 443
            // OrderersName
438 444
            // 
445
            this.OrderersName.Frozen = true;
439 446
            this.OrderersName.HeaderText = "請求先名";
440 447
            this.OrderersName.Name = "OrderersName";
441 448
            this.OrderersName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
443 450
            // 
444 451
            // DepositDate
445 452
            // 
446
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
447
            this.DepositDate.DefaultCellStyle = dataGridViewCellStyle3;
453
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
454
            this.DepositDate.DefaultCellStyle = dataGridViewCellStyle29;
455
            this.DepositDate.Frozen = true;
448 456
            this.DepositDate.HeaderText = "入金日";
449 457
            this.DepositDate.Name = "DepositDate";
450 458
            this.DepositDate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
452 460
            // 
453 461
            // DepositAmountCash
454 462
            // 
455
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
456
            this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle4;
463
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
464
            this.DepositAmountCash.DefaultCellStyle = dataGridViewCellStyle30;
465
            this.DepositAmountCash.Frozen = true;
457 466
            this.DepositAmountCash.HeaderText = "入金金額\r\n(振込)";
458 467
            this.DepositAmountCash.Name = "DepositAmountCash";
459 468
            this.DepositAmountCash.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
461 470
            // 
462 471
            // DepositAmountBill
463 472
            // 
464
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
465
            this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle5;
473
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
474
            this.DepositAmountBill.DefaultCellStyle = dataGridViewCellStyle31;
475
            this.DepositAmountBill.Frozen = true;
466 476
            this.DepositAmountBill.HeaderText = "入金金額\r\n(手形)";
467 477
            this.DepositAmountBill.Name = "DepositAmountBill";
468 478
            this.DepositAmountBill.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
470 480
            // 
471 481
            // RequestNo
472 482
            // 
483
            this.RequestNo.Frozen = true;
473 484
            this.RequestNo.HeaderText = "■請求No";
474 485
            this.RequestNo.Name = "RequestNo";
475 486
            this.RequestNo.Visible = false;
476 487
            // 
477 488
            // OrderNo
478 489
            // 
490
            this.OrderNo.Frozen = true;
479 491
            this.OrderNo.HeaderText = "■受付番号";
480 492
            this.OrderNo.Name = "OrderNo";
481 493
            this.OrderNo.Visible = false;
482 494
            // 
483 495
            // ConstructionName
484 496
            // 
497
            this.ConstructionName.Frozen = true;
485 498
            this.ConstructionName.HeaderText = "現場名";
486 499
            this.ConstructionName.Name = "ConstructionName";
487 500
            this.ConstructionName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
495 508
            // 
496 509
            // PaymentSchedule
497 510
            // 
498
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
499
            this.PaymentSchedule.DefaultCellStyle = dataGridViewCellStyle6;
511
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
512
            this.PaymentSchedule.DefaultCellStyle = dataGridViewCellStyle32;
500 513
            this.PaymentSchedule.HeaderText = "入金\r\n予定日";
501 514
            this.PaymentSchedule.Name = "PaymentSchedule";
502 515
            this.PaymentSchedule.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
505 518
            // 
506 519
            // BillCreationDate
507 520
            // 
508
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
509
            this.BillCreationDate.DefaultCellStyle = dataGridViewCellStyle7;
521
            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
522
            this.BillCreationDate.DefaultCellStyle = dataGridViewCellStyle33;
510 523
            this.BillCreationDate.HeaderText = "請求日";
511 524
            this.BillCreationDate.Name = "BillCreationDate";
512 525
            this.BillCreationDate.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
514 527
            // 
515 528
            // BillPrice
516 529
            // 
517
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
518
            this.BillPrice.DefaultCellStyle = dataGridViewCellStyle8;
530
            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
531
            this.BillPrice.DefaultCellStyle = dataGridViewCellStyle34;
519 532
            this.BillPrice.HeaderText = "請求金額\r\n(税抜)";
520 533
            this.BillPrice.Name = "BillPrice";
521 534
            this.BillPrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
523 536
            // 
524 537
            // TaxPrice
525 538
            // 
526
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
527
            this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle9;
539
            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
540
            this.TaxPrice.DefaultCellStyle = dataGridViewCellStyle35;
528 541
            this.TaxPrice.HeaderText = "請求金額\r\n(消費税)";
529 542
            this.TaxPrice.Name = "TaxPrice";
530 543
            this.TaxPrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
532 545
            // 
533 546
            // DepositAmount
534 547
            // 
535
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
536
            this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle10;
548
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
549
            this.DepositAmount.DefaultCellStyle = dataGridViewCellStyle36;
537 550
            this.DepositAmount.HeaderText = "入金金額";
538 551
            this.DepositAmount.Name = "DepositAmount";
539 552
            this.DepositAmount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
541 554
            // 
542 555
            // DiscountAmount
543 556
            // 
544
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
545
            this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle11;
557
            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
558
            this.DiscountAmount.DefaultCellStyle = dataGridViewCellStyle37;
546 559
            this.DiscountAmount.HeaderText = "値引金額";
547 560
            this.DiscountAmount.Name = "DiscountAmount";
548 561
            this.DiscountAmount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
550 563
            // 
551 564
            // CnstrPrice
552 565
            // 
553
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
554
            this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle12;
566
            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
567
            this.CnstrPrice.DefaultCellStyle = dataGridViewCellStyle38;
555 568
            this.CnstrPrice.HeaderText = "協力金";
556 569
            this.CnstrPrice.Name = "CnstrPrice";
557 570
            this.CnstrPrice.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
559 572
            // 
560 573
            // Fees
561 574
            // 
562
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
563
            this.Fees.DefaultCellStyle = dataGridViewCellStyle13;
575
            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
576
            this.Fees.DefaultCellStyle = dataGridViewCellStyle39;
564 577
            this.Fees.HeaderText = "手数料";
565 578
            this.Fees.Name = "Fees";
566 579
            this.Fees.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
568 581
            // 
569 582
            // OtherAdjustments
570 583
            // 
571
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
572
            this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle14;
584
            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
585
            this.OtherAdjustments.DefaultCellStyle = dataGridViewCellStyle40;
573 586
            this.OtherAdjustments.HeaderText = "その他調整";
574 587
            this.OtherAdjustments.Name = "OtherAdjustments";
575 588
            this.OtherAdjustments.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
577 590
            // 
578 591
            // CarryAmount
579 592
            // 
580
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
581
            this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle15;
593
            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
594
            this.CarryAmount.DefaultCellStyle = dataGridViewCellStyle41;
582 595
            this.CarryAmount.HeaderText = "次回繰越";
583 596
            this.CarryAmount.Name = "CarryAmount";
584 597
            this.CarryAmount.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
586 599
            // 
587 600
            // PersonName
588 601
            // 
589
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
590
            this.PersonName.DefaultCellStyle = dataGridViewCellStyle16;
602
            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
603
            this.PersonName.DefaultCellStyle = dataGridViewCellStyle42;
591 604
            this.PersonName.HeaderText = "担当者\r\n承認";
592 605
            this.PersonName.Name = "PersonName";
593 606
            this.PersonName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
607 620
            // 
608 621
            // ApprovalName_1
609 622
            // 
610
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
611
            this.ApprovalName_1.DefaultCellStyle = dataGridViewCellStyle17;
623
            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
624
            this.ApprovalName_1.DefaultCellStyle = dataGridViewCellStyle43;
612 625
            this.ApprovalName_1.HeaderText = "承認者1\r\n承認";
613 626
            this.ApprovalName_1.Name = "ApprovalName_1";
614 627
            this.ApprovalName_1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
641 654
            // 
642 655
            // ApprovalName_2
643 656
            // 
644
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
645
            this.ApprovalName_2.DefaultCellStyle = dataGridViewCellStyle18;
657
            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
658
            this.ApprovalName_2.DefaultCellStyle = dataGridViewCellStyle44;
646 659
            this.ApprovalName_2.HeaderText = "承認者2\r\n承認";
647 660
            this.ApprovalName_2.Name = "ApprovalName_2";
648 661
            this.ApprovalName_2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
675 688
            // 
676 689
            // ApprovalName_3
677 690
            // 
678
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
679
            this.ApprovalName_3.DefaultCellStyle = dataGridViewCellStyle19;
691
            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
692
            this.ApprovalName_3.DefaultCellStyle = dataGridViewCellStyle45;
680 693
            this.ApprovalName_3.HeaderText = "承認者3\r\n承認";
681 694
            this.ApprovalName_3.Name = "ApprovalName_3";
682 695
            this.ApprovalName_3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
709 722
            // 
710 723
            // ApprovalName_4
711 724
            // 
712
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
713
            this.ApprovalName_4.DefaultCellStyle = dataGridViewCellStyle20;
725
            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
726
            this.ApprovalName_4.DefaultCellStyle = dataGridViewCellStyle46;
714 727
            this.ApprovalName_4.HeaderText = "承認者4\r\n承認";
715 728
            this.ApprovalName_4.Name = "ApprovalName_4";
716 729
            this.ApprovalName_4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
743 756
            // 
744 757
            // ApprovalName_5
745 758
            // 
746
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
747
            this.ApprovalName_5.DefaultCellStyle = dataGridViewCellStyle21;
759
            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
760
            this.ApprovalName_5.DefaultCellStyle = dataGridViewCellStyle47;
748 761
            this.ApprovalName_5.HeaderText = "承認者5\r\n承認";
749 762
            this.ApprovalName_5.Name = "ApprovalName_5";
750 763
            this.ApprovalName_5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
777 790
            // 
778 791
            // ApprovalName_6
779 792
            // 
780
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
781
            this.ApprovalName_6.DefaultCellStyle = dataGridViewCellStyle22;
793
            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
794
            this.ApprovalName_6.DefaultCellStyle = dataGridViewCellStyle48;
782 795
            this.ApprovalName_6.HeaderText = "承認者6\r\n承認";
783 796
            this.ApprovalName_6.Name = "ApprovalName_6";
784 797
            this.ApprovalName_6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
811 824
            // 
812 825
            // ApprovalName_7
813 826
            // 
814
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
815
            this.ApprovalName_7.DefaultCellStyle = dataGridViewCellStyle23;
827
            dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
828
            this.ApprovalName_7.DefaultCellStyle = dataGridViewCellStyle49;
816 829
            this.ApprovalName_7.HeaderText = "承認者7\r\n承認";
817 830
            this.ApprovalName_7.Name = "ApprovalName_7";
818 831
            this.ApprovalName_7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
845 858
            // 
846 859
            // ApprovalName_8
847 860
            // 
848
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
849
            this.ApprovalName_8.DefaultCellStyle = dataGridViewCellStyle24;
861
            dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
862
            this.ApprovalName_8.DefaultCellStyle = dataGridViewCellStyle50;
850 863
            this.ApprovalName_8.HeaderText = "承認者8\r\n承認";
851 864
            this.ApprovalName_8.Name = "ApprovalName_8";
852 865
            this.ApprovalName_8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
879 892
            // 
880 893
            // ApprovalName_9
881 894
            // 
882
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
883
            this.ApprovalName_9.DefaultCellStyle = dataGridViewCellStyle25;
895
            dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
896
            this.ApprovalName_9.DefaultCellStyle = dataGridViewCellStyle51;
884 897
            this.ApprovalName_9.HeaderText = "承認者9\r\n承認";
885 898
            this.ApprovalName_9.Name = "ApprovalName_9";
886 899
            this.ApprovalName_9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
913 926
            // 
914 927
            // ApprovalName_10
915 928
            // 
916
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
917
            this.ApprovalName_10.DefaultCellStyle = dataGridViewCellStyle26;
929
            dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
930
            this.ApprovalName_10.DefaultCellStyle = dataGridViewCellStyle52;
918 931
            this.ApprovalName_10.HeaderText = "承認者10\r\n承認";
919 932
            this.ApprovalName_10.Name = "ApprovalName_10";
920 933
            this.ApprovalName_10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
......
963 976
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
964 977
            this.Margin = new System.Windows.Forms.Padding(4);
965 978
            this.Name = "FrmSelectPayment";
979
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
966 980
            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmSelectPayment_FormClosing);
967 981
            this.Load += new System.EventHandler(this.FrmSelectPayment_Load);
968 982
            this.panel1.ResumeLayout(false);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs
629 629
                var f = new FrmSelectRegField();
630 630
                f.m_OrderersDivision = depositOrderer.OrderersDivision;
631 631
                f.m_OrderersCode = depositOrderer.OrderersCode;
632
                foreach (var depositDetail in depositOrderer.VisibleDepositDetails)
632
                //foreach (var depositDetail in depositOrderer.VisibleDepositDetails)
633
                foreach (var depositDetail in depositOrderer.DepositDetails)
633 634
                {
634 635
                    f.m_lstMyField.Add(new FrmSelectRegField.MyFieldData()
635 636
                    {
......
1421 1422
                {
1422 1423
                    var depositDetail = depositOrderer.FindDepositDetailByLineCount(CommonMotions.cnvInt(cells[(int)DispColumn.LineCount].Value));
1423 1424
                    long amount = CommonMotions.cnvLong(cellValue);
1425
                    bool bUpdateCarryAmount = false;
1424 1426
                    switch (e.ColumnIndex)
1425 1427
                    {
1426 1428
                        case (int)DispColumn.DepositAmount:
1427 1429
                            depositDetail.DepositAmount = amount;
1430
                            bUpdateCarryAmount = true;
1428 1431
                            break;
1429 1432
                        case (int)DispColumn.DiscountAmount:
1430 1433
                            depositDetail.DiscountAmount = amount;
1434
                            bUpdateCarryAmount = true;
1431 1435
                            break;
1432 1436
                        case (int)DispColumn.CnstrPrice:
1433 1437
                            depositDetail.CnstrPrice = amount;
1438
                            bUpdateCarryAmount = true;
1434 1439
                            break;
1435 1440
                        case (int)DispColumn.Fees:
1436 1441
                            depositDetail.Fees = amount;
1442
                            bUpdateCarryAmount = true;
1437 1443
                            break;
1438 1444
                        case (int)DispColumn.OtherAdjustments:
1439 1445
                            depositDetail.OtherAdjustments = amount;
1446
                            bUpdateCarryAmount = true;
1440 1447
                            break;
1441 1448
                        case (int)DispColumn.CarryAmount:
1442 1449
                            depositDetail.CarryAmount = amount;
1443 1450
                            break;
1444 1451
                    }
1452
                    // 繰越金の調整が必要
1453
                    if (bUpdateCarryAmount == true)
1454
                    {
1455
                        long RequestAmount = depositDetail.BillPrice + depositDetail.TaxPrice;
1456
                        long DepositAmount = depositDetail.DepositAmount + depositDetail.DiscountAmount + depositDetail.CnstrPrice + depositDetail.Fees + depositDetail.OtherAdjustments;
1457
                        depositDetail.CarryAmount = RequestAmount - DepositAmount;
1458
                    }
1459

  
1445 1460
                    depositDetail.Editted = true;
1446 1461
                }
1447 1462
                var headerIndex = DetectHeaderIndex(e.RowIndex);
......
2076 2091
                        dgvMaster.Columns[j].Visible = true;
2077 2092
                        j += 5;
2078 2093
                    }
2094
                    // 現場が存在する行は、総務入力側のセルも編集可能か判定しておく
2095
                    if (CanEditDeposit(depositOrderer))
2096
                    {
2097
                        row.Cells[(int)DispColumn.DepositDate].ReadOnly = false;
2098
                        row.Cells[(int)DispColumn.DepositAmountCash].ReadOnly = false;
2099
                        row.Cells[(int)DispColumn.DepositAmountBill].ReadOnly = false;
2100
                    }
2079 2101
                    if (CanEditDepositDetail(depositDetail))
2080 2102
                    {
2081 2103
                        row.Cells[(int)DispColumn.DepositAmount].ReadOnly = false;
......
2191 2213
                depositAmount += depositDetail.DepositAmount;
2192 2214
            }
2193 2215
            long unknownAmount = (depositAmountCash + depositAmountBill) - depositAmount;
2194
            if (unknownAmount <= 0)
2216
            if (unknownAmount == 0)
2195 2217
                return;
2196 2218
            // 不明行は入金明細の一番下に作成する
2197 2219
            var unknownIndex = index + depositOrderer.VisibleDepositDetails.Count;
......
2260 2282
            long fees = 0;
2261 2283
            long otherAdjustments = 0;
2262 2284
            long carryAmount = 0;
2263
            foreach (var depositDetail in depositOrderer.DepositDetails)
2285

  
2286
            foreach (var depositDetail in depositOrderer.VisibleDepositDetails)
2264 2287
            {
2265 2288
                billPrice += depositDetail.BillPrice;
2266 2289
                taxPrice += depositDetail.TaxPrice;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmSelectPaymentDay.Designer.cs
58 58
            this.btnCancel.Location = new System.Drawing.Point(161, 10);
59 59
            this.btnCancel.Name = "btnCancel";
60 60
            this.btnCancel.Size = new System.Drawing.Size(140, 40);
61
            this.btnCancel.TabIndex = 3;
61
            this.btnCancel.TabIndex = 1;
62 62
            this.btnCancel.Text = "キャンセル";
63 63
            this.btnCancel.UseVisualStyleBackColor = false;
64 64
            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
......
71 71
            this.panel1.Location = new System.Drawing.Point(-8, 100);
72 72
            this.panel1.Name = "panel1";
73 73
            this.panel1.Size = new System.Drawing.Size(320, 60);
74
            this.panel1.TabIndex = 3;
74
            this.panel1.TabIndex = 1;
75 75
            // 
76 76
            // groupBox2
77 77
            // 
......
80 80
            this.groupBox2.Location = new System.Drawing.Point(52, 10);
81 81
            this.groupBox2.Name = "groupBox2";
82 82
            this.groupBox2.Size = new System.Drawing.Size(200, 80);
83
            this.groupBox2.TabIndex = 7;
83
            this.groupBox2.TabIndex = 0;
84 84
            this.groupBox2.TabStop = false;
85 85
            this.groupBox2.Text = "支払日";
86 86
            // 
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.Designer.cs
52 52
            this.btnEnd.Location = new System.Drawing.Point(892, 524);
53 53
            this.btnEnd.Name = "btnEnd";
54 54
            this.btnEnd.Size = new System.Drawing.Size(120, 30);
55
            this.btnEnd.TabIndex = 3;
55
            this.btnEnd.TabIndex = 2;
56 56
            this.btnEnd.Text = "終 了";
57 57
            this.btnEnd.UseVisualStyleBackColor = false;
58 58
            this.btnEnd.Click += new System.EventHandler(this.btnEnd_Click);
......
65 65
            this.btnSelect.Location = new System.Drawing.Point(764, 524);
66 66
            this.btnSelect.Name = "btnSelect";
67 67
            this.btnSelect.Size = new System.Drawing.Size(120, 30);
68
            this.btnSelect.TabIndex = 2;
68
            this.btnSelect.TabIndex = 1;
69 69
            this.btnSelect.Text = "選 択";
70 70
            this.btnSelect.UseVisualStyleBackColor = false;
71 71
            this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
branches/src/ProcessManagement/ProcessManagement/Forms/SubForms/FrmConstructionDiag.cs
364 364
            {
365 365
                dgvMaster.Rows.Clear();
366 366

  
367
                string strSQL = string.Empty;
367
                StringBuilder strSQL = new StringBuilder();
368
//                string strSQL = string.Empty;
368 369

  
369 370
////                if (m_ProcessNo == (int)ClsExcute.ProcessExecuteNo.TAndPCosts)      Del BIT 2017/02/22
370 371
                if (m_SelectType == (int)SelectConstructionType.Ongoing)                    // 検索タイプが進行中 Add BIT 2017/02/22
371 372
                {   // ----- 購入品選択の場合
372 373
                    // 進行中案件を検索する
373
                    strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING";
374
                    strSQL += " FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONLEDGER C";
375
                    strSQL += string.Format(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
376
                    strSQL += " AND A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE AND C.COMPLATEFLG = 0";
374
                    strSQL.Append("SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING");
375
                    strSQL.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONLEDGER C");
376
                    strSQL.AppendFormat(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
377
                    strSQL.Append(" AND A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE AND C.COMPLATEFLG = 0");
377 378

  
378 379
                    switch (m_PersonCharge)
379 380
                    {
380 381
                        case (int)PersonChargePoint.Sales:
381 382
                            /// 営業担当検索
382
                            strSQL += string.Format(" AND A.SalesPersonCode = {0}", m_PersonCode);
383
                            strSQL.AppendFormat(" AND A.SalesPersonCode = {0}", m_PersonCode);
383 384
                            break;
384 385
                        case (int)PersonChargePoint.Construction:
385 386
                            /// 工事担当者
386
                            strSQL += string.Format(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
387
                            strSQL.AppendFormat(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
387 388
                            break;
388 389
                    }
389
                    strSQL += " ORDER BY A.ConstructionPeriodStart DESC";
390
                    strSQL.Append(" ORDER BY A.ConstructionPeriodStart DESC");
390 391
                }
391 392
                else if (m_SelectType == (int)SelectConstructionType.CombinedOrder)                    // 検索タイプが一括請求 Add BIT 2017/02/22
392 393
                {   // ----- 請求入力(一括請求)の場合
393 394
                    // 進行中+一括請求を検索する
394
                    strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING";
395
                    strSQL += " FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONLEDGER C";
396
                    strSQL += string.Format(" WHERE (A.BillingSplitFlg = 0 AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
397
                    strSQL += " AND A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE AND C.COMPLATEFLG = 0 ";
395
                    strSQL.Append("SELECT");
396
                    strSQL.Append(" UNI.CONSTRUCTIONCODE");
397
                    strSQL.Append(" , UNI.DETAILSTRING");
398
                    strSQL.Append(" FROM (");
399
                    strSQL.Append(" SELECT");
400
                    strSQL.Append(" A1.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
401
                    strSQL.Append(" , B1.DETAILSTRING AS DETAILSTRING");
402
                    strSQL.Append(" , A1.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
403
                    strSQL.Append(" FROM"); 
404
                    strSQL.Append(" CONSTRUCTIONBASEINFO A1");
405
                    strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B1 ON ");
406
                    strSQL.Append(" A1.CONSTRUCTIONCODE = B1.CONSTRUCTIONCODE");
407
                    strSQL.AppendFormat(" AND B1.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
408
                    strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C1 ON ");
409
                    strSQL.Append(" A1.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE");
410
                    strSQL.Append(" AND C1.COMPLATEFLG = 0 ");
411
                    strSQL.Append(" WHERE ");
412
                    strSQL.AppendFormat(" A1.BILLINGSPLITFLG = {0}", (int)CommonDefine.BaseInfoBillingSplitFlg.AllOnBilling);
413
                    strSQL.AppendFormat(" AND A1.JOINFLG <> {0}", (int)CommonDefine.BaseInfoJoinFlg.JoinChildren);
398 414

  
399 415
                    switch (m_PersonCharge)
400 416
                    {
401 417
                        case (int)PersonChargePoint.Sales:
402 418
                            /// 営業担当検索
403
                            strSQL += string.Format(" AND A.SalesPersonCode = {0}", m_PersonCode);
419
                            strSQL.AppendFormat(" AND A1.SALESPERSONCODE = {0}", m_PersonCode);
404 420
                            break;
405 421
                        case (int)PersonChargePoint.Construction:
406 422
                            /// 工事担当者
407
                            strSQL += string.Format(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
423
                            strSQL.AppendFormat(" AND (A1.CONSTRUCTIONPERSONCODE = {0} OR A1.CONSTRSUBPERSONCODE = {0} OR A1.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
408 424
                            break;
409 425
                    }
410
                    strSQL += " ORDER BY A.ConstructionPeriodStart DESC";
426

  
427
                    strSQL.Append(" UNION ALL");
428
                    strSQL.Append(" SELECT");
429
                    strSQL.Append(" A2.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
430
                    strSQL.Append(" , B2.DETAILSTRING AS DETAILSTRING");
431
                    strSQL.Append(" , A2.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
432
                    strSQL.Append(" FROM");
433
                    strSQL.Append(" CONSTRUCTIONBASEINFO A2");
434
                    strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B2 ON ");
435
                    strSQL.Append(" A2.CONSTRUCTIONCODE = B2.CONSTRUCTIONCODE");
436
                    strSQL.AppendFormat(" AND B2.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
437
                    strSQL.Append(" INNER JOIN CONSTRUCTIONLINK D2 ON ");
438
                    strSQL.Append(" A2.CONSTRUCTIONCODE = D2.FLUCTUATIONCODE");
439
                    strSQL.AppendFormat(" AND D2.LINKTYPE = {0}",(int)CommonDefine.LinkDataType.JoinType);
440
                    strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C2 ON ");
441
                    strSQL.Append(" D2.CONSTRUCTIONCODE = C2.CONSTRUCTIONCODE");
442
                    strSQL.Append(" AND C2.COMPLATEFLG = 0 ");
443
                    strSQL.Append(" WHERE ");
444
                    strSQL.AppendFormat(" A2.BILLINGSPLITFLG = {0}", (int)CommonDefine.BaseInfoBillingSplitFlg.AllOnBilling);
445
                    strSQL.AppendFormat(" AND A2.JOINFLG = {0}", (int)CommonDefine.BaseInfoJoinFlg.JoinChildren);
446

  
447
                    switch (m_PersonCharge)
448
                    {
449
                        case (int)PersonChargePoint.Sales:
450
                            /// 営業担当検索
451
                            strSQL.AppendFormat(" AND A2.SALESPERSONCODE = {0}", m_PersonCode);
452
                            break;
453
                        case (int)PersonChargePoint.Construction:
454
                            /// 工事担当者
455
                            strSQL.AppendFormat(" AND (A2.CONSTRUCTIONPERSONCODE = {0} OR A2.CONSTRSUBPERSONCODE = {0} OR A2.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
456
                            break;
457
                    }
458
                    strSQL.Append(" ) UNI ORDER BY UNI.CONSTRUCTIONPERIODSTART DESC");
459

  
411 460
                }
412 461
                else if (m_SelectType == (int)SelectConstructionType.SeparateBilling)                    // 検索タイプが分割請求 Add BIT 2017/02/22
413 462
                {   // ----- 請求入力(分割請求)の場合
414
                    // 進行中+一括請求を検索する
415
                    strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING";
416
                    strSQL += " FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, CONSTRUCTIONLEDGER C";
417
                    strSQL += string.Format(" WHERE (A.BillingSplitFlg = 1 AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
418
                    strSQL += " AND A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE AND C.COMPLATEFLG = 0 ";
463
                    // 進行中+分割請求を検索する
464
                    strSQL.Append("SELECT");
465
                    strSQL.Append(" UNI.CONSTRUCTIONCODE");
466
                    strSQL.Append(" , UNI.DETAILSTRING");
467
                    strSQL.Append(" FROM (");
468
                    strSQL.Append(" SELECT");
469
                    strSQL.Append(" A1.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
470
                    strSQL.Append(" , B1.DETAILSTRING AS DETAILSTRING");
471
                    strSQL.Append(" , A1.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
472
                    strSQL.Append(" FROM");
473
                    strSQL.Append(" CONSTRUCTIONBASEINFO A1");
474
                    strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B1 ON ");
475
                    strSQL.Append(" A1.CONSTRUCTIONCODE = B1.CONSTRUCTIONCODE");
476
                    strSQL.AppendFormat(" AND B1.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
477
                    strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C1 ON ");
478
                    strSQL.Append(" A1.CONSTRUCTIONCODE = C1.CONSTRUCTIONCODE");
479
                    strSQL.Append(" AND C1.COMPLATEFLG = 0 ");
480
                    strSQL.Append(" WHERE ");
481
                    strSQL.AppendFormat(" A1.BILLINGSPLITFLG = {0}", (int)CommonDefine.BaseInfoBillingSplitFlg.SplitBilling);
482
                    strSQL.AppendFormat(" AND A1.JOINFLG <> {0}", (int)CommonDefine.BaseInfoJoinFlg.JoinChildren);
419 483

  
420 484
                    switch (m_PersonCharge)
421 485
                    {
422 486
                        case (int)PersonChargePoint.Sales:
423 487
                            /// 営業担当検索
424
                            strSQL += string.Format(" AND A.SalesPersonCode = {0}", m_PersonCode);
488
                            strSQL.AppendFormat(" AND A1.SALESPERSONCODE = {0}", m_PersonCode);
425 489
                            break;
426 490
                        case (int)PersonChargePoint.Construction:
427 491
                            /// 工事担当者
428
                            strSQL += string.Format(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
492
                            strSQL.AppendFormat(" AND (A1.CONSTRUCTIONPERSONCODE = {0} OR A1.CONSTRSUBPERSONCODE = {0} OR A1.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
429 493
                            break;
430 494
                    }
431
                    strSQL += " ORDER BY A.ConstructionPeriodStart DESC";
495

  
496
                    strSQL.Append(" UNION ALL");
497
                    strSQL.Append(" SELECT");
498
                    strSQL.Append(" A2.CONSTRUCTIONCODE AS CONSTRUCTIONCODE");
499
                    strSQL.Append(" , B2.DETAILSTRING AS DETAILSTRING");
500
                    strSQL.Append(" , A2.CONSTRUCTIONPERIODSTART AS CONSTRUCTIONPERIODSTART");
501
                    strSQL.Append(" FROM");
502
                    strSQL.Append(" CONSTRUCTIONBASEINFO A2");
503
                    strSQL.Append(" INNER JOIN CONSTRUCTIONBASEINFODETAIL B2 ON ");
504
                    strSQL.Append(" A2.CONSTRUCTIONCODE = B2.CONSTRUCTIONCODE");
505
                    strSQL.AppendFormat(" AND B2.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
506
                    strSQL.Append(" INNER JOIN CONSTRUCTIONLINK D2 ON ");
507
                    strSQL.Append(" A2.CONSTRUCTIONCODE = D2.FLUCTUATIONCODE");
508
                    strSQL.AppendFormat(" AND D2.LINKTYPE = {0}", (int)CommonDefine.LinkDataType.JoinType);
509
                    strSQL.Append(" INNER JOIN CONSTRUCTIONLEDGER C2 ON ");
510
                    strSQL.Append(" D2.CONSTRUCTIONCODE = C2.CONSTRUCTIONCODE");
511
                    strSQL.Append(" AND C2.COMPLATEFLG = 0 ");
512
                    strSQL.Append(" WHERE ");
513
                    strSQL.AppendFormat(" A2.BILLINGSPLITFLG = {0}", (int)CommonDefine.BaseInfoBillingSplitFlg.SplitBilling);
514
                    strSQL.AppendFormat(" AND A2.JOINFLG = {0}", (int)CommonDefine.BaseInfoJoinFlg.JoinChildren);
515

  
516
                    switch (m_PersonCharge)
517
                    {
518
                        case (int)PersonChargePoint.Sales:
519
                            /// 営業担当検索
520
                            strSQL.AppendFormat(" AND A2.SALESPERSONCODE = {0}", m_PersonCode);
521
                            break;
522
                        case (int)PersonChargePoint.Construction:
523
                            /// 工事担当者
524
                            strSQL.AppendFormat(" AND (A2.CONSTRUCTIONPERSONCODE = {0} OR A2.CONSTRSUBPERSONCODE = {0} OR A2.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
525
                            break;
526
                    }
527
                    strSQL.Append(" ) UNI ORDER BY UNI.CONSTRUCTIONPERIODSTART DESC");
432 528
                }
433 529
                ///                else if (m_ProcessNo == (int)ClsExcute.ProcessExecuteNo.OrderJoin) Del BIT 2017/02/22
434 530
                else                                // Add BIT 2017/02/22
435 531
	            {
436 532
                    // 対象全ての案件を検索する
437
                    strSQL = "SELECT DISTINCT A.CONSTRUCTIONCODE, B.DETAILSTRING, A.OrderersDivision, A.OrderersCode";
438
                    strSQL += " FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, PERSONINCHARGEMASTER C";
439
                    strSQL += string.Format(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
440
                    strSQL += string.Format(" AND A.JOINFLG = {0} ", (int)CommonDefine.BaseInfoJoinFlg.JoinParent);
533
                    strSQL.Append("SELECT DISTINCT A.CONSTRUCTIONCODE, B.DETAILSTRING, A.OrderersDivision, A.OrderersCode");
534
                    strSQL.Append(" FROM CONSTRUCTIONBASEINFO A, CONSTRUCTIONBASEINFODETAIL B, PERSONINCHARGEMASTER C");
535
                    strSQL.AppendFormat(" WHERE (A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE AND B.DETAILNO = {0})", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName);
536
                    strSQL.AppendFormat(" AND A.JOINFLG = {0} ", (int)CommonDefine.BaseInfoJoinFlg.JoinParent);
441 537
                    switch (m_PersonCharge)
442 538
                    {
443 539
                        case (int)PersonChargePoint.Sales:
444 540
                            /// 営業担当検索
445
                            strSQL += string.Format(" AND A.SalesPersonCode = {0}", m_PersonCode);
541
                            strSQL.AppendFormat(" AND A.SALESPERSONCODE = {0}", m_PersonCode);
446 542
                            break;
447 543
                        case (int)PersonChargePoint.Construction:
448 544
                            /// 工事担当者
449
                            strSQL += string.Format(" AND (A.ConstructionPersonCode = {0} OR A.ConstrSubPersonCode = {0} OR A.ConstructionInstructor = {0})", m_PersonCode);
545
                            strSQL.AppendFormat(" AND (A.CONSTRUCTIONPERSONCODE = {0} OR A.CONSTRSUBPERSONCODE = {0} OR A.CONSTRUCTIONINSTRUCTOR = {0})", m_PersonCode);
450 546
                            break;
451 547
                    }
452
                    strSQL += " AND (C.PERSONCODE = A.SALESPERSONCODE";
453
                    strSQL += " Or C.PERSONCODE = A.CONSTRUCTIONPERSONCODE";
454
                    strSQL += " Or C.PERSONCODE = A.CONSTRSUBPERSONCODE";
455
                    strSQL += " Or C.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR)";
456
                    strSQL += " ORDER BY B.DETAILSTRING ASC, A.CONSTRUCTIONCODE DESC";
548
                    strSQL.Append(" AND (C.PERSONCODE = A.SALESPERSONCODE");
549
                    strSQL.Append(" OR C.PERSONCODE = A.CONSTRUCTIONPERSONCODE");
550
                    strSQL.Append(" OR C.PERSONCODE = A.CONSTRSUBPERSONCODE");
551
                    strSQL.Append(" OR C.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR)");
552
                    strSQL.Append(" ORDER BY B.DETAILSTRING ASC, A.CONSTRUCTIONCODE DESC");
457 553
                }
458 554

  
459 555
                ArrayList BaseList = new ArrayList();
460
                if (!BaseDB.ExecuteReader(strSQL, ref BaseList)) return;
556
                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref BaseList)) return;
461 557
                if (BaseList.Count == 0) return;
462 558

  
463 559
                // 要素表示

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