プロジェクト

全般

プロフィール

リビジョン 427

堀内約6年前に追加

注文書状態確認:検索SQLのバグ修正
まとめ入力:修正中
印刷エクセル:HYOUのロゴイメージ削除、不要シート削除

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs
366 366
                wrkFormat.Append("SELECT A.CONSTRUCTIONCODE,");
367 367
                wrkFormat.Append(" B.DETAILSTRING,");
368 368
                wrkFormat.Append(" A.CONSTRUCTIONSTATUSFLG,");
369
                wrkFormat.Append(" D.PERSONCODE,");
370
                wrkFormat.Append(" D.PERSONNAME,");
371
                wrkFormat.Append(" D.DEPARTMENTCODE,");
372
                wrkFormat.Append(" D.DEPARTMENTNAME,");
373
                wrkFormat.Append(" D.MANDISPORDER,");
374
                wrkFormat.Append(" D.DEPDISPORDER,");
369

  
370
                if (radioButton1.Checked)
371
                {
372
                    wrkFormat.Append(" C.PERSONCODE,");
373
                    wrkFormat.Append(" C.PERSONNAME,");
374
                    wrkFormat.Append(" C.DEPARTMENTCODE,");
375
                    wrkFormat.Append(" C.DEPARTMENTNAME,");
376
                    wrkFormat.Append(" C.MANDISPORDER,");
377
                    wrkFormat.Append(" C.DEPDISPORDER,");
378
                }
379
                else
380
                {
381
                    wrkFormat.Append(" D.PERSONCODE,");
382
                    wrkFormat.Append(" D.PERSONNAME,");
383
                    wrkFormat.Append(" D.DEPARTMENTCODE,");
384
                    wrkFormat.Append(" D.DEPARTMENTNAME,");
385
                    wrkFormat.Append(" D.MANDISPORDER,");
386
                    wrkFormat.Append(" D.DEPDISPORDER,");
387
                }
388

  
375 389
                wrkFormat.Append(" DATE_FORMAT(A2.PRINTOUTDATE, '%Y/%m/%d') AS PDate,");
376 390
                wrkFormat.Append(" DATE_FORMAT(A12.SendDate, '%Y/%m/%d') AS MDate,");
377 391
                wrkFormat.Append(" DATE_FORMAT(A12.ReturnDate, '%Y/%m/%d') AS RDate,");
......
382 396
                wrkFormat.Append(" FROM CONSTRUCTIONBASEINFO A");
383 397

  
384 398
                wrkFormat.Append(" LEFT JOIN (SELECT");
399
                wrkFormat.Append("            CA.CONSTRUCTIONCODE");
400
                wrkFormat.Append("          , CA.CONSTRUCTIONPERSONCODE PERSONCODE");
401
                wrkFormat.Append("          , CB.PERSONNAME PERSONNAME");
402
                wrkFormat.Append("          , ifnull(CA.ConstrDepCode, 0) As DEPARTMENTCODE");
403
                wrkFormat.Append("          , ifnull(CD.DetailString, '') As DEPARTMENTNAME");
404
                wrkFormat.Append("          , ifnull(CB.DISPLAYORDER, 99999) As MANDISPORDER");
405
                wrkFormat.Append("          , ifnull(CC.DISPLAYORDER, 99999) As DEPDISPORDER");
406
                wrkFormat.Append("          FROM CONSTRUCTIONBASEINFO CA");
407
                wrkFormat.Append("          LEFT JOIN PERSONINCHARGEMASTER CB");
408
                wrkFormat.Append("               ON CA.CONSTRUCTIONPERSONCODE = CB.PERSONCODE");
409
                wrkFormat.Append("          LEFT JOIN DEPARTMENTMASTER CC");
410
                wrkFormat.Append("               ON CA.ConstrDepCode = CC.DEPARTMENTCODE");
411
                wrkFormat.Append("          LEFT JOIN constructionbaseinfodetail As CD");
412
                wrkFormat.Append("               ON CD.ConstructionCode = CA.ConstructionCode");
413
                wrkFormat.AppendFormat("         And CD.DetailNo = {0}) AS C", (int)ConstructionBaseInfoDetail.DataNoDef.SalesDepartmentName);
414
                wrkFormat.Append(" ON A.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE");
415

  
416
                wrkFormat.Append(" LEFT JOIN (SELECT");
385 417
                wrkFormat.Append("            DA.CONSTRUCTIONCODE");
386 418
                wrkFormat.Append("          , DA.CONSTRUCTIONPERSONCODE PERSONCODE");
387 419
                wrkFormat.Append("          , DB.PERSONNAME PERSONNAME");
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs
1145 1145
            this.dgvCompany013.HeaderText = "業者名";
1146 1146
            this.dgvCompany013.Name = "dgvCompany013";
1147 1147
            this.dgvCompany013.ReadOnly = true;
1148
            this.dgvCompany013.Resizable = System.Windows.Forms.DataGridViewTriState.False;
1149 1148
            this.dgvCompany013.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1150 1149
            this.dgvCompany013.Width = 140;
1151 1150
            // 
......
1161 1160
            this.dgvCompany015.HeaderText = "現場名";
1162 1161
            this.dgvCompany015.Name = "dgvCompany015";
1163 1162
            this.dgvCompany015.ReadOnly = true;
1164
            this.dgvCompany015.Resizable = System.Windows.Forms.DataGridViewTriState.False;
1165 1163
            this.dgvCompany015.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1166 1164
            this.dgvCompany015.Width = 180;
1167 1165
            // 
......
1169 1167
            // 
1170 1168
            this.dgvCompany016.HeaderText = "請求明細";
1171 1169
            this.dgvCompany016.Name = "dgvCompany016";
1172
            this.dgvCompany016.Resizable = System.Windows.Forms.DataGridViewTriState.False;
1173 1170
            this.dgvCompany016.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1174 1171
            this.dgvCompany016.Width = 180;
1175 1172
            // 
......
2058 2055
            this.dgvProject012.HeaderText = "現場名";
2059 2056
            this.dgvProject012.Name = "dgvProject012";
2060 2057
            this.dgvProject012.ReadOnly = true;
2061
            this.dgvProject012.Resizable = System.Windows.Forms.DataGridViewTriState.False;
2062 2058
            this.dgvProject012.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
2063 2059
            this.dgvProject012.Width = 180;
2064 2060
            // 
......
2073 2069
            // 
2074 2070
            this.dgvProject014.HeaderText = "協力会社\r\nコード";
2075 2071
            this.dgvProject014.Name = "dgvProject014";
2072
            this.dgvProject014.Resizable = System.Windows.Forms.DataGridViewTriState.False;
2076 2073
            // 
2077 2074
            // dgvProject015
2078 2075
            // 
2079 2076
            this.dgvProject015.HeaderText = "業者名";
2080 2077
            this.dgvProject015.Name = "dgvProject015";
2081 2078
            this.dgvProject015.ReadOnly = true;
2082
            this.dgvProject015.Resizable = System.Windows.Forms.DataGridViewTriState.False;
2083 2079
            this.dgvProject015.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
2084 2080
            this.dgvProject015.Width = 140;
2085 2081
            // 
......
2087 2083
            // 
2088 2084
            this.dgvProject016.HeaderText = "請求明細";
2089 2085
            this.dgvProject016.Name = "dgvProject016";
2090
            this.dgvProject016.Resizable = System.Windows.Forms.DataGridViewTriState.False;
2091 2086
            this.dgvProject016.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
2092 2087
            this.dgvProject016.Width = 180;
2093 2088
            // 
......
2773 2768
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
2774 2769
            this.KeyPreview = true;
2775 2770
            this.Margin = new System.Windows.Forms.Padding(4);
2776
            this.MinimizeBox = false;
2777 2771
            this.Name = "FrmRequestSummaryList";
2778 2772
            this.ShowIcon = false;
2779 2773
            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
......
2838 2832
        private System.Windows.Forms.Label label11;
2839 2833
        private System.Windows.Forms.ComboBox cmbPerson;
2840 2834
        private System.Windows.Forms.Button btnDataUpDate;
2835
        private System.Windows.Forms.Label lblCellTotal;
2836
        private System.Windows.Forms.Button btnTotalDsp;
2837
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany001;
2838
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany002;
2839
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany003;
2840
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany004;
2841
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany005;
2842
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany006;
2843
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany007;
2844
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany008;
2845
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany009;
2846
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany010;
2847
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany011;
2848
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany012;
2849
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany013;
2850
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany014;
2851
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany015;
2852
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany016;
2853
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany017;
2854
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany018;
2855
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany019;
2856
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany020;
2857
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany021;
2858
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany022;
2859
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany023;
2860
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany024;
2861
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany025;
2862
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany026;
2863
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany027;
2864
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany028;
2865
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany029;
2866
        private System.Windows.Forms.DataGridViewComboBoxColumn dgvCompany030;
2867
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany031;
2868
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany032;
2869
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany033;
2870
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany034;
2871
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany035;
2872
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany036;
2873
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany037;
2874
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany038;
2875
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany039;
2876
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany040;
2877
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany041;
2878
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany042;
2879
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany043;
2880
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany044;
2881
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany045;
2882
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany046;
2883
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany047;
2884
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany048;
2885
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany049;
2886
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany050;
2887
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany051;
2888
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany052;
2889
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany053;
2890
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany054;
2891
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany055;
2892
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany056;
2893
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany057;
2894
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany058;
2895
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany059;
2896
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany060;
2897
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany061;
2898
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany062;
2899
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany063;
2900
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany064;
2901
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany065;
2902
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany066;
2903
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany067;
2904
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany068;
2905
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany069;
2906
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany070;
2907
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany071;
2908
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany072;
2909
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany073;
2910
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany074;
2911
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany075;
2912
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany076;
2913
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany077;
2914
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany078;
2915
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany079;
2916
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany080;
2917
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany081;
2918
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany082;
2919
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany083;
2920
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany084;
2921
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany085;
2922
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany086;
2923
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany087;
2924
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany088;
2925
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany089;
2926
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany090;
2927
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany091;
2928
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany092;
2929
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany093;
2930
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany094;
2931
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany095;
2932
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany096;
2933
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany097;
2934
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany098;
2935
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany099;
2936
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany100;
2841 2937
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvProject001;
2842 2938
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvProject002;
2843 2939
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvProject003;
......
2938 3034
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvProject098;
2939 3035
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvProject099;
2940 3036
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvProject100;
2941
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany001;
2942
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany002;
2943
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany003;
2944
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany004;
2945
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany005;
2946
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany006;
2947
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany007;
2948
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany008;
2949
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany009;
2950
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany010;
2951
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany011;
2952
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany012;
2953
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany013;
2954
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany014;
2955
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany015;
2956
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany016;
2957
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany017;
2958
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany018;
2959
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany019;
2960
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany020;
2961
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany021;
2962
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany022;
2963
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany023;
2964
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany024;
2965
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany025;
2966
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany026;
2967
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany027;
2968
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany028;
2969
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany029;
2970
        private System.Windows.Forms.DataGridViewComboBoxColumn dgvCompany030;
2971
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany031;
2972
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany032;
2973
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany033;
2974
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany034;
2975
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany035;
2976
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany036;
2977
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany037;
2978
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany038;
2979
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany039;
2980
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany040;
2981
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany041;
2982
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany042;
2983
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany043;
2984
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany044;
2985
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany045;
2986
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany046;
2987
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany047;
2988
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany048;
2989
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany049;
2990
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany050;
2991
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany051;
2992
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany052;
2993
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany053;
2994
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany054;
2995
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany055;
2996
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany056;
2997
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany057;
2998
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany058;
2999
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany059;
3000
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany060;
3001
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany061;
3002
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany062;
3003
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany063;
3004
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany064;
3005
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany065;
3006
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany066;
3007
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany067;
3008
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany068;
3009
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany069;
3010
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany070;
3011
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany071;
3012
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany072;
3013
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany073;
3014
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany074;
3015
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany075;
3016
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany076;
3017
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany077;
3018
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany078;
3019
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany079;
3020
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany080;
3021
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany081;
3022
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany082;
3023
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany083;
3024
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany084;
3025
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany085;
3026
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany086;
3027
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany087;
3028
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany088;
3029
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany089;
3030
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany090;
3031
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany091;
3032
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany092;
3033
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany093;
3034
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany094;
3035
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany095;
3036
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany096;
3037
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany097;
3038
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany098;
3039
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany099;
3040
        private System.Windows.Forms.DataGridViewTextBoxColumn dgvCompany100;
3041
        private System.Windows.Forms.Label lblCellTotal;
3042
        private System.Windows.Forms.Button btnTotalDsp;
3043 3037
    }
3044 3038
}
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs
4667 4667
                sql.AppendFormat("    and Cl.ComplateFlg = {0} ", (int)ConstructionLedger.CompFlagDef.Operateing);
4668 4668

  
4669 4669
                sql.Append("        inner join ConstructionBaseinfoDetail as Cbd ");
4670
                sql.Append("           on Cbd.ConstructionCode = Cld.ConstructionCode ");
4670
                sql.Append("           on Cbd.ConstructionCode = Cld.SourceCode ");
4671 4671
                sql.AppendFormat("     and Cbd.DetailNo = {0} ", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
4672 4672

  
4673 4673
                sql.Append("        inner join SubContractorMaster as Sc");
......
4738 4738
                sql.Append("  , ifnull(Scm.DisplayOrder, 99999999) as DisplayOrder ");
4739 4739
                sql.Append("  , Bdd.ConstructionCode as ConstructionCode ");
4740 4740
                sql.Append("  , case Bdd.FieldName ");
4741
                sql.AppendFormat("    when '{0}' then Cbd.DetailString", s_UnknownString);
4742
                sql.Append("    else  Bdd.FieldName");
4741
                sql.AppendFormat("    when '{0}' then  Bdd.FieldName", s_UnknownString);
4742
                sql.Append("    else Cbd.DetailString");
4743 4743
                sql.Append("    End as FieldName ");
4744 4744
                sql.Append("  , Bdd.BillPrice as BillPrice ");
4745 4745
                sql.Append("  , Bdd.HighwPrice as HighwPrice ");
......
4833 4833
                sql.AppendFormat("      and Pa.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval);
4834 4834
                sql.Append("            and Pa.SeqNo = 1 ");
4835 4835
                sql.AppendFormat("      and Pa.ApprovalStatus = {0}) ", (int)CommonDefine.ApprovalStatus.Approval);
4836
                sql.Append("       on Bdd.ConstructionCode = Cbi.ConstructionCode ");
4837
                
4838
                sql.Append("       left join ConstructionBaseinfoDetail as Cbd");
4839
                sql.Append("                 on Cbd.ConstructionCode = Cbi.ConstructionCode ");
4840
                sql.AppendFormat("           and Cbd.DetailNo = {0}) ", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
4836
                sql.Append("       on Bdd.ConstructionCode = Cbi.ConstructionCode) ");
4841 4837

  
4842 4838
                sql.Append("       on Bd.CompanyCode = Bdd.CompanyCode ");
4843 4839
                sql.Append("       and Bd.TargetDate = Bdd.TargetDate ");
......
4846 4842
                sql.Append("  left join (PurchaseOrderDate as Pod )");
4847 4843
                sql.Append("       on Bd.CompanyCode = Pod.CompanyCode ");
4848 4844
                sql.Append("       and Bdd.ConstructionCode = Pod.ConstructionCode ");
4845

  
4849 4846
                sql.Append("  left join constructionledger as Cl");
4850 4847
                sql.Append("       ON Cl.ConstructionCode = Bdd.CONSTRUCTIONCODE");
4851 4848
                sql.AppendFormat(" And Cl.ComplateFlg = {0}", (int)ConstructionLedger.CompFlagDef.Operateing);
4849

  
4852 4850
                sql.Append("  Left join constructionledgerDetail as Cld");
4853 4851
                sql.Append("       ON Cld.ConstructionCode = Bdd.CONSTRUCTIONCODE");
4854 4852
                sql.AppendFormat(" And Cld.GroupCount = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
4855 4853
                sql.Append("       And Cld.DetailCount = Bdd.CONSTRUCTIONROWCNT");
4856 4854

  
4855
                sql.Append("  left join ConstructionBaseinfoDetail as Cbd");
4856
                sql.Append("       on Cbd.ConstructionCode = Cld.SourceCode ");
4857
                sql.AppendFormat(" and Cbd.DetailNo = {0} ", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
4858

  
4857 4859
                sql.Append("  left join approvalmaster As AppM ");
4858 4860
                sql.AppendFormat(" on AppM.ApprovalCode = {0} ", Appcode);
4859 4861
                sql.Append("       And AppM.DepartmentCode = Picm.DepartmentCode ");
4860
                sql.Append("     Left join PersonInChargeMaster as AppPName ");
4861
                sql.Append("        on AppPName.PersonCode = AppM.ApprovalPerson ");
4862
                sql.Append("     Left Join personapproval As PersonApp ");
4863
                sql.Append("        On PersonApp.PersonCode = Cbi.ConstructionPersonCode ");
4864
                sql.Append("        And PersonApp.PersonCodeApproval = AppPName.PersonCode ");
4865 4862

  
4866
                sql.AppendFormat("  And DATE (PersonApp.OrderDate) = '{0}' ", GetTargetDate().ToShortDateString());
4867
                sql.Append("        And  PersonApp.SeqNo > 1");
4863
                sql.Append("  Left join PersonInChargeMaster as AppPName ");
4864
                sql.Append("       on AppPName.PersonCode = AppM.ApprovalPerson ");
4868 4865

  
4869
                sql.Append("     Left Join paymentapprovalinfo As PayApp");
4870
                sql.Append("        On PayApp.COMPANYCODE = Pdd.COMPANYCODE");
4871
                sql.Append("        And PayApp.TARGETDATE = Pdd.TARGETDATE");
4872
                sql.Append("        And PayApp.SEQNO = Pdd.SEQNO");
4873
                sql.Append("        And PayApp.LINECOUNT = Pdd.LINECOUNT");
4874
                sql.Append("        And PayApp.APPROVALPERSON = AppM.ApprovalPerson");
4866
                sql.Append("  Left Join personapproval As PersonApp ");
4867
                sql.Append("       On PersonApp.PersonCode = Cbi.ConstructionPersonCode ");
4868
                sql.Append("       And PersonApp.PersonCodeApproval = AppPName.PersonCode ");
4875 4869

  
4876
                sql.Append("     Inner Join SubContractorMaster as Scm ");
4870
                sql.AppendFormat(" And DATE (PersonApp.OrderDate) = '{0}' ", GetTargetDate().ToShortDateString());
4871
                sql.Append("       And  PersonApp.SeqNo > 1");
4872

  
4873
                sql.Append("  Left Join paymentapprovalinfo As PayApp");
4874
                sql.Append("       On PayApp.COMPANYCODE = Pdd.COMPANYCODE");
4875
                sql.Append("       And PayApp.TARGETDATE = Pdd.TARGETDATE");
4876
                sql.Append("       And PayApp.SEQNO = Pdd.SEQNO");
4877
                sql.Append("       And PayApp.LINECOUNT = Pdd.LINECOUNT");
4878
                sql.Append("       And PayApp.APPROVALPERSON = AppM.ApprovalPerson");
4879

  
4880
                sql.Append("  Inner Join SubContractorMaster as Scm ");
4877 4881
                sql.Append("        On Bdd.CompanyCode = Scm.CompanyCode ");
4878 4882
                sql.AppendFormat("  And Scm.LabourKind = {0} ", m_Labourkind);
4879 4883

  
4880 4884
                sql.AppendFormat(" Where Bd.TargetDate = {0} ", m_Select_TargetDate);
4881 4885

  
4886
                int nNotCode = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
4887
                sql.AppendFormat(" And Cbi.ConstructionStatusFlg != {0} ", nNotCode);
4882 4888
            }
4883 4889
            catch (Exception ex)
4884 4890
            {

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