リビジョン 394
セキュリティマスタメンテ:左右移動キーバグ修正
構成マスタ:定数定義追加
工事承認画面:表示営業期を工事年度切り替え追加・最終承認までは常に申請中に変更
工事情報入力:部署・担当引継掲示板メッセージ色変更
工事予算書:総務部コード固定を修正
積算予算書:マスタ登録が無い大項目を選択時にタブが表示されないバグ修正
注文書印刷:総務部コード固定を修正
請求入力:15回限度メッセージ追加
大項目・中項目関連マスタ:下位項目有選択項目で、マスタに登録されていないときにエラーを色で表示を追加
メニュー:ログイン者と関係のあるメッセージを表示する様に、秘書連絡と掲示板を修正
工事一覧:登録直後の案件が2件表示されるバグ修正
trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs | ||
---|---|---|
353 | 353 |
/// </summary> |
354 | 354 |
public static string s_AllMembersString = "全 員"; |
355 | 355 |
public static int s_AllMembersCode = 99999999; |
356 |
#endregion |
|
356 | 357 |
|
357 | 358 |
/// <summary> |
359 |
/// 部署引継色 |
|
360 |
/// </summary> |
|
361 |
public static Color s_SuccessionBackColor = Color.LightSkyBlue; |
|
362 |
public static Color s_SuccessionForeColor = Color.LightYellow; |
|
363 |
|
|
364 |
/// <summary> |
|
365 |
/// 担当割当色 |
|
366 |
/// </summary> |
|
367 |
public static Color s_AssignBackColor = Color.LightBlue; |
|
368 |
public static Color s_AssignForeColor = Color.LightYellow; |
|
369 |
|
|
370 |
/// <summary> |
|
358 | 371 |
/// 社長室コード(部署コード) |
359 | 372 |
/// </summary> |
360 |
public static int s_PresidentsOffice = 7; |
|
373 |
//public static int s_PresidentsOffice = 7;
|
|
361 | 374 |
|
362 | 375 |
/// <summary> |
363 | 376 |
/// 総務部コード(部署コード) |
364 | 377 |
/// </summary> |
365 | 378 |
public static int s_GeneralAffairsDevision = 4; |
366 | 379 |
#endregion |
367 |
#endregion |
|
368 | 380 |
|
369 | 381 |
#region 行動予定 会社行事名称・コード |
370 | 382 |
/// <summary> |
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
---|---|---|
419 | 419 |
static int m_EditFlg = (int)CommonDefine.ProcessDataEdit.Reference; |
420 | 420 |
#endregion |
421 | 421 |
|
422 |
#region 起動不許可時メッセージ |
|
423 |
/// <summary> |
|
424 |
/// 起動不許可時メッセージ |
|
425 |
/// </summary> |
|
426 |
private const string s_NotExecuteMessage = "選択された処理の起動権限が設定されていません。"; |
|
427 |
private const string s_NotExecuteTitile = "起動権限確認"; |
|
428 |
#endregion |
|
429 |
|
|
422 | 430 |
#region 起動処理 |
423 | 431 |
/// <summary> |
424 | 432 |
/// プロセス起動 |
... | ... | |
435 | 443 |
// 起動チェック |
436 | 444 |
if (!ClsSecurityPermission.GetExecutePermission(m_ProcControlPara[NowPoint].ProcNo, ref m_EditFlg)) |
437 | 445 |
{ |
438 |
MessageBox.Show("選択された処理の起動権限が設定されていません。", "起動権限確認", MessageBoxButtons.OK, MessageBoxIcon.Stop);
|
|
446 |
MessageBox.Show(s_NotExecuteMessage, s_NotExecuteTitile, MessageBoxButtons.OK, MessageBoxIcon.Stop);
|
|
439 | 447 |
BackProcess(); |
440 | 448 |
} |
441 | 449 |
|
... | ... | |
444 | 452 |
#region 通常処理 |
445 | 453 |
// ----- 通常処理 |
446 | 454 |
case (int)ProcessExecuteNo.ConstructionList: // 1:工事情報一覧 |
455 |
// 一覧の次処理の起動チェック |
|
456 |
int NextProcNo = m_ProcControlPara[NowPoint].IntExecParameter[0]; |
|
457 |
if (!ClsSecurityPermission.GetExecutePermission(NextProcNo, ref m_EditFlg)) |
|
458 |
{ |
|
459 |
MessageBox.Show(s_NotExecuteMessage, s_NotExecuteTitile, MessageBoxButtons.OK, MessageBoxIcon.Stop); |
|
460 |
BackProcess(); |
|
461 |
break; |
|
462 |
} |
|
463 |
|
|
447 | 464 |
ProcessExecuteNo_ConstructionList(m_ProcControlPara[NowPoint]); |
448 | 465 |
break; |
449 | 466 |
|
... | ... | |
921 | 938 |
{ |
922 | 939 |
// 次起動プロセスセット |
923 | 940 |
frm.ExecuteFlg = CurrentPara.IntExecParameter[0]; |
941 |
|
|
924 | 942 |
// データ追加フラグ |
925 | 943 |
frm.DataAddtionButton = CurrentPara.BoolExecParameter[0]; |
926 | 944 |
|
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs | ||
---|---|---|
366 | 366 |
#endregion |
367 | 367 |
|
368 | 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.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision) return false;
|
|
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 | 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 |
} |
|
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 | 393 |
|
394 |
return bReturn; |
|
395 |
} |
|
396 |
catch (Exception ex) |
|
397 |
{ |
|
398 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
399 |
return false; |
|
400 |
} |
|
401 |
} |
|
394 |
// return bReturn;
|
|
395 |
// }
|
|
396 |
// catch (Exception ex)
|
|
397 |
// {
|
|
398 |
// logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
399 |
// return false;
|
|
400 |
// }
|
|
401 |
//}
|
|
402 | 402 |
#endregion |
403 | 403 |
#endregion |
404 | 404 |
|
trunk/src/ProcessManagement/ProcessManagement/DataModel/ComponentMaster.cs | ||
---|---|---|
10 | 10 |
/// </summary> |
11 | 11 |
public class ComponentMaster |
12 | 12 |
{ |
13 |
#region 定数 |
|
14 |
#region 下位項目フラグ定義 |
|
15 |
/// <summary> |
|
16 |
/// 下位項目フラグ定義 |
|
17 |
/// </summary> |
|
18 |
public enum SubitemsFlgDef |
|
19 |
{ |
|
20 |
/// <summary> |
|
21 |
/// 0:下位項目無 |
|
22 |
/// </summary> |
|
23 |
NoneData = 0, |
|
24 |
/// <summary> |
|
25 |
/// 1:下位項目有 |
|
26 |
/// </summary> |
|
27 |
ExistsData |
|
28 |
} |
|
29 |
#endregion |
|
30 |
|
|
31 |
#region 直接入力フラグ |
|
32 |
/// <summary> |
|
33 |
/// 直接入力フラグ |
|
34 |
/// </summary> |
|
35 |
public enum DirectInputFlgDef |
|
36 |
{ |
|
37 |
/// <summary> |
|
38 |
/// 0:直接入力不許可 |
|
39 |
/// </summary> |
|
40 |
NoneInput = 0, |
|
41 |
/// <summary> |
|
42 |
/// 1:直接入力許可 |
|
43 |
/// </summary> |
|
44 |
DirectInput, |
|
45 |
} |
|
46 |
#endregion |
|
47 |
|
|
48 |
#region 自社経費フラグ |
|
49 |
/// <summary> |
|
50 |
/// 自社経費フラグ |
|
51 |
/// </summary> |
|
52 |
public enum MyExpensesFlgDef |
|
53 |
{ |
|
54 |
/// <summary> |
|
55 |
/// 0:施工費 |
|
56 |
/// </summary> |
|
57 |
ConstrCost = 0, |
|
58 |
/// <summary> |
|
59 |
/// 1:経費 |
|
60 |
/// </summary> |
|
61 |
Expenses, |
|
62 |
} |
|
63 |
#endregion |
|
64 |
#endregion |
|
65 |
|
|
13 | 66 |
#region メンバ変数 |
14 | 67 |
private int m_ComponentCode = 0; // 構成キー |
15 | 68 |
private int m_DisplayOrder = 0; // 表示順 |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs | ||
---|---|---|
244 | 244 |
//?R???g???[???I?u?W?F?N?g?? |
245 | 245 |
SetDisplayObject(); |
246 | 246 |
|
247 |
// ???????????C?A?E?g??? |
|
248 |
InitDispLayout(); |
|
249 |
|
|
247 | 250 |
// ?f?[?^?\?? |
248 | 251 |
AllDataDisplay(); |
249 | 252 |
|
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
---|---|---|
326 | 326 |
m_ApprovalCode = Code2; |
327 | 327 |
} |
328 | 328 |
|
329 |
// 申請レコード更新 |
|
330 |
// 承認時は条件を満たすかをチェックする |
|
331 |
switch (statusCode) |
|
332 |
{ |
|
333 |
case (int)CommonDefine.ApprovalStatus.Approval: |
|
334 |
// ----- 承認 |
|
335 |
// 案件に対して最終承認がされているかを確認する |
|
336 |
if (!ClsCommonApproval.CheckProcessApprovalFinal(m_ConstructionCode, m_ApprovalCode, m_OrderNo)) break; |
|
329 |
// ----- 申請レコード更新 |
|
330 |
// 承認以外は以下を処理しない |
|
331 |
if (statusCode != (int)CommonDefine.ApprovalStatus.Approval) return true; |
|
337 | 332 |
|
338 |
// 最終承認がされていれば申請レコードを承認へ変更する |
|
339 |
if (!ClsCommonApproval.SetPrimaryRecStatus(m_ConstructionCode, |
|
340 |
m_ApprovalCode, |
|
341 |
m_OrderNo, |
|
342 |
statusCode)) return false; |
|
333 |
// ----- 承認 |
|
334 |
// 案件に対して最終承認がされているかを確認する |
|
335 |
if (!ClsCommonApproval.CheckProcessApprovalFinal(m_ConstructionCode, m_ApprovalCode, m_OrderNo)) return true; |
|
343 | 336 |
|
344 |
// 承認完了後に処理があるものは処理する |
|
345 |
ApprovalNextProcess(); |
|
337 |
// 最終承認がされていれば申請レコードを承認へ変更する |
|
338 |
if (!ClsCommonApproval.SetPrimaryRecStatus(m_ConstructionCode, |
|
339 |
m_ApprovalCode, |
|
340 |
m_OrderNo, |
|
341 |
statusCode)) return false; |
|
346 | 342 |
|
347 |
break; |
|
343 |
// 承認完了後に処理があるものは処理する |
|
344 |
ApprovalNextProcess(); |
|
348 | 345 |
|
349 |
default: |
|
350 |
// ----- 承認以外 |
|
351 |
if (!ClsCommonApproval.SetPrimaryRecStatus(m_ConstructionCode, |
|
352 |
m_ApprovalCode, |
|
353 |
m_OrderNo, |
|
354 |
statusCode)) return false; |
|
355 |
break; |
|
356 |
} |
|
357 |
|
|
358 | 346 |
return true; |
359 | 347 |
} |
360 | 348 |
catch (Exception ex) |
... | ... | |
441 | 429 |
} |
442 | 430 |
#endregion |
443 | 431 |
|
432 |
#region 初期時画面レイアウト設定 |
|
433 |
/// <summary> |
|
434 |
/// 初期時画面レイアウト設定 |
|
435 |
/// </summary> |
|
436 |
private void InitDispLayout() |
|
437 |
{ |
|
438 |
try |
|
439 |
{ |
|
440 |
label14.Text = CommonMotions.GetYearTitle(); |
|
441 |
label19.Text = CommonMotions.GetYearTitle(false).Replace("度", ""); |
|
442 |
} |
|
443 |
catch (Exception ex) |
|
444 |
{ |
|
445 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
446 |
} |
|
447 |
} |
|
448 |
#endregion |
|
449 |
|
|
444 | 450 |
#region 表示オブジェクトの取得 |
445 | 451 |
/// <summary> |
446 | 452 |
/// 表示オブジェクトの取得 |
... | ... | |
742 | 748 |
ArrayList workdlist = new ArrayList(); |
743 | 749 |
if (!cbidDB.ExecuteReader(strSQL.ToString(), ref workdlist)) return false; |
744 | 750 |
if (workdlist.Count == 0) return false; |
745 |
|
|
751 |
|
|
746 | 752 |
// 営業期数セット |
747 |
m_dispLabelControl[(int)DispHeader.ConstrPeriod].Text = string.Format("{0}", m_ConstrBaseRec.ConstructionPeriod); |
|
753 |
if (CommonMotions.BasePeriodYear()) |
|
754 |
{ |
|
755 |
m_dispLabelControl[(int)DispHeader.ConstrPeriod].Text = string.Format("{0}", m_ConstrBaseRec.ConstructionPeriod); |
|
756 |
} |
|
757 |
else |
|
758 |
{ |
|
759 |
m_dispLabelControl[(int)DispHeader.ConstrPeriod].Text = string.Format("{0}", m_ConstrBaseRec.ConstructionYear); |
|
760 |
} |
|
748 | 761 |
|
749 | 762 |
object[] objRec = (object[])workdlist[0]; |
750 | 763 |
// データ表示 |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
---|---|---|
485 | 485 |
for (int i = 0; i < s_SQLPart3_1_2.Length; i++) wrkFormat.Append(s_SQLPart3_1_2[i]); |
486 | 486 |
} |
487 | 487 |
|
488 |
if (CommonMotions.BasePeriodYear()) |
|
489 |
{ |
|
490 |
for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5[i]); |
|
491 |
} |
|
492 |
else |
|
493 |
{ |
|
494 |
for (int i = 0; i < s_SQLPart5.Length; i++) wrkFormat.Append(s_SQLPart5_1[i]); |
|
495 |
} |
|
496 |
|
|
488 | 497 |
strSQL.AppendFormat(wrkFormat.ToString(), numUDConstPro.Value); |
489 | 498 |
strSQL.AppendFormat(" AND A.ConstructionStatusFlg < {0}", ProgressComplete); |
490 | 499 |
|
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs | ||
---|---|---|
3677 | 3677 |
this.cmbConstructionYear.FormattingEnabled = true; |
3678 | 3678 |
this.cmbConstructionYear.Location = new System.Drawing.Point(639, 4); |
3679 | 3679 |
this.cmbConstructionYear.Name = "cmbConstructionYear"; |
3680 |
this.cmbConstructionYear.Size = new System.Drawing.Size(134, 24);
|
|
3680 |
this.cmbConstructionYear.Size = new System.Drawing.Size(115, 24);
|
|
3681 | 3681 |
this.cmbConstructionYear.TabIndex = 1; |
3682 | 3682 |
this.toolTip1.SetToolTip(this.cmbConstructionYear, "工事の着工開始年度を入力してください"); |
3683 | 3683 |
this.cmbConstructionYear.Visible = false; |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
---|---|---|
4707 | 4707 |
data.LinkCode = string.Format("{0}", m_DspCtrl[(int)DspCnt.ConstructionCode].Text); |
4708 | 4708 |
|
4709 | 4709 |
// ???b?Z?[?W?F?Z?b?g |
4710 |
data.MessageColor = String.Format("0x{0:X2}{1:X2}{2:X2}", Color.Black.R
|
|
4711 |
, Color.Black.G
|
|
4712 |
, Color.Black.B);
|
|
4713 |
data.BackColor = String.Format("0x{0:X2}{1:X2}{2:X2}", Color.LightSkyBlue.R
|
|
4714 |
, Color.LightSkyBlue.G
|
|
4715 |
, Color.LightSkyBlue.B);
|
|
4710 |
data.MessageColor = String.Format("0x{0:X2}{1:X2}{2:X2}", CommonDefine.s_SuccessionForeColor.R
|
|
4711 |
, CommonDefine.s_SuccessionForeColor.G
|
|
4712 |
, CommonDefine.s_SuccessionForeColor.B);
|
|
4713 |
data.BackColor = String.Format("0x{0:X2}{1:X2}{2:X2}", CommonDefine.s_SuccessionBackColor.R
|
|
4714 |
, CommonDefine.s_SuccessionBackColor.G
|
|
4715 |
, CommonDefine.s_SuccessionBackColor.B);
|
|
4716 | 4716 |
data.WritingDate = DateTime.Now; |
4717 | 4717 |
data.PersonCode = CommonMotions.LoginUserData.PersonCode; |
4718 | 4718 |
data.ShareFlag = 1; |
... | ... | |
4809 | 4809 |
data.LinkCode = string.Format("{0}", m_DspCtrl[(int)DspCnt.ConstructionCode].Text); |
4810 | 4810 |
|
4811 | 4811 |
// ???b?Z?[?W?F?Z?b?g |
4812 |
data.MessageColor = String.Format("0x{0:X2}{1:X2}{2:X2}", Color.Black.R
|
|
4813 |
, Color.Black.G
|
|
4814 |
, Color.Black.B);
|
|
4815 |
data.BackColor = String.Format("0x{0:X2}{1:X2}{2:X2}", Color.LightBlue.R
|
|
4816 |
, Color.LightBlue.G
|
|
4817 |
, Color.LightBlue.B);
|
|
4812 |
data.MessageColor = String.Format("0x{0:X2}{1:X2}{2:X2}", CommonDefine.s_AssignForeColor.R
|
|
4813 |
, CommonDefine.s_AssignForeColor.G
|
|
4814 |
, CommonDefine.s_AssignForeColor.B);
|
|
4815 |
data.BackColor = String.Format("0x{0:X2}{1:X2}{2:X2}", CommonDefine.s_AssignBackColor.R
|
|
4816 |
, CommonDefine.s_AssignBackColor.G
|
|
4817 |
, CommonDefine.s_AssignBackColor.B);
|
|
4818 | 4818 |
|
4819 | 4819 |
data.WritingDate = DateTime.Now; |
4820 | 4820 |
data.PersonCode = CommonMotions.LoginUserData.PersonCode; |
... | ... | |
6006 | 6006 |
try |
6007 | 6007 |
{ |
6008 | 6008 |
// ????????????????????????????????????????b?N???? |
6009 |
if (m_DspCtrl[(int)DspCnt.RevCompleteDate].Text.Length < 1
|
|
6010 |
|| m_DspCtrl[(int)DspCnt.RevCompleteDate].Text.Equals(CommonDefine.s_UndecidedString))
|
|
6009 |
TextBox txtRevComp = (TextBox)m_DspCtrl[(int)DspCnt.RevCompleteDate];
|
|
6010 |
if (txtRevComp.Text.Length < 1 || txtRevComp.Text.Equals(CommonDefine.s_UndecidedString))
|
|
6011 | 6011 |
{ |
6012 | 6012 |
// ?????????????? |
6013 |
m_DspCtrl[(int)DspCnt.RevCompleteDate].Enabled = true;
|
|
6013 |
txtRevComp.Enabled = true;
|
|
6014 | 6014 |
// ?????????????R?????g |
6015 | 6015 |
m_DspCtrl[(int)DspCnt.RevCompleteComment].Enabled = true; |
6016 | 6016 |
} |
... | ... | |
6020 | 6020 |
btnDataEntry.Visible = true; |
6021 | 6021 |
} |
6022 | 6022 |
// ?????m?F????????????????????????????b?N???? |
6023 |
if (m_DspCtrl[(int)DspCnt.BillingComplateDate].Text.Length < 1
|
|
6024 |
|| m_DspCtrl[(int)DspCnt.BillingComplateDate].Text.Equals(CommonDefine.s_UndecidedString))
|
|
6023 |
TextBox txtBillComp = (TextBox)m_DspCtrl[(int)DspCnt.BillingComplateDate];
|
|
6024 |
if (txtBillComp.Text.Length < 1 || txtBillComp.Text.Equals(CommonDefine.s_UndecidedString))
|
|
6025 | 6025 |
{ |
6026 | 6026 |
// ?????m?F?? |
6027 |
m_DspCtrl[(int)DspCnt.BillingComplateDate].Enabled = true;
|
|
6027 |
txtBillComp.Enabled = true;
|
|
6028 | 6028 |
// ?????R?????g |
6029 | 6029 |
m_DspCtrl[(int)DspCnt.BillingComment].Enabled = true; |
6030 | 6030 |
} |
6031 |
|
|
6032 |
// ----- ?V?X?e?????l????I?? |
|
6033 |
// ?????E?N?x????I?? |
|
6034 |
if (CommonMotions.BasePeriodYear()) |
|
6035 |
{ |
|
6036 |
label28.Visible = true; |
|
6037 |
cmbConstructionPeriod.Visible = true; |
|
6038 |
|
|
6039 |
label2.Visible = false; |
|
6040 |
cmbConstructionYear.Visible = false; |
|
6041 |
} |
|
6042 |
else |
|
6043 |
{ |
|
6044 |
label28.Visible = false; |
|
6045 |
cmbConstructionPeriod.Visible = false; |
|
6046 |
|
|
6047 |
label2.Visible = true; |
|
6048 |
cmbConstructionYear.Visible = true; |
|
6049 |
label2.Location = label28.Location; |
|
6050 |
cmbConstructionYear.Location = cmbConstructionPeriod.Location; |
|
6051 |
} |
|
6031 | 6052 |
} |
6032 | 6053 |
catch (Exception ex) |
6033 | 6054 |
{ |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs | ||
---|---|---|
794 | 794 |
new Font("?l?r ????", 6F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
795 | 795 |
|
796 | 796 |
// ??????????????f?[?^??A?N?Z?X?????????Q????[?h // DEBUG 2016/05/19 |
797 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision)
|
|
797 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep)
|
|
798 | 798 |
{ |
799 | 799 |
m_EditLock = true; |
800 | 800 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs | ||
---|---|---|
3526 | 3526 |
if (GetComponentRec(ComponentCode, ref wrkRec)) |
3527 | 3527 |
{ |
3528 | 3528 |
// 直接入力ができる項目は金額入力可にする |
3529 |
if (wrkRec.DirectInputFlg == 1) InputFlg = true;
|
|
3529 |
if (wrkRec.DirectInputFlg == (int)ComponentMaster.DirectInputFlgDef.DirectInput) InputFlg = true;
|
|
3530 | 3530 |
// 下位データが無い場合は入力許可 |
3531 |
if (wrkRec.SubitemsFlg == 0)
|
|
3531 |
if (wrkRec.SubitemsFlg == (int)ComponentMaster.SubitemsFlgDef.NoneData)
|
|
3532 | 3532 |
{ |
3533 | 3533 |
dgvGrid.Rows[NewRowCnt].Cells[(int)GridTotalColumn.LineTotal].ReadOnly = false; |
3534 | 3534 |
dgvGrid.Rows[NewRowCnt].Cells[(int)GridTotalColumn.InputFlg].Value = (int)CommonDefine.DirectInput.Input; |
... | ... | |
4482 | 4482 |
iExpensesFlg = CompList[iy].MyExpensesFlg; |
4483 | 4483 |
|
4484 | 4484 |
// 下位に項目が無ければ直接入力 |
4485 |
if (CompList[iy].SubitemsFlg == 0) iInputFlg = 1;
|
|
4485 |
if (CompList[iy].SubitemsFlg == (int)ComponentMaster.SubitemsFlgDef.NoneData) iInputFlg = 1;
|
|
4486 | 4486 |
else iInputFlg = 0; |
4487 | 4487 |
|
4488 | 4488 |
// 直接入力フラグがOnの場合は直接入力可能をOnにする |
4489 |
if (CompList[iy].DirectInputFlg == 1) iInputFlg = 1;
|
|
4489 |
if (CompList[iy].DirectInputFlg == (int)ComponentMaster.DirectInputFlgDef.DirectInput) iInputFlg = 1;
|
|
4490 | 4490 |
|
4491 | 4491 |
// ----- 入力許可フラグと自社経費フラグを見えないセルに持つ |
4492 | 4492 |
dgvEntryData.Rows[CurrentRow].Cells[(int)GridTotalColumn.ExpensesFlg].Value = iExpensesFlg; |
... | ... | |
4595 | 4595 |
|
4596 | 4596 |
// 積算見積ページデータ取得 |
4597 | 4597 |
StringBuilder strSQL = new StringBuilder(); |
4598 |
strSQL.Append("SELECT A.*, B.CNT, B.COMPONENTCODE FROM ESTIMATEDATABODY A,"); |
|
4599 |
strSQL.Append(" (SELECT COMPONENTCODE, COUNT(*) CNT FROM COMPONENTLINKMASTER BB"); |
|
4600 |
strSQL.Append(" WHERE BB.COMPONENTCODE IN (SELECT BBB.COMPONENTCODE FROM ESTIMATEDATABODY BBB"); |
|
4601 |
strSQL.AppendFormat(" WHERE BBB.CONSTRUCTIONCODE = {0}) GROUP BY BB.COMPONENTCODE) B", m_ConstructionCode); |
|
4598 |
strSQL.Append("SELECT"); |
|
4599 |
strSQL.Append(" A.*"); |
|
4600 |
strSQL.Append(", B.CNT"); |
|
4601 |
strSQL.Append(", B.COMPONENTCODE"); |
|
4602 |
strSQL.Append(" FROM"); |
|
4603 |
strSQL.Append(" ESTIMATEDATABODY A"); |
|
4604 |
strSQL.Append(" LEFT JOIN(SELECT"); |
|
4605 |
strSQL.Append(" BBB.CONSTRUCTIONCODE"); |
|
4606 |
strSQL.Append(" , BBB.COMPONENTCODE"); |
|
4607 |
strSQL.Append(" , COUNT(*) As CNT"); |
|
4608 |
strSQL.Append(" FROM ESTIMATEDATABODY BBB"); |
|
4609 |
strSQL.AppendFormat(" WHERE BBB.CONSTRUCTIONCODE = {0}", m_ConstructionCode); |
|
4610 |
strSQL.Append(" GROUP BY BBB.COMPONENTCODE) AS B"); |
|
4611 |
strSQL.Append(" On B.CONSTRUCTIONCODE = A.ConstructionCode"); |
|
4612 |
strSQL.Append(" And B.COMPONENTCODE = A.COMPONENTCODE"); |
|
4602 | 4613 |
strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode); |
4603 |
strSQL.Append(" AND B.COMPONENTCODE = A.COMPONENTCODE"); |
|
4604 | 4614 |
strSQL.Append(" ORDER BY A.PAGECOUNT"); |
4615 |
|
|
4605 | 4616 |
ArrayList MiddleDataList = new ArrayList(); |
4606 | 4617 |
if (!etbDB.ExecuteReader(strSQL.ToString(), ref MiddleDataList)) return false; |
4607 | 4618 |
|
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs | ||
---|---|---|
367 | 367 |
bool bRet = false; |
368 | 368 |
|
369 | 369 |
// 総務部所属者のみ注文書を印刷できる |
370 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision)
|
|
370 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep)
|
|
371 | 371 |
{ |
372 | 372 |
bRet = true; |
373 | 373 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.cs | ||
---|---|---|
312 | 312 |
{ |
313 | 313 |
try |
314 | 314 |
{ |
315 |
// 今は15回まででお茶を濁す |
|
316 |
if (m_nMaxOrderNo > 14) |
|
317 |
{ |
|
318 |
MessageBox.Show("請求回数は15回までです。" |
|
319 |
, "請求回数エラー" |
|
320 |
, MessageBoxButtons.OK |
|
321 |
, MessageBoxIcon.Error); |
|
322 |
return; |
|
323 |
} |
|
324 |
|
|
325 |
|
|
315 | 326 |
// データが変更されている場合 |
316 | 327 |
if (m_bDirty == true) |
317 | 328 |
{ |
318 |
if (ShowMessageBox("データが保存されます。よろしいですか?", "保存確認", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) |
|
329 |
if (ShowMessageBox("データが保存されます。よろしいですか?" |
|
330 |
, "保存確認" |
|
331 |
, MessageBoxButtons.YesNo |
|
332 |
, MessageBoxIcon.Information) == DialogResult.No) |
|
319 | 333 |
{ |
320 | 334 |
return; |
321 | 335 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Component/FrmComponent.cs | ||
---|---|---|
913 | 913 |
foreach (ComponentMaster work in wrk) |
914 | 914 |
{ |
915 | 915 |
// 作業項目の有無を選択 |
916 |
if (work.SubitemsFlg == 0) |
|
917 |
sflg = "無"; |
|
918 |
else |
|
919 |
sflg = "有"; |
|
920 |
|
|
921 |
if (work.DirectInputFlg == 0) |
|
922 |
dflg = "不許可"; |
|
923 |
else |
|
924 |
dflg = "許可"; |
|
916 |
if (work.SubitemsFlg == (int)ComponentMaster.SubitemsFlgDef.NoneData) { sflg = "無"; } |
|
917 |
else { sflg = "有"; } |
|
925 | 918 |
|
926 |
if (work.MyExpensesFlg == 0) |
|
927 |
lflg = "施工費"; |
|
928 |
else |
|
929 |
lflg = "経費"; |
|
919 |
if (work.DirectInputFlg == (int)ComponentMaster.DirectInputFlgDef.NoneInput) { dflg = "不許可"; } |
|
920 |
else { dflg = "許可"; } |
|
930 | 921 |
|
922 |
if (work.MyExpensesFlg == (int)ComponentMaster.MyExpensesFlgDef.ConstrCost) { lflg = "施工費"; } |
|
923 |
else { lflg = "経費"; } |
|
924 |
|
|
931 | 925 |
dgvWorkList.Rows.Add((ino++) |
932 | 926 |
, work.ComponentCode |
933 | 927 |
, work.ComponentName |
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ComponentLink/FrmComponentLink.cs | ||
---|---|---|
776 | 776 |
try |
777 | 777 |
{ |
778 | 778 |
// 作業名称取得クラス領域 |
779 |
List<ComponentMaster> wrk = new List<ComponentMaster>(); |
|
780 | 779 |
// 作業名称取得SQL |
781 | 780 |
StringBuilder strSql = new StringBuilder(); |
782 |
strSql.AppendFormat(" Where DeleteFlg = {0} Order By DisplayOrder ASC", (int)CommonDefine.DataRowDeleteDef.Exists); |
|
781 |
strSql.Append("SELECT * From componentmaster As A"); |
|
782 |
strSql.Append(" Left Join(Select"); |
|
783 |
strSql.Append(" BB.ComponentCode"); |
|
784 |
strSql.Append(" , Count(*) As LinkCount"); |
|
785 |
strSql.Append(" From componentlinkmaster As BB"); |
|
786 |
strSql.Append(" Group By BB.ComponentCode) As B"); |
|
787 |
strSql.Append(" On B.ComponentCode = A.ComponentCode"); |
|
788 |
strSql.AppendFormat(" Where A.DeleteFlg = {0}", (int)CommonDefine.DataRowDeleteDef.Exists); |
|
789 |
strSql.Append(" Order By A.DisplayOrder ASC"); |
|
783 | 790 |
|
784 | 791 |
// グリッドの行を0に戻す |
785 | 792 |
dgvComponentList.Rows.Clear(); |
... | ... | |
787 | 794 |
lblSelectName.Text = ""; |
788 | 795 |
|
789 | 796 |
// 作業名称取得 |
790 |
if (!sbDB.SelectAction(strSql.ToString(), ref wrk)) return false; |
|
797 |
ArrayList wrk = new ArrayList(); |
|
798 |
if (!sbDB.ExecuteReader(strSql.ToString(), ref wrk)) return false; |
|
791 | 799 |
|
792 | 800 |
// データ表示 |
801 |
int DataCnt = Enum.GetNames(typeof(IOMComponent.NameColumn)).Length; |
|
793 | 802 |
string sflg = string.Empty; |
794 | 803 |
string dflg = string.Empty; |
795 | 804 |
string lflg = string.Empty; |
796 | 805 |
int ino = 1; |
797 |
foreach (ComponentMaster work in wrk) |
|
806 |
ComponentMaster work = new ComponentMaster(); |
|
807 |
foreach (object[] objWrk in wrk) |
|
798 | 808 |
{ |
809 |
sbDB.Reader2Struct(objWrk, ref work); |
|
810 |
|
|
799 | 811 |
// 作業項目の有無を選択 |
800 |
if (work.SubitemsFlg == 0) |
|
801 |
sflg = "無"; |
|
802 |
else |
|
803 |
sflg = "有"; |
|
812 |
if (work.SubitemsFlg == (int)ComponentMaster.SubitemsFlgDef.NoneData) { sflg = "無"; } |
|
813 |
else { sflg = "有"; } |
|
804 | 814 |
|
805 |
if (work.DirectInputFlg == 0) |
|
806 |
dflg = "不許可"; |
|
807 |
else |
|
808 |
dflg = "許可"; |
|
815 |
if (work.DirectInputFlg == (int)ComponentMaster.DirectInputFlgDef.NoneInput) { dflg = "不許可"; } |
|
816 |
else { dflg = "許可"; } |
|
809 | 817 |
|
810 |
if (work.MyExpensesFlg == 0) |
|
811 |
lflg = "施工費"; |
|
812 |
else |
|
813 |
lflg = "経費"; |
|
818 |
if (work.MyExpensesFlg == (int)ComponentMaster.MyExpensesFlgDef.ConstrCost) { lflg = "施工費"; } |
|
819 |
else { lflg = "経費"; } |
|
814 | 820 |
|
815 |
dgvComponentList.Rows.Add((ino++) |
|
821 |
int Rowcnt = dgvComponentList.Rows.Add((ino++)
|
|
816 | 822 |
, work.ComponentCode |
817 | 823 |
, work.ComponentName |
818 | 824 |
, sflg |
... | ... | |
820 | 826 |
, lflg |
821 | 827 |
); |
822 | 828 |
|
829 |
// ----- 設定エラーを色で返す |
|
830 |
bool bErrsubItems = false; |
|
831 |
int nCout = CommonMotions.cnvInt(objWrk[DataCnt + 1]); |
|
832 |
if (work.SubitemsFlg == (int)ComponentMaster.SubitemsFlgDef.ExistsData) |
|
833 |
{ |
|
834 |
// 下位項目有で中項目の設定が無い |
|
835 |
if (nCout < 1) bErrsubItems = true; |
|
836 |
} |
|
837 |
else if (work.SubitemsFlg == (int)ComponentMaster.SubitemsFlgDef.NoneData) |
|
838 |
{ |
|
839 |
// 下位項目無で中項目の設定が有る |
|
840 |
if (nCout > 0) bErrsubItems = true; |
|
841 |
} |
|
842 |
if (bErrsubItems) |
|
843 |
{ |
|
844 |
dgvComponentList.Rows[Rowcnt].Cells[(int)DispColumn.subItems].Style.BackColor = Color.Yellow; |
|
845 |
} |
|
823 | 846 |
} |
824 | 847 |
// 表示行が足りない場合は追加する |
825 | 848 |
//if (dgvComponentList.Rows.Count <= CommonDefine.s_MaxInitLineCountMastamente) |
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/ComponentLink/FrmComponentLink.designer.cs | ||
---|---|---|
44 | 44 |
this.panel1 = new System.Windows.Forms.Panel(); |
45 | 45 |
this.btnLineDel = new System.Windows.Forms.Button(); |
46 | 46 |
this.btnLineAdd = new System.Windows.Forms.Button(); |
47 |
this.dgvItemList = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
48 |
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
49 |
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
50 |
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
47 | 51 |
this.btnDispDown = new System.Windows.Forms.Button(); |
48 | 52 |
this.btnDispUp = new System.Windows.Forms.Button(); |
49 | 53 |
this.btnEnd = new System.Windows.Forms.Button(); |
50 | 54 |
this.btnDataSelect = new System.Windows.Forms.Button(); |
51 | 55 |
this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
52 | 56 |
this.lblSelectName = new System.Windows.Forms.Label(); |
53 |
this.dgvItemList = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
54 |
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
55 |
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
56 |
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
57 | 57 |
this.dgvComponentList = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
58 | 58 |
this.Column0 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
59 | 59 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
62 | 62 |
this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
63 | 63 |
this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
64 | 64 |
this.panel1.SuspendLayout(); |
65 |
((System.ComponentModel.ISupportInitialize)(this.dgvItemList)).BeginInit(); |
|
65 | 66 |
this.groupBoxEx1.SuspendLayout(); |
66 |
((System.ComponentModel.ISupportInitialize)(this.dgvItemList)).BeginInit(); |
|
67 | 67 |
((System.ComponentModel.ISupportInitialize)(this.dgvComponentList)).BeginInit(); |
68 | 68 |
this.SuspendLayout(); |
69 | 69 |
// |
... | ... | |
147 | 147 |
this.btnLineAdd.UseVisualStyleBackColor = false; |
148 | 148 |
this.btnLineAdd.Click += new System.EventHandler(this.btnLineAdd_Click); |
149 | 149 |
// |
150 |
// dgvItemList |
|
151 |
// |
|
152 |
this.dgvItemList.AllowUserToAddRows = false; |
|
153 |
this.dgvItemList.AllowUserToDeleteRows = false; |
|
154 |
this.dgvItemList.AllowUserToResizeColumns = false; |
|
155 |
this.dgvItemList.AllowUserToResizeRows = false; |
|
156 |
this.dgvItemList.BackgroundColor = System.Drawing.Color.White; |
|
157 |
this.dgvItemList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
158 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
159 |
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; |
|
160 |
dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
161 |
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; |
|
162 |
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; |
|
163 |
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; |
|
164 |
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; |
|
165 |
this.dgvItemList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; |
|
166 |
this.dgvItemList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; |
|
167 |
this.dgvItemList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
|
168 |
this.dataGridViewTextBoxColumn1, |
|
169 |
this.dataGridViewTextBoxColumn3, |
|
170 |
this.dataGridViewTextBoxColumn4}); |
|
171 |
this.dgvItemList.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; |
|
172 |
this.dgvItemList.EnableHeadersVisualStyles = false; |
|
173 |
this.dgvItemList.Location = new System.Drawing.Point(13, 3); |
|
174 |
this.dgvItemList.Name = "dgvItemList"; |
|
175 |
this.dgvItemList.RowHeadersWidth = 20; |
|
176 |
this.dgvItemList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; |
|
177 |
this.dgvItemList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; |
|
178 |
this.dgvItemList.Size = new System.Drawing.Size(540, 510); |
|
179 |
this.dgvItemList.TabIndex = 52; |
|
180 |
// |
|
181 |
// dataGridViewTextBoxColumn1 |
|
182 |
// |
|
183 |
this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; |
|
184 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
185 |
dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
186 |
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black; |
|
187 |
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle2; |
|
188 |
this.dataGridViewTextBoxColumn1.Frozen = true; |
|
189 |
this.dataGridViewTextBoxColumn1.HeaderText = "№"; |
|
190 |
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; |
|
191 |
this.dataGridViewTextBoxColumn1.ReadOnly = true; |
|
192 |
this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
193 |
this.dataGridViewTextBoxColumn1.Width = 60; |
|
194 |
// |
|
195 |
// dataGridViewTextBoxColumn3 |
|
196 |
// |
|
197 |
this.dataGridViewTextBoxColumn3.Frozen = true; |
|
198 |
this.dataGridViewTextBoxColumn3.HeaderText = "工種キー"; |
|
199 |
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; |
|
200 |
this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
201 |
this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
202 |
this.dataGridViewTextBoxColumn3.Visible = false; |
|
203 |
// |
|
204 |
// dataGridViewTextBoxColumn4 |
|
205 |
// |
|
206 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; |
|
207 |
dataGridViewCellStyle3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
208 |
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black; |
|
209 |
this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle3; |
|
210 |
this.dataGridViewTextBoxColumn4.Frozen = true; |
|
211 |
this.dataGridViewTextBoxColumn4.HeaderText = "中項目名称"; |
|
212 |
this.dataGridViewTextBoxColumn4.MaxInputLength = 50; |
|
213 |
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; |
|
214 |
this.dataGridViewTextBoxColumn4.ReadOnly = true; |
|
215 |
this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
216 |
this.dataGridViewTextBoxColumn4.Width = 440; |
|
217 |
// |
|
150 | 218 |
// btnDispDown |
151 | 219 |
// |
152 | 220 |
this.btnDispDown.BackColor = System.Drawing.Color.Gainsboro; |
... | ... | |
228 | 296 |
this.lblSelectName.TabIndex = 0; |
229 | 297 |
this.lblSelectName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; |
230 | 298 |
// |
231 |
// dgvItemList |
|
232 |
// |
|
233 |
this.dgvItemList.AllowUserToAddRows = false; |
|
234 |
this.dgvItemList.AllowUserToDeleteRows = false; |
|
235 |
this.dgvItemList.AllowUserToResizeColumns = false; |
|
236 |
this.dgvItemList.AllowUserToResizeRows = false; |
|
237 |
this.dgvItemList.BackgroundColor = System.Drawing.Color.White; |
|
238 |
this.dgvItemList.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
239 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
|
240 |
dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; |
|
241 |
dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
242 |
dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; |
|
243 |
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; |
|
244 |
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; |
|
245 |
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; |
|
246 |
this.dgvItemList.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; |
|
247 |
this.dgvItemList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; |
|
248 |
this.dgvItemList.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
|
249 |
this.dataGridViewTextBoxColumn1, |
|
250 |
this.dataGridViewTextBoxColumn3, |
|
251 |
this.dataGridViewTextBoxColumn4}); |
|
252 |
this.dgvItemList.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically; |
|
253 |
this.dgvItemList.EnableHeadersVisualStyles = false; |
|
254 |
this.dgvItemList.Location = new System.Drawing.Point(13, 3); |
|
255 |
this.dgvItemList.Name = "dgvItemList"; |
|
256 |
this.dgvItemList.RowHeadersWidth = 20; |
|
257 |
this.dgvItemList.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; |
|
258 |
this.dgvItemList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; |
|
259 |
this.dgvItemList.Size = new System.Drawing.Size(540, 510); |
|
260 |
this.dgvItemList.TabIndex = 52; |
|
261 |
// |
|
262 |
// dataGridViewTextBoxColumn1 |
|
263 |
// |
|
264 |
this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; |
|
265 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; |
|
266 |
dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
267 |
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black; |
|
268 |
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle2; |
|
269 |
this.dataGridViewTextBoxColumn1.Frozen = true; |
|
270 |
this.dataGridViewTextBoxColumn1.HeaderText = "№"; |
|
271 |
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; |
|
272 |
this.dataGridViewTextBoxColumn1.ReadOnly = true; |
|
273 |
this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
274 |
this.dataGridViewTextBoxColumn1.Width = 60; |
|
275 |
// |
|
276 |
// dataGridViewTextBoxColumn3 |
|
277 |
// |
|
278 |
this.dataGridViewTextBoxColumn3.Frozen = true; |
|
279 |
this.dataGridViewTextBoxColumn3.HeaderText = "工種キー"; |
|
280 |
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; |
|
281 |
this.dataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
|
282 |
this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
283 |
this.dataGridViewTextBoxColumn3.Visible = false; |
|
284 |
// |
|
285 |
// dataGridViewTextBoxColumn4 |
|
286 |
// |
|
287 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; |
|
288 |
dataGridViewCellStyle3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
289 |
dataGridViewCellStyle3.ForeColor = System.Drawing.Color.Black; |
|
290 |
this.dataGridViewTextBoxColumn4.DefaultCellStyle = dataGridViewCellStyle3; |
|
291 |
this.dataGridViewTextBoxColumn4.Frozen = true; |
|
292 |
this.dataGridViewTextBoxColumn4.HeaderText = "中項目名称"; |
|
293 |
this.dataGridViewTextBoxColumn4.MaxInputLength = 50; |
|
294 |
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; |
|
295 |
this.dataGridViewTextBoxColumn4.ReadOnly = true; |
|
296 |
this.dataGridViewTextBoxColumn4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
|
297 |
this.dataGridViewTextBoxColumn4.Width = 440; |
|
298 |
// |
|
299 | 299 |
// dgvComponentList |
300 | 300 |
// |
301 | 301 |
this.dgvComponentList.AllowUserToAddRows = false; |
... | ... | |
417 | 417 |
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; |
418 | 418 |
this.BackColor = System.Drawing.Color.Black; |
419 | 419 |
this.ClientSize = new System.Drawing.Size(1220, 687); |
420 |
this.Controls.Add(this.dgvComponentList); |
|
420 | 421 |
this.Controls.Add(this.groupBoxEx1); |
421 | 422 |
this.Controls.Add(this.btnDataSelect); |
422 | 423 |
this.Controls.Add(this.panel1); |
423 |
this.Controls.Add(this.dgvComponentList); |
|
424 | 424 |
this.Controls.Add(this.label1); |
425 | 425 |
this.Controls.Add(this.btnDataDelete); |
426 | 426 |
this.Controls.Add(this.btnDataEntry); |
... | ... | |
438 | 438 |
this.Load += new System.EventHandler(this.FrmComponentLink_Load); |
439 | 439 |
this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmComponentLink_KeyDown); |
440 | 440 |
this.panel1.ResumeLayout(false); |
441 |
((System.ComponentModel.ISupportInitialize)(this.dgvItemList)).EndInit(); |
|
441 | 442 |
this.groupBoxEx1.ResumeLayout(false); |
442 |
((System.ComponentModel.ISupportInitialize)(this.dgvItemList)).EndInit(); |
|
443 | 443 |
((System.ComponentModel.ISupportInitialize)(this.dgvComponentList)).EndInit(); |
444 | 444 |
this.ResumeLayout(false); |
445 | 445 |
|
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurity.cs | ||
---|---|---|
889 | 889 |
/// <param name="e"></param> |
890 | 890 |
private void FrmSecurity_SizeChanged(object sender, EventArgs e) |
891 | 891 |
{ |
892 |
if (this.WindowState == FormWindowState.Normal) |
|
893 |
{ |
|
894 |
// Normalサイズ設定 |
|
895 |
OrignalSizeSet(); |
|
896 |
} |
|
892 |
// Normalサイズ設定 |
|
893 |
OrignalSizeSet(); |
|
897 | 894 |
} |
898 | 895 |
#endregion |
899 | 896 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs | ||
---|---|---|
670 | 670 |
try |
671 | 671 |
{ |
672 | 672 |
DataGridViewEX dgv = dgvProcess; |
673 |
int DspCtrlCnt = Enum.GetNames(typeof(GridColumn)).Length; |
|
673 | 674 |
// 最前列は処理しない |
674 |
if (dgv.CurrentCell.ColumnIndex <= ((int)GridColumn.SecName + 2)) return;
|
|
675 |
if (dgv.CurrentCell.ColumnIndex <= (DspCtrlCnt + 1)) return;
|
|
675 | 676 |
|
676 | 677 |
// カレント行数取得 |
677 | 678 |
int curRow = dgv.CurrentCell.RowIndex; |
... | ... | |
763 | 764 |
try |
764 | 765 |
{ |
765 | 766 |
DataGridViewEX dgv = dgvProcess; |
767 |
|
|
768 |
int DspCtrlCnt = Enum.GetNames(typeof(GridColumn)).Length; |
|
766 | 769 |
// 最前列は処理しない |
767 |
if (dgv.CurrentCell.ColumnIndex > dgv.ColumnCount - 3) return; |
|
770 |
if (dgv.CurrentCell.ColumnIndex < DspCtrlCnt) return; |
|
771 |
// 最後尾は処理しない |
|
772 |
if ((dgv.ColumnCount - 2) <= dgv.CurrentCell.ColumnIndex) return; |
|
768 | 773 |
|
769 | 774 |
// カレント行数取得 |
770 | 775 |
int curRow = dgv.CurrentCell.RowIndex; |
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.cs | ||
---|---|---|
961 | 961 |
{ |
962 | 962 |
// 自画面再表示 |
963 | 963 |
this.Visible = true; |
964 |
|
|
965 |
// 画面初期データセット |
|
966 |
DisplayDataLoad(); |
|
967 |
|
|
968 |
// サブフォームハンドルリスト初期化 |
|
969 |
InitSubFormHandleList(); |
|
970 |
|
|
971 |
// 初期化フラグOFF |
|
972 |
m_bInitFlg = false; |
|
964 | 973 |
} |
965 | 974 |
else if (drRet == DialogResult.No) |
966 | 975 |
{ |
... | ... | |
1305 | 1314 |
bExecFlg = ClsSecurityPermission.PersonDataAccess(iConstructionCode); |
1306 | 1315 |
|
1307 | 1316 |
// 総務部所属者は工事基本情報の全データを対象にできるただし参照のみ |
1308 |
if (CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision) bExecFlg = true;
|
|
1317 |
if (CommonMotions.LoginUserSecurity.GeneralAffairs == (int)SecurityMaster.GeneAffDef.GeneralDep) bExecFlg = true;
|
|
1309 | 1318 |
|
1310 | 1319 |
if (bExecFlg) |
1311 | 1320 |
{ |
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
---|---|---|
587 | 587 |
{ |
588 | 588 |
try |
589 | 589 |
{ |
590 |
// 使用しないボタンを消す |
|
591 |
ButtonControlVisibleSet(tblLayoutOrder.Controls); |
|
592 |
|
|
590 | 593 |
// ----- 受注管理 |
591 |
int None = (int)CommonDefine.SecurityRangePos.None; // 担当のみ |
|
592 |
if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key) |
|
594 |
int Normal = (int)CommonDefine.SecurityRankPos.NormalAuthority; // 担当のみ |
|
595 |
int Limited = (int)CommonDefine.SecurityRankPos.LimitedAuthority; // 所属長 |
|
596 |
|
|
597 |
btnOrder0300.Visible = true; |
|
598 |
btnOrder0301.Visible = true; |
|
599 |
// 結合・分割は上位2クラスのみ使える |
|
600 |
if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[Normal].Key |
|
601 |
|| CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[Limited].Key) |
|
593 | 602 |
{ |
594 |
btnOrder0300.Text = string.Empty;
|
|
595 |
btnOrder0301.Text = string.Empty;
|
|
603 |
btnOrder0300.Visible = false;
|
|
604 |
btnOrder0301.Visible = false;
|
|
596 | 605 |
} |
597 | 606 |
|
598 |
// 使用しないボタンを消す |
|
599 |
ButtonControlVisibleSet(tblLayoutOrder.Controls); |
|
600 |
|
|
607 |
// ----- 使用ボタンはすべて表示する |
|
601 | 608 |
// 実行権限が無いものは表示しない |
602 |
int editflg = 0; |
|
603 |
int RowFalseCnt = 0; |
|
604 |
string strButtonName = string.Empty; |
|
605 |
bool bDsp = true; |
|
606 |
for (int iy = 0; iy < OrderMenuButton.GetLength(0); iy++) |
|
607 |
{ |
|
608 |
RowFalseCnt = 0; |
|
609 |
for (int ix = 0; ix < OrderMenuButton.GetLength(1); ix++) |
|
610 |
{ |
|
611 |
// ボタンをさがす。 |
|
612 |
strButtonName = string.Format("{0}{1}{2}", s_btnOrder, iy.ToString("00"), ix.ToString("00")); |
|
613 |
Control[] findCtrl = this.Controls.Find(strButtonName, true); |
|
614 |
// ボタンが無ければ処理しない |
|
615 |
if (findCtrl.Length < 1) continue; |
|
609 |
//int editflg = 0;
|
|
610 |
//int RowFalseCnt = 0;
|
|
611 |
//string strButtonName = string.Empty;
|
|
612 |
//bool bDsp = true;
|
|
613 |
//for (int iy = 0; iy < OrderMenuButton.GetLength(0); iy++)
|
|
614 |
//{
|
|
615 |
// RowFalseCnt = 0;
|
|
616 |
// for (int ix = 0; ix < OrderMenuButton.GetLength(1); ix++)
|
|
617 |
// {
|
|
618 |
// // ボタンをさがす。
|
|
619 |
// strButtonName = string.Format("{0}{1}{2}", s_btnOrder, iy.ToString("00"), ix.ToString("00"));
|
|
620 |
// Control[] findCtrl = this.Controls.Find(strButtonName, true);
|
|
621 |
// // ボタンが無ければ処理しない
|
|
622 |
// if (findCtrl.Length < 1) continue;
|
|
616 | 623 |
|
617 |
if (ClsSecurityPermission.GetExecutePermission(OrderMenuButton[iy, ix], ref editflg)) |
|
618 |
{ |
|
619 |
// ボタンが見つかれば、表示を変更する |
|
620 |
bDsp = true; |
|
621 |
} |
|
622 |
else |
|
623 |
{ |
|
624 |
// ボタンが見つかれば、表示を変更する |
|
625 |
bDsp = false; |
|
626 |
RowFalseCnt++; |
|
627 |
} |
|
628 |
// ボタンが見つかれば、表示を変更する |
|
629 |
((Button)findCtrl[0]).Visible = bDsp; |
|
630 |
} |
|
631 |
} |
|
624 |
// if (ClsSecurityPermission.GetExecutePermission(OrderMenuButton[iy, ix], ref editflg))
|
|
625 |
// {
|
|
626 |
// // ボタンが見つかれば、表示を変更する
|
|
627 |
// bDsp = true;
|
|
628 |
// }
|
|
629 |
// else
|
|
630 |
// {
|
|
631 |
// // ボタンが見つかれば、表示を変更する
|
|
632 |
// bDsp = false;
|
|
633 |
// RowFalseCnt++;
|
|
634 |
// }
|
|
635 |
// // ボタンが見つかれば、表示を変更する
|
|
636 |
// ((Button)findCtrl[0]).Visible = bDsp;
|
|
637 |
// }
|
|
638 |
//}
|
|
632 | 639 |
} |
633 | 640 |
catch (Exception ex) |
634 | 641 |
{ |
... | ... | |
2574 | 2581 |
strSQL.Append("SELECT"); |
2575 | 2582 |
strSQL.Append(" A.*"); |
2576 | 2583 |
strSQL.Append(", B.TONAME"); |
2584 |
strSQL.Append(", B.TOCODE"); |
|
2577 | 2585 |
strSQL.Append(" FROM"); |
2578 | 2586 |
strSQL.Append(" MESSAGEBOARDDATA A"); |
2579 |
strSQL.Append(", MESSAGEBOARDTERGET B"); |
|
2587 |
strSQL.Append(" INNER JOIN MESSAGEBOARDTERGET B"); |
|
2588 |
strSQL.Append(" ON B.RECORDNUMBER = A.RECORDNUMBER"); |
|
2589 |
strSQL.Append(" AND B.BRANCHNUMBER = A.BRANCHNUMBER"); |
|
2590 |
|
|
2580 | 2591 |
strSQL.Append(" Where"); |
2581 |
if (exeflg == (int)TabNameEnum.MessageBoard) |
|
2582 |
{ // 掲示板データ |
|
2583 |
strSQL.Append(" A.WritingDate > DATE_ADD(NOW(), INTERVAL - 1 MONTH)"); |
|
2584 |
strSQL.AppendFormat(" And A.MessageFlag = {0}", (int)MessageBoardData.MessageFlgDef.Normal); |
|
2592 |
switch (exeflg) |
|
2593 |
{ |
|
2594 |
case (int)TabNameEnum.MessageBoard: |
|
2595 |
// 掲示板データ |
|
2596 |
strSQL.Append(" DATE(A.WritingDate) > DATE(DATE_ADD(NOW(), INTERVAL - 1 MONTH))"); |
|
2597 |
strSQL.AppendFormat(" And A.MessageFlag = {0}", (int)MessageBoardData.MessageFlgDef.Normal); |
|
2598 |
|
|
2599 |
DispMessageSelect(exeflg, ref strSQL); |
|
2600 |
|
|
2601 |
strSQL.Append(" Order By"); |
|
2602 |
strSQL.Append(" A.RecordNumber Desc"); |
|
2603 |
strSQL.Append(", A.BranchNumber Asc"); |
|
2604 |
strSQL.Append(", B.SeqNum ASC"); |
|
2605 |
break; |
|
2606 |
|
|
2607 |
case (int)TabNameEnum.BusinessMessage: |
|
2608 |
// 秘書からの連絡 |
|
2609 |
strSQL.Append(" DATE(A.WritingDate) > DATE(DATE_ADD(NOW(), INTERVAL - 10 DAY))"); |
|
2610 |
strSQL.AppendFormat(" And A.MessageFlag = {0}", (int)MessageBoardData.MessageFlgDef.Secretary); |
|
2611 |
|
|
2612 |
DispMessageSelect(exeflg, ref strSQL); |
|
2613 |
|
|
2614 |
strSQL.Append(" Order By"); |
|
2615 |
strSQL.Append(" A.WritingDate Desc"); |
|
2616 |
strSQL.Append(", A.MessageTitile Asc"); |
|
2617 |
strSQL.Append(", B.SeqNum ASC"); |
|
2618 |
break; |
|
2585 | 2619 |
} |
2586 |
else
|
|
2587 |
{ // 秘書からの連絡
|
|
2588 |
strSQL.Append(" A.WritingDate > DATE_ADD(NOW(), INTERVAL - 10 DAY)");
|
|
2589 |
strSQL.AppendFormat(" And A.MessageFlag = {0}", (int)MessageBoardData.MessageFlgDef.Secretary);
|
|
2590 |
}
|
|
2591 |
strSQL.Append(" AND B.RECORDNUMBER = A.RECORDNUMBER");
|
|
2592 |
strSQL.Append(" AND B.BRANCHNUMBER = A.BRANCHNUMBER");
|
|
2620 |
}
|
|
2621 |
catch (Exception ex)
|
|
2622 |
{
|
|
2623 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
2624 |
} |
|
2625 |
}
|
|
2626 |
#endregion
|
|
2593 | 2627 |
|
2594 |
if (exeflg == (int)TabNameEnum.MessageBoard) |
|
2628 |
|
|
2629 |
#region 秘書からの連絡の表示範囲を設定するSQL作成 |
|
2630 |
/// <summary> |
|
2631 |
/// 秘書からの連絡の表示範囲を設定するSQL作成 |
|
2632 |
/// </summary> |
|
2633 |
private void DispMessageSelect(int exeflg, ref StringBuilder strSQL) |
|
2634 |
{ |
|
2635 |
try |
|
2636 |
{ |
|
2637 |
// キー値取得 |
|
2638 |
int AllPath = (int)CommonDefine.SecurityRangePos.AllPath; // 全部署 |
|
2639 |
int Multiple = (int)CommonDefine.SecurityRangePos.Multiple; // 複数部署 |
|
2640 |
int Only = (int)CommonDefine.SecurityRangePos.Only; // 自部署のみ |
|
2641 |
int None = (int)CommonDefine.SecurityRangePos.None; // 自担当者のみ |
|
2642 |
|
|
2643 |
// データアクセスに権限により制限がある |
|
2644 |
if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode |
|
2645 |
|| CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[AllPath].Key) |
|
2595 | 2646 |
{ |
2596 |
strSQL.Append(" Order By"); |
|
2597 |
strSQL.Append(" A.RecordNumber Desc"); |
|
2598 |
strSQL.Append(", A.BranchNumber Asc"); |
|
2599 |
strSQL.Append(", B.SeqNum ASC"); |
|
2600 |
|
|
2647 |
// すべて対象(制限SQL無) |
|
2601 | 2648 |
} |
2602 |
else |
|
2603 |
{ // 掲示板データ |
|
2604 |
strSQL.Append(" Order By"); |
|
2605 |
strSQL.Append(" A.WritingDate Desc"); |
|
2606 |
strSQL.Append(", A.MessageTitile Asc"); |
|
2607 |
strSQL.Append(", B.SeqNum ASC"); |
|
2649 |
else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Multiple].Key |
|
2650 |
|| CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[Only].Key) |
|
2651 |
{ |
|
2652 |
// 一部制限有 |
|
2653 |
strSQL.Append(" And ("); |
|
2654 |
// 機密管理者(自部署のみ) |
|
2655 |
switch (exeflg) |
|
2656 |
{ |
|
2657 |
case (int)TabNameEnum.MessageBoard: |
|
2658 |
// 掲示板データ |
|
2659 |
strSQL.AppendFormat(" (A.FromCode = {0})", CommonMotions.LoginUserData.PersonCode); |
|
2660 |
strSQL.Append(" Or (A.RecordNumber IN(Select B1.RecordNumber From MESSAGEBOARDTERGET As B1"); |
|
2661 |
strSQL.AppendFormat(" Where B1.ToCode = {0}))", CommonDefine.s_AllMembersCode); |
|
2662 |
strSQL.Append(" Or (A.RecordNumber IN(Select B2.RecordNumber From MESSAGEBOARDTERGET As B2"); |
|
2663 |
strSQL.AppendFormat(" Where B2.ToCode = {0}))", CommonMotions.LoginUserData.PersonCode); |
|
2664 |
strSQL.Append(" Or (A.RecordNumber IN(Select B3.RecordNumber From MESSAGEBOARDTERGET As B3"); |
|
2665 |
strSQL.Append(" Where B3.ToCode In (Select A2.PersonCode From PERSONDEPARTMENTMASTER As A1"); |
|
2666 |
strSQL.AppendFormat(" Inner Join personinchargemaster As A2"); |
|
2667 |
strSQL.Append(" On A2.DepartmentCode = A1.DepartmentCode"); |
|
2668 |
strSQL.AppendFormat(" Where A1.PersonCode = {0})))", CommonMotions.LoginUserData.PersonCode); |
|
2669 |
strSQL.Append(" Or (A.RecordNumber IN(Select B4.RecordNumber From MESSAGEBOARDTERGET As B4"); |
|
2670 |
strSQL.Append(" Where B4.ToCode In (Select A3.DepartmentCode From PERSONDEPARTMENTMASTER As A3"); |
|
2671 |
strSQL.AppendFormat(" Where A3.PersonCode = {0})))", CommonMotions.LoginUserData.PersonCode); |
|
2672 |
break; |
|
2673 |
case (int)TabNameEnum.BusinessMessage: |
|
2674 |
// 秘書からの連絡 |
|
2675 |
strSQL.AppendFormat("(B.ToCode = {0})", CommonMotions.LoginUserData.PersonCode); |
|
2676 |
strSQL.Append(" Or (B.ToCode In (Select A1.PersonCode From personinchargemaster As A1"); |
|
2677 |
strSQL.AppendFormat(" Inner Join PERSONDEPARTMENTMASTER As A2"); |
|
2678 |
strSQL.Append(" On A2.DepartmentCode = A1.DepartmentCode"); |
|
2679 |
strSQL.AppendFormat(" Where A2.PersonCode = {0}))", CommonMotions.LoginUserData.PersonCode); |
|
2680 |
break; |
|
2681 |
} |
|
2682 |
strSQL.Append(")"); |
|
2608 | 2683 |
} |
2684 |
else if (CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key) |
|
2685 |
{ |
|
2686 |
strSQL.Append(" And ("); |
|
2687 |
switch (exeflg) |
|
2688 |
{ |
|
2689 |
case (int)TabNameEnum.MessageBoard: |
|
2690 |
// 掲示板データ |
|
2691 |
strSQL.AppendFormat(" (A.FromCode = {0})", CommonMotions.LoginUserData.PersonCode); |
|
2692 |
strSQL.Append(" Or (A.RecordNumber IN(Select B1.RecordNumber From MESSAGEBOARDTERGET As B1"); |
|
2693 |
strSQL.AppendFormat(" Where B1.ToCode = {0}))", CommonDefine.s_AllMembersCode); |
|
2694 |
strSQL.Append(" Or (A.RecordNumber IN(Select B2.RecordNumber From MESSAGEBOARDTERGET As B2"); |
|
2695 |
strSQL.AppendFormat(" Where B2.ToCode = {0}))", CommonMotions.LoginUserData.PersonCode); |
|
2696 |
strSQL.Append(" Or (A.RecordNumber IN(Select B3.RecordNumber From MESSAGEBOARDTERGET As B3"); |
|
2697 |
strSQL.AppendFormat(" Where B3.ToCode = {0}))", CommonMotions.LoginUserData.DepartmentCode); |
|
2698 |
break; |
|
2699 |
case (int)TabNameEnum.BusinessMessage: |
|
2700 |
// 秘書からの連絡 |
|
2701 |
strSQL.AppendFormat(" (B.ToCode = {0})", CommonMotions.LoginUserData.PersonCode); |
|
2702 |
break; |
|
2703 |
} |
|
2704 |
strSQL.Append(")"); |
|
2705 |
} |
|
2609 | 2706 |
} |
2610 | 2707 |
catch (Exception ex) |
2611 | 2708 |
{ |
... | ... | |
2658 | 2755 |
|
2659 | 2756 |
int nProgCount = 0; |
2660 | 2757 |
|
2758 |
int None = (int)CommonDefine.SecurityRangePos.None; // 自担当者のみ |
|
2759 |
|
|
2661 | 2760 |
// 掲示板データフィールド数取得 |
2662 | 2761 |
int ToNameCnt = Enum.GetNames(typeof(IOMessageBoardData.ColumnCnt)).Length; |
2762 |
// 部署引継色を文字列で取得 |
|
2763 |
string cBackColor = String.Format("0x{0:X2}{1:X2}{2:X2}", CommonDefine.s_SuccessionBackColor.R |
|
2764 |
, CommonDefine.s_SuccessionBackColor.G |
|
2765 |
, CommonDefine.s_SuccessionBackColor.B); |
|
2663 | 2766 |
|
2664 | 2767 |
// 1件目のデータ取得 |
2665 | 2768 |
object[] firstRec = (object[])mbdData[0]; |
... | ... | |
2668 | 2771 |
MessageBoardData wrkRow = new MessageBoardData(); |
2669 | 2772 |
mbdDB.Reader2Struct(firstRec, ref wrkRow); |
2670 | 2773 |
StringBuilder TergetName = new StringBuilder(); |
2671 |
|
|
2774 |
List<int> TergetCode = new List<int>(); |
|
2672 | 2775 |
foreach (object[] DataRec in mbdData) |
2673 | 2776 |
{ |
2674 | 2777 |
// 同じメッセージならば相手先を結合する |
... | ... | |
2678 | 2781 |
{ |
2679 | 2782 |
if (TergetName.Length != 0) TergetName.Append(","); |
2680 | 2783 |
TergetName.Append(CommonMotions.cnvString(DataRec[ToNameCnt])); |
2784 |
TergetCode.Add(CommonMotions.cnvInt(DataRec[ToNameCnt + 1])); |
|
2681 | 2785 |
continue; |
2682 | 2786 |
} |
2683 | 2787 |
|
2788 |
// 掲示板の場合、部署引継データで自分に関係がないデータは担当者に表示しない |
|
2789 |
if (exeflg == (int)TabNameEnum.MessageBoard |
|
2790 |
&& wrkRow.LinkType == (int)MessageBoardData.LinkTypeDef.ConstructionInfo |
|
2791 |
&& CommonMotions.LoginUserSecurity.SecRange == CommonDefine.SecurityRangeList[None].Key) |
|
2792 |
{ |
|
2793 |
// 部署引継を色で判定する |
|
2794 |
if (wrkRow.BackColor.Equals(cBackColor)) |
|
2795 |
{ |
|
2796 |
bool bMatch = false; |
|
2797 |
foreach (int CurCode in TergetCode) |
|
2798 |
{ |
|
2799 |
if (CurCode == CommonMotions.LoginUserData.PersonCode) |
|
2800 |
{ |
|
2801 |
bMatch = true; |
|
2802 |
break; |
|
2803 |
} |
|
2804 |
} |
|
2805 |
// 書込み者がログイン者 |
|
2806 |
if (wrkRow.FromCode == CommonMotions.LoginUserData.PersonCode) bMatch = true; |
|
2807 |
|
|
2808 |
// 表示しない |
|
2809 |
if (!bMatch) goto AfterSet; |
|
2810 |
} |
|
2811 |
} |
|
2812 |
|
|
2684 | 2813 |
// データセット |
2685 | 2814 |
SetMessageBoardGrid(wrkRow, exeflg, TergetName.ToString()); |
2686 | 2815 |
nProgCount++; |
2687 | 2816 |
|
2817 |
AfterSet: |
|
2688 | 2818 |
// ブレイクキーセット |
2689 | 2819 |
BreakRecordNo = NowRecordNo; |
2690 | 2820 |
BreakBranchNo = NowBranchNo; |
... | ... | |
2693 | 2823 |
mbdDB.ClearStruct(ref wrkRow); |
2694 | 2824 |
mbdDB.Reader2Struct(DataRec, ref wrkRow); |
2695 | 2825 |
TergetName.Clear(); |
2826 |
TergetCode.Clear(); |
|
2696 | 2827 |
TergetName.Append(CommonMotions.cnvString(DataRec[ToNameCnt])); |
2828 |
TergetCode.Add(CommonMotions.cnvInt(DataRec[ToNameCnt+1])); |
|
2697 | 2829 |
|
2698 | 2830 |
// ProgressBarの値を変更する |
2699 | 2831 |
prgber.Value = nProgCount; |
trunk/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
---|---|---|
33 | 33 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
34 | 34 |
// 既定値にすることができます: |
35 | 35 |
// [assembly: AssemblyVersion("1.0.*")] |
36 |
[assembly: AssemblyVersion("1.1.1.1")]
|
|
37 |
[assembly: AssemblyFileVersion("1.1.1.1")]
|
|
36 |
[assembly: AssemblyVersion("1.0.0.0")]
|
|
37 |
[assembly: AssemblyFileVersion("1.0.1.0")]
|
|
38 | 38 |
// Log4netを使用する |
39 | 39 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
40 | 40 |
[assembly: NeutralResourcesLanguage("ja-JP")] |
他の形式にエクスポート: Unified diff