プロジェクト

全般

プロフィール

リビジョン 191

堀内7年以上前に追加

請求まとめインターフェース追加
メニュー起動項目追加

差分を表示:

branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
192 192
                    // 工事台帳実行データよりグループごとの合計金額を取得する
193 193
                    strSQL = "SELECT GROUPCOUNT, SUM(PAYMENTAMOUNT)";
194 194
                    strSQL += " FROM CONSTRUCTIONLEDGEREXCUTE";
195
                    strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}",ConstrCode);
195
                    strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", ConstrCode);
196 196
                    strSQL += " GROUP BY GROUPCOUNT";
197 197
                    strSQL += " ORDER BY GROUPCOUNT";
198 198

  
......
207 207
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.Expenses);               // 1:経費
208 208

  
209 209
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.ConstructionCosts);      // 2:施工費
210
                    
210

  
211 211
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.TransportationCosts);    // 3:交通費(通行料・電車代)
212 212
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.PurchaseCosts);          // 4:購入品
213 213
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.VehicleLeaseFee);        // 5:車両リース代
214 214
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.ParkingCosts);           // 6:駐車場・資材置き場
215 215
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.RoomChargeCosts);        // 7:宿泊費
216
                    
216

  
217 217
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.DisposeCosts);           // 8:処分費等
218 218
                    int Payment = CalcGetTotal(InData, GroupCodeList);                              // ----- 支払額
219 219

  
......
229 229
                    GroupCodeList.Clear();
230 230
                    GroupCodeList.Add((int)FrmConstructionLedger.DataGroup.BillingAmount);          // 14:請求金額
231 231
                    int Billing = CalcGetTotal(InData, GroupCodeList);                              // ----- 請求額
232
                    
232

  
233 233
                    // ----- 工事詳細台帳更新
234 234
                    strSQL = "UPDATE CONSTRUCTIONLEDGER SET";
235 235
                    strSQL += string.Format(" TOTALPAYMENT = {0}", Payment);
......
292 292
        /// </summary>
293 293
        /// <returns></returns>
294 294
        private static bool SearchTatgetConstructionLedger(IOConstructionLedger LedgerDB, IOConstructionLedgerDetail LedgerDetailDB
295
                                                            ,int ConstructionCode, int GroupNo, string TargetMonth, ref int LineCnt, ref int ColCnt)
295
                                                            , int ConstructionCode, int GroupNo, string TargetMonth, ref int LineCnt, ref int ColCnt)
296 296
        {
297 297
            try
298 298
            {
......
300 300
                string strLedger = LedgerDB.CreatePrimarykeyString(ConstructionCode);
301 301
                ConstructionLedger LedgerRec = new ConstructionLedger();
302 302
                if (!LedgerDB.SelectAction(strLedger, ref LedgerRec, false)) return false;
303
                
303

  
304 304
                // 現在の処理年月をDateTime型に変換する
305 305
                DateTime NowDates = CommonMotions.cnvDate(TargetMonth + "/01");
306 306

  
......
472 472
                // 見えない画面を出す
473 473
                frm.WindowState = FormWindowState.Minimized;
474 474
                frm.Hide();
475
                
475

  
476 476
                // データを追加する
477 477
                frm.AddingConstrCode = ConstructionCode;
478 478
                if (!frm.AddDataLedger)
......
561 561
                    LedgerExDB.ExecuteReader(strExecout, ref arExecList, false);
562 562
                    if (arExecList.Count != 0)
563 563
                    {
564
                       object[] objRec = (object[])arExecList[0];
565
                       NowValue = CommonMotions.cnvInt(objRec[0]);
564
                        object[] objRec = (object[])arExecList[0];
565
                        NowValue = CommonMotions.cnvInt(objRec[0]);
566 566
                    }
567 567

  
568 568
                    // 1日分の給与を取得する
......
752 752
                    LedgerExDBRec.ColumnCount = ColumnCount;        // 列番号
753 753
                    LedgerExDBRec.PaymentAmount = DaySalary;        // 支払金額
754 754
                    LedgerExDBRec.TargetMonth = ColumnDate;         // 対象年月
755
                    
755

  
756 756
                    // データ作成
757 757
                    if (!LedgerExDB.InsertAction(LedgerExDBRec, false)) return false;
758
                    
758

  
759 759
                    return true;
760 760
                }
761 761

  
......
839 839
                    bSuccess = false;
840 840
                    return bSuccess;
841 841
                }
842
                
842

  
843 843
                // データ保存処理
844 844
                if (!frm.SaveLedgerData)
845 845
                {
......
913 913
            }
914 914
        }
915 915
        #endregion
916

  
917
        // ↓↓ ** ----- インターフェース ----- **
918
        #region 支払金額合計チェック
919
        /// <summary>
920
        /// 支払金額合計が実行金額を超えた場合はflaseを返す
921
        /// </summary>
922
        /// <param name="ConstrCode">工事番号</param>
923
        /// <param name="CompanyCode">会社コード</param>
924
        /// <param name="LineNo">工事台帳行番号</param>
925
        /// <param name="CurrentValue">現在入力値</param>
926
        /// <param name="TargetDate">現在入力年月</param>
927
        /// <returns></returns>
928
        public static bool OverExecAmount(int ConstrCode, int LineNo, int CurrentValue, DateTime TargetDate, int CompanyCode = 0)
929
        {
930
            IOConstructionLedgerDetail DetailDB = new IOConstructionLedgerDetail();
931
            try
932
            {
933
                // 行番号無は新規追加分としてチェックしない
934
                if (LineNo < 1) return true;
935

  
936
                StringBuilder strSQL = new StringBuilder();
937

  
938
                int GroupNo = (int)FrmConstructionLedger.DataGroup.ConstructionCosts;
939

  
940
                strSQL.Append("select");
941
                strSQL.Append(" A.ConstructionCode,");
942
                strSQL.Append(" A.CompanyCode,");
943
                strSQL.Append(" A.ExecutionAmount,");
944
                strSQL.Append(" SUM(B.PaymentAmount)");
945
                strSQL.Append(" From constructionledgerdetail AS A");
946

  
947
                strSQL.Append(" LEFT OUTER JOIN constructionledgerexcute AS B");
948
                strSQL.Append(" ON B.ConstructionCode = A.ConstructionCode");
949
                strSQL.Append(" AND B.GroupCount = A.GroupCount");
950
                strSQL.Append(" AND B.LineCount = A.LineCount");
951
                strSQL.AppendFormat(" AND DATE_FORMAT(B.TargetMonth ,'%Y%m') <> '{0}'", TargetDate.ToString("yyyyMM"));
952

  
953
                strSQL.AppendFormat(" WHERE A.ConstructionCode = {0}", ConstrCode);
954
                strSQL.AppendFormat(" AND A.GroupCount = {0}", GroupNo);
955
                strSQL.AppendFormat(" AND A.LineCount = {0}", LineNo);
956
                if (CompanyCode != 0) strSQL.AppendFormat(" AND A.CompanyCode = {0}", CompanyCode);
957

  
958
                ArrayList ArrayList = new ArrayList();
959
                if (!DetailDB.ExecuteReader(strSQL.ToString(), ref ArrayList)) return false;
960
                if (ArrayList.Count == 0) return false;
961

  
962
                object[] objRec = (object[])ArrayList[0];
963
                int ExecValue = CommonMotions.cnvInt(objRec[2]);
964
                int PaymentValue = CommonMotions.cnvInt(objRec[3]);
965
                
966
                // 登録値+入力値が実行金額を超えた場合はfalseを返す
967
                if (ExecValue < (PaymentValue + CurrentValue)) return false;
968

  
969
                return true;
970
            }
971
            catch (System.Exception ex)
972
            {
973
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
974
                return false;
975
            }
976
            finally
977
            {
978
                DetailDB.close(); DetailDB = null;
979
            }
980
        }
981
        #endregion
982

  
983
        #region 工事詳細台帳支払いデータ一括登録
984
        /// <summary>
985
        /// 工事詳細台帳支払いデータ一括登録
986
        /// </summary>
987
        /// <param name="EntryList"></param>
988
        /// <returns></returns>
989
        public static bool EntryExecuteData(List<ConstructionLedgerExcute> EntryList)
990
        {
991
            IOConstructionLedgerExcute ExecDB = new IOConstructionLedgerExcute();
992
            try
993
            {
994
                ExecDB.connect(); ExecDB.beginTran();
995

  
996
                StringBuilder strSQL = new StringBuilder();
997
                bool bExists = true;
998
                bool bRet = true;
999
                foreach (ConstructionLedgerExcute CurRec in EntryList)
1000
                {
1001
                    strSQL.Clear();
1002

  
1003
                    strSQL.AppendFormat(ExecDB.CreatePrimarykeyString(CurRec.ConstructionCode,
1004
                                                                        CurRec.GroupCount,
1005
                                                                        CurRec.LineCount,
1006
                                                                        CurRec.ColumnCount));
1007

  
1008
                    List<ConstructionLedgerExcute> ExecList = new List<ConstructionLedgerExcute>();
1009
                    if (!ExecDB.SelectAction(strSQL.ToString(), ref ExecList, false)) continue;
1010
                    if (ExecList.Count == 0) bExists = false;
1011

  
1012
                    if (bExists)
1013
                    {   // データ存在時は支払金額更新
1014
                        if(!ExecDB.UpdateFeild(CurRec.ConstructionCode,
1015
                                            CurRec.GroupCount,
1016
                                            CurRec.LineCount,
1017
                                            CurRec.ColumnCount,
1018
                                            (int)IOConstructionLedgerExcute.TableColumn.PaymentAmount,
1019
                                            CurRec.PaymentAmount,
1020
                                            false))
1021
                        {
1022
                            bRet = false;
1023
                            ExecDB.rollback();
1024
                            break;
1025
                        }
1026
                    }
1027
                    else
1028
                    {   // データ未作成の場合は施工費の最大行番号で新規データ作成
1029
                        strSQL.Clear();
1030
                        strSQL.Append("SELECT MAX(LINECOUNT) FROM CONSTRUCTIONLEDGEREXCUTE");
1031
                        strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", CurRec.ConstructionCode);
1032
                        strSQL.AppendFormat(" AND GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
1033

  
1034
                        ArrayList CountData = new ArrayList();
1035
                        ExecDB.ExecuteReader(strSQL.ToString(), ref CountData, false);
1036

  
1037
                        object[] objRec = (object[])CountData[0];
1038
                        CurRec.LineCount = CommonMotions.cnvInt(objRec[0]) + 1;
1039
                        if (!ExecDB.InsertAction(CurRec, false))
1040
                        {
1041
                            bRet = false;
1042
                            ExecDB.rollback();
1043
                            break;
1044
                        }
1045
                    }
1046
                }
1047

  
1048
                return bRet;
1049
            }
1050
            catch (System.Exception ex)
1051
            {
1052
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1053
                return false;
1054
            }
1055
            finally
1056
            {
1057
                ExecDB.commit();
1058
                ExecDB.close(); ExecDB = null;
1059
            }
1060
        }
1061
        #endregion
1062
        // ↑↑ ** ----- インターフェース ----- **
916 1063
    }
917 1064
}
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
84 84
            PriceOfBudget = 37,                 // 37:台帳状況確認画面
85 85
            MaterialEntrylList = 38,            // 38:資材選択一覧
86 86
            BillingEntrylList = 39,             // 39:請求選択一覧
87
            PurchaseStatusInput = 40,           // 40:注文書状況日付入力
87
            PurchaseStatusInput = 40,           // 40:注文書状況入力
88
            ReqBillingStatus = 41,              // 41:請求書状況入力
88 89
        }
89 90
        #endregion
90 91

  
......
189 190
                                                                                { (int)ProcessExecuteNo.PriceOfBudget,          "工事台帳状態確認-表示"},
190 191
                                                                                { (int)ProcessExecuteNo.MaterialEntrylList,     "資材データ一覧-表示"},
191 192
                                                                                { (int)ProcessExecuteNo.BillingEntrylList,      "請求データ一覧-表示"},
192
                                                                                { (int)ProcessExecuteNo.PurchaseStatusInput,      "注文書状況日付-入力"},
193
                                                                                { (int)ProcessExecuteNo.PurchaseStatusInput,    "注文書状況-入力"},
194
                                                                                { (int)ProcessExecuteNo.ReqBillingStatus,     "請求書状況-入力"},
193 195
        };
194 196

  
195 197
        #endregion
......
255 257
        public enum ApprovalListNo
256 258
        {
257 259
            /// <summary>
258
            /// 0:空白
260
            ///  0:空白
259 261
            /// </summary>
260 262
            None = 0,
261 263
            /// <summary>
262
            /// 1:積算見積書承認
264
            ///  1:積算見積書承認
263 265
            /// </summary>
264 266
            EstimateApproval,
265 267
            /// <summary>
266
            /// 2:積算予算書承認
268
            ///  2:積算予算書承認
267 269
            /// </summary>
268 270
            EstimateBudgetApproval,
269 271
            /// <summary>
270
            /// 3:工事予算書承認
272
            ///  3:工事予算書承認
271 273
            /// </summary>
272 274
            ConstructionBudgetApproval,
273 275
            /// <summary>
274
            /// 4:注文書承認
276
            ///  4:注文書承認
275 277
            /// </summary>
276 278
            PurchaseOrderEntryApproval,
277 279
            /// <summary>
278
            /// 5:請求書承認
280
            ///  5:請求書承認
279 281
            /// </summary>
280 282
            OrderBillingApproval,
281 283
            /// <summary>
282
            /// 6:工事日報承認
284
            ///  6:工事日報承認
283 285
            /// </summary>
284 286
            DRConstructionApproval,
285 287
            /// <summary>
286
            /// 7:議事録承認
288
            ///  7:議事録承認
287 289
            /// </summary>
288 290
            DRProceedingsApproval,
289 291
            /// <summary>
290
            /// 8:出勤管理承認
292
            ///  8:出勤管理承認
291 293
            /// </summary>
292 294
            DRWorkApproval,
293 295
            /// <summary>
294
            /// 9:発注者登録承認
296
            ///  9:発注者登録承認
295 297
            /// </summary>
296 298
            CostomerRegistApproval,
297 299
            /// <summary>
298
            ///10:協力会社登録承認
300
            /// 10:協力会社登録承認
299 301
            /// </summary>
300
            SubConstregistApproval
302
            SubConstregistApproval,
303
            /// <summary>
304
            /// 11:手間支払
305
            /// </summary>
306
            FeePayment,
307
            /// <summary>
308
            /// 12:業者支払
309
            /// </summary>
310
            SubConstrPayment,
301 311
        }
302 312
        #endregion
303 313

  
......
336 346
                                                                                {8, "出勤管理承認"},
337 347
                                                                                {9, "発注者登録承認"},
338 348
                                                                                {10, "協力会社登録承認"},
349
                                                                                {11, "手間支払確認承認"},
350
                                                                                {12, "業社支払確認承認"},
339 351
                                                                                {98, "入金確認承認"},
340 352
                                                                                {99, "請求まとめ承認"}
341 353
                                                                                };
......
456 468
            {
457 469
                while (m_ProcControlPara.Count != 0)
458 470
                {
471
                    // 起動指示処理取得
459 472
                    int NowPoint = GetNowProcessPoint();
460 473

  
461 474
                    // 起動チェック
475
                    //int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
476
                    //if (!ClsSecurityPermission.GetExecutePermission(m_ProcControlPara[NowPoint].ProcNo, ref EditFlg))
477
                    //{
478
                    //    MessageBox.Show("選択された処理の起動権限が設定されていません。", "起動権限確認", MessageBoxButtons.OK, MessageBoxIcon.Stop);
479
                    //    BackProcess();
480
                    //}
462 481

  
463

  
464

  
465 482
                    switch (m_ProcControlPara[NowPoint].ProcNo)
466 483
                    {
467 484
                        #region 通常処理
......
625 642
                            ProcessExecuteNo_PurchaseStatusInput(m_ProcControlPara[NowPoint]);
626 643
                            break;
627 644

  
645
                        case (int)ProcessExecuteNo.ReqBillingStatus:                  // 41:請求書状況入力
646
                            ProcessExecuteNo_ReqBillingStatus(m_ProcControlPara[NowPoint]);
647
                            break;
648

  
628 649
                        #endregion
629 650

  
630 651
                        #region マスタメンテ
......
908 929
            FrmConstructionList frm = new FrmConstructionList();
909 930
            try
910 931
            {
911
                // 次起動プロセスが設定されていない場合は終了
912
                if (CurrentPara.IntExecParameter[0] == 0)
913
                {
914
                    // 前プロセスに戻る
915
                    BackProcess();
916
                    return;
917
                }
918

  
919 932
                // 次起動プロセスセット
920 933
                frm.ExecuteFlg = CurrentPara.IntExecParameter[0];
921 934
                // データ追加フラグ
......
955 968

  
956 969
                // 起動・編集フラグ
957 970
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
958
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
959
                {
960
                    BackProcess();
961
                    return;
962
                }
971
                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
963 972
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
964 973

  
965 974
                // パラメータセット
......
1001 1010

  
1002 1011
                // 起動・編集フラグ
1003 1012
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1004
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1005
                {
1006
                    BackProcess();
1007
                    return;
1008
                }
1013
                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
1009 1014
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1010 1015

  
1011 1016
                // パラメータセット
......
1044 1049

  
1045 1050
                // 起動・編集フラグ
1046 1051
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1047
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1048
                {
1049
                    BackProcess();
1050
                    return;
1051
                }
1052
                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
1052 1053
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1053 1054

  
1054 1055
                // パラメータセット
......
1088 1089

  
1089 1090
                // 起動・編集フラグ
1090 1091
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1091
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1092
                {
1093
                    BackProcess();
1094
                    return;
1095
                }
1092
                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
1096 1093
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1097 1094

  
1098 1095
                // パラメータセット
......
1131 1128

  
1132 1129
                // 起動・編集フラグ
1133 1130
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1134
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1135
                {
1136
                    BackProcess();
1137
                    return;
1138
                }
1131
                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
1139 1132
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1140 1133

  
1141 1134
                // パラメータセット
......
1174 1167

  
1175 1168
                // 起動・編集フラグ
1176 1169
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1177
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1178
                {
1179
                    BackProcess();
1180
                    return;
1181
                }
1170
                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
1182 1171
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1183 1172

  
1184 1173
                // パラメータセット
......
1224 1213

  
1225 1214
                // 起動・編集フラグ
1226 1215
                int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
1227
                if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg))
1228
                {
1229
                    BackProcess();
1230
                    return;
1231
                }
1216
                ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg);
1232 1217
                if (EditFlg == (int)CommonDefine.ProcessDataEdit.Reference) frm.EditLock = true;
1233 1218

  
1234 1219
                // パラメータセット
......
2506 2491
        }
2507 2492
        #endregion
2508 2493

  
2494
        #region 請求書状況入力
2495
        /// <summary>
2496
        /// 請求書状況入力
2497
        /// </summary>
2498
        /// <param name="CurrentPara"></param>
2499
        public static void ProcessExecuteNo_ReqBillingStatus(ProcessParameter CurrentPara)
2500
        {
2501
            // 請求選択一覧
2502
            FrmReqBillingStatus frm = new FrmReqBillingStatus();
2503
            try
2504
            {
2505
                // パラメータセット
2506
                //frm.ExecuteFlg = CurrentPara.IntExecParameter[0];
2507

  
2508
                // フォーム表示
2509
                frm.ShowDialog();
2510
            }
2511
            catch (Exception ex)
2512
            {
2513
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
2514
                BackProcess();
2515
            }
2516
            finally
2517
            {
2518
                frm.Dispose(); frm = null;
2519
            }
2520
        }
2509 2521
        #endregion
2510 2522

  
2523
        #endregion
2524

  
2511 2525
        #region マスタメンテナンス
2512 2526
        // ----------------- メンテナンス起動
2513 2527
        #region 管理マスタ
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerExcute.cs
478 478
                        break;
479 479
                    // 支払金額
480 480
                    case (int)TableColumn.PaymentAmount:
481
                        strcmd.AppendFormat(" PaymentAmount = {0}", (int)value);
481
                        strcmd.AppendFormat(" PaymentAmount = {0}", (double)value);
482 482
                        break;
483 483
                    // 対象年月
484 484
                    case (int)TableColumn.TargetMonth:
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMApproval.cs
66 66
        public bool SelectAction(string AddSQLString, ref List<ApprovalMaster> data, bool bConnect = true)
67 67
        {
68 68
            // インターフェース
69
            string strcmd = "";
69
            StringBuilder strcmd = new StringBuilder();
70 70
            ArrayList arData = new ArrayList();
71 71

  
72 72
            try
73 73
            {
74 74
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
75
                strcmd = "SELECT";
76
                strcmd += " ApprovalCode";
77
                strcmd += ",DepartmentCode";
78
                strcmd += ",SeqNo";
79
                strcmd += ",DisplayOrder";
80
                strcmd += ",ApprovalPerson";
81
                strcmd += ",ApprovalAuthority";
82
                strcmd += ",DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')";
83
                strcmd += ",DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')";
84
                strcmd += " FROM ApprovalMaster";
85
                strcmd += AddSQLString;
75
                strcmd.Append("SELECT");
76
                strcmd.Append(" ApprovalCode");
77
                strcmd.Append(",DepartmentCode");
78
                strcmd.Append(",SeqNo");
79
                strcmd.Append(",DisplayOrder");
80
                strcmd.Append(",ApprovalPerson");
81
                strcmd.Append(",ApprovalAuthority");
82
                strcmd.Append(",DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
83
                strcmd.Append(",DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
84
                strcmd.Append(" FROM ApprovalMaster");
85
                strcmd.Append(AddSQLString);
86 86

  
87 87
                // SQL実行
88
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return false;
88
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return false;
89 89

  
90 90
                // データセット
91 91
                foreach (object[] objwrk in arData)
......
99 99
            }
100 100
            catch (Exception ex)
101 101
            {
102
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
102
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
103 103
                return false;
104 104
            }
105 105

  
......
114 114
        /// <returns>true:成功 false:失敗</returns>
115 115
        public bool InsertAction(List<ApprovalMaster> data, bool bConnect = true)
116 116
        {
117
            string strcmd = "";
117
            StringBuilder strcmd = new StringBuilder();
118 118
            try
119 119
            {
120 120
                bool bColFirst = true;
121
                strcmd = "INSERT INTO ApprovalMaster";
122
                strcmd += " (";
121
                strcmd.Append("INSERT INTO ApprovalMaster");
122
                strcmd.Append(" (");
123 123
                foreach (var gender in Enum.GetValues(typeof(NameColumn)))
124 124
                {
125
                    if (!bColFirst) strcmd += ", ";
126
                    strcmd += gender.ToString();
125
                    if (!bColFirst) strcmd.Append(", ");
126
                    strcmd.Append(gender.ToString());
127 127
                    bColFirst = false;
128 128
                }
129
                strcmd += ") VALUES";
129
                strcmd.Append(") VALUES");
130 130

  
131 131
                bool bDataFirst = true;
132 132
                foreach (ApprovalMaster work in data)
133 133
                {
134
                    if (bDataFirst) strcmd += " (";
135
                    else strcmd += ", (";
134
                    if (bDataFirst) strcmd.Append(" (");
135
                    else strcmd.Append(", (");
136 136

  
137
                    strcmd += string.Format("  {0}", work.ApprovalCode.ToString());
138
                    strcmd += string.Format(", {0}", work.DepartmentCode.ToString());
139
                    strcmd += string.Format(", {0}", work.SeqNo.ToString());
140
                    strcmd += string.Format(", {0}", work.DisplayOrder.ToString());
141
                    strcmd += string.Format(", {0}", work.ApprovalPerson.ToString());
142
                    strcmd += string.Format(", {0}", work.ApprovalAuthority.ToString());
143
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
144
                    strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
137
                    strcmd.AppendFormat("  {0}", work.ApprovalCode.ToString());
138
                    strcmd.AppendFormat(", {0}", work.DepartmentCode.ToString());
139
                    strcmd.AppendFormat(", {0}", work.SeqNo.ToString());
140
                    strcmd.AppendFormat(", {0}", work.DisplayOrder.ToString());
141
                    strcmd.AppendFormat(", {0}", work.ApprovalPerson.ToString());
142
                    strcmd.AppendFormat(", {0}", work.ApprovalAuthority.ToString());
143
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
144
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
145 145

  
146
                    strcmd += ")";
146
                    strcmd.Append(")");
147 147

  
148 148
                    bDataFirst = false;
149 149
                }
150 150

  
151
                if (!ExecuteNonQuery(strcmd, false)) return false;
151
                if (!ExecuteNonQuery(strcmd.ToString(), false)) return false;
152 152

  
153 153
                return true;
154 154
            }
155 155
            catch (Exception ex)
156 156
            {
157
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
157
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
158 158
                return false;
159 159
            }
160 160
        }
161 161
        public bool InsertAction(ApprovalMaster data, bool bConnect = true)
162 162
        {
163
            string strcmd = "";
163
            StringBuilder strcmd = new StringBuilder();
164 164
            try
165 165
            {
166 166

  
167 167
                bool bColFirst = true;
168
                strcmd = "INSERT INTO ApprovalMaster";
169
                strcmd += " (";
168
                strcmd.Append("INSERT INTO ApprovalMaster");
169
                strcmd.Append(" (");
170 170
                foreach (var gender in Enum.GetValues(typeof(NameColumn)))
171 171
                {
172
                    if (!bColFirst) strcmd += ", ";
173
                    strcmd += gender.ToString();
172
                    if (!bColFirst) strcmd.Append(", ");
173
                    strcmd.Append(gender.ToString());
174 174
                    bColFirst = false;
175 175
                }
176
                strcmd += ") VALUES (";
176
                strcmd.Append(") VALUES (");
177 177

  
178
                strcmd += string.Format("  {0}", data.ApprovalCode.ToString());
179
                strcmd += string.Format(", {0}", data.DepartmentCode.ToString());
180
                strcmd += string.Format(", {0}", data.SeqNo.ToString());
181
                strcmd += string.Format(", {0}", data.DisplayOrder.ToString());
182
                strcmd += string.Format(", {0}", data.ApprovalPerson.ToString());
183
                strcmd += string.Format(", {0}", data.ApprovalAuthority.ToString());
178
                strcmd.AppendFormat("  {0}", data.ApprovalCode.ToString());
179
                strcmd.AppendFormat(", {0}", data.DepartmentCode.ToString());
180
                strcmd.AppendFormat(", {0}", data.SeqNo.ToString());
181
                strcmd.AppendFormat(", {0}", data.DisplayOrder.ToString());
182
                strcmd.AppendFormat(", {0}", data.ApprovalPerson.ToString());
183
                strcmd.AppendFormat(", {0}", data.ApprovalAuthority.ToString());
184 184

  
185
                strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.EntryDate);
186
                strcmd += string.Format(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.UpdateDate);
187
                strcmd += ")";
185
                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.EntryDate);
186
                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", data.UpdateDate);
187
                strcmd.Append(")");
188 188

  
189
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
189
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
190 190

  
191 191
                return true;
192 192
            }
193 193
            catch (Exception ex)
194 194
            {
195
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
195
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
196 196
                return false;
197 197
            }
198 198
        }
......
207 207
        /// <returns>true:成功 false:失敗</returns>
208 208
        public bool UpdateAction(string AddSQLString, ApprovalMaster data, bool bConnect = true)
209 209
        {
210
            string strcmd = "";
210
            StringBuilder strcmd = new StringBuilder();
211 211
            try
212 212
            {
213 213

  
214
                strcmd = "UPDATE ApprovalMaster";
214
                strcmd.Append("UPDATE ApprovalMaster");
215 215

  
216
                strcmd += " SET";
216
                strcmd.Append(" SET");
217 217

  
218
                strcmd += string.Format(" ApprovalCode = {0}", data.ApprovalCode.ToString());
219
                strcmd += string.Format(",DepartmentCode = {0}", data.DepartmentCode.ToString());
220
                strcmd += string.Format(",SeqNo = {0}", data.SeqNo.ToString());
221
                strcmd += string.Format(",DisplayOrder = {0}", data.DisplayOrder.ToString());
222
                strcmd += string.Format(",ApprovalPerson = {0}", data.ApprovalPerson.ToString());
223
                strcmd += string.Format(",ApprovalAuthority = {0}", data.ApprovalAuthority.ToString());
218
                strcmd.AppendFormat(" ApprovalCode = {0}", data.ApprovalCode.ToString());
219
                strcmd.AppendFormat(",DepartmentCode = {0}", data.DepartmentCode.ToString());
220
                strcmd.AppendFormat(",SeqNo = {0}", data.SeqNo.ToString());
221
                strcmd.AppendFormat(",DisplayOrder = {0}", data.DisplayOrder.ToString());
222
                strcmd.AppendFormat(",ApprovalPerson = {0}", data.ApprovalPerson.ToString());
223
                strcmd.AppendFormat(",ApprovalAuthority = {0}", data.ApprovalAuthority.ToString());
224 224

  
225
                strcmd += ", UpdateDate = NOW()";
226
                strcmd += AddSQLString;
225
                strcmd.Append(", UpdateDate = NOW()");
226
                strcmd.Append(AddSQLString);
227 227

  
228
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
228
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
229 229

  
230 230
                return true;
231 231
            }
232 232
            catch (Exception ex)
233 233
            {
234
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
234
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
235 235
                return false;
236 236
            }
237 237
        }
......
247 247
        public bool DeleteAction(string AddSQLString, bool bConnect = true)
248 248
        {
249 249
            // インターフェース
250
            string strcmd = "";
250
            StringBuilder strcmd = new StringBuilder();
251 251
            try
252 252
            {
253
                strcmd = string.Format("{0}{1}", "DELETE FROM ApprovalMaster", AddSQLString);
253
                strcmd.AppendFormat("{0}{1}", "DELETE FROM ApprovalMaster", AddSQLString);
254 254

  
255
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
255
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
256 256

  
257 257
                return true;
258 258
            }
259 259
            catch (Exception ex)
260 260
            {
261
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
261
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
262 262
                return false;
263 263
            }
264 264
        }
......
306 306
        /// <returns>Where文字列</returns>
307 307
        public string CreatePrimarykeyString(int ApprovalCode, int DepartmentCode = -1, int SeqNo = -1)
308 308
        {
309
            string strWork = string.Empty;
309
            StringBuilder strWork = new StringBuilder();
310 310
            try
311 311
            {
312
                strWork = string.Format(" Where ApprovalCode = {0}", ApprovalCode.ToString());
312
                strWork.AppendFormat(" Where ApprovalCode = {0}", ApprovalCode.ToString());
313 313
                if (DepartmentCode != -1)
314
                    strWork += string.Format(" And DepartmentCode = {0}", DepartmentCode.ToString());
314
                    strWork.AppendFormat(" And DepartmentCode = {0}", DepartmentCode.ToString());
315 315
                if (SeqNo != -1)
316
                    strWork += string.Format(" And SeqNo = {0}", SeqNo.ToString());
316
                    strWork.AppendFormat(" And SeqNo = {0}", SeqNo.ToString());
317 317

  
318 318
            }
319 319
            catch (Exception ex)
320 320
            {
321
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strWork);
321
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strWork.ToString());
322 322
            }
323 323

  
324
            return strWork;
324
            return strWork.ToString();
325 325
        }
326 326
        /// <summary>
327 327
        /// 枝番の最大値を取得する
......
332 332
        public int SelectMaxSeqNoCount(string AddSQLString, bool bConnect = true)
333 333
        {
334 334
            // インターフェース
335
            string strcmd = "";
335
            StringBuilder strcmd = new StringBuilder();
336 336
            ArrayList arData = new ArrayList();
337 337
            int iRet = 0;
338 338
            try
339 339
            {
340 340
                // SQL作成
341
                strcmd = "SELECT IFNULL(MAX(SeqNo), 0) FROM ApprovalMaster" + AddSQLString;
341
                strcmd.AppendFormat("SELECT IFNULL(MAX(SeqNo), 0) FROM ApprovalMaster{0}" , AddSQLString);
342 342

  
343 343
                // SQL実行
344
                if (!ExecuteReader(strcmd, ref arData, bConnect)) return iRet;
344
                if (!ExecuteReader(strcmd.ToString(), ref arData, bConnect)) return iRet;
345 345

  
346 346
                // データセット
347 347
                foreach (object[] objwrk in arData)
......
355 355
            }
356 356
            catch (Exception ex)
357 357
            {
358
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
358
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd.ToString());
359 359
            }
360 360
            return iRet;
361 361
        }
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs
266 266
                        if (ClsApprovalPermission.CheckProcessApprovalData(m_ConstructionCode, m_ApprovalCode, m_OrderNo))
267 267
                        {
268 268
                            // 最終承認がされていれば申請レコードを承認へ変更する
269
                            ClsApprovalPermission.SetPrimaryRecStatus(m_ConstructionCode, m_ApprovalCode, m_OrderNo, statusCode);
269
                            if (!ClsApprovalPermission.SetPrimaryRecStatus(m_ConstructionCode,
270
                                                                            m_ApprovalCode,
271
                                                                            m_OrderNo,
272
                                                                            statusCode)) return false;
270 273
                            
271 274
                            // 工事詳細台帳データを作成するデータがある
272 275
                            CaretaLedgerData();
......
274 277
                        break;
275 278
                    default:
276 279
                        // ----- 承認以外
277
                        ClsApprovalPermission.SetPrimaryRecStatus(m_ConstructionCode, m_ApprovalCode, m_OrderNo, statusCode);
280
                        if (!ClsApprovalPermission.SetPrimaryRecStatus(m_ConstructionCode,
281
                                                                        m_ApprovalCode,
282
                                                                        m_OrderNo,
283
                                                                        statusCode)) return false;
278 284
                        break;
279 285
                }
280 286
                return true;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs
87 87
                }
88 88

  
89 89
                // ???N???v???Z?X?Z?b?g
90
                NowPoint = ClsExcute.NextProcess(m_ExecuteFlg);
90
                int NextProcNo = m_ExecuteFlg;
91
                // ?{?H??????????\????N?????????`?F?b?N????
92
                if (NextProcNo == (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint)
93
                {
94
                    int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference;
95
                    if (!ClsSecurityPermission.GetExecutePermission(NextProcNo, ref EditFlg))
96
                    {   // ?N????????????????????????\??????
97
                        NextProcNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderEntry;
98
                    }
99
                }
100
                NowPoint = ClsExcute.NextProcess(NextProcNo);
91 101
                // ?I???H??????Z?b?g
92 102
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(para_ConstructionCode);
93 103
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonMotions.cnvInt(dgv.Rows[CurrentIndex].Cells[(int)DispColumn.OrderNo].Value));
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.Designer.cs
2597 2597
            this.panel3.Anchor = System.Windows.Forms.AnchorStyles.Top;
2598 2598
            this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))));
2599 2599
            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
2600
            this.panel3.Controls.Add(this.pnlApproval);
2601
            this.panel3.Controls.Add(this.pnlApprovalButton);
2602 2600
            this.panel3.Controls.Add(this.cmbDepartment);
2603 2601
            this.panel3.Controls.Add(this.label2);
2604 2602
            this.panel3.Controls.Add(this.cmbConstructionPerson);
......
2618 2616
            this.pnlApproval.Controls.Add(this.lblApprovalCount);
2619 2617
            this.pnlApproval.Controls.Add(this.btnPetition);
2620 2618
            this.pnlApproval.Controls.Add(this.btnApproval);
2621
            this.pnlApproval.Location = new System.Drawing.Point(1056, 2);
2619
            this.pnlApproval.Location = new System.Drawing.Point(1069, 3);
2622 2620
            this.pnlApproval.Name = "pnlApproval";
2623 2621
            this.pnlApproval.Size = new System.Drawing.Size(262, 34);
2624 2622
            this.pnlApproval.TabIndex = 109;
......
2672 2670
            this.pnlApprovalButton.Controls.Add(this.btnOnApproval);
2673 2671
            this.pnlApprovalButton.Controls.Add(this.btnNotApproval);
2674 2672
            this.pnlApprovalButton.Controls.Add(this.btnOnHold);
2675
            this.pnlApprovalButton.Location = new System.Drawing.Point(1056, 2);
2673
            this.pnlApprovalButton.Location = new System.Drawing.Point(1069, 3);
2676 2674
            this.pnlApprovalButton.Name = "pnlApprovalButton";
2677 2675
            this.pnlApprovalButton.Size = new System.Drawing.Size(262, 34);
2678 2676
            this.pnlApprovalButton.TabIndex = 110;
......
2836 2834
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
2837 2835
            this.BackColor = System.Drawing.Color.Black;
2838 2836
            this.ClientSize = new System.Drawing.Size(1344, 697);
2837
            this.Controls.Add(this.pnlApproval);
2839 2838
            this.Controls.Add(this.lblCellTotal);
2840 2839
            this.Controls.Add(this.btnDataDelete);
2841 2840
            this.Controls.Add(this.btnDataEntry);
......
2843 2842
            this.Controls.Add(this.TabControl1);
2844 2843
            this.Controls.Add(this.btnEnd);
2845 2844
            this.Controls.Add(this.label1);
2845
            this.Controls.Add(this.pnlApprovalButton);
2846 2846
            this.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
2847 2847
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
2848 2848
            this.KeyPreview = true;
......
2867 2867
            this.tabPage6.ResumeLayout(false);
2868 2868
            ((System.ComponentModel.ISupportInitialize)(this.dgvPage6)).EndInit();
2869 2869
            this.panel3.ResumeLayout(false);
2870
            this.panel3.PerformLayout();
2871 2870
            this.pnlApproval.ResumeLayout(false);
2872 2871
            this.pnlApprovalButton.ResumeLayout(false);
2873 2872
            this.ResumeLayout(false);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCosts.cs
387 387
                // 初期表示
388 388
                InitDataLoad();
389 389

  
390
                // グリッドロック
391
                GridEditLock();
392

  
390 393
                // 初期表示フラグOFF
391 394
                m_bInitFlg = false;
392 395

  
......
1024 1027
                if (m_EditLock) SeeModeLock(ix, true);
1025 1028
            }
1026 1029

  
1030
            // グリッドロック
1031
            GridEditLock();
1032

  
1027 1033
            // データ変更フラグクリア
1028 1034
            m_bChengeAns = false;
1029 1035
        }
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs
166 166
            {
167 167
                // 存在月を担当者毎経費データより取得する
168 168
                //string strSQL = "SELECT DATE_FORMAT(ACTIONDATE,'YYYY/MM'), COUNT(*) FROM CostDataOfPerson GROUP BY DATE_FORMAT(ACTIONDATE,'YYYY/MM') ORDER BY 1";
169
                string strSQL = "SELECT DATE_FORMAT(ACTIONDATE,'%Y/%m'), COUNT(*) FROM CostDataOfPerson GROUP BY DATE_FORMAT(ACTIONDATE,'%Y/%m') ORDER BY 1";
169
                string strSQL = "SELECT DATE_FORMAT(ACTIONDATE,'%Y/%m'), COUNT(*) FROM CostDataOfPerson GROUP BY DATE_FORMAT(ACTIONDATE,'%Y/%m') ORDER BY 1 DESC";
170 170
                ArrayList arList = new ArrayList();
171 171
                CostDB.ExecuteReader(strSQL, ref arList);
172 172

  
......
217 217
        {
218 218
            try
219 219
            {
220
                // 新セキュリティデータ対応済みかを確認する
221
                if (CommonMotions.LoginUserData.SecCode == 0)
222
                {
223
                    InitCombBox_OLD();
224
                }
225
                else
226
                {
227
                    InitCombBox_NEW();
228
                }
229
            }
230
            catch (Exception ex)
231
            {
232
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
233
            }
234
        }
235
        #endregion
236

  
237
        #region コンボボックス初期表示(旧)
238
        /// <summary>
239
        /// コンボボックス初期表示(旧)
240
        /// </summary>
241
        private void InitCombBox_OLD()
242
        {
243
            try
244
            {
245
                // システム権限によってデータアクセスに制限がある
246
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement
247
                || CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key
248
                || CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key
249
                || CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision)
250
                {
251
                    // システム管理者
252
                    // 最高機密管理者
253
                    // 統括機密管理者
254
                    // 総務部所属者は全て見える
255

  
256
                    // 部署・担当者コンボ表示
257
                    DispAllCombBoxControl(true);
258
                }
259
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
260
                {
261
                    // 所属長
262
                    // 部署コンボ非表示
263
                    NonDispDepCombBox();
264
                }
265
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
266
                {
267
                    // 一般使用者(自分のみアクセス可能)
268
                    // 部署・担当者コンボ非表示
269
                    DispAllCombBoxControl(false);
270
                }
271
            }
272
            catch (Exception ex)
273
            {
274
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
275
            }
276
        }
277
        #endregion
278

  
279
        #region コンボボックス初期表示(新)
280
        /// <summary>
281
        /// コンボボックス初期表示(新)
282
        /// </summary>
283
        private void InitCombBox_NEW()
284
        {
285
            try
286
            {
287 220
                int AllPath = (int)CommonDefine.SecurityRangePos.AllPath;           // 全部署
288 221
                int Multiple = (int)CommonDefine.SecurityRangePos.Multiple;         // 複数部署
289 222
                int Only = (int)CommonDefine.SecurityRangePos.Only;                 // 自部署のみ
......
1741 1674
        }
1742 1675
        #endregion
1743 1676

  
1677
        #region グリッドの編集をロックする
1678
        /// <summary>
1679
        /// グリッドの編集をロックする
1680
        /// </summary>
1681
        private void GridEditLock()
1682
        {
1683
            try
1684
            {
1685
                // 全グリッドを編集可能にする
1686
                for (int i = (int)InputTabCount.Transport; i <= (int)InputTabCount.DisposalCost; i++)
1687
                {
1688
                    // グリッド取得
1689
                    DataGridView dgv = m_dispGridControl[i];
1690
                    dgv.ReadOnly = false;
1691
                }
1692

  
1693
                // 選択されていれば抜ける
1694
                if (CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue) != 0) return;
1695

  
1696
                // 全グリッドを編集不可にする
1697
                for (int i = (int)InputTabCount.Transport; i <= (int)InputTabCount.DisposalCost; i++)
1698
                {
1699
                    // グリッド取得
1700
                    DataGridView dgv = m_dispGridControl[i];
1701
                    dgv.ReadOnly = true;
1702
                }
1703
            }
1704
            catch (System.Exception ex)
1705
            {
1706
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1707
            }
1708
        }
1709
        #endregion
1744 1710
    }
1745 1711
}
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs
530 530
                DataGridView dgv = dgvProcess;
531 531

  
532 532
                // 起動対象マスタ取得
533
                string strSQL = "SELECT";
534
                strSQL += CreateFeildSQL("A.");
535
                strSQL += ", B.EXECCODE";
536
                strSQL += ", B.EDITFLG";
537
                strSQL += " FROM SECURITYMASTER A";
538
                strSQL += " LEFT JOIN PROCESSEXCUTEMASTER B ON B.SECCODE = A.SECCODE";
539
                strSQL += " ORDER BY A.DISPLAYORDER, B.EXECCODE";
533
                StringBuilder strSQL = new StringBuilder(512);
534
                strSQL.Append("SELECT");
535
                strSQL.Append(CreateFeildSQL("A."));
536
                strSQL.Append(", B.EXECCODE");
537
                strSQL.Append(", B.EDITFLG");
538
                strSQL.Append(" FROM SECURITYMASTER A");
539
                strSQL.Append(" LEFT JOIN PROCESSEXCUTEMASTER B ON B.SECCODE = A.SECCODE");
540
                strSQL.Append(" ORDER BY A.DISPLAYORDER, B.EXECCODE");
540 541
                ArrayList peList = new ArrayList();
541
                secDB.ExecuteReader(strSQL, ref peList);
542
                secDB.ExecuteReader(strSQL.ToString(), ref peList);
542 543
                if (peList.Count == 0) return;
543 544

  
544 545
                m_SecMasterList.Clear();
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs
601 601
                                                                    },
602 602
                                                                    {(int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint,
603 603
                                                                        (int)ClsExcute.ProcessExecuteNo.PurchaseOrderStatus,
604
                                                                        (int)ClsExcute.ProcessExecuteNo.ReqBillingStatus,
604 605
                                                                        0,
605
                                                                        0,
606 606
                                                                        0
607 607
                                                                    },
608 608
                                                                    {(int)ClsExcute.ProcessExecuteNo.RequestSummaryList,
......
2259 2259
        /// <param name="e"></param>
2260 2260
        private void btnOrder_Click(object sender, EventArgs e)
2261 2261
        {
2262
            int NowPoint = -1;
2263 2262
            try
2264 2263
            {
2265
                // 自画面非表示
2266
                if (CommonMotions.ProductionExecution) this.Visible = false;
2267

  
2268 2264
                // 参照オブジェクトをボタンに変換
2269 2265
                System.Windows.Forms.Button btnKey = (System.Windows.Forms.Button)sender;
2270
                int ButtonCol = tblLayoutOrder.GetColumn(btnKey);                           // 列取得(X)
2271
                int ButtonRow = tblLayoutOrder.GetRow(btnKey);                              // 行取得(Y)
2272 2266

  
2273 2267
                // 処理起動
2274
                OrderTabEvent(ButtonRow, ButtonCol, ref NowPoint);
2268
                OrderTabEvent(btnKey);
2275 2269
            }
2276 2270
            catch (Exception ex)
2277 2271
            {
2278 2272
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
2279 2273
            }
2280
            finally
2281
            {
2282
                // 再表示
2283
                if (NowPoint > -1) DisplayDataLoad();
2284
                // 自画面表示
2285
                if (CommonMotions.ProductionExecution) this.Visible = true;
2286
            }
2287 2274
        }
2288 2275
        #endregion
2289 2276

  
......
2295 2282
        /// <param name="e"></param>
2296 2283
        private void btnConstruction_Click(object sender, EventArgs e)
2297 2284
        {
2298
            int NowPoint = -1;
2299 2285
            try
2300 2286
            {
2301
                // 自画面非表示
2302
                if (CommonMotions.ProductionExecution) this.Visible = false;
2303

  
2304 2287
                // 参照オブジェクトをボタンに変換
2305 2288
                System.Windows.Forms.Button btnKey = (System.Windows.Forms.Button)sender;
2306
                int ButtonCol = tblLayoutConstruction.GetColumn(btnKey);                    // 列取得(X)
2307
                int ButtonRow = tblLayoutConstruction.GetRow(btnKey);                       // 行取得(Y)
2308 2289
             
2309 2290
                // 処理起動
2310
                ConstructionTabEvent(ButtonRow, ButtonCol, ref NowPoint);
2291
                ConstructionTabEvent(btnKey);
2311 2292
            }
2312 2293
            catch (Exception ex)
2313 2294
            {
2314 2295
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
2315 2296
            }
2316
            finally
2317
            {
2318
                // 再表示
2319
                if (NowPoint > -1) DisplayDataLoad();
2320
                // 自画面表示
2321
                if (CommonMotions.ProductionExecution) this.Visible = true;
2322
            }
2323 2297
        }
2324 2298
        #endregion
2325 2299

  
......
2331 2305
        /// <param name="e"></param>
2332 2306
        private void btnAffairs_Click(object sender, EventArgs e)
2333 2307
        {
2334
            int NowPoint = -1;
2335 2308
            try
2336 2309
            {
2337
                // 自画面非表示
2338
                if (CommonMotions.ProductionExecution) this.Visible = false;
2339

  
2340 2310
                // 参照オブジェクトをボタンに変換
2341 2311
                System.Windows.Forms.Button btnKey = (System.Windows.Forms.Button)sender;
2342
                int ButtonCol = tblLayoutConstruction.GetColumn(btnKey);                    // 列取得(X)
2343
                int ButtonRow = tblLayoutConstruction.GetRow(btnKey);                       // 行取得(Y)
2344 2312

  
2345 2313
                // 処理起動
2346
                AffairsTabEvent(ButtonRow, ButtonCol, ref NowPoint);
2314
                AffairsTabEvent(btnKey);
2347 2315
            }
2348 2316
            catch (Exception ex)
2349 2317
            {
2350 2318
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
2351 2319
            }
2352
            finally
2353
            {
2354
                // 再表示
2355
                if (NowPoint > -1) DisplayDataLoad();
2356
                // 自画面表示
2357
                if (CommonMotions.ProductionExecution) this.Visible = true;
2358
            }
2359 2320
        }
2360 2321
        #endregion
2361 2322

  
......
2369 2330
        {
2370 2331
            try
2371 2332
            {
2372
                int NowPoint = -1;
2373
                // 自画面非表示
2374
                if (CommonMotions.ProductionExecution) this.Visible = false;
2375

  
2376 2333
                // 参照オブジェクトをボタンに変換
2377 2334
                System.Windows.Forms.Button btnKey = (System.Windows.Forms.Button)sender;
2378
                int ButtonCol = tblLayoutConstruction.GetColumn(btnKey);                    // 列取得(X)
2379
                int ButtonRow = tblLayoutConstruction.GetRow(btnKey);                       // 行取得(Y)
2380 2335

  
2381 2336
                // 処理起動
2382
                NotificationTabEvent(ButtonRow, ButtonCol, ref NowPoint);
2337
                NotificationTabEvent(btnKey);
2383 2338
            }
2384 2339
            catch (Exception ex)
2385 2340
            {
2386 2341
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
2387 2342
            }
2388
            finally
2389
            {
2390
                // 自画面表示
2391
                if (CommonMotions.ProductionExecution) this.Visible = true;
2392
            }
2393 2343
        }
2394 2344
        #endregion
2395 2345

  
......
2403 2353
        {
2404 2354
            try
2405 2355
            {
2406
                // 自画面非表示
2407
                if (CommonMotions.ProductionExecution) this.Visible = false;
2408

  
2409 2356
                // 参照オブジェクトをボタンに変換
2410 2357
                System.Windows.Forms.Button btnKey = (System.Windows.Forms.Button)sender;
2411 2358

  
2412
                int ProcessNo = CommonMotions.cnvInt(btnKey.Name);
2413
                int NowPoint = ClsExcute.NextProcess(ProcessNo);
2414

  
2415
                // 処理実行
2416
                ClsExcute.ProcesscExecute();
2359
                MasterMaintenanceTabEvent(btnKey);
2417 2360
            }
2418 2361
            catch (Exception ex)
2419 2362
            {
2420 2363
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
2421 2364
            }
2422
            finally
2423
            {
2424
                // 再表示
2425
                DisplayDataLoad();
2426
                // 自画面表示
2427
                if (CommonMotions.ProductionExecution) this.Visible = true;
2428
            }
2429 2365
        }
2430 2366
        #endregion
2431 2367

  
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
143 143
                int Tabcount = MenuTabName[wrkname];
144 144

  
145 145
                // グリッドセルを画面サイズに合わせる
146
                if (m_Alldgv[Tabcount] != null)
146
                if (m_Alldgv[Tabcount - 1] != null)
147 147
                {
148 148
                    bool bNormal = false;
149 149

  
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuEvent.cs
35 35
        /// <param name="RowCnt"></param>
36 36
        /// <param name="ColCnt"></param>
37 37
        /// <param name="NowPoint"></param>
38
        private void OrderTabEvent(int RowCnt, int ColCnt, ref int NowPoint)
38
        private void OrderTabEvent(Button btnKey)
39 39
        {
40
            int NowPoint = -1;
40 41
            try
41 42
            {
43
                int ColCnt = tblLayoutOrder.GetColumn(btnKey);                          // 列取得(X)
44
                int RowCnt = tblLayoutOrder.GetRow(btnKey);                             // 行取得(Y)
45
                
42 46
                switch (RowCnt)
43 47
                {
44 48
                    case 0:
......
123 127
                        }
124 128
                        break;
125 129
                }
126
                if (NowPoint < 0) return;
130
                if (NowPoint < 0)
131
                {
132
                    MessageBox.Show("処理が実装されていません。", "未実装処理", MessageBoxButtons.OK, MessageBoxIcon.None);
133
                    return;
134
                }
127 135

  
136
                // 自画面非表示
137
                if (CommonMotions.ProductionExecution) this.Visible = false;
138

  
128 139
                // 処理実行
129 140
                ClsExcute.ProcesscExecute();
130 141
            }
......
132 143
            {
133 144
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
134 145
            }
146
            finally
147
            {
148
                // 再表示
149
                if (NowPoint > -1) DisplayDataLoad();
150
                // 自画面表示
151
                if (CommonMotions.ProductionExecution) this.Visible = true;
152
            }
135 153
        }
136 154
        #endregion
137 155

  
......
142 160
        /// <param name="RowCnt"></param>
143 161
        /// <param name="ColCnt"></param>
144 162
        /// <param name="NowPoint"></param>
145
        private void ConstructionTabEvent(int RowCnt, int ColCnt, ref int NowPoint)
163
        private void ConstructionTabEvent(Button btnKey)
146 164
        {
165
            int NowPoint = -1;
147 166
            try
148 167
            {
168
                int ColCnt = tblLayoutOrder.GetColumn(btnKey);                          // 列取得(X)
169
                int RowCnt = tblLayoutOrder.GetRow(btnKey);                             // 行取得(Y)
170

  
149 171
                switch (RowCnt)
150 172
                {
151 173
                    case 1:
......
181 203
                                #endregion
182 204
                            case 5:
183 205
                                #region 各工事打合わせ議事録
184
                                NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.DRList);
206
                                NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.Proceedings);
185 207
                                // 日報一覧から表示を行うため起動プロセスはパラメータの1つ目にセットする。
186 208
                                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ClsExcute.ProcessExecuteNo.Proceedings);
187 209
                                break;
......
517 539
                        }
518 540
                        break;
519 541
                }
520
                if (NowPoint < 0) return;
542
                if (NowPoint < 0)
543
                {
544
                    MessageBox.Show("処理が実装されていません。", "未実装処理", MessageBoxButtons.OK, MessageBoxIcon.None);
545
                    return;
546
                }
521 547

  
548
                // 自画面非表示
549
                if (CommonMotions.ProductionExecution) this.Visible = false;
550

  
522 551
                // 処理実行
523 552
                ClsExcute.ProcesscExecute();
524 553
            }
......
526 555
            {
527 556
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
528 557
            }
558
            finally
559
            {
560
                // 再表示
561
                if (NowPoint > -1) DisplayDataLoad();
562
                // 自画面表示
563
                if (CommonMotions.ProductionExecution) this.Visible = true;
564
            }
529 565
        }
530 566
        #endregion
531 567

  
......
536 572
        /// <param name="RowCnt"></param>
537 573
        /// <param name="ColCnt"></param>
538 574
        /// <param name="NowPoint"></param>
539
        private void AffairsTabEvent(int RowCnt, int ColCnt, ref int NowPoint)
575
        private void AffairsTabEvent(Button btnKey)
540 576
        {
577
            int NowPoint = -1;
541 578
            try
542 579
            {
580
                int ColCnt = tblLayoutOrder.GetColumn(btnKey);                          // 列取得(X)
581
                int RowCnt = tblLayoutOrder.GetRow(btnKey);                             // 行取得(Y)
582

  
543 583
                switch (RowCnt)
544 584
                {
545 585
                    case 1:
......
649 689
                                break;
650 690
                                #endregion
651 691
                            case 5:
692
                                #region 請求書発給状況一覧
693
                                // 請求書発給状況一覧
694
                                // ----- 起動プロセス設定
695
                                NowPoint = ClsExcute.NextProcess((int)ClsExcute.ProcessExecuteNo.ReqBillingStatus);
696
                                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)ClsExcute.ProcessExecuteNo.ReqBillingStatus);
652 697
                                break;
698
                                #endregion
653 699
                            case 7:
654 700
                                break;
655 701
                            case 9:
......
705 751
                        }
706 752
                        break;
707 753
                }
708
                if (NowPoint < 0) return;
754
                if (NowPoint < 0)
755
                {
756
                    MessageBox.Show("処理が実装されていません。", "未実装処理", MessageBoxButtons.OK, MessageBoxIcon.Stop);
757
                    return;
758
                }
709 759

  
760
                // 自画面非表示
761
                if (CommonMotions.ProductionExecution) this.Visible = false;
762

  
710 763
                // 処理実行
711 764
                ClsExcute.ProcesscExecute();
712 765
            }
......
714 767
            {
715 768
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
716 769
            }
770
            finally
771
            {
772
                // 再表示
773
                if (NowPoint > -1) DisplayDataLoad();
774
                // 自画面表示
775
                if (CommonMotions.ProductionExecution) this.Visible = true;
776
            }
717 777
        }
718 778
        #endregion
719 779

  
......
724 784
        /// <param name="RowCnt"></param>
725 785
        /// <param name="ColCnt"></param>
726 786
        /// <param name="NowPoint"></param>
727
        private void NotificationTabEvent(int RowCnt, int ColCnt, ref int NowPoint)
787
        private void NotificationTabEvent(Button btnKey)
728 788
        {
789
            int NowPoint = -1;
729 790
            try
730 791
            {
792
                int ColCnt = tblLayoutOrder.GetColumn(btnKey);                          // 列取得(X)
793
                int RowCnt = tblLayoutOrder.GetRow(btnKey);                             // 行取得(Y)
794

  
731 795
                switch (RowCnt)
732 796
                {
733 797
                    case 0:
......
759 823
                        break;
760 824
                }
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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