プロジェクト

全般

プロフィール

リビジョン 107

山内7年以上前に追加

請求まとめ(業者追加削除、不明行不具合対応)

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs
731 731

  
732 732
                if (dgvCompany.Visible == true)
733 733
                {
734
                    sql.AppendLine("order by Scm.DISPLAYORDER ASC, Bdd.SEQNO ASC, case when Bdd.CONSTRUCTIONCODE = 0 Then  2099999999 else Bdd.LINECOUNT end ");
734
                    sql.AppendLine("order by Scm.DISPLAYORDER ASC, Bdd.SEQNO DESC, case when Bdd.CONSTRUCTIONCODE = 0 Then  2099999999 else Bdd.LINECOUNT end ");
735 735
                 }
736 736
                else if (dgvProject.Visible == true)
737 737
                {
738
                    sql.AppendLine("order by Bdd.CONSTRUCTIONCODE DESC,Scm.DISPLAYORDER ASC,Bdd.SEQNO ASC,Bdd.LINECOUNT ASC ");
738
                    sql.AppendLine("order by Bdd.CONSTRUCTIONCODE DESC, Scm.DISPLAYORDER ASC ,Bdd.SEQNO ASC ,Bdd.LINECOUNT ASC ");
739 739
                }
740 740

  
741 741
                // ?f?[?^???@???v?E???v???v?Z?????A?S???f?[?^????????
......
1807 1807

  
1808 1808
                if(!m_initDataLoad) m_bChengeAns = true;
1809 1809

  
1810
                // ?V?K???
1811
                if (dgvCompany.Visible == true && btnAddCompany.Enabled == true &&
1812
                    (e.ColumnIndex >= (int)DispColumn.SomuSeikyu && e.ColumnIndex < (int)DispColumn.KojiSeikyu))
1813
                {
1814
                    int GoukeiSeqNo;
1815
                    string cell = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[Code_Column].Value) == CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value) && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1)
1816
                                                                    .Max(x => (string)x.Cells[(int)DispColumn.GoukeiSeqNo].Value.ToString());
1817
                    if (cell != null)
1818
                    {
1819
                        GoukeiSeqNo = CommonMotions.cnvInt(cell);
1820
                        if (GoukeiSeqNo == CommonMotions.cnvInt(dgv[(int)DispColumn.GoukeiSeqNo, e.RowIndex].Value) && CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) != 0)
1821
                        {
1822
                            // ?C?x???g?n???h??????o???????????s
1823
                            this.BeginInvoke((MethodInvoker)delegate
1824
                            {
1825
                                int MakeIndex = 0;
1826
                                MakeNewRow(CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), "", 0,
1827
                                            CommonMotions.cnvInt(dgv[(int)DispColumn.No, e.RowIndex].Value), ref MakeIndex, -1, e.RowIndex + 1);
1828
                                dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = CommonMotions.cnvInt(dgv[(int)DispColumn.CompanyDispOrder, e.RowIndex].Value);
1829
                                dgv.Rows[MakeIndex].Cells[m_GoukeiCode_Column + 1].ToolTipText = CommonMotions.cnvString(dgv[m_GoukeiCode_Column + 1, e.RowIndex].ToolTipText);
1830
                                ResetNo();
1831
                            });
1832
                        }
1833
                    }
1834
                }
1810
                // ?V?K??? ?Z??????e??X??s???s??????????l??C???i????s???s??????????{?^????s???s????j
1811
                //if (dgvCompany.Visible == true && btnAddCompany.Enabled == true &&
1812
                //    (e.ColumnIndex >= (int)DispColumn.SomuSeikyu && e.ColumnIndex < (int)DispColumn.KojiSeikyu))
1813
                //{
1814
                //    int GoukeiSeqNo;
1815
                //    string cell = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[Code_Column].Value) == CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value) && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1)
1816
                //                                                    .Max(x => (string)x.Cells[(int)DispColumn.GoukeiSeqNo].Value.ToString());
1817
                //    if (cell != null)
1818
                //    {
1819
                //        GoukeiSeqNo = CommonMotions.cnvInt(cell);
1820
                //        if (GoukeiSeqNo == CommonMotions.cnvInt(dgv[(int)DispColumn.GoukeiSeqNo, e.RowIndex].Value) && CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value) != 0)
1821
                //        {
1822
                //            // ?C?x???g?n???h??????o???????????s
1823
                //            this.BeginInvoke((MethodInvoker)delegate
1824
                //            {
1825
                //                int MakeIndex = 0;
1826
                //                MakeNewRow(CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value), "", 0,
1827
                //                            CommonMotions.cnvInt(dgv[(int)DispColumn.No, e.RowIndex].Value), ref MakeIndex, -1, e.RowIndex + 1);
1828
                //                dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = CommonMotions.cnvInt(dgv[(int)DispColumn.CompanyDispOrder, e.RowIndex].Value);
1829
                //                dgv.Rows[MakeIndex].Cells[m_GoukeiCode_Column + 1].ToolTipText = CommonMotions.cnvString(dgv[m_GoukeiCode_Column + 1, e.RowIndex].ToolTipText);
1830
                //                ResetNo();
1831
                //            });
1832
                //        }
1833
                //    }
1834
                //}
1835 1835

  
1836 1836
            }
1837 1837

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
584 584
                    if (dgvCompany.Visible == true)  // ???
585 585
                    {
586 586
                        // ????\?????????????????????@???@??????????????????X
587
                        //DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>()
588
                        //                                            .Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
589
                        //                                                     && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1).ToArray();
587
                        DataGridViewRow[] rows = dgv.Rows.Cast<DataGridViewRow>()
588
                                                                    .Where(x => CommonMotions.cnvInt(x.Cells[m_Company_Column].Value) == selRec.CompanyCode
589
                                                                             && CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowVisible].Value) == 1).ToArray();
590 590
                        //if (rows.Count() > 1)
591 591
                        //{
592 592
                        //    return;
......
606 606

  
607 607
                        MakeIndex = SearchRowIndex(selRec.DisplayOrder);
608 608

  
609
                        // ????\?????????????A???v?s??????????
610
                        if (rows.Count() > 1)
611
                        {
612
                            MakeIndex -= (int)GoukeiRows.???v;
613
                        }
614

  
609 615
                        // ?f?[?^????s
610 616
                        MakeNewRow(selRec.CompanyCode, selRec.CompanyName, 0, No, ref MakeIndex, -1, MakeIndex);
611 617
                        dgv.Rows[MakeIndex].Cells[(int)DispColumn.CompanyDispOrder].Value = selRec.DisplayOrder;
612 618
                        MakeIndex++;
613 619
                        MakeGoukei = true;
614 620

  
621
                        // ???v?s??
622
                        if (rows.Count() < 1)
623
                        {
624
                            if (MakeGoukei == true)
625
                            {
626
                                // ???v?s???
627
                                MakeGoukeiGyo(dgv, selRec.CompanyCode, selRec.DisplayOrder, MakeIndex);
628

  
629
                            }
630
                        }
631

  
632
                        ResetNo();
633
                        m_bChengeAns = true;
615 634
                    }
616 635
                    else if (dgvProject.Visible == true)  // ????
617 636
                    {
618 637
                        // ?????????????
619 638
                    }
620

  
621
                    // ???v?s??
622
                    if (MakeGoukei == true)
623
                    {
624
                        // ???v?s???
625
                        MakeGoukeiGyo(dgv, selRec.CompanyCode, selRec.DisplayOrder, MakeIndex);
626

  
627
                    }
628

  
629
                    ResetNo();
630

  
631
                    m_bChengeAns = true;
632 639
                }
633 640

  
634 641
            }

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