プロジェクト

全般

プロフィール

リビジョン 117

山内7年以上前に追加

入金確認(現場登録の不明行が他担当に含まれるのを修正)

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRegField.cs
607 607
                {
608 608
                    TotalPrice += MyData.DepositAmount;
609 609

  
610
                    // 不明行は含まない
611
                    if (MyData.RequestNo == 0)
612
                    {
613
                        continue;
614
                    }
615

  
610 616
                    // 対象工事でない場合
611 617
                    if( IsTargetConstruction( MyData ) == false )
612 618
                    {
......
628 634

  
629 635
                foreach (MyFieldData MyData in m_lstMyField)
630 636
                {
637
                    // 不明行は含まない
638
                    if (MyData.RequestNo == 0)
639
                    {
640
                        continue;
641
                    }
642

  
631 643
                    // 対象工事の場合場合
632 644
                    if( IsTargetConstruction( MyData ) == true )
633 645
                    {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SelectPayment/FrmSelectPayment.cs
504 504
        /// <param name="e"></param>
505 505
        private void FrmSelectPayment_Load(object sender, EventArgs e)
506 506
        {
507
            // 対象月コンボBOX設定
508
            IODepositData IoDd = new IODepositData();
509

  
507 510
            try
508 511
            {
509
                // 対象月コンボBOX設定
510
                IODepositData IoDd = new IODepositData();
511 512
                string now = DateTime.Now.ToString("yyyy/MM");
512 513
                List<DepositData> lstDd = new List<DepositData>();
513 514
                List<string> lstDate = new List<string>();
......
545 546
                dgvMaster.CellDoubleClick += DataGridView_DoubleCellClick;
546 547
                dgvMaster.CellEnter += DataGridView_CellEnter;
547 548
                dgvMaster.CellValueChanged += DataGridView_CellValueChanged;
549

  
550
                IoDd.close();
551
                IoDd = null;
548 552
            }
549 553
        }
550 554
        #endregion
......
590 594
                    MessageBox.Show("すでに現場が登録されているため、削除できません。", "削除エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
591 595
                    return;
592 596
                }
597

  
598
                if (MessageBox.Show("発注者を削除します。", "削除確認", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
599
                {
600
                    return;
601
                }
602

  
593 603
                // 保存前のものは削除する
594 604
                if (depositOrderer.Added)
595 605
                    depositOrderers.Remove(depositOrderer);
......
795 805
        {
796 806
            IOMessageBoardData mbdDB = new IOMessageBoardData();
797 807
            IOMessageBoardTerget mbtDB = new IOMessageBoardTerget();
808

  
798 809
            try
799 810
            {
800 811
                mbdDB.connect();
......
882 893
            }
883 894
            finally
884 895
            {
885
                mbdDB.close(); mbdDB = null;
886
                mbtDB.close(); mbtDB = null;
896
                mbdDB.close(); 
897
                mbdDB = null;
898
                mbtDB.close(); 
899
                mbtDB = null;
887 900
            }
888 901
        }
889 902
        #endregion
......
926 939
            dgvMaster.CellDoubleClick -= DataGridView_DoubleCellClick;
927 940
            dgvMaster.CellEnter -= DataGridView_CellEnter;
928 941
            dgvMaster.CellValueChanged -= DataGridView_CellValueChanged;
942

  
929 943
            var ioDepositData = new IODepositData();
930 944
            var ioDepositDataDetail = new IODepositDataDetail();
931 945
            var ioDepositApprovalInfo = new IODepositApprovalInfo();
932 946
            var ioRequestHead = new IORequestHead();
947

  
933 948
            try
934 949
            {
935 950
                ResetTargetDate();
......
1180 1195
                dgvMaster.CellDoubleClick += DataGridView_DoubleCellClick;
1181 1196
                dgvMaster.CellEnter += DataGridView_CellEnter;
1182 1197
                dgvMaster.CellValueChanged += DataGridView_CellValueChanged;
1198

  
1183 1199
                ioDepositData.close();
1184 1200
                ioDepositDataDetail.close();
1185 1201
                ioDepositApprovalInfo.close();
1186 1202
                ioRequestHead.close();
1203

  
1204
                ioDepositData = null;
1205
                ioDepositDataDetail = null;
1206
                ioDepositApprovalInfo = null;
1207
                ioRequestHead = null;
1187 1208
            }
1188 1209
        }
1189 1210
        #endregion
......
1816 1837
        /// <returns></returns>
1817 1838
        private ArrayList SelectDepositData()
1818 1839
        {
1840
            var depDb = new IODepositData();
1841

  
1819 1842
            try
1820 1843
            {
1821 1844
                var sql = new StringBuilder();
......
1836 1859
                sql.Append("on OdrM. OrderCotegory = Dep.OrderersDivision and OdrM.OrderersCode = Dep.OrderersCode ");
1837 1860
                sql.AppendFormat("where Dep.TargetDate = {0} ", m_Select_TargetDate);
1838 1861
                sql.Append("order by Dep.OrderersDivision, Dep.OrderersCode, Dep.SeqNo ");
1839
                var depDb = new IODepositData();
1862

  
1840 1863
                var data = new ArrayList();
1841 1864
                if (!depDb.ExecuteReader(sql.ToString(), ref data)) return new ArrayList();
1842 1865
                return data;
......
1846 1869
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1847 1870
                return new ArrayList();
1848 1871
            }
1872
            finally
1873
            {
1874
                depDb.close();
1875
                depDb = null;
1876
            }
1849 1877
        }
1850 1878
        #endregion
1851 1879

  
......
1859 1887
        /// <returns></returns>
1860 1888
        private ArrayList SelectDepositDetailData(int orderersDivision, int orderersCode, int targetDate)
1861 1889
        {
1890
            var depDb = new IODepositData();
1891

  
1862 1892
            try
1863 1893
            {
1864 1894
                var sql = new StringBuilder();
......
1915 1945
                sql.AppendFormat(" AND DepD.TargetDate = {0}", m_Select_TargetDate);
1916 1946
                sql.Append(" ORDER BY");
1917 1947
                sql.Append(" DepD.RequestNo");
1918
                var depDb = new IODepositData();
1948

  
1919 1949
                var data = new ArrayList();
1950

  
1920 1951
                if (!depDb.ExecuteReader(sql.ToString(), ref data)) return new ArrayList();
1921 1952
                return data;
1922 1953
            }
......
1925 1956
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1926 1957
                return new ArrayList();
1927 1958
            }
1959
            finally
1960
            {
1961
                depDb.close();
1962
                depDb = null;
1963
            }
1928 1964
        }
1929 1965
        #endregion
1930 1966

  
......
1956 1992
            }
1957 1993
            finally
1958 1994
            {
1995
                ioDai.close();
1959 1996
                ioDai = null;
1960 1997
            }
1961 1998
        }
......
2782 2819
        /// <returns></returns>
2783 2820
        private bool CheckPermission(int DepartmentCode, int ConstructionPersonCode, int ConstrSubPersonCode, int ConstructionInstructor)
2784 2821
        {
2822
            var ioPdm = new IOMPersonDepartment();
2823

  
2785 2824
            try
2786 2825
            {
2787 2826
                // 全部署対象
......
2793 2832
                // 複数部署対象、または自部署のみ対象
2794 2833
                else if ((m_UserInfo.m_SecRange == ClsSecurityPermission.SecRangeType.MultiDepartment) || (m_UserInfo.m_SecRange == ClsSecurityPermission.SecRangeType.OneDepartment))
2795 2834
                {
2796
                    var ioPdm = new IOMPersonDepartment();
2797 2835
                    var arDataPdm = new ArrayList();
2798 2836
                    var sql = new StringBuilder();
2799 2837
                    sql.AppendLine("select Pdm.DepartmentCode ");
......
2834 2872
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
2835 2873
                return false;
2836 2874
            }
2875
            finally
2876
            {
2877
                ioPdm.close();
2878
                ioPdm = null;
2879
            }
2837 2880
        }
2838 2881
        #endregion
2839 2882

  
......
2847 2890
        private bool SelectDefaultApprove(int departmentCode, ref List<ApproveData> approves)
2848 2891
        {
2849 2892
            var IoAm = new IOMApproval();
2893

  
2850 2894
            var arDataAm = new ArrayList();
2851 2895
            var sql = new StringBuilder();
2896

  
2852 2897
            try
2853 2898
            {
2854 2899
                sql.AppendLine("select Am.APPROVALPERSON, Picm.SealPrintName,Am.ApprovalAuthority ");
......
2881 2926
            }
2882 2927
            finally
2883 2928
            {
2929
                IoAm.close();
2884 2930
                IoAm = null;
2885 2931
            }
2886 2932
        }
branches/src/ProcessManagement/ProcessManagement/ProcessManagement.csproj.user
3 3
  <PropertyGroup>
4 4
    <ReferencePath>
5 5
    </ReferencePath>
6
    <ProjectView>ProjectFiles</ProjectView>
6
    <ProjectView>ShowAllFiles</ProjectView>
7
    <PublishUrlHistory>publish\</PublishUrlHistory>
8
    <InstallUrlHistory />
9
    <SupportUrlHistory />
10
    <UpdateUrlHistory />
11
    <BootstrapperUrlHistory />
12
    <ErrorReportUrlHistory />
13
    <FallbackCulture>ja-JP</FallbackCulture>
14
    <VerifyUploadedFiles>false</VerifyUploadedFiles>
7 15
  </PropertyGroup>
8 16
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
9 17
    <StartArguments>/NOCHECK</StartArguments>
10 18
  </PropertyGroup>
19
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
20
    <StartArguments>/NOCHECK</StartArguments>
21
  </PropertyGroup>
11 22
</Project>

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