リビジョン 315
掲示板アクセス権限チェックバグ修正
請求まとめ修正中
branches/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs | ||
---|---|---|
57 | 57 |
/// <summary> |
58 | 58 |
/// ログインユーザー参照部署データ |
59 | 59 |
/// </summary> |
60 |
private static List<PersonDepartmentMaster> m_LoginUserDepartment = new List<PersonDepartmentMaster>(); |
|
60 |
private static List<PersonDepartmentMaster> m_LoginUserRefDepartment = new List<PersonDepartmentMaster>();
|
|
61 | 61 |
|
62 | 62 |
/// <summary> |
63 | 63 |
/// ログインユーザーセキュリティ区分 |
... | ... | |
119 | 119 |
/// <summary> |
120 | 120 |
/// ログインユーザー参照部署データ |
121 | 121 |
/// </summary> |
122 |
public static List<PersonDepartmentMaster> LoginUserDepartment |
|
122 |
public static List<PersonDepartmentMaster> LoginUserRefDepartment
|
|
123 | 123 |
{ |
124 |
get { return m_LoginUserDepartment; } |
|
125 |
set { m_LoginUserDepartment = value; } |
|
124 |
get { return m_LoginUserRefDepartment; }
|
|
125 |
set { m_LoginUserRefDepartment = value; }
|
|
126 | 126 |
} |
127 | 127 |
|
128 | 128 |
/// <summary> |
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 133;
|
|
17 |
public static int s_SystemVersion = 134;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs | ||
---|---|---|
156 | 156 |
{ |
157 | 157 |
bool MacthFlg = false; |
158 | 158 |
|
159 |
// 新セキュリティデータ対応済みかを確認する |
|
159 |
// 読込み時のチェック |
|
160 |
MacthFlg = MessageReadPermission(RecoadNo, BuranchNo); |
|
161 |
|
|
162 |
if (bRead) return MacthFlg; |
|
163 |
|
|
160 | 164 |
// 編集・書込み時のチェック |
161 |
if (MessageNewEditPermission(RecoadNo, BuranchNo)) return true;
|
|
165 |
MacthFlg = MessageNewEditPermission(RecoadNo, BuranchNo);
|
|
162 | 166 |
|
163 |
// 読込み時のチェック |
|
164 |
if (bRead) |
|
165 |
{ |
|
166 |
MacthFlg = MessageNewReadPermission(RecoadNo, BuranchNo); |
|
167 |
} |
|
168 |
|
|
169 | 167 |
return MacthFlg; |
170 | 168 |
} |
171 | 169 |
catch (Exception ex) |
... | ... | |
279 | 277 |
depcode = CommonMotions.cnvInt(objRec[PersonBaseBoardDataCnt + (int)IOMPersonInCharge.ColumnCnt.DepartmentCode]); |
280 | 278 |
} |
281 | 279 |
// 参照部署があるかのチェック |
282 |
foreach (PersonDepartmentMaster wrkRec in CommonMotions.LoginUserDepartment) |
|
280 |
foreach (PersonDepartmentMaster wrkRec in CommonMotions.LoginUserRefDepartment)
|
|
283 | 281 |
{ |
284 | 282 |
if (depcode == wrkRec.DepartmentCode) return true; |
285 | 283 |
} |
... | ... | |
305 | 303 |
{ |
306 | 304 |
ShareFlag = 0, |
307 | 305 |
DepartmentCode, |
308 |
SecRank |
|
306 |
SecRank, |
|
307 |
FromCode |
|
309 | 308 |
} |
310 | 309 |
#endregion |
311 | 310 |
|
... | ... | |
317 | 316 |
/// <param name="BuranchNo">レコード枝番</param> |
318 | 317 |
/// <param name="bRead">読込許可・書込み許可</param> |
319 | 318 |
/// <returns></returns> |
320 |
public static bool MessageNewReadPermission(int RecoadNo, int BuranchNo)
|
|
319 |
public static bool MessageReadPermission(int RecoadNo, int BuranchNo) |
|
321 | 320 |
{ |
322 | 321 |
IOMessageBoardTerget mbtDB = new IOMessageBoardTerget(); |
323 |
IOMSecurity secDB = new IOMSecurity(); |
|
324 | 322 |
try |
325 | 323 |
{ |
326 | 324 |
// 権限ランク取得 |
... | ... | |
341 | 339 |
} |
342 | 340 |
else |
343 | 341 |
{ |
344 |
// 掲示板閲覧テーブルのチェック |
|
345 |
StringBuilder strSQL = new StringBuilder(); |
|
346 |
strSQL.Append("SELECT"); |
|
347 |
strSQL.Append(" A.RecordNumber"); |
|
348 |
strSQL.Append(", A.BranchNumber"); |
|
349 |
strSQL.Append(", A.SeqNum"); |
|
350 |
strSQL.Append(", A.ToCode"); |
|
351 |
strSQL.Append(", A.ToName"); |
|
352 |
strSQL.Append(", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')"); |
|
353 |
strSQL.Append(", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')"); |
|
354 |
strSQL.Append(" , B.SHAREFLAG, C.DEPARTMENTCODE, D.SECRANK FROM MESSAGEBOARDTERGET A"); |
|
355 |
strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.TOCODE"); |
|
356 |
strSQL.Append(" LEFT JOIN SECURITYMASTER D ON D.SECCODE = C.SECCODE"); |
|
357 |
strSQL.Append(" , MESSAGEBOARDDATA B"); |
|
358 |
strSQL.AppendFormat(" WHERE A.RECORDNUMBER = {0}", RecoadNo); |
|
359 |
strSQL.AppendFormat(" AND A.BRANCHNUMBER = {0}", BuranchNo); |
|
360 |
strSQL.Append(" AND B.RECORDNUMBER = A.RECORDNUMBER"); |
|
361 |
strSQL.Append(" AND B.BRANCHNUMBER = A.BRANCHNUMBER"); |
|
342 |
ArrayList TargetList = new ArrayList(); |
|
343 |
/// 読込ターゲット取得 |
|
344 |
if (!GetReadTarget(mbtDB, RecoadNo, BuranchNo, ref TargetList)) return false; |
|
345 |
if (TargetList.Count == 0) return false; |
|
362 | 346 |
|
363 |
ArrayList terList = new ArrayList(); |
|
364 |
if (!mbtDB.ExecuteReader(strSQL.ToString(), ref terList)) return true; |
|
365 |
if (terList.Count == 0) return true; |
|
366 | 347 |
|
348 |
bool bProtect = false; |
|
367 | 349 |
// 対象テーブルにあるか? |
368 | 350 |
int TergetCnt = Enum.GetNames(typeof(IOMessageBoardTerget.NameColumn)).Length; |
369 | 351 |
MessageBoardTerget wrkRec = new MessageBoardTerget(); |
370 |
for (int i = 0; i < terList.Count; i++)
|
|
352 |
for (int i = 0; i < TargetList.Count; i++)
|
|
371 | 353 |
{ |
372 | 354 |
mbtDB.ClearStruct(ref wrkRec); |
373 |
object[] objRec = (object[])terList[i];
|
|
355 |
object[] objRec = (object[])TargetList[i];
|
|
374 | 356 |
mbtDB.Reader2Struct(objRec, ref wrkRec); |
375 | 357 |
|
358 |
if (i == 0) |
|
359 |
{ |
|
360 |
// ロック判定部署か? |
|
361 |
bProtect = DecideLockData(CommonMotions.cnvInt(objRec[TergetCnt + (int)GetTarget.FromCode])); |
|
362 |
} |
|
376 | 363 |
|
377 | 364 |
// ---------- |
378 | 365 |
int CurRecRank = 0; |
... | ... | |
380 | 367 |
// 対象者コードが5桁以下ならば部署コード |
381 | 368 |
if (wrkRec.ToCode < 99999) |
382 | 369 |
{ |
383 |
// 所属が対象ならばOK |
|
370 |
// 所属部署が対象ならばOK
|
|
384 | 371 |
if (wrkRec.ToCode == CommonMotions.LoginUserData.DepartmentCode) return true; |
385 | 372 |
|
386 | 373 |
// 管理者対象フラグ取得 |
... | ... | |
390 | 377 |
{ |
391 | 378 |
if (ShareFlag != 0) return false; |
392 | 379 |
} |
393 |
|
|
394 |
StringBuilder strSECSQL = new StringBuilder(); |
|
395 |
strSECSQL.Append("SELECT"); |
|
396 |
strSECSQL.Append(" MAX(B.SECRANK)"); |
|
397 |
strSECSQL.Append(" FROM"); |
|
398 |
strSECSQL.Append(" PERSONINCHARGEMASTER A"); |
|
399 |
strSECSQL.Append(", SECURITYMASTER B"); |
|
400 |
strSECSQL.Append(" WHERE"); |
|
401 |
strSECSQL.AppendFormat(" DEPARTMENTCODE = {0}", wrkRec.ToCode); |
|
402 |
strSECSQL.Append(" AND B.SECCODE = A.SECCODE"); |
|
403 |
|
|
404 |
ArrayList SecarList = new ArrayList(); |
|
405 |
secDB.ExecuteReader(strSECSQL.ToString(), ref SecarList); |
|
406 |
object[] objSecRec = (object[])SecarList[0]; |
|
407 |
|
|
408 |
// 部署コード取得 |
|
409 | 380 |
DepCode = wrkRec.ToCode; |
410 |
|
|
411 |
// 部署の最高アクセス権限を取得する |
|
412 |
CurRecRank = CommonMotions.cnvInt(objSecRec[0]); |
|
413 |
if (CurRecRank == 0) CurRecRank = 9; |
|
414 | 381 |
} |
415 | 382 |
else |
416 | 383 |
{ // ----- 以外は担当者コード |
... | ... | |
425 | 392 |
|
426 | 393 |
// アクセスランクを取得する |
427 | 394 |
CurRecRank = CommonMotions.cnvInt(objRec[TergetCnt + (int)GetTarget.SecRank]); |
395 |
// ランク無は最大値をセット |
|
428 | 396 |
if (CurRecRank == 0) CurRecRank = 9; |
429 | 397 |
} |
430 |
// 部署コードが無い場合はチェックしない |
|
431 |
if (DepCode == 0) continue; |
|
432 |
|
|
433 |
// ログイン者が所属長の場合は対象者の所属部署を参照部署と比較 |
|
434 |
if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key |
|
435 |
|| CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key) |
|
398 |
|
|
399 |
if (!bProtect) |
|
436 | 400 |
{ |
437 |
// 参照部署にあるかのチェック |
|
438 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserDepartment) |
|
401 |
// ログイン者が所属長の場合は対象者の所属部署を参照部署と比較 |
|
402 |
if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key |
|
403 |
|| CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key) |
|
439 | 404 |
{ |
440 |
if (DepCode == RefDepRec.DepartmentCode) |
|
405 |
// 参照部署にあるかのチェック |
|
406 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserRefDepartment) |
|
441 | 407 |
{ |
442 |
// 書込み者が自分より上位者では無い場合は読み込める |
|
443 |
if (CommonMotions.LoginUserSecurity.SecRank <= CurRecRank) return true; |
|
408 |
if (DepCode == RefDepRec.DepartmentCode) |
|
409 |
{ |
|
410 |
if (wrkRec.ToCode < 99999) |
|
411 |
{ |
|
412 |
return true; |
|
413 |
} |
|
414 |
else |
|
415 |
{ |
|
416 |
// 書込み者が自分より上位者では無い場合は読み込める |
|
417 |
if (CommonMotions.LoginUserSecurity.SecRank <= CurRecRank) return true; |
|
418 |
} |
|
419 |
} |
|
444 | 420 |
} |
445 | 421 |
} |
446 | 422 |
} |
... | ... | |
457 | 433 |
finally |
458 | 434 |
{ |
459 | 435 |
mbtDB.close(); mbtDB = null; |
460 |
secDB.close(); secDB = null; |
|
461 | 436 |
} |
462 | 437 |
} |
463 | 438 |
#endregion |
464 | 439 |
|
440 |
#region 読込ターゲット取得 |
|
441 |
/// <summary> |
|
442 |
/// 読込ターゲット取得 |
|
443 |
/// </summary> |
|
444 |
private static bool GetReadTarget(IOMessageBoardTerget mbtDB, int RecoadNo, int BuranchNo, ref ArrayList TargetList) |
|
445 |
{ |
|
446 |
try |
|
447 |
{ |
|
448 |
// 掲示板閲覧テーブルのチェック |
|
449 |
StringBuilder strSQL = new StringBuilder(); |
|
450 |
strSQL.Append("SELECT"); |
|
451 |
strSQL.Append(" A.RecordNumber"); |
|
452 |
strSQL.Append(", A.BranchNumber"); |
|
453 |
strSQL.Append(", A.SeqNum"); |
|
454 |
strSQL.Append(", A.ToCode"); |
|
455 |
strSQL.Append(", A.ToName"); |
|
456 |
strSQL.Append(", DATE_FORMAT(A.EntryDate, '%Y/%m/%d %H:%i:%s')"); |
|
457 |
strSQL.Append(", DATE_FORMAT(A.UpdateDate, '%Y/%m/%d %H:%i:%s')"); |
|
458 |
strSQL.Append(", B.SHAREFLAG"); |
|
459 |
strSQL.Append(", C.DEPARTMENTCODE"); |
|
460 |
strSQL.Append(", D.SECRANK"); |
|
461 |
strSQL.Append(", B.FromCode"); |
|
462 |
strSQL.Append(" FROM MESSAGEBOARDTERGET A"); |
|
463 |
strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C"); |
|
464 |
strSQL.Append(" ON C.PERSONCODE = A.TOCODE"); |
|
465 |
strSQL.Append(" LEFT JOIN SECURITYMASTER D"); |
|
466 |
strSQL.Append(" ON D.SECCODE = C.SECCODE"); |
|
467 |
strSQL.Append(", MESSAGEBOARDDATA B"); |
|
468 |
strSQL.AppendFormat(" WHERE A.RECORDNUMBER = {0}", RecoadNo); |
|
469 |
strSQL.AppendFormat(" AND A.BRANCHNUMBER = {0}", BuranchNo); |
|
470 |
strSQL.Append(" AND B.RECORDNUMBER = A.RECORDNUMBER"); |
|
471 |
strSQL.Append(" AND B.BRANCHNUMBER = A.BRANCHNUMBER"); |
|
472 |
|
|
473 |
if (!mbtDB.ExecuteReader(strSQL.ToString(), ref TargetList)) return false; |
|
474 |
|
|
475 |
return true; |
|
476 |
} |
|
477 |
catch (Exception ex) |
|
478 |
{ |
|
479 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
480 |
return false; |
|
481 |
} |
|
482 |
} |
|
483 |
#endregion |
|
484 |
|
|
485 |
#region 最上位部署ロック判定 |
|
486 |
/// <summary> |
|
487 |
/// 最上位部署ロック判定 |
|
488 |
/// </summary> |
|
489 |
private static bool DecideLockData(int nFromCode) |
|
490 |
{ |
|
491 |
IOMSecurity SecDB = new IOMSecurity(); |
|
492 |
try |
|
493 |
{ |
|
494 |
int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority; // 経営者アクセス |
|
495 |
int nRankCode = CommonDefine.SecurityRankList[SRank].Key; |
|
496 |
|
|
497 |
StringBuilder strSQL = new StringBuilder(); |
|
498 |
if (nFromCode < 99999) |
|
499 |
{ // ----- 対象者コードが5桁未満ならば部署コード |
|
500 |
// 部署内の最大セキュリティ区分を取得する |
|
501 |
strSQL.Append("SELECT"); |
|
502 |
strSQL.Append(" MIN(B.SECRANK)"); |
|
503 |
strSQL.Append(" FROM"); |
|
504 |
strSQL.Append(" PERSONINCHARGEMASTER A"); |
|
505 |
strSQL.Append(", SECURITYMASTER B"); |
|
506 |
strSQL.AppendFormat(" WHERE A.DEPARTMENTCODE = {0}", nFromCode); |
|
507 |
strSQL.Append(" AND B.SECCODE = A.SECCODE"); |
|
508 |
|
|
509 |
} |
|
510 |
else |
|
511 |
{ // ----- 対象者コードが5桁以上ならば担当者コード |
|
512 |
// 担当者のセキュリティ区分を取得する |
|
513 |
strSQL.Append("SELECT"); |
|
514 |
strSQL.Append(" B.SECRANK"); |
|
515 |
strSQL.Append(" FROM"); |
|
516 |
strSQL.Append(" PERSONINCHARGEMASTER A"); |
|
517 |
strSQL.Append(", SECURITYMASTER B"); |
|
518 |
strSQL.AppendFormat(" WHERE A.PERSONCODE = {0}", nFromCode); |
|
519 |
strSQL.Append(" AND B.SECCODE = A.SECCODE"); |
|
520 |
|
|
521 |
} |
|
522 |
ArrayList arData = new ArrayList(); |
|
523 |
if (!SecDB.ExecuteReader(strSQL.ToString(), ref arData)) return false; |
|
524 |
if (arData.Count < 1) return false; |
|
525 |
|
|
526 |
object[] objRec = (object[])arData[0]; |
|
527 |
|
|
528 |
bool bRet = false; |
|
529 |
if (nRankCode == CommonMotions.cnvInt(objRec[0])) bRet = true; |
|
530 |
|
|
531 |
return bRet; |
|
532 |
} |
|
533 |
catch (Exception ex) |
|
534 |
{ |
|
535 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
536 |
return false; |
|
537 |
} |
|
538 |
finally |
|
539 |
{ |
|
540 |
SecDB.close(); SecDB = null; |
|
541 |
} |
|
542 |
} |
|
543 |
#endregion |
|
544 |
|
|
465 | 545 |
#region 指定担当者がログインユーザー配下の所属かどうかを確認する |
466 | 546 |
/// <summary> |
467 | 547 |
/// 指定担当者がログインユーザー配下の所属かどうかを確認する |
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs | ||
---|---|---|
1126 | 1126 |
{ |
1127 | 1127 |
// ----- ログイン者はメモリより取得 |
1128 | 1128 |
DepartmentCode = CommonMotions.LoginUserData.DepartmentCode; |
1129 |
foreach (PersonDepartmentMaster wrkRec in CommonMotions.LoginUserDepartment) |
|
1129 |
foreach (PersonDepartmentMaster wrkRec in CommonMotions.LoginUserRefDepartment)
|
|
1130 | 1130 |
{ |
1131 | 1131 |
TargetDepartment.Add(wrkRec); |
1132 | 1132 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs | ||
---|---|---|
30 | 30 |
/// </summary> |
31 | 31 |
private void InitializeComponent() |
32 | 32 |
{ |
33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
33 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
40 | 40 |
this.label1 = new System.Windows.Forms.Label(); |
41 | 41 |
this.btnDataDelete = new System.Windows.Forms.Button(); |
42 | 42 |
this.btnDataEntry = new System.Windows.Forms.Button(); |
... | ... | |
87 | 87 |
this.btnLineDel = new System.Windows.Forms.Button(); |
88 | 88 |
this.btnLineAdd = new System.Windows.Forms.Button(); |
89 | 89 |
this.panel2 = new System.Windows.Forms.Panel(); |
90 |
this.lblCellTotal = new System.Windows.Forms.Label(); |
|
91 | 90 |
this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
92 | 91 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
93 | 92 |
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
117 | 116 |
this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
118 | 117 |
this.Column26 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
119 | 118 |
this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
119 |
this.lblCellTotal = new System.Windows.Forms.Label(); |
|
120 | 120 |
this.btnDispDown = new System.Windows.Forms.Button(); |
121 | 121 |
this.btnDispUp = new System.Windows.Forms.Button(); |
122 | 122 |
this.btnOtherProc = new System.Windows.Forms.Button(); |
... | ... | |
125 | 125 |
this.btnSelect = new System.Windows.Forms.Button(); |
126 | 126 |
this.btnCreate = new System.Windows.Forms.Button(); |
127 | 127 |
this.grpExample1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
128 |
this.lblReqSumType03 = new System.Windows.Forms.Label(); |
|
128 | 129 |
this.lblReqSumType01 = new System.Windows.Forms.Label(); |
129 | 130 |
this.lblReqSumType02 = new System.Windows.Forms.Label(); |
130 |
this.lblReqSumType03 = new System.Windows.Forms.Label(); |
|
131 | 131 |
this.panel1.SuspendLayout(); |
132 | 132 |
this.pnlGroup2.SuspendLayout(); |
133 | 133 |
this.pnlGroup1.SuspendLayout(); |
... | ... | |
772 | 772 |
| System.Windows.Forms.AnchorStyles.Left) |
773 | 773 |
| System.Windows.Forms.AnchorStyles.Right))); |
774 | 774 |
this.panel2.BackColor = System.Drawing.Color.WhiteSmoke; |
775 |
this.panel2.Controls.Add(this.dgvAllDisplay); |
|
775 | 776 |
this.panel2.Controls.Add(this.lblCellTotal); |
776 |
this.panel2.Controls.Add(this.dgvAllDisplay); |
|
777 | 777 |
this.panel2.Location = new System.Drawing.Point(7, 204); |
778 | 778 |
this.panel2.Name = "panel2"; |
779 |
this.panel2.Size = new System.Drawing.Size(1290, 447);
|
|
779 |
this.panel2.Size = new System.Drawing.Size(1290, 450);
|
|
780 | 780 |
this.panel2.TabIndex = 36; |
781 | 781 |
// |
782 |
// lblCellTotal |
|
783 |
// |
|
784 |
this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
785 |
this.lblCellTotal.AutoSize = true; |
|
786 |
this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke; |
|
787 |
this.lblCellTotal.Font = new System.Drawing.Font("MS P明朝", 9.75F, System.Drawing.FontStyle.Bold); |
|
788 |
this.lblCellTotal.ForeColor = System.Drawing.Color.Black; |
|
789 |
this.lblCellTotal.Location = new System.Drawing.Point(100, 427); |
|
790 |
this.lblCellTotal.Name = "lblCellTotal"; |
|
791 |
this.lblCellTotal.Size = new System.Drawing.Size(0, 13); |
|
792 |
this.lblCellTotal.TabIndex = 36; |
|
793 |
// |
|
794 | 782 |
// dgvAllDisplay |
795 | 783 |
// |
796 | 784 |
this.dgvAllDisplay.AllowUserToAddRows = false; |
... | ... | |
802 | 790 |
| System.Windows.Forms.AnchorStyles.Right))); |
803 | 791 |
this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |
804 | 792 |
this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
805 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
806 |
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
|
|
807 |
dataGridViewCellStyle8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
808 |
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
809 |
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
810 |
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
811 |
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
812 |
this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
|
|
793 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
794 |
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
|
|
795 |
dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
796 |
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
|
|
797 |
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
798 |
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
799 |
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
800 |
this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
|
|
813 | 801 |
this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; |
814 | 802 |
this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
815 | 803 |
this.Column1, |
... | ... | |
845 | 833 |
this.dgvAllDisplay.RowHeadersVisible = false; |
846 | 834 |
this.dgvAllDisplay.RowHeadersWidth = 20; |
847 | 835 |
this.dgvAllDisplay.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; |
848 |
this.dgvAllDisplay.RowTemplate.Height = 21; |
|
849 | 836 |
this.dgvAllDisplay.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; |
850 |
this.dgvAllDisplay.Size = new System.Drawing.Size(1278, 418);
|
|
837 |
this.dgvAllDisplay.Size = new System.Drawing.Size(1278, 442);
|
|
851 | 838 |
this.dgvAllDisplay.TabIndex = 35; |
852 | 839 |
this.dgvAllDisplay.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellDoubleClick); |
853 | 840 |
this.dgvAllDisplay.CellEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvAllDisplay_CellEnter); |
... | ... | |
860 | 847 |
// |
861 | 848 |
// Column1 |
862 | 849 |
// |
863 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
864 |
this.Column1.DefaultCellStyle = dataGridViewCellStyle9;
|
|
850 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
851 |
this.Column1.DefaultCellStyle = dataGridViewCellStyle2;
|
|
865 | 852 |
this.Column1.Frozen = true; |
866 | 853 |
this.Column1.HeaderText = "№"; |
867 | 854 |
this.Column1.Name = "Column1"; |
... | ... | |
920 | 907 |
// |
921 | 908 |
// Column5 |
922 | 909 |
// |
923 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
924 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle10;
|
|
910 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
911 |
this.Column5.DefaultCellStyle = dataGridViewCellStyle3;
|
|
925 | 912 |
this.Column5.Frozen = true; |
926 | 913 |
this.Column5.HeaderText = "項 目"; |
927 | 914 |
this.Column5.Name = "Column5"; |
... | ... | |
932 | 919 |
// |
933 | 920 |
// Column6 |
934 | 921 |
// |
935 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
936 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle11;
|
|
922 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
|
923 |
this.Column6.DefaultCellStyle = dataGridViewCellStyle4;
|
|
937 | 924 |
this.Column6.Frozen = true; |
938 | 925 |
this.Column6.HeaderText = "業 種"; |
939 | 926 |
this.Column6.Name = "Column6"; |
... | ... | |
971 | 958 |
// |
972 | 959 |
// Column7 |
973 | 960 |
// |
974 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
975 |
dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
|
976 |
dataGridViewCellStyle12.Format = "N0";
|
|
977 |
dataGridViewCellStyle12.NullValue = null;
|
|
978 |
this.Column7.DefaultCellStyle = dataGridViewCellStyle12;
|
|
961 |
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
962 |
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
|
|
963 |
dataGridViewCellStyle5.Format = "N0";
|
|
964 |
dataGridViewCellStyle5.NullValue = null;
|
|
965 |
this.Column7.DefaultCellStyle = dataGridViewCellStyle5;
|
|
979 | 966 |
this.Column7.Frozen = true; |
980 | 967 |
this.Column7.HeaderText = "予定(見積)金額"; |
981 | 968 |
this.Column7.Name = "Column7"; |
... | ... | |
986 | 973 |
// |
987 | 974 |
// Column12 |
988 | 975 |
// |
989 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
990 |
dataGridViewCellStyle13.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
|
991 |
this.Column12.DefaultCellStyle = dataGridViewCellStyle13;
|
|
976 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
977 |
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
|
|
978 |
this.Column12.DefaultCellStyle = dataGridViewCellStyle6;
|
|
992 | 979 |
this.Column12.Frozen = true; |
993 | 980 |
this.Column12.HeaderText = "実 行 金 額"; |
994 | 981 |
this.Column12.Name = "Column12"; |
... | ... | |
999 | 986 |
// |
1000 | 987 |
// Column9 |
1001 | 988 |
// |
1002 |
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
1003 |
this.Column9.DefaultCellStyle = dataGridViewCellStyle14;
|
|
989 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
|
|
990 |
this.Column9.DefaultCellStyle = dataGridViewCellStyle7;
|
|
1004 | 991 |
this.Column9.Frozen = true; |
1005 | 992 |
this.Column9.HeaderText = "比率(%)"; |
1006 | 993 |
this.Column9.Name = "Column9"; |
... | ... | |
1142 | 1129 |
this.Column28.Name = "Column28"; |
1143 | 1130 |
this.Column28.Visible = false; |
1144 | 1131 |
// |
1132 |
// lblCellTotal |
|
1133 |
// |
|
1134 |
this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
1135 |
this.lblCellTotal.AutoSize = true; |
|
1136 |
this.lblCellTotal.BackColor = System.Drawing.Color.WhiteSmoke; |
|
1137 |
this.lblCellTotal.Font = new System.Drawing.Font("MS P明朝", 9.75F, System.Drawing.FontStyle.Bold); |
|
1138 |
this.lblCellTotal.ForeColor = System.Drawing.Color.Black; |
|
1139 |
this.lblCellTotal.Location = new System.Drawing.Point(100, 430); |
|
1140 |
this.lblCellTotal.Name = "lblCellTotal"; |
|
1141 |
this.lblCellTotal.Size = new System.Drawing.Size(0, 13); |
|
1142 |
this.lblCellTotal.TabIndex = 36; |
|
1143 |
// |
|
1145 | 1144 |
// btnDispDown |
1146 | 1145 |
// |
1147 | 1146 |
this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
... | ... | |
1252 | 1251 |
this.grpExample1.TabStop = false; |
1253 | 1252 |
this.grpExample1.Visible = false; |
1254 | 1253 |
// |
1254 |
// lblReqSumType03 |
|
1255 |
// |
|
1256 |
this.lblReqSumType03.BackColor = System.Drawing.Color.LightGray; |
|
1257 |
this.lblReqSumType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
1258 |
this.lblReqSumType03.ForeColor = System.Drawing.Color.White; |
|
1259 |
this.lblReqSumType03.Location = new System.Drawing.Point(218, 4); |
|
1260 |
this.lblReqSumType03.Name = "lblReqSumType03"; |
|
1261 |
this.lblReqSumType03.Size = new System.Drawing.Size(100, 20); |
|
1262 |
this.lblReqSumType03.TabIndex = 1; |
|
1263 |
this.lblReqSumType03.Text = "対 象 外"; |
|
1264 |
this.lblReqSumType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
1265 |
// |
|
1255 | 1266 |
// lblReqSumType01 |
1256 | 1267 |
// |
1257 | 1268 |
this.lblReqSumType01.BackColor = System.Drawing.Color.Yellow; |
... | ... | |
1276 | 1287 |
this.lblReqSumType02.Text = "選 択 済"; |
1277 | 1288 |
this.lblReqSumType02.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
1278 | 1289 |
// |
1279 |
// lblReqSumType03 |
|
1280 |
// |
|
1281 |
this.lblReqSumType03.BackColor = System.Drawing.Color.LightGray; |
|
1282 |
this.lblReqSumType03.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
1283 |
this.lblReqSumType03.ForeColor = System.Drawing.Color.White; |
|
1284 |
this.lblReqSumType03.Location = new System.Drawing.Point(218, 4); |
|
1285 |
this.lblReqSumType03.Name = "lblReqSumType03"; |
|
1286 |
this.lblReqSumType03.Size = new System.Drawing.Size(100, 20); |
|
1287 |
this.lblReqSumType03.TabIndex = 1; |
|
1288 |
this.lblReqSumType03.Text = "対 象 外"; |
|
1289 |
this.lblReqSumType03.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
1290 |
// |
|
1291 | 1290 |
// FrmConstructionLedger |
1292 | 1291 |
// |
1293 | 1292 |
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
... | ... | |
1296 | 1295 |
this.ClientSize = new System.Drawing.Size(1344, 692); |
1297 | 1296 |
this.Controls.Add(this.btnCreate); |
1298 | 1297 |
this.Controls.Add(this.btnSelect); |
1299 |
this.Controls.Add(this.button2); |
|
1300 |
this.Controls.Add(this.button1); |
|
1301 | 1298 |
this.Controls.Add(this.btnOtherProc); |
1302 |
this.Controls.Add(this.btnDispDown); |
|
1303 |
this.Controls.Add(this.btnDispUp); |
|
1304 | 1299 |
this.Controls.Add(this.label4); |
1305 | 1300 |
this.Controls.Add(this.panel2); |
1306 | 1301 |
this.Controls.Add(this.btnLineDel); |
... | ... | |
1312 | 1307 |
this.Controls.Add(this.label1); |
1313 | 1308 |
this.Controls.Add(this.label2); |
1314 | 1309 |
this.Controls.Add(this.grpExample1); |
1310 |
this.Controls.Add(this.button2); |
|
1311 |
this.Controls.Add(this.button1); |
|
1312 |
this.Controls.Add(this.btnDispDown); |
|
1313 |
this.Controls.Add(this.btnDispUp); |
|
1315 | 1314 |
this.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
1316 | 1315 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
1317 | 1316 |
this.KeyPreview = true; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.resx | ||
---|---|---|
117 | 117 |
<resheader name="writer"> |
118 | 118 |
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> |
119 | 119 |
</resheader> |
120 |
<metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
121 |
<value>True</value> |
|
122 |
</metadata> |
|
123 |
<metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
124 |
<value>True</value> |
|
125 |
</metadata> |
|
126 | 120 |
<metadata name="Column3.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
127 | 121 |
<value>True</value> |
128 | 122 |
</metadata> |
... | ... | |
195 | 189 |
<metadata name="Column28.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
196 | 190 |
<value>True</value> |
197 | 191 |
</metadata> |
192 |
<metadata name="lblCellTotal.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
|
193 |
<value>True</value> |
|
194 |
</metadata> |
|
198 | 195 |
</root> |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
---|---|---|
7618 | 7618 |
try |
7619 | 7619 |
{ |
7620 | 7620 |
// 請求処理連携以外は処理しない |
7621 |
if (!m_BillingProc) return;
|
|
7621 |
if (!m_ReqSumFlag) return;
|
|
7622 | 7622 |
|
7623 | 7623 |
// 支払カラム以外は処理しない |
7624 | 7624 |
int FixColCnt = Enum.GetNames(typeof(GridColumn)).Length; |
... | ... | |
7723 | 7723 |
// 請求まとめ行色変更処理 |
7724 | 7724 |
SetReqSumRowColor(CurRow); |
7725 | 7725 |
} |
7726 |
// フォームスタイルセット |
|
7727 |
this.BackColor = SystemColors.ControlLightLight; |
|
7728 |
int nWDiff = panel2.Width - dgv.Width; |
|
7729 |
panel2.Width = panel1.Width; |
|
7730 |
dgv.Width = (panel2.Width - nWDiff); |
|
7726 | 7731 |
} |
7727 | 7732 |
catch (System.Exception ex) |
7728 | 7733 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/FrmSelectRegField.cs | ||
---|---|---|
907 | 907 |
else |
908 | 908 |
{ |
909 | 909 |
// 担当者対象部署マスタに含まれるか判定 |
910 |
foreach( PersonDepartmentMaster Prsn in CommonMotions.LoginUserDepartment) |
|
910 |
foreach( PersonDepartmentMaster Prsn in CommonMotions.LoginUserRefDepartment)
|
|
911 | 911 |
{ |
912 | 912 |
if( MyData.DepartmentCode == Prsn.DepartmentCode ) |
913 | 913 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
---|---|---|
1644 | 1644 |
DataGridViewRow CurRow = dgv.CurrentRow; |
1645 | 1645 |
|
1646 | 1646 |
int nCompnyCode = CommonMotions.cnvInt(CurRow.Cells[m_Company_Column].Value); |
1647 |
int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_ConstructionCode].Value);
|
|
1647 |
int nConstrCode = CommonMotions.cnvInt(CurRow.Cells[m_Genba_Column].Value);
|
|
1648 | 1648 |
if (rdbCompany.Checked) |
1649 | 1649 |
{ // ??? |
1650 | 1650 |
// ??????R?[?h????????????????? |
... | ... | |
3858 | 3858 |
|| m_UserInfo.m_Type == CommonDefine.SecurityRankPos.FreeAuthority) |
3859 | 3859 |
{ |
3860 | 3860 |
// ?Q????????????`?F?b?N |
3861 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserDepartment) |
|
3861 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserRefDepartment)
|
|
3862 | 3862 |
{ |
3863 | 3863 |
// ??????????????????????H?????\?????? |
3864 | 3864 |
if (RefDepRec.DepartmentCode != DepCode) |
... | ... | |
3891 | 3891 |
else if (m_UserInfo.m_SecRange == ClsSecurityPermission.SecRangeType.OneDepartment) |
3892 | 3892 |
{ |
3893 | 3893 |
// ?Q????????????`?F?b?N |
3894 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserDepartment) |
|
3894 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserRefDepartment)
|
|
3895 | 3895 |
{ |
3896 | 3896 |
// ??????????????????????H?????\?????? |
3897 | 3897 |
if (RefDepRec.DepartmentCode != DepCode) |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmLogin.cs | ||
---|---|---|
392 | 392 |
SetLoginUserData(wrkrec); |
393 | 393 |
|
394 | 394 |
// ----- 参照部署データ取得 |
395 |
CommonMotions.LoginUserDepartment.Clear(); |
|
396 |
List<PersonDepartmentMaster> depList = CommonMotions.LoginUserDepartment; |
|
395 |
CommonMotions.LoginUserRefDepartment.Clear();
|
|
396 |
List<PersonDepartmentMaster> depList = CommonMotions.LoginUserRefDepartment;
|
|
397 | 397 |
string strpdSQL = pdDB.CreatePrimarykeyString(LoginUserID); |
398 | 398 |
// 担当者参照部署マスタ読込 |
399 | 399 |
if (!pdDB.SelectAction(strSQL, ref depList)) return false; |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs | ||
---|---|---|
1551 | 1551 |
int Range = 0; |
1552 | 1552 |
int CurRank = ClsSecurityPermission.GetPersonDataAccessRank(PersonCode, ref Range); |
1553 | 1553 |
// 参照部署にあるかのチェック |
1554 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserDepartment) |
|
1554 |
foreach (PersonDepartmentMaster RefDepRec in CommonMotions.LoginUserRefDepartment)
|
|
1555 | 1555 |
{ |
1556 | 1556 |
if (DepCode == RefDepRec.DepartmentCode) |
1557 | 1557 |
{ |
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
---|---|---|
2386 | 2386 |
// 担当者は返信・編集以外メッセージを見ることはできない |
2387 | 2387 |
if (WriteingCode != CommonMotions.LoginUserData.PersonCode) |
2388 | 2388 |
{ |
2389 |
// 所属長以上は全てのメッセージを見ることができる
|
|
2389 |
// 所属長以上対象部署の全てのメッセージを見ることができる
|
|
2390 | 2390 |
if (!ClsMessageBoradAccess.MessagePermission(RecoadNo, BuranchNo)) return false; |
2391 | 2391 |
} |
2392 | 2392 |
|
... | ... | |
2433 | 2433 |
int WriteingCode = CommonMotions.cnvInt(wrkRow.Cells[(int)MessageGridCount.Writer].Value); |
2434 | 2434 |
|
2435 | 2435 |
// 読込権限がない場合は処理しない |
2436 |
if (!ClsMessageBoradAccess.MessageNewReadPermission(RecoadNo, BuranchNo)) return false;
|
|
2436 |
if (!ClsMessageBoradAccess.MessageReadPermission(RecoadNo, BuranchNo)) return false; |
|
2437 | 2437 |
|
2438 | 2438 |
int ExecProcNo = (int)ClsExcute.SubFormExecuteNo.MessageReader; |
2439 | 2439 |
|
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
33 | 33 |
// 既定値にすることができます: |
34 | 34 |
// [assembly: AssemblyVersion("1.0.*")] |
35 |
[assembly: AssemblyVersion("1.0.1.33")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.1.33")]
|
|
35 |
[assembly: AssemblyVersion("1.0.1.34")]
|
|
36 |
[assembly: AssemblyFileVersion("1.0.1.34")]
|
|
37 | 37 |
// Log4netを使用する |
38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff