プロジェクト

全般

プロフィール

リビジョン 436

堀内約6年前に追加

工事情報:登録時チェックに期の範囲チェック追加
セキュリティ区分の参照が旧をみているものを修正
担当者マスタ:削除者のメンテナンス時に削除済みの文字表示
セキュリティマスタ:請求書承認状態チェックが無いものを追加
協力会社マスタ:職種追加・削除ボタンのEnable処理抜け追加
集計単位マスタ:削除バグ修正
小項目マスタ:画面変更・種別毎単価取得バグ修正

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
257 257
        /// <summary>
258 258
        /// フィールドカラー
259 259
        /// </summary>
260

  
260 261
        /// <summary>
261 262
        /// エラー時色
262 263
        /// </summary>
263 264
        public static Color s_clrError = Color.Red;
265

  
264 266
        /// <summary>
267
        /// ワーニング時色
268
        /// </summary>
269
        public static Color s_clrWarning = Color.Yellow;
270

  
271
        /// <summary>
265 272
        /// 正常時色
266 273
        /// </summary>
267 274
        public static Color s_clrNormal = Color.White;
......
977 984
        public static string EditModeStringNew = "新 規";
978 985
        public static string EditModeStringEdit = "修 正";
979 986
        public static string EditModeStringRef = "参 照";
987
        public static string EditModeStringDeled = "削除済";
980 988
        #endregion
981 989

  
982 990
        #region 1ページ初期行数
trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
2043 2043
        /// </summary>
2044 2044
        /// <param name="objCtrl"></param>
2045 2045
        /// <param name="chgColor"></param>
2046
        public static void chgBackColor(object objCtrl, bool bPara)
2046
        public static void chgBackColor(object objCtrl, bool bPara, bool bWarning = false)
2047 2047
        {
2048 2048
            try
2049 2049
            {
2050
                // エラー色・ワーニング色
2051
                Color ErrorColor = CommonDefine.s_clrError;
2052
                if (bWarning) ErrorColor = CommonDefine.s_clrWarning;
2053

  
2050 2054
                if (objCtrl.GetType().Equals(typeof(TextBox)) || objCtrl.GetType().Equals(typeof(TextBoxEX)))
2051 2055
                {
2052 2056
                    TextBox wrk = (TextBox)objCtrl;
......
2056 2060
                    }
2057 2061
                    else
2058 2062
                    {
2059
                        wrk.BackColor = CommonDefine.s_clrError;
2063
                        wrk.BackColor = ErrorColor;
2060 2064
                        wrk.Focus();
2061 2065
                    }
2062 2066
                }
......
2069 2073
                    }
2070 2074
                    else
2071 2075
                    {
2072
                        wrk.Style.BackColor = CommonDefine.s_clrError;
2076
                        wrk.Style.BackColor = ErrorColor;
2073 2077
                        wrk.Selected = true;
2074 2078
                    }
2075 2079
                }
......
2082 2086
                    }
2083 2087
                    else
2084 2088
                    {
2085
                        wrk.BackColor = CommonDefine.s_clrError;
2089
                        wrk.BackColor = ErrorColor;
2086 2090
                        wrk.Focus();
2087 2091
                    }
2088 2092
                }
......
2095 2099
                    }
2096 2100
                    else
2097 2101
                    {
2098
                        wrk.BackColor = CommonDefine.s_clrError;
2102
                        wrk.BackColor = ErrorColor;
2099 2103
                        wrk.Focus();
2100 2104
                    }
2101 2105
                }
......
2108 2112
                    }
2109 2113
                    else
2110 2114
                    {
2111
                        wrk.BackColor = CommonDefine.s_clrError;
2115
                        wrk.BackColor = ErrorColor;
2112 2116
                        wrk.Focus();
2113 2117
                    }
2114 2118
                }
......
2121 2125
                    }
2122 2126
                    else
2123 2127
                    {
2124
                        wrk.BackColor = CommonDefine.s_clrError;
2128
                        wrk.BackColor = ErrorColor;
2125 2129
                    }
2126 2130
                }
2127 2131
                else if (objCtrl.GetType().Equals(typeof(NumericUpDown)))
......
2133 2137
                    }
2134 2138
                    else
2135 2139
                    {
2136
                        wrk.BackColor = CommonDefine.s_clrError;
2140
                        wrk.BackColor = ErrorColor;
2137 2141
                    }
2138 2142
                }
2139 2143
            }
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsCommonApproval.cs
844 844
            try
845 845
            {
846 846
                // システム管理者は全ての権限を持つ
847
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement) return true;
847
                if (CommonMotions.LoginUserSecurity.SecCode == CommonDefine.AdminSecurityManagement) return true;
848 848

  
849 849
                bool bApproval = false;
850 850

  
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs
674 674
            }
675 675
        }
676 676
        #endregion
677

  
678
        #region 指定担当者のセキュリティ区分を取得する
679
        /// <summary>
680
        /// 指定担当者のセキュリティ区分を取得する
681
        /// </summary>
682
        /// <param name="PerSonCode"></param>
683
        /// <returns></returns>
684
        private static int GetPersonSecyrity(int PerSonCode)
685
        {
686
            IOMPersonInCharge picDB = new IOMPersonInCharge();
687
            try
688
            {
689
                string strSQL = picDB.CreatePrimarykeyString(PerSonCode);
690
                PersonInChargeMaster perRec = new PersonInChargeMaster();
691
                if (!picDB.SelectAction(strSQL, ref perRec)) return 9;
692

  
693
                return perRec.SecurityManagement;
694
            }
695
            catch (Exception ex)
696
            {
697
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
698
                return 9;
699
            }
700
            finally
701
            {
702
                picDB.close(); picDB = null;
703
            }
704
        }
705
        #endregion
706 677
    }
707 678
}
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs
70 70
        }
71 71
        #endregion
72 72

  
73
        #region 旧セキュリティメソッド
74
        #region 工事データアクセス許可
75
        /// <summary>
76
        /// 工事データアクセス許可確認
77
        /// </summary>
78
        /// <param name="RecoadNo"></param>
79
        /// <param name="BuranchNo"></param>
80
        /// <returns></returns>
81
        public static bool ConstructionDataAccessPermission(int ConstructionCode, bool bWriteFlg = true)
82
        {
83
            try
84
            {
85
                bool bAccessFlg = false;
86

  
87
                // システム権限によってデータアクセスに制限がある
88
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement)
89
                {
90
                    // システム管理者(すべて対象)
91
                    bAccessFlg = true;
92
                }
93
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key)
94
                {
95
                    // 最高機密管理者(すべて対象)
96
                    bAccessFlg = true;
97
                }
98
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key)
99
                {
100
                    // 統括機密管理者(データはすべて対象)
101
                    bAccessFlg = true;
102
                }
103
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
104
                {
105
                    // 機密管理者(自部署のみ閲覧可)
106
                    bAccessFlg = CheckSecurityManagementDivision3(ConstructionCode, bWriteFlg);
107
                }
108
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
109
                {
110
                    // 一般使用者(自データのみ)
111
                    bAccessFlg = CheckSecurityManagementDivision4(ConstructionCode);
112
                }
113

  
114
                return bAccessFlg;
115
            }
116
            catch (Exception ex)
117
            {
118
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
119
                return false;
120
            }
121
        }
122
        #endregion
123

  
124
        #region 所属長のアクセス権限チェック
125
        /// <summary>
126
        /// 所属長のアクセス権限をチェックする
127
        /// </summary>
128
        /// <param name="ConstructionCode"></param>
129
        /// <returns></returns>
130
        private static bool CheckSecurityManagementDivision3(int ConstructionCode, bool bWriteFlg)
131
        {
132
            IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
133
            try
134
            {
135
                bool bAccessFlg = false;
136

  
137
                // 工事基本情報取得
138
                string strSQL = cbiDB.CreatePrimarykeyString(ConstructionCode);
139
                ConstructionBaseInfo cbiData = new ConstructionBaseInfo();
140
                if (!cbiDB.SelectAction(strSQL, ref cbiData)) return bAccessFlg;
141

  
142
                if (bWriteFlg)
143
                {
144
                    // 工事担当者未定の場合は見積提出から後は見ることができる
145
                    int iEstimateStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("見積提出")).Key;
146
                    if (cbiData.ConstructionStatusFlg >= iEstimateStatus && cbiData.ConstructionPersonCode == 0)
147
                    {
148
                        return true;
149
                    }
150
                }
151

  
152
                // 部署引継の場合は工事移管先コードをチェックする
153
                int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("部署引継")).Key;
154
                // 工事移管先コード
155
                if (cbiData.ConstructionStatusFlg == iStatus)
156
                {
157
                    // 工事移管先が5桁以下の数字場合は部署コードなので該当部署かをチェックする
158
                    if (cbiData.TransferConstruction <= 99999 && cbiData.TransferConstruction == CommonMotions.LoginUserData.DepartmentCode)
159
                    {
160
                        return true;
161
                    }
162
                }
163

  
164
                // 全てアクセスできる工事状態は以下の状態以外
165
                int iAccessStatus1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("仮 受 注")).Key;
166

  
167
                // 担当者の部署コードをチェックする
168
                int PersonCode = 0;
169
                for (int i = 0; i < 3; i++)
170
                {
171
                    switch (i)
172
                    {
173
                        case 0:
174
                            // 営業担当者
175
                            PersonCode = cbiData.SalesPersonCode;
176
                            break;
177
                        case 1:
178
                            // 見積提出以降でないとアクセス出来ない
179
                            if (cbiData.ConstructionStatusFlg < iAccessStatus1) continue;
180

  
181
                            // 工事担当者
182
                            PersonCode = cbiData.ConstructionPersonCode;
183
                            break;
184
                        case 2:
185
                            // 見積提出以降でないとアクセス出来ない
186
                            if (cbiData.ConstructionStatusFlg < iAccessStatus1) continue;
187

  
188
                            // 工事指導員
189
                            PersonCode = cbiData.ConstructionInstructor;
190
                            break;
191
                    }
192

  
193
                    // 担当者の部署コードがログイン者の部署コードと同じかをチェックする
194
                    if (GetDepartmentCodeOnPersonInCharge(PersonCode) == CommonMotions.LoginUserData.DepartmentCode)
195
                    {
196
                        bAccessFlg = true;
197
                        break;
198
                    }
199
                }
200

  
201
                return bAccessFlg;
202
            }
203
            catch (Exception ex)
204
            {
205
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
206
                return false;
207
            }
208
            finally
209
            {
210
                cbiDB.close(); cbiDB = null;
211
            }
212
        }
213
        #endregion
214

  
215
        #region 一般ユーザーのアクセス権限チェック
216
        /// <summary>
217
        /// 一般ユーザーのアクセス権限をチェックする
218
        /// </summary>
219
        /// <param name="ConstructionCode"></param>
220
        /// <returns></returns>
221
        private static bool CheckSecurityManagementDivision4(int ConstructionCode)
222
        {
223
            IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
224
            try
225
            {
226
                bool bAccessFlg = false;
227

  
228
                // 工事基本情報取得
229
                string strSQL = cbiDB.CreatePrimarykeyString(ConstructionCode);
230
                ConstructionBaseInfo cbiData = new ConstructionBaseInfo();
231
                if (!cbiDB.SelectAction(strSQL, ref cbiData)) return bAccessFlg;
232

  
233
                // 全てアクセスできる工事状態は以下の状態以外
234
                int iAccessStatus1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("依頼受け中")).Key;
235
                int iAccessStatus2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("見積提出")).Key;
236

  
237
                // 担当者コードをチェックする
238
                int PersonCode = 0;
239
                for (int i = 0; i < 3; i++)
240
                {
241
                    switch (i)
242
                    {
243
                        case 0:
244
                            // 営業担当者
245
                            PersonCode = cbiData.SalesPersonCode;
246
                            break;
247
                        case 1:
248
                            // 仮受注以降でないとアクセス出来ない
249
                            if (cbiData.ConstructionStatusFlg == iAccessStatus1 ||
250
                                cbiData.ConstructionStatusFlg == iAccessStatus2) continue;
251

  
252
                            // 工事担当者
253
                            PersonCode = cbiData.ConstructionPersonCode;
254
                            break;
255
                        case 2:
256
                            // 仮受注以降でないとアクセス出来ない
257
                            if (cbiData.ConstructionStatusFlg == iAccessStatus1 ||
258
                                cbiData.ConstructionStatusFlg == iAccessStatus2) continue;
259

  
260
                            // 工事指導員
261
                            PersonCode = cbiData.ConstructionInstructor;
262
                            break;
263
                    }
264

  
265
                    // 担当者の部署コードがログイン者の部署コードと同じかをチェックする
266
                    if (PersonCode == CommonMotions.LoginUserData.PersonCode)
267
                    {
268
                        bAccessFlg = true;
269
                        break;
270
                    }
271
                }
272

  
273
                return bAccessFlg;
274
            }
275
            catch (Exception ex)
276
            {
277
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
278
                return false;
279
            }
280
            finally
281
            {
282
                cbiDB.close(); cbiDB = null;
283
            }
284
        }
285
        #endregion
286

  
287
        #region 担当者の部署コードを取得
288
        /// <summary>
289
        /// 担当者の部署コードを取得する
290
        /// </summary>
291
        /// <param name="PersonCode"></param>
292
        /// <returns></returns>
293
        private static int GetDepartmentCodeOnPersonInCharge(int PersonCode)
294
        {
295
            IOMPersonInCharge picDB = new IOMPersonInCharge();
296
            try
297
            {
298
                // 工事部署取得
299
                PersonInChargeMaster PersonRec = new PersonInChargeMaster();
300
                string strPerson = picDB.CreatePrimarykeyString(PersonCode);
301
                if (!picDB.SelectAction(strPerson, ref PersonRec)) return 0;
302

  
303
                return PersonRec.DepartmentCode;
304
            }
305
            catch (Exception ex)
306
            {
307
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
308
                return 0;
309
            }
310
            finally
311
            {
312
                picDB.close(); picDB = null;
313
            }
314

  
315
        }
316
        #endregion
317

  
318
        #region 行動予定データアクセス許可
319
        /// <summary>
320
        /// 行動予定書き込み権限チェック
321
        /// </summary>
322
        /// <param name="PersonCode"></param>
323
        /// <returns></returns>
324
        public static bool ActionSchdulePermission(int PersonCode)
325
        {
326
            try
327
            {
328
                bool MacthFlg = false;
329
                // システム権限によってデータアクセスに制限がある
330
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement)
331
                {
332
                    // システム管理者(すべて対象)
333
                    MacthFlg = true;
334
                }
335
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key)
336
                {
337
                    // 最高機密管理者(すべて対象)
338
                    MacthFlg = true;
339
                }
340
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key)
341
                {
342
                    // 統括機密管理者(機能制限)
343
                    MacthFlg = true;
344
                }
345
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
346
                {
347
                    // 機密管理者(自部署のみ閲覧可)
348
                    if (CommonMotions.LoginUserData.DepartmentCode == GetDepartmentCodeOnPersonInCharge(PersonCode)) MacthFlg = true;
349
                }
350
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
351
                {
352
                    // 一般使用者(自分のみアクセス可能)
353
                    if (CommonMotions.LoginUserData.PersonCode == PersonCode) MacthFlg = true;
354
                }
355
                if (!MacthFlg) return false;
356

  
357
                return true;
358
            }
359
            catch (Exception ex)
360
            {
361
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
362
                return false;
363
            }
364
        }
365

  
366
        #endregion
367

  
368
        #region 総務部の対象プロセスへの起動許可判定
369
        ///// <summary>
370
        ///// 総務部の対象プロセスへの起動許可判定
371
        ///// </summary>
372
        ///// <param name="ProcessNo"></param>
373
        ///// <returns></returns>
374
        //public static bool PermitGeneralAffairsDevision(int ProcessNo)
375
        //{
376
        //    try
377
        //    {
378
        //        bool bReturn = false;
379
        //        if (CommonMotions.LoginUserSecurity.GeneralAffairs != (int)SecurityMaster.GeneAffDef.GeneralDep) return false;
380
                    
381
        //        switch (ProcessNo)
382
        //        {
383
        //            case (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo:  //  2:工事情報入力
384
        //            case (int)ClsExcute.ProcessExecuteNo.ConstructionBudget:    //  6:工事予算書入力
385
        //            case (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint:    // 10:注文書印刷
386
        //            case (int)ClsExcute.ProcessExecuteNo.ConstructionLedger:    // 13:工事詳細台帳
387
        //                bReturn = true;
388
        //                break;
389
        //            default:
390
        //                bReturn = false;
391
        //                break;
392
        //        }
393

  
394
        //        return bReturn;
395
        //    }
396
        //    catch (Exception ex)
397
        //    {
398
        //        logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
399
        //        return false;
400
        //    }
401
        //}
402
        #endregion
403
        #endregion
404

  
405 73
        #region セキュリティメソッド
406 74

  
407 75
        #region 対象セキュリティ区分のデータアクセスランク・レンジを返す
......
951 619
                // 指定対象者のセキュリティ区分・範囲を取得する
952 620
                int Range = 0;
953 621
                int Rank = GetPersonDataAccessRank(PersonCode, ref Range);
954
                // 設定されていない場合は旧メソッドを呼ぶ
955
                if (Rank == 0 && Range == 0)
956
                {
957
                    return ConstructionDataAccessPermission(ConstructionCode, bWriteFlg);
958
                }
959 622

  
960 623
                int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;     // 経営者アクセス
961 624
                int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;        // 統括者アクセス
......
1301 964
                // 保護区分ランク
1302 965
                // システム管理者・特別権限
1303 966
                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
1304
                 || CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key)
967
                 || CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key)
1305 968
                {
1306 969
                    // 特別権限
1307 970
                    userInfo.m_Type = CommonDefine.SecurityRankPos.SpecialAuthority;
1308 971
                }
1309 972
                // 統括者権限
1310
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.FreeAuthority].Key)
973
                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.FreeAuthority].Key)
1311 974
                {
1312 975
                    // 統括者権限
1313 976
                    userInfo.m_Type = CommonDefine.SecurityRankPos.FreeAuthority;
1314 977

  
1315 978
                }
1316 979
                // 所属長権限
1317
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.LimitedAuthority].Key)
980
                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.LimitedAuthority].Key)
1318 981
                {
1319 982
                    // 所属長権限
1320 983
                    userInfo.m_Type = CommonDefine.SecurityRankPos.LimitedAuthority;
1321 984

  
1322 985
                }
1323 986
                // 一般権限
1324
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.NormalAuthority].Key)
987
                else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.NormalAuthority].Key)
1325 988
                {
1326 989
                    // 一般権限
1327 990
                    userInfo.m_Type = CommonDefine.SecurityRankPos.NormalAuthority;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
503 503
                    return false;
504 504
                }
505 505

  
506
                // ???????O??`?F?b?N
507
                List<int> FieldNo = new List<int>();
508
                if (!CheckCurrentTerm(ref FieldNo))
509
                {
510
                    StringBuilder strMsg = new StringBuilder();
511
                    foreach (int CurNo in FieldNo)
512
                    {
513
                        strMsg.AppendFormat("{0}\r\n", s_FieldName[CurNo].Value);
514

  
515
                    }
516
                    strMsg.Append("???????????????????A\r\n?o?^??????????????????H");
517
                    DialogResult drAns = MessageBox.Show(strMsg.ToString()
518
                                    , "?f?[?^?m?F"
519
                                    , MessageBoxButtons.OKCancel, MessageBoxIcon.Warning);
520

  
521
                    if (drAns == DialogResult.Cancel) return false;
522
                }
523

  
506 524
                return true;
507 525
            }
508 526
            catch (System.Exception ex)
......
513 531
        }
514 532
        #endregion
515 533

  
534
        #region ????????E?N?x????O????t???`?F?b?N????
535
        /// <summary>
536
        /// ????????E?N?x????O????t???`?F?b?N????
537
        /// </summary>
538
        /// <returns></returns>
539
        private bool CheckCurrentTerm(ref List<int> FieldNo)
540
        {
541
            try
542
            {
543
                // ?????????E??????
544
                int ThisYear = 0;
545
                if (CommonMotions.BasePeriodYear())
546
                {   // ?c???
547
                    ThisYear = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text);
548
                }
549
                else
550
                {   // ?H???N?x
551
                    ThisYear = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionYear].Text);
552
                }
553

  
554
                DateTime dtStart = CommonMotions.GetOpeningEndDate(ThisYear);
555
                DateTime dtComp = CommonMotions.GetOpeningEndDate(ThisYear, false);
556

  
557
                bool bRet = true;
558
                int DspCtrlCnt = Enum.GetNames(typeof(DspCnt)).Length;
559
                for (int ix = 0; ix < DspCtrlCnt; ix++)
560
                {
561
                    // ?w?i?F??X?i?????j
562
                    CommonMotions.chgBackColor(m_DspCtrl[ix], true);
563
                    switch (ix)
564
                    {
565
                        // 5:??????
566
                        case (int)DspCnt.RequestedDate:
567
                        // 6:?????o??
568
                        case (int)DspCnt.EstimatesSubmittedDate:
569
                        // 9:???
570
                        case (int)DspCnt.OrderDate:
571
                        // 10:?????\???
572
                        case (int)DspCnt.OrderCompletionDate:
573
                        // 11:?{?H?J?n??
574
                        case (int)DspCnt.ConstructionStartingDate:
575
                        // 12:?{?H??????
576
                        case (int)DspCnt.ConstructionCompletionDate:
577
                        // 16:????L??????
578
                        case (int)DspCnt.EstimatesExpirationDate:
579
                        // 17:?H???J?n??
580
                        case (int)DspCnt.StartDate:
581
                        // 18:?H???I????
582
                        case (int)DspCnt.EndDate:
583
                        // 45:?????o????
584
                        case (int)DspCnt.EstimatesSubmitDeadline:
585
                        // 48:?H??????
586
                        case (int)DspCnt.TransferConstructionDate:
587
                        // 50:?_??H???J?n
588
                        case (int)DspCnt.ConstructionPeriodStart:
589
                        // 51:?_??H??????
590
                        case (int)DspCnt.ConstructionPeriodEnd:
591
                        // 53:?????????J?n??
592
                        case (int)DspCnt.BillingStartDate:
593
                        // 54:?????m?F??
594
                        case (int)DspCnt.BillingComplateDate:
595
                        // 55:?J?n?\???
596
                        case (int)DspCnt.OrderStartingDate:
597
                        // 57:??Z????m?F?\????
598
                        case (int)DspCnt.EstimatePetition:
599
                        // 58:??Z??????F??
600
                        case (int)DspCnt.EstimateApproval:
601
                        // 59:??Z?\?Z?m?F?\????
602
                        case (int)DspCnt.EstimateBudgetPetition:
603
                        // 60:??Z?\?Z???F??
604
                        case (int)DspCnt.EstimateBudgetApproval:
605
                        // 61:?????
606
                        case (int)DspCnt.ProvisionalOrderDate:
607
                        // 62:????
608
                        case (int)DspCnt.NonOrderDate:
609
                        // 64:?_??H???J?n?i???????j
610
                        case (int)DspCnt.ConstructionPeriodStart2:
611
                        // 65:?_??H???????i???????j
612
                        case (int)DspCnt.ConstructionPeriodEnd2:
613
                        // 66:?{?H?????J?n??
614
                        case (int)DspCnt.PreparationStartDate:
615
                        // 67:?H???\?Z?\????
616
                        case (int)DspCnt.ConstructionBudgetPetition:
617
                        // 68:?H???\?Z???F??
618
                        case (int)DspCnt.ConstructionBudgetApproval:
619
                        // 82:?H???????????????
620
                        case (int)DspCnt.LedgerComplateDate:
621
                        // 84:?????\???
622
                        case (int)DspCnt.InspectPlanningDate:
623
                        // 85:???????s??
624
                        case (int)DspCnt.InspectExecuteDate:
625
                        // 86:??????????????
626
                        case (int)DspCnt.RevCompleteDate:
627
                            if (m_DspCtrl[ix].Text.Length < 1) continue;
628
                            if (!CommonMotions.DispFieldDateCheck(m_DspCtrl[ix], false)) continue;
629

  
630
                            DateTime dtCurDate = CommonMotions.cnvDate(m_DspCtrl[ix].Text);
631
                            if (dtCurDate.Date == DateTime.MinValue.Date) continue;
632

  
633
                            if (dtCurDate.Date < dtStart.Date || dtComp.Date < dtCurDate.Date)
634
                            {
635
                                // ?w?i?F??X?i???[?j???O???j
636
                                m_DspCtrl[ix].BackColor = CommonDefine.s_clrWarning;
637
                                FieldNo.Add(ix);
638
                                bRet = false;
639
                            }
640
                            break;
641

  
642
                        default:
643
                            break;
644
                    }
645
                }
646

  
647
                return bRet;
648
            }
649
            catch (System.Exception ex)
650
            {
651
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
652
                return false;
653
            }
654
        }
655
        #endregion
656

  
516 657
        #region ??Z??????z?Z?b?g
517 658
        /// <summary>
518 659
        /// ??Z????f?[?^???????z????????
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs
799 799
                // ??????????????f?[?^??A?N?Z?X?????????Q????[?h  // DEBUG 2016/05/19
800 800
                int nSecCode = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key;
801 801
                if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep
802
                        && CommonMotions.LoginUserData.SecurityManagement != nSecCode)
802
                        && CommonMotions.LoginUserSecurity.SecRank != nSecCode)
803 803
                {
804 804
                    m_EditLock = true;
805 805
                }
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/BudgetItem/FrmBudgetItemAux.cs
877 877
                // 選択エラー
878 878
                int GrpCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispEditCol.GroupCode].Value);
879 879
                int CompCode = CommonMotions.cnvInt(CurRow.Cells[(int)DispEditCol.ComponentCode].Value);
880
                if (GrpCode < 1 || CompCode < 1)
880
                if (GrpCode < 1 && CompCode < 1)
881 881
                {
882 882
                    MessageBox.Show("データが選択されていません。", "選択エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
883 883
                    return;
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionSpec/FrmConstructionSpec.cs
76 76
        private enum DispControl
77 77
        {
78 78
            SpecCode = 0,
79
            ItemName,
80 79
            SpecName,
80
            SpecRatio,
81 81
            UnitScale,
82 82
            UnitPrice,
83 83
            EditMode,
84 84
            SearchButton,
85
            ItemName,
85 86
        }
86 87

  
87 88
        #endregion
......
109 110
        /// <summary>
110 111
        /// 表示コントロール保持配列
111 112
        /// </summary>
112
        private Control[] m_dispControl = new Control[7];
113
        private Control[] m_dispControl = new Control[8];
113 114
        /// <summary>
114 115
        /// 終了ボタン押下フラグ
115 116
        /// </summary>
......
201 202
            // コントロールオブジェクト取得
202 203
            GetDisplayObject();
203 204

  
204
            // クリア
205
            ClearDisplay();
206

  
207 205
            // データ表示
208 206
            DispGridData();
209 207
            
......
476 474
            if (CommonMotions.chkObjectIsNull(dgvSpecList.CurrentRow.Cells[(int)DispGridColumn.SpecCode].Value) ||
477 475
                CommonMotions.cnvString(dgvSpecList.CurrentRow.Cells[(int)DispGridColumn.SpecCode].Value).Length == 0)
478 476
            {
479
                // クリア
480
                ClearDisplay();
481 477
                // フィールドロック解除
482 478
                ControlLock(false);
483 479
                return;
......
485 481

  
486 482
            m_SpecCode = CommonMotions.cnvInt(dgvSpecList.CurrentRow.Cells[(int)DispGridColumn.SpecCode].Value);
487 483

  
488
            // クリア
489
            ClearDisplay();
490

  
491 484
            // フィールドロック解除
492 485
            ControlLock();
493 486

  
......
501 494
            }
502 495

  
503 496
            // フォーカスセット
504
            m_dispControl[(int)DispControl.ItemName].Focus();
497
            m_dispControl[(int)DispControl.SpecName].Focus();
505 498

  
506 499
        }
507 500
        #endregion
......
566 559
                // フィールドロック解除
567 560
                ControlLock();
568 561

  
562
                // 中項目名称表示
563
                lblSelItemName.Text = CommonMotions.cnvString(dgvItemList.CurrentRow.Cells[(int)DispColumn.ItemName].Value);
564

  
569 565
                // 新規時
570 566
                string strWhere = string.Format(" Where ItemCode = {0}",m_ItemCode);
571 567
                m_SpecCode = (csDB.GetMaxSpecCodeCount(strWhere) + 1);
......
577 573
                    return;
578 574
                }
579 575

  
576
                // 工事種別毎単価を表示する
577
                DispTypePrice();
578

  
580 579
                // モード表示
581 580
                m_dispControl[(int)DispControl.EditMode].Text = CommonDefine.EditModeStringNew;
582 581
                // フォーカスセット
583
                m_dispControl[(int)DispControl.ItemName].Focus();
582
                m_dispControl[(int)DispControl.SpecName].Focus();
584 583
            }
585 584
            catch (System.Exception ex)
586 585
            {
......
592 591
                csDB = null;
593 592
            }
594 593
        }
594
        #endregion
595 595

  
596
        #region 検索ボタン押下
596 597
        /// <summary>
597 598
        /// 検索ボタン押下
598 599
        /// </summary>
......
634 635
            {
635 636
                // グリッドの行を0に戻す
636 637
                dgvSpecList.Rows.Clear();
637
                // クリア
638 638
                ClearDisplay();
639 639

  
640
                // 中項目名称表示
641
                lblSelItemName.Text = CommonMotions.cnvString(dgvItemList.CurrentRow.Cells[(int)DispColumn.ItemName].Value);
642

  
640 643
                // 小項目なしは処理しない
641 644
                if (CommonMotions.cnvString(dgvItemList.CurrentRow.Cells[(int)DispColumn.subItems].Value).Equals("無")) return;
642 645

  
......
720 723
        private void GetDisplayObject()
721 724
        {
722 725
            m_dispControl[(int)DispControl.SpecCode] = lblSpecCode;
723
            m_dispControl[(int)DispControl.ItemName] = txtInput1;
724
            m_dispControl[(int)DispControl.SpecName] = txtInput2;
726
            m_dispControl[(int)DispControl.SpecName] = txtInput1;
727
            m_dispControl[(int)DispControl.SpecRatio] = txtInput2;
725 728
            m_dispControl[(int)DispControl.UnitScale] = txtInput3;
726 729
            m_dispControl[(int)DispControl.UnitPrice] = txtInput4;
727 730
            m_dispControl[(int)DispControl.EditMode] = lblEditMode;
728 731
            m_dispControl[(int)DispControl.SearchButton] = btnSerach;
732
            m_dispControl[(int)DispControl.ItemName] = lblSelItemName;
733

  
729 734
        }
730 735
        #endregion
731 736

  
......
779 784
            {
780 785
                // ------ 作業マスタチェック
781 786
                //作業名称
782
                if (m_dispControl[(int)DispControl.ItemName].Text != null)
787
                if (m_dispControl[(int)DispControl.SpecName].Text != null)
783 788
                    // レングスチェック
784
                    bAns = CommonMotions.DispFieldLengthCheck(m_dispControl[(int)DispControl.ItemName], s_ItemNameLength);
789
                    bAns = CommonMotions.DispFieldLengthCheck(m_dispControl[(int)DispControl.SpecName], s_ItemNameLength);
785 790
                bRet &= bAns;
786 791

  
787 792
                //規格・寸法
788
                if (m_dispControl[(int)DispControl.SpecName].Text != null)
793
                if (m_dispControl[(int)DispControl.SpecRatio].Text != null)
789 794
                    // レングスチェック
790
                    bAns = CommonMotions.DispFieldLengthCheck(m_dispControl[(int)DispControl.SpecName], s_SpecNameLength, true);
795
                    bAns = CommonMotions.DispFieldLengthCheck(m_dispControl[(int)DispControl.SpecRatio], s_SpecNameLength, true);
791 796
                bRet &= bAns;
792 797

  
793 798
                //単位
......
899 904
                // データセット
900 905
                cw.ItemCode = m_ItemCode;
901 906
                cw.SpecCode = m_SpecCode;
902
                cw.ItemName = m_dispControl[(int)DispControl.ItemName].Text.ToString();
903
                cw.SpecName = m_dispControl[(int)DispControl.SpecName].Text.ToString();
907
                cw.ItemName = m_dispControl[(int)DispControl.SpecName].Text.ToString();
908
                cw.SpecName = m_dispControl[(int)DispControl.SpecRatio].Text.ToString();
904 909
                cw.UnitName = m_dispControl[(int)DispControl.UnitScale].Text.ToString();
905 910
                cw.UnitPrice = CommonMotions.cnvDouble(m_dispControl[(int)DispControl.UnitPrice].Text.ToString());
906 911
                cw.DeleteFlg = 0;
......
983 988

  
984 989
                    EntList.Add(CurRec);
985 990
                }
986
                if (!csupDB.InsertAction(EntList, false))
991
                if (EntList.Count > 0)
987 992
                {
988
                    MessageBox.Show("作業単価マスタ:登録に失敗しました。"
989
                                    , "登録エラー"
990
                                    , MessageBoxButtons.OK
991
                                    , MessageBoxIcon.Error);
992
                    return false;
993
                    if (!csupDB.InsertAction(EntList, false))
994
                    {
995
                        MessageBox.Show("作業単価マスタ:登録に失敗しました。"
996
                                        , "登録エラー"
997
                                        , MessageBoxButtons.OK
998
                                        , MessageBoxIcon.Error);
999
                        return false;
1000
                    }
993 1001
                }
994 1002

  
995 1003
                return true;
......
1100 1108
                // 画面クリア
1101 1109
                ClearDisplay();
1102 1110

  
1111
                // 中項目名称表示
1112
                lblSelItemName.Text = CommonMotions.cnvString(dgvItemList.CurrentRow.Cells[(int)DispColumn.ItemName].Value);
1113

  
1103 1114
                // 新規時は表示しない
1104 1115
                if (m_SpecCode == 0) return;
1105 1116

  
......
1112 1123
                {
1113 1124
                    // データ表示
1114 1125
                    m_dispControl[(int)DispControl.SpecCode].Text = wrklist[0].SpecCode.ToString();         // 作業コード
1115
                    m_dispControl[(int)DispControl.ItemName].Text = wrklist[0].ItemName.ToString();         // 作業名称
1116
                    m_dispControl[(int)DispControl.SpecName].Text = wrklist[0].SpecName.ToString();         // 規格・寸法名称
1126
                    m_dispControl[(int)DispControl.SpecName].Text = wrklist[0].ItemName.ToString();         // 作業名称
1127
                    m_dispControl[(int)DispControl.SpecRatio].Text = wrklist[0].SpecName.ToString();         // 規格・寸法名称
1117 1128
                    m_dispControl[(int)DispControl.UnitScale].Text = wrklist[0].UnitName.ToString();        // 単位名称
1118 1129
                    m_dispControl[(int)DispControl.UnitPrice].Text = wrklist[0].UnitPrice.ToString("#,0.0");  // 単価
1119 1130
                    if (EditLock)
......
1157 1168
                StringBuilder strSQL = new StringBuilder();
1158 1169
                strSQL.Append("Select");
1159 1170
                strSQL.Append(" E.TypeCode");
1160
                strSQL.Append(", F.ComponentCode");
1161
                strSQL.Append(", A.ItemCode");
1162
                strSQL.Append(", A.SpecCode");
1171
                strSQL.Append(", E.ComponentCode");
1172
                strSQL.Append(", F.ItemCode");
1173
                strSQL.AppendFormat(", ifnull(B.SpecCode, {0})", m_SpecCode);
1163 1174
                strSQL.Append(", C.NameString");
1164 1175
                strSQL.Append(", D.ComponentName");
1165
                strSQL.Append(", A.ItemName");
1166
                strSQL.Append(", A.SpecName");
1167
                strSQL.Append(", B.UnitPrice");
1168
                strSQL.Append(", C.DisplayOrder");
1169
                strSQL.Append(", D.DisplayOrder");
1170
                strSQL.Append(" From constructionspecmaster As A");
1171

  
1176
                strSQL.Append(", ifnull(B.UnitPrice, 0)");
1177
                strSQL.Append(" From");
1178
                strSQL.Append(" constructionitemmaster A");
1172 1179
                strSQL.Append(" Inner Join componentlinkmaster As F");
1173 1180
                strSQL.Append("        On F.ItemCode = A.ItemCode");
1174

  
1175
                strSQL.Append(" Left Join componentmaster As D");
1176
                strSQL.Append("        On D.ComponentCode = F.ComponentCode");
1177

  
1178 1181
                strSQL.Append(" Inner Join componenttotypemaster As E");
1179 1182
                strSQL.Append("        On E.ComponentCode = F.ComponentCode");
1180

  
1181 1183
                strSQL.Append(" Left Join constructiontypemaster As C");
1182 1184
                strSQL.Append("        On C.TypeCode = E.TypeCode");
1183

  
1184 1185
                strSQL.Append(" Left Join constructionspecunitprice As B");
1185 1186
                strSQL.Append("        On B.ConstructionTypeCode = E.TypeCode");
1186 1187
                strSQL.Append("        And B.ComponentCode = F.ComponentCode");
1187 1188
                strSQL.Append("        And B.ItemCode = A.ItemCode");
1188
                strSQL.Append("        And B.SpecCode = A.SpecCode");
1189

  
1189
                strSQL.AppendFormat("  And B.SpecCode = {0}", m_SpecCode);
1190
                strSQL.Append(" Left Join componentmaster As D");
1191
                strSQL.Append("        On D.ComponentCode = F.ComponentCode");
1190 1192
                strSQL.Append(" Where");
1191 1193
                strSQL.AppendFormat(" A.ItemCode = {0}", m_ItemCode);
1192
                strSQL.AppendFormat(" And A.SpecCode = {0}", m_SpecCode);
1193
                strSQL.Append(" Order By C.DisplayOrder ASC, D.DisplayOrder ASC");
1194
                  strSQL.Append(" Order By C.DisplayOrder ASC, D.DisplayOrder ASC");
1195

  
1194 1196
                ArrayList arrayList = new ArrayList();
1195 1197
                if (!spDB.ExecuteReader(strSQL.ToString(), ref arrayList)) return;
1196 1198

  
......
1212 1214
                    }
1213 1215
                    strNameArray[0] = CommonMotions.cnvString(objRec[4]);
1214 1216
                    strNameArray[1] = CommonMotions.cnvString(objRec[5]);
1215
                    int nValue = (int)CommonMotions.cnvDouble(objRec[8]);
1217
                    int nValue = (int)CommonMotions.cnvDouble(objRec[6]);
1216 1218

  
1217 1219
                    int nRow = dgvPrice.Rows.Add(++Cnt
1218 1220
                                                , nCodeArray[0]
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ConstructionSpec/FrmConstructionSpec.designer.cs
29 29
        private void InitializeComponent()
30 30
        {
31 31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
32 36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
33 37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
34 38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
......
37 41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
38 42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
39 43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
44 44
            this.btnDataEntry = new System.Windows.Forms.Button();
45 45
            this.btnEnd = new System.Windows.Forms.Button();
46 46
            this.label1 = new System.Windows.Forms.Label();
......
62 62
            this.txtInput3 = new System.Windows.Forms.TextBox();
63 63
            this.btnSerach = new System.Windows.Forms.Button();
64 64
            this.dgvPrice = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
65
            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
66
            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
67
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
68
            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
69
            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
70
            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
71
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
72
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
65 73
            this.dgvItemList = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
66 74
            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
67 75
            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
73 81
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
74 82
            this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
75 83
            this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
76
            this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
77
            this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
78
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
79
            this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
80
            this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
81
            this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
82
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
83
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
84
            this.lblSelItemName = new System.Windows.Forms.Label();
84 85
            ((System.ComponentModel.ISupportInitialize)(this.dgvPrice)).BeginInit();
85 86
            ((System.ComponentModel.ISupportInitialize)(this.dgvItemList)).BeginInit();
86 87
            ((System.ComponentModel.ISupportInitialize)(this.dgvSpecList)).BeginInit();
......
142 143
            // 
143 144
            this.btnDataSelect.BackColor = System.Drawing.Color.SpringGreen;
144 145
            this.btnDataSelect.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
145
            this.btnDataSelect.Location = new System.Drawing.Point(962, 293);
146
            this.btnDataSelect.Location = new System.Drawing.Point(962, 300);
146 147
            this.btnDataSelect.Name = "btnDataSelect";
147 148
            this.btnDataSelect.Size = new System.Drawing.Size(120, 30);
148 149
            this.btnDataSelect.TabIndex = 10;
......
155 156
            // 
156 157
            this.btnDataLineEntry.BackColor = System.Drawing.Color.PaleGreen;
157 158
            this.btnDataLineEntry.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
158
            this.btnDataLineEntry.Location = new System.Drawing.Point(1090, 293);
159
            this.btnDataLineEntry.Location = new System.Drawing.Point(1090, 300);
159 160
            this.btnDataLineEntry.Name = "btnDataLineEntry";
160 161
            this.btnDataLineEntry.Size = new System.Drawing.Size(120, 30);
161 162
            this.btnDataLineEntry.TabIndex = 11;
......
167 168
            // btnDispDown
168 169
            // 
169 170
            this.btnDispDown.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
170
            this.btnDispDown.Location = new System.Drawing.Point(1170, 172);
171
            this.btnDispDown.Location = new System.Drawing.Point(1170, 200);
171 172
            this.btnDispDown.Name = "btnDispDown";
172 173
            this.btnDispDown.Size = new System.Drawing.Size(40, 40);
173 174
            this.btnDispDown.TabIndex = 13;
......
179 180
            // btnDispUp
180 181
            // 
181 182
            this.btnDispUp.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
182
            this.btnDispUp.Location = new System.Drawing.Point(1170, 108);
183
            this.btnDispUp.Location = new System.Drawing.Point(1170, 150);
183 184
            this.btnDispUp.Name = "btnDispUp";
184 185
            this.btnDispUp.Size = new System.Drawing.Size(40, 40);
185 186
            this.btnDispUp.TabIndex = 12;
......
193 194
            this.lblEditMode.BackColor = System.Drawing.Color.White;
194 195
            this.lblEditMode.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
195 196
            this.lblEditMode.Font = new System.Drawing.Font("MS 明朝", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
196
            this.lblEditMode.Location = new System.Drawing.Point(600, 292);
197
            this.lblEditMode.Location = new System.Drawing.Point(600, 300);
197 198
            this.lblEditMode.Name = "lblEditMode";
198 199
            this.lblEditMode.Size = new System.Drawing.Size(117, 32);
199 200
            this.lblEditMode.TabIndex = 24;
......
327 328
            this.btnSerach.TabStop = false;
328 329
            this.btnSerach.Text = "検索";
329 330
            this.btnSerach.UseVisualStyleBackColor = true;
331
            this.btnSerach.Click += new System.EventHandler(this.btnSerach_Click);
330 332
            // 
331 333
            // dgvPrice
332 334
            // 
......
365 367
            this.dgvPrice.TabIndex = 52;
366 368
            this.dgvPrice.CellValidated += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPrice_CellValidated);
367 369
            // 
370
            // dataGridViewTextBoxColumn6
371
            // 
372
            this.dataGridViewTextBoxColumn6.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
373
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
374
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
375
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle2;
376
            this.dataGridViewTextBoxColumn6.Frozen = true;
377
            this.dataGridViewTextBoxColumn6.HeaderText = "№";
378
            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
379
            this.dataGridViewTextBoxColumn6.ReadOnly = true;
380
            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
381
            this.dataGridViewTextBoxColumn6.Width = 60;
382
            // 
383
            // Column6
384
            // 
385
            this.Column6.Frozen = true;
386
            this.Column6.HeaderText = "種別キー";
387
            this.Column6.Name = "Column6";
388
            this.Column6.ReadOnly = true;
389
            this.Column6.Visible = false;
390
            // 
391
            // Column7
392
            // 
393
            this.Column7.Frozen = true;
394
            this.Column7.HeaderText = "構成キー";
395
            this.Column7.Name = "Column7";
396
            this.Column7.ReadOnly = true;
397
            this.Column7.Visible = false;
398
            // 
399
            // dataGridViewTextBoxColumn7
400
            // 
401
            this.dataGridViewTextBoxColumn7.Frozen = true;
402
            this.dataGridViewTextBoxColumn7.HeaderText = "工種キー";
403
            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
404
            this.dataGridViewTextBoxColumn7.ReadOnly = true;
405
            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
406
            this.dataGridViewTextBoxColumn7.Visible = false;
407
            // 
408
            // dataGridViewTextBoxColumn8
409
            // 
410
            this.dataGridViewTextBoxColumn8.HeaderText = "作業キー";
411
            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
412
            this.dataGridViewTextBoxColumn8.ReadOnly = true;
413
            this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
414
            this.dataGridViewTextBoxColumn8.Visible = false;
415
            // 
416
            // dataGridViewTextBoxColumn9
417
            // 
418
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
419
            dataGridViewCellStyle3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
420
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle3;
421
            this.dataGridViewTextBoxColumn9.HeaderText = "工事種別名称";
422
            this.dataGridViewTextBoxColumn9.MaxInputLength = 50;
423
            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
424
            this.dataGridViewTextBoxColumn9.ReadOnly = true;
425
            this.dataGridViewTextBoxColumn9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
426
            this.dataGridViewTextBoxColumn9.Width = 200;
427
            // 
428
            // Column5
429
            // 
430
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
431
            dataGridViewCellStyle4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
432
            this.Column5.DefaultCellStyle = dataGridViewCellStyle4;
433
            this.Column5.HeaderText = "構成名称";
434
            this.Column5.Name = "Column5";
435
            this.Column5.ReadOnly = true;
436
            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
437
            this.Column5.Width = 200;
438
            // 
439
            // Column1
440
            // 
441
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
442
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
443
            this.Column1.DefaultCellStyle = dataGridViewCellStyle5;
444
            this.Column1.HeaderText = "単 価";
445
            this.Column1.Name = "Column1";
446
            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
447
            this.Column1.Width = 130;
448
            // 
368 449
            // dgvItemList
369 450
            // 
370 451
            this.dgvItemList.AllowUserToAddRows = false;
......
482 563
            this.Column3,
483 564
            this.Column4});
484 565
            this.dgvSpecList.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
485
            this.dgvSpecList.Location = new System.Drawing.Point(600, 40);
566
            this.dgvSpecList.Location = new System.Drawing.Point(600, 70);
486 567
            this.dgvSpecList.Name = "dgvSpecList";
487 568
            this.dgvSpecList.RowHeadersVisible = false;
488 569
            this.dgvSpecList.RowHeadersWidth = 20;
489 570
            this.dgvSpecList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
490
            this.dgvSpecList.RowTemplate.Height = 21;
571
            this.dgvSpecList.RowTemplate.Height = 20;
491 572
            this.dgvSpecList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
492
            this.dgvSpecList.Size = new System.Drawing.Size(560, 236);
573
            this.dgvSpecList.Size = new System.Drawing.Size(560, 226);
493 574
            this.dgvSpecList.TabIndex = 2;
494 575
            this.dgvSpecList.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSpecList_CellClick);
495 576
            // 
......
535 616
            this.Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
536 617
            this.Column4.Width = 480;
537 618
            // 
538
            // dataGridViewTextBoxColumn6
619
            // lblSelItemName
539 620
            // 
540
            this.dataGridViewTextBoxColumn6.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
541
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
542
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
543
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle2;
544
            this.dataGridViewTextBoxColumn6.Frozen = true;
545
            this.dataGridViewTextBoxColumn6.HeaderText = "№";
546
            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
547
            this.dataGridViewTextBoxColumn6.ReadOnly = true;
548
            this.dataGridViewTextBoxColumn6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
549
            this.dataGridViewTextBoxColumn6.Width = 60;
621
            this.lblSelItemName.BackColor = System.Drawing.Color.White;
622
            this.lblSelItemName.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
623
            this.lblSelItemName.ForeColor = System.Drawing.Color.Black;
624
            this.lblSelItemName.Location = new System.Drawing.Point(600, 40);
625
            this.lblSelItemName.Name = "lblSelItemName";
626
            this.lblSelItemName.Size = new System.Drawing.Size(610, 25);
627
            this.lblSelItemName.TabIndex = 53;
628
            this.lblSelItemName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
550 629
            // 
551
            // Column6
552
            // 
553
            this.Column6.Frozen = true;
554
            this.Column6.HeaderText = "種別キー";
555
            this.Column6.Name = "Column6";
556
            this.Column6.ReadOnly = true;
557
            this.Column6.Visible = false;
558
            // 
559
            // Column7
560
            // 
561
            this.Column7.Frozen = true;
562
            this.Column7.HeaderText = "構成キー";
563
            this.Column7.Name = "Column7";
564
            this.Column7.ReadOnly = true;
565
            this.Column7.Visible = false;
566
            // 
567
            // dataGridViewTextBoxColumn7
568
            // 
569
            this.dataGridViewTextBoxColumn7.Frozen = true;
570
            this.dataGridViewTextBoxColumn7.HeaderText = "工種キー";
571
            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
572
            this.dataGridViewTextBoxColumn7.ReadOnly = true;
573
            this.dataGridViewTextBoxColumn7.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
574
            this.dataGridViewTextBoxColumn7.Visible = false;
575
            // 
576
            // dataGridViewTextBoxColumn8
577
            // 
578
            this.dataGridViewTextBoxColumn8.HeaderText = "作業キー";
579
            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
580
            this.dataGridViewTextBoxColumn8.ReadOnly = true;
581
            this.dataGridViewTextBoxColumn8.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
582
            this.dataGridViewTextBoxColumn8.Visible = false;
583
            // 
584
            // dataGridViewTextBoxColumn9
585
            // 
586
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
587
            dataGridViewCellStyle3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
588
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle3;
589
            this.dataGridViewTextBoxColumn9.HeaderText = "工事種別名称";
590
            this.dataGridViewTextBoxColumn9.MaxInputLength = 50;
591
            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
592
            this.dataGridViewTextBoxColumn9.ReadOnly = true;
593
            this.dataGridViewTextBoxColumn9.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
594
            this.dataGridViewTextBoxColumn9.Width = 200;
595
            // 
596
            // Column5
597
            // 
598
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
599
            dataGridViewCellStyle4.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
600
            this.Column5.DefaultCellStyle = dataGridViewCellStyle4;
601
            this.Column5.HeaderText = "構成名称";
602
            this.Column5.Name = "Column5";
603
            this.Column5.ReadOnly = true;
604
            this.Column5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
605
            this.Column5.Width = 200;
606
            // 
607
            // Column1
608
            // 
609
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
610
            dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
611
            this.Column1.DefaultCellStyle = dataGridViewCellStyle5;
612
            this.Column1.HeaderText = "単 価";
613
            this.Column1.Name = "Column1";
614
            this.Column1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
615
            this.Column1.Width = 130;
616
            // 
617 630
            // FrmConstructionSpec
618 631
            // 
619 632
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
620 633
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
621 634
            this.BackColor = System.Drawing.Color.Black;
622 635
            this.ClientSize = new System.Drawing.Size(1220, 687);
636
            this.Controls.Add(this.lblSelItemName);
623 637
            this.Controls.Add(this.dgvPrice);
624 638
            this.Controls.Add(this.lblStaticWorkCode);
625 639
            this.Controls.Add(this.label4);
......
703 717
        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
704 718
        private System.Windows.Forms.DataGridViewTextBoxColumn Column5;
705 719
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
720
        private System.Windows.Forms.Label lblSelItemName;
706 721
    }
707 722
}
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInChargeAuxiliary.cs
246 246
                DispMentenanceData();
247 247

  
248 248
                // モード表示
249
                if (m_EditLock)
250
                    m_dispControl[(int)DispCtrl.EditMode].Text = CommonDefine.EditModeStringRef;
249
                if (rdbMode1.Checked)
250
                {
251
                    if (m_EditLock)
252
                        m_dispControl[(int)DispCtrl.EditMode].Text = CommonDefine.EditModeStringRef;
253
                    else
254
                        m_dispControl[(int)DispCtrl.EditMode].Text = CommonDefine.EditModeStringEdit;
255
                }
251 256
                else
252
                    m_dispControl[(int)DispCtrl.EditMode].Text = CommonDefine.EditModeStringEdit;
257
                {
258
                    m_dispControl[(int)DispCtrl.EditMode].Text = CommonDefine.EditModeStringDeled;
259
                }
253 260

  
254 261
                // 参照時はデータ変更させない
255 262
                if (m_EditLock)
......
1167 1174
        }
1168 1175
        #endregion
1169 1176

  
1170
        #region 工事情報担当者部署確認
1171
        /// <summary>
1172
        /// 工事情報担当者部署確認
1173
        /// </summary>
1174
        /// <returns></returns>
1175
        //private bool DepChangeCheck(int PersonCode, ref List<int> PeriodList)
1176
        //{
1177
        //    IOMPersonInCharge picDB = new IOMPersonInCharge();
1178
        //    IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
1179
        //    FrmCustomCount frm = new FrmCustomCount();
1180
        //    try
1181
        //    {
1182
        //        StringBuilder strSQL = new StringBuilder();
1183
        //        strSQL.AppendFormat(" Where PersonCode = {0}", PersonCode);
1184
        //        List<PersonInChargeMaster> GetList = new List<PersonInChargeMaster>();
1185
        //        if (!picDB.SelectAction(strSQL.ToString(), ref GetList)) return false;
1186
        //        if (GetList.Count < 1) return false;
1187

  
1188
        //        // 登録データと部署が違えば処理する
1189
        //        if (GetList[0].DepartmentCode == CommonMotions.cnvInt(cmbDepartment.SelectedValue)) return false;
1190

  
1191
        //        // 工事情報件数取得
1192
        //        strSQL.Clear();
1193
        //        strSQL.Append("Select ConstructionPeriod, Count(*) From constructionbaseinfo");
1194
        //        strSQL.Append(" Where (");
1195
        //        strSQL.AppendFormat(" (SalesPersonCode = {0} And SalesDepCode = {1})", PersonCode, GetList[0].DepartmentCode);
1196
        //        strSQL.AppendFormat(" Or (ConstructionPersonCode = {0} And ConstrDepCode = {1})", PersonCode, GetList[0].DepartmentCode);
1197
        //        strSQL.AppendFormat(" Or (ConstrSubPersonCode = {0} And ConstrSubDepCode = {1})", PersonCode, GetList[0].DepartmentCode);
1198
        //        strSQL.AppendFormat(" Or (ConstructionInstructor = {0} And ConstrInstrDepCode = {1})", PersonCode, GetList[0].DepartmentCode);
1199
        //        strSQL.Append(")");
1200
        //        strSQL.Append(" Group By ConstructionPeriod");
1201
        //        strSQL.Append(" Order By ConstructionPeriod desc");
1202
        //        ArrayList arList = new ArrayList();
1203
        //        if (!BaseDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
1204

  
1205
        //        // 工事情報件数チェック
1206
        //        int nAllCnt = 0;
1207
        //        frm.arrayList.Clear();
1208
        //        foreach (object[] objRec in arList)
1209
        //        {
1210
        //            nAllCnt += CommonMotions.cnvInt(objRec[1]);
1211
        //            frm.arrayList.Add(new KeyValuePair<int, int>(CommonMotions.cnvInt(objRec[0])
1212
        //                                                        , CommonMotions.cnvInt(objRec[1])));
1213
        //        }
1214
        //        // 対象工事情報が1件も無い場合
1215
        //        if (nAllCnt < 1) return false;
1216

  
1217
        //        // あればサブフォームを表示する
1218
        //        frm.ShowDialog();
1219
        //        if (frm.ReturnValue == DialogResult.Cancel) return false;
1220

  
1221
        //        // リスト追加
1222
        //        foreach (KeyValuePair<int, int> CurData in frm.arrayList)
1223
        //        {
1224
        //            PeriodList.Add(CurData.Key);
1225
        //        }
1226

  
1227
        //        return true;
1228
        //    }
1229
        //    catch (System.Exception ex)
1230
        //    {
1231
        //        logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1232
        //        return false;
1233
        //    }
1234
        //    finally
1235
        //    {
1236
        //        picDB.close(); picDB = null;
1237
        //        BaseDB.close(); BaseDB = null;
1238
        //        frm.Dispose(); frm = null;
1239
        //    }
1240
        //}
1241
        #endregion
1242

  
1243 1177
        #region 担当者部署変更取得データ並び
1244 1178
        /// <summary>
1245 1179
        /// 担当者部署変更取得データ並び
......
2443 2377
                {
2444 2378
                    int TopSec = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key;
2445 2379
                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode
2446
                        || CommonMotions.LoginUserData.SecurityManagement == TopSec)
2380
                        || CommonMotions.LoginUserSecurity.SecRank == TopSec)
2447 2381
                    {
2448 2382
                        // デフォルト文字セット
2449 2383
                        btnDataEntry.Text = ButtonString[1, 0];
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurity.cs
138 138
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderStatus, string.Empty),       // 19:注文書発給一覧
139 139
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestInput, string.Empty),              // 31:請求入力
140 140
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestPrint, string.Empty),              // 32:請求書印刷
141
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.DepartmentCost, string.Empty),            // 46:部署出納帳
142
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ReqApprovalStatus, string.Empty),         // 47:請求承認状況閲覧 
141 143
                                                    
142 144
                                                    new KeyValuePair<int, string>(-1, "総 務 管 理"),                                                    // ----- タイトル
143 145
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseStatusInput, string.Empty),       // 40:注文書状況入力
......
213 215
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.PurchaseOrderStatus, string.Empty),       // 19:注文書発給一覧
214 216
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestInput, string.Empty),              // 31:請求入力
215 217
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.RequestPrint, string.Empty),              // 32:請求書印刷
218
                                                    new KeyValuePair<int, string>((int)ClsExcute.ProcessExecuteNo.ReqApprovalStatus, string.Empty),         // 47:請求承認状況閲覧 
216 219
                                                    
217 220
                                                    new KeyValuePair<int, string>(-1, "マスタメンテナンス"),                                                // ----- タイトル
218 221
                                                    new KeyValuePair<int, string>((int)ClsExcute.MaintenanceExecuteNo.System, string.Empty),                // システム管理登録
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs
299 299
                
300 300
                // 起動データ取得
301 301
                List<ProcessExcute> exeList = new List<ProcessExcute>();
302
                string strExe = execDB.CreatePrimarykeyString(CommonMotions.LoginUserData.SecurityManagement) + " ORDER BY ExecCode";
302
                string strExe = execDB.CreatePrimarykeyString(CommonMotions.LoginUserData.SecCode) + " ORDER BY ExecCode";
303 303
                if (!execDB.SelectAction(strExe, ref exeList)) return false;
304 304
                CommonMotions.LoginUserProcExe.Clear();
305 305
                foreach (ProcessExcute wrkRec in exeList)
......
1234 1234
            try
1235 1235
            {
1236 1236
                // システム管理者は処理しない
1237
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement) return;
1237
                if (CommonMotions.LoginUserSecurity.SecCode == CommonDefine.AdminSecurityManagement) return;
1238 1238

  
1239 1239
                CommonMotions.LoginUserProcExe.Clear();
1240 1240
                // 起動データ取得
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/SubContractor/FrmSubContractorAuxiliary.cs
430 430
            m_dispControl[(int)DispCtrl.btnJobItemDelte] = btnJobItemDelete;
431 431
            m_dispControl[(int)DispCtrl.PaymentNormal] = rdbPayment01;
432 432
            m_dispControl[(int)DispCtrl.PaymentLabour] = rdbPayment02;
433
            m_dispControl[(int)DispCtrl.GridJobLink] = dgvJobLink;
434
            m_dispControl[(int)DispCtrl.btnJobLinkAdd] = btnJobLinkAdd;
435
            m_dispControl[(int)DispCtrl.btnJobLinkDelte] = btnJobLinkDelete;
433 436
        }
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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