リビジョン 350
工事予算書承認時:台帳更新トリガにバグあり修正
工事情報:部署コンボボックスセット時のSQLにバグあり修正
積算予算書:端数処理金額を追加
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 200;
|
|
17 |
public static int s_SystemVersion = 202;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs | ||
---|---|---|
372 | 372 |
if (!cbiDB.SelectAction(strSQL, ref cbiData)) return false; |
373 | 373 |
int DepartmentCode = GetFromConstrAndAppTheDep(ConstructionCode, ApprovalCode, OrderNo); |
374 | 374 |
|
375 |
// 承認データを取得する(申請データを除く) |
|
376 |
string strData = ApprDB.CreatePrimarykeyString(ConstructionCode, ApprovalCode, OrderNo); |
|
377 |
strData += string.Format(" And SeqNo != {0} And ApprovalStatus = {1}", s_PrimartyRecord, (int)CommonDefine.ApprovalStatus.Approval); |
|
378 |
List<ProcessApproval> DataList = new List<ProcessApproval>(); |
|
379 |
if (!ApprDB.SelectAction(strData, ref DataList)) return false; |
|
380 |
if (DataList.Count == 0) return false; |
|
381 |
|
|
382 | 375 |
// 承認経路マスタを取得する |
383 | 376 |
string strMaster = mApprDB.CreatePrimarykeyString(ApprovalCode, DepartmentCode); |
384 | 377 |
List<ApprovalMaster> MasterList = new List<ApprovalMaster>(); |
... | ... | |
389 | 382 |
} |
390 | 383 |
if (MasterList.Count == 0) return false; |
391 | 384 |
|
385 |
// 承認データを取得する |
|
386 |
string strData = ApprDB.CreatePrimarykeyString(ConstructionCode, ApprovalCode, OrderNo); |
|
387 |
//strData += string.Format(" And SeqNo != {0} And ApprovalStatus = {1}", s_PrimartyRecord, (int)CommonDefine.ApprovalStatus.Approval); |
|
388 |
strData += " Order By SeqNo ASC"; |
|
389 |
List<ProcessApproval> DataList = new List<ProcessApproval>(); |
|
390 |
if (!ApprDB.SelectAction(strData, ref DataList)) return false; |
|
391 |
if (DataList.Count == 0) return false; |
|
392 |
|
|
393 |
// 申請データを取得する |
|
394 |
ProcessApproval RequestData = DataList.Find(x => x.SeqNo == s_PrimartyRecord); |
|
395 |
if (RequestData == null) return false; |
|
396 |
|
|
392 | 397 |
int NoCnt = MasterList.Count; |
393 | 398 |
foreach (ProcessApproval DataRec in DataList) |
394 | 399 |
{ |
400 |
// 申請データは対象にしない |
|
401 |
if (DataRec.SeqNo == s_PrimartyRecord) continue; |
|
402 |
|
|
395 | 403 |
// 承認以外は対象にしない |
396 | 404 |
if (DataRec.ApprovalStatus != (int)CommonDefine.ApprovalStatus.Approval) continue; |
405 |
|
|
397 | 406 |
foreach (ApprovalMaster MasterRec in MasterList) |
398 | 407 |
{ |
399 | 408 |
// 承認者コードが違えば次レコードへ |
400 | 409 |
if (DataRec.PersonCode != MasterRec.ApprovalPerson) continue; |
401 | 410 |
|
411 |
// 承認していればデータ件数からマイナス |
|
412 |
--NoCnt; |
|
413 |
|
|
402 | 414 |
// 最終承認権限が設定されていれば承認済み |
403 | 415 |
if (MasterRec.ApprovalAuthority == (int)ApprovalMaster.ApprovalAuthorityDef.LastApproval) |
404 | 416 |
{ |
417 |
// 最終承認済みは処理しない |
|
418 |
if (RequestData.ApprovalStatus == (int)CommonDefine.ApprovalStatus.Approval) break; |
|
419 |
|
|
405 | 420 |
bApproval = true; |
406 | 421 |
break; |
407 | 422 |
} |
408 |
// 承認していればデータ件数からマイナス |
|
409 |
--NoCnt; |
|
410 | 423 |
} |
411 | 424 |
// 最終決裁者が承認していれば処理終了 |
412 | 425 |
if (bApproval) break; |
413 | 426 |
} |
414 | 427 |
// マスタに設定されている承認者全員が承認していれば承認 |
415 |
if (NoCnt == 0) bApproval = true; |
|
428 |
if (NoCnt == 0) |
|
429 |
{ |
|
430 |
// 最終承認済みは処理しない |
|
431 |
if (RequestData.ApprovalStatus != (int)CommonDefine.ApprovalStatus.Approval) |
|
432 |
{ |
|
433 |
bApproval = true; |
|
434 |
} |
|
435 |
} |
|
416 | 436 |
|
417 | 437 |
return bApproval; |
418 | 438 |
} |
branches/src/ProcessManagement/ProcessManagement/DataModel/ConstrCharge.cs | ||
---|---|---|
1 |
using System; |
|
2 |
using System.Collections.Generic; |
|
3 |
using System.Linq; |
|
4 |
using System.Text; |
|
5 |
using System.Threading.Tasks; |
|
6 |
|
|
7 |
namespace ProcessManagement.DataModel |
|
8 |
{ |
|
9 |
/// <summary> |
|
10 |
/// 工事担当者データ |
|
11 |
/// </summary> |
|
12 |
public class ConstrCharge |
|
13 |
{ |
|
14 |
#region 定数 |
|
15 |
/// <summary> |
|
16 |
/// 設定区分定義 |
|
17 |
/// </summary> |
|
18 |
public enum DivisionDef |
|
19 |
{ |
|
20 |
/// <summary> |
|
21 |
/// 1:指導員給料行 |
|
22 |
/// </summary> |
|
23 |
Instructor = 1, |
|
24 |
/// <summary> |
|
25 |
/// 2:副担当者給料行 |
|
26 |
/// </summary> |
|
27 |
Assistant, |
|
28 |
/// <summary> |
|
29 |
/// 3:担当者給料行 |
|
30 |
/// </summary> |
|
31 |
Payroll, |
|
32 |
} |
|
33 |
#endregion |
|
34 |
|
|
35 |
#region メンバ変数 |
|
36 |
private int m_ConstructionCode = 0; // 工事コード |
|
37 |
private int m_Division = 0; // 設定区分 |
|
38 |
private int m_SeqNo = 0; // 連番 |
|
39 |
private int m_DepartmentCode = 0; // 部署コード |
|
40 |
private int m_PersonCode = 0; // 担当者コード |
|
41 |
private DateTime m_StartDate = DateTime.MinValue; // 担当開始年月日 |
|
42 |
private DateTime m_CompDate = DateTime.MinValue; // 担当終了年月日 |
|
43 |
private DateTime m_EntryDate = DateTime.Now; // 登録日付 |
|
44 |
private DateTime m_UpdateDate = DateTime.Now; // 更新日付 |
|
45 |
#endregion |
|
46 |
|
|
47 |
#region コンストラクタ |
|
48 |
#endregion |
|
49 |
|
|
50 |
#region プロパティ |
|
51 |
/// <summary> |
|
52 |
/// 工事コード |
|
53 |
/// </summary> |
|
54 |
public int ConstructionCode |
|
55 |
{ |
|
56 |
get { return m_ConstructionCode; } |
|
57 |
set { m_ConstructionCode = value; } |
|
58 |
} |
|
59 |
|
|
60 |
/// <summary> |
|
61 |
/// 設定区分 |
|
62 |
/// </summary> |
|
63 |
public int Division |
|
64 |
{ |
|
65 |
get { return m_Division; } |
|
66 |
set { m_Division = value; } |
|
67 |
} |
|
68 |
|
|
69 |
/// <summary> |
|
70 |
/// 連番 |
|
71 |
/// </summary> |
|
72 |
public int SeqNo |
|
73 |
{ |
|
74 |
get { return m_SeqNo; } |
|
75 |
set { m_SeqNo = value; } |
|
76 |
} |
|
77 |
|
|
78 |
/// <summary> |
|
79 |
/// 部署コード |
|
80 |
/// </summary> |
|
81 |
public int DepartmentCode |
|
82 |
{ |
|
83 |
get { return m_DepartmentCode; } |
|
84 |
set { m_DepartmentCode = value; } |
|
85 |
} |
|
86 |
|
|
87 |
/// <summary> |
|
88 |
/// 担当者コード |
|
89 |
/// </summary> |
|
90 |
public int PersonCode |
|
91 |
{ |
|
92 |
get { return m_PersonCode; } |
|
93 |
set { m_PersonCode = value; } |
|
94 |
} |
|
95 |
|
|
96 |
/// <summary> |
|
97 |
/// 担当開始年月日 |
|
98 |
/// </summary> |
|
99 |
public DateTime StartDate |
|
100 |
{ |
|
101 |
get { return m_StartDate; } |
|
102 |
set { m_StartDate = value; } |
|
103 |
} |
|
104 |
|
|
105 |
/// <summary> |
|
106 |
/// 担当終了年月日 |
|
107 |
/// </summary> |
|
108 |
public DateTime CompDate |
|
109 |
{ |
|
110 |
get { return m_CompDate; } |
|
111 |
set { m_CompDate = value; } |
|
112 |
} |
|
113 |
|
|
114 |
/// <summary> |
|
115 |
/// 登録日付 |
|
116 |
/// </summary> |
|
117 |
public DateTime EntryDate |
|
118 |
{ |
|
119 |
set { m_EntryDate = value; } |
|
120 |
get { return m_EntryDate; } |
|
121 |
} |
|
122 |
/// <summary> |
|
123 |
/// 更新日付 |
|
124 |
/// </summary> |
|
125 |
public DateTime UpdateDate |
|
126 |
{ |
|
127 |
set { m_UpdateDate = value; } |
|
128 |
get { return m_UpdateDate; } |
|
129 |
} |
|
130 |
#endregion |
|
131 |
|
|
132 |
} |
|
133 |
} |
branches/src/ProcessManagement/ProcessManagement/DataModel/ChgConstrCharge.cs | ||
---|---|---|
1 |
using System; |
|
2 |
using System.Collections.Generic; |
|
3 |
using System.Linq; |
|
4 |
using System.Text; |
|
5 |
using System.Threading.Tasks; |
|
6 |
|
|
7 |
namespace ProcessManagement.DataModel |
|
8 |
{ |
|
9 |
/// <summary> |
|
10 |
/// 工事担当者変更履歴データ |
|
11 |
/// </summary> |
|
12 |
public class ChgConstrCharge |
|
13 |
{ |
|
14 |
#region 定数 |
|
15 |
/// <summary> |
|
16 |
/// 設定区分定義 |
|
17 |
/// </summary> |
|
18 |
public enum DivisionDef |
|
19 |
{ |
|
20 |
/// <summary> |
|
21 |
/// 1:指導員給料行 |
|
22 |
/// </summary> |
|
23 |
Instructor = 1, |
|
24 |
/// <summary> |
|
25 |
/// 2:副担当者給料行 |
|
26 |
/// </summary> |
|
27 |
Assistant, |
|
28 |
/// <summary> |
|
29 |
/// 3:担当者給料行 |
|
30 |
/// </summary> |
|
31 |
Payroll, |
|
32 |
} |
|
33 |
#endregion |
|
34 |
|
|
35 |
#region メンバ変数 |
|
36 |
private int m_ConstructionCode = 0; // 工事コード |
|
37 |
private int m_Division = 0; // 設定区分 |
|
38 |
private int m_SeqNo = 0; // 連番 |
|
39 |
private int m_DepartmentCode = 0; // 部署コード |
|
40 |
private int m_PersonCode = 0; // 担当者コード |
|
41 |
private DateTime m_StartDate = DateTime.MinValue; // 担当開始年月日 |
|
42 |
private DateTime m_CompDate = DateTime.MinValue; // 担当終了年月日 |
|
43 |
private DateTime m_EntryDate = DateTime.Now; // 登録日付 |
|
44 |
private DateTime m_UpdateDate = DateTime.Now; // 更新日付 |
|
45 |
#endregion |
|
46 |
|
|
47 |
#region コンストラクタ |
|
48 |
#endregion |
|
49 |
|
|
50 |
#region プロパティ |
|
51 |
/// <summary> |
|
52 |
/// 工事コード |
|
53 |
/// </summary> |
|
54 |
public int ConstructionCode |
|
55 |
{ |
|
56 |
get { return m_ConstructionCode; } |
|
57 |
set { m_ConstructionCode = value; } |
|
58 |
} |
|
59 |
|
|
60 |
/// <summary> |
|
61 |
/// 設定区分 |
|
62 |
/// </summary> |
|
63 |
public int Division |
|
64 |
{ |
|
65 |
get { return m_Division; } |
|
66 |
set { m_Division = value; } |
|
67 |
} |
|
68 |
|
|
69 |
/// <summary> |
|
70 |
/// 連番 |
|
71 |
/// </summary> |
|
72 |
public int SeqNo |
|
73 |
{ |
|
74 |
get { return m_SeqNo; } |
|
75 |
set { m_SeqNo = value; } |
|
76 |
} |
|
77 |
|
|
78 |
/// <summary> |
|
79 |
/// 部署コード |
|
80 |
/// </summary> |
|
81 |
public int DepartmentCode |
|
82 |
{ |
|
83 |
get { return m_DepartmentCode; } |
|
84 |
set { m_DepartmentCode = value; } |
|
85 |
} |
|
86 |
|
|
87 |
/// <summary> |
|
88 |
/// 担当者コード |
|
89 |
/// </summary> |
|
90 |
public int PersonCode |
|
91 |
{ |
|
92 |
get { return m_PersonCode; } |
|
93 |
set { m_PersonCode = value; } |
|
94 |
} |
|
95 |
|
|
96 |
/// <summary> |
|
97 |
/// 担当開始年月日 |
|
98 |
/// </summary> |
|
99 |
public DateTime StartDate |
|
100 |
{ |
|
101 |
get { return m_StartDate; } |
|
102 |
set { m_StartDate = value; } |
|
103 |
} |
|
104 |
|
|
105 |
/// <summary> |
|
106 |
/// 担当終了年月日 |
|
107 |
/// </summary> |
|
108 |
public DateTime CompDate |
|
109 |
{ |
|
110 |
get { return m_CompDate; } |
|
111 |
set { m_CompDate = value; } |
|
112 |
} |
|
113 |
|
|
114 |
/// <summary> |
|
115 |
/// 登録日付 |
|
116 |
/// </summary> |
|
117 |
public DateTime EntryDate |
|
118 |
{ |
|
119 |
set { m_EntryDate = value; } |
|
120 |
get { return m_EntryDate; } |
|
121 |
} |
|
122 |
/// <summary> |
|
123 |
/// 更新日付 |
|
124 |
/// </summary> |
|
125 |
public DateTime UpdateDate |
|
126 |
{ |
|
127 |
set { m_UpdateDate = value; } |
|
128 |
get { return m_UpdateDate; } |
|
129 |
} |
|
130 |
#endregion |
|
131 |
|
|
132 |
} |
|
133 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs | ||
---|---|---|
728 | 728 |
|
729 | 729 |
m_dispLabelControl[(int)DispHeader.ApprovalName].Text = CommonMotions.LoginUserData.PersonName; // 承認者名 |
730 | 730 |
m_dispLabelControl[(int)DispHeader.ApprovalDepartmentName].Text = DepartmentRec.DepartmentString; // 部署名 |
731 |
m_dispLabelControl[(int)DispHeader.ApprovalDisplayString].Text = CommonMotions.LoginUserData.DisplayString; // 役職名 |
|
731 |
string strwrk = CommonMotions.LoginUserData.DisplayString.Substring(0, 7); |
|
732 |
m_dispLabelControl[(int)DispHeader.ApprovalDisplayString].Text = strwrk; // 役職名 |
|
732 | 733 |
m_dispLabelControl[(int)DispHeader.ApprovalStatus].Text = strStatus; // 状態 |
733 | 734 |
|
734 | 735 |
return true; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
---|---|---|
969 | 969 |
|
970 | 970 |
m_dispLabelControl[(int)DispHeader.ApprovalName].Text = CommonMotions.LoginUserData.PersonName; // 承認者名 |
971 | 971 |
m_dispLabelControl[(int)DispHeader.ApprovalDepartmentName].Text = DepartmentRec.DepartmentString; // 部署名 |
972 |
m_dispLabelControl[(int)DispHeader.ApprovalDisplayString].Text = CommonMotions.LoginUserData.DisplayString; // 役職名 |
|
972 |
|
|
973 |
string strwrk = string.Empty; |
|
974 |
if (CommonMotions.LoginUserData.DisplayString.Length > 7) |
|
975 |
strwrk = CommonMotions.LoginUserData.DisplayString.Substring(0, 7); |
|
976 |
else |
|
977 |
strwrk = CommonMotions.LoginUserData.DisplayString; |
|
978 |
m_dispLabelControl[(int)DispHeader.ApprovalDisplayString].Text = strwrk; // 役職名 |
|
973 | 979 |
m_dispLabelControl[(int)DispHeader.ApprovalStatus].Text = strStatus; // 状態 |
974 | 980 |
|
975 | 981 |
return true; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs | ||
---|---|---|
1401 | 1401 |
|
1402 | 1402 |
// ?R???{?{?b?N?X?Z?b?g |
1403 | 1403 |
SetDepartmentCombbox(); // ???? |
1404 |
SetcmbPersonInCharge(); // ?S???? |
|
1405 |
SetConstrManCombbox(); // ?H???S????i???p????????????j |
|
1404 |
SetcmbPersonInCharge(); // ?S????
|
|
1405 |
SetConstrManCombbox(); // ?H???S????i???p????????????j
|
|
1406 | 1406 |
SetcmbConstructionYear(); // ?H???N?x |
1407 | 1407 |
SetcmbConstructionPeriod(); // ?c??? |
1408 | 1408 |
SetcmbDivisionCombBox(); // ??????? |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
---|---|---|
2391 | 2391 |
} |
2392 | 2392 |
#endregion |
2393 | 2393 |
|
2394 |
#region ?????R???{?{?b?N?X?f?[?^???r?p?k?? |
|
2395 |
/// <summary> |
|
2396 |
/// ?????R???{?{?b?N?X?f?[?^???r?p?k?? |
|
2397 |
/// </summary> |
|
2398 |
/// <param name="strSQL"></param> |
|
2399 |
public static void CreateDepCombBoxSQL(ref StringBuilder strSQL, int nTargetCount) |
|
2400 |
{ |
|
2401 |
try |
|
2402 |
{ |
|
2403 |
// ??????f?[?^???????????? |
|
2404 |
bool bNowSeason = CommonMotions.CheckNowSeason(nTargetCount); |
|
2405 |
|
|
2406 |
strSQL.Append("SELECT"); |
|
2407 |
strSQL.Append(" A.DEPARTMENTCODE"); |
|
2408 |
strSQL.Append(", A.DEPARTMENTSTRING"); |
|
2409 |
strSQL.Append(", A.DISPLAYORDER"); |
|
2410 |
strSQL.Append(", COUNT(*)"); |
|
2411 |
strSQL.Append(" FROM"); |
|
2412 |
if (bNowSeason) |
|
2413 |
{ |
|
2414 |
// ??????v???C?}???e?[?u????????}?X?^ |
|
2415 |
strSQL.Append(" DEPARTMENTMASTER A"); |
|
2416 |
} |
|
2417 |
else |
|
2418 |
{ // ?????f?[?^??H???????????? |
|
2419 |
strSQL.Append(" ("); |
|
2420 |
strSQL.Append("Select"); |
|
2421 |
strSQL.Append(" A1.SalesDepCode As DEPARTMENTCODE"); |
|
2422 |
strSQL.Append(", B1.DetailString As DEPARTMENTSTRING"); |
|
2423 |
strSQL.Append(", ifnull(C1.DisplayOrder, 10) As DISPLAYORDER"); |
|
2424 |
strSQL.Append(" From Constructionbaseinfo As A1"); |
|
2425 |
strSQL.Append(" Inner Join constructionbaseinfodetail As B1"); |
|
2426 |
strSQL.Append(" On B1.ConstructionCode = A1.ConstructionCode"); |
|
2427 |
strSQL.AppendFormat(" And B1.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.SalesDepartmentName); |
|
2428 |
strSQL.Append(" Left Join departmentmaster As C1"); |
|
2429 |
strSQL.Append(" On C1.DepartmentCode = A1.SalesDepCode"); |
|
2430 |
strSQL.AppendFormat(" Where A1.ConstructionPeriod = {0}", nTargetCount); |
|
2431 |
strSQL.Append(" And A1.SalesDepCode != 0"); |
|
2432 |
|
|
2433 |
strSQL.Append(" Union Select"); |
|
2434 |
strSQL.Append(" A2.ConstrDepCode As DEPARTMENTCODE"); |
|
2435 |
strSQL.Append(", B2.DetailString As DEPARTMENTSTRING"); |
|
2436 |
strSQL.Append(", ifnull(C2.DisplayOrder, 10) As DISPLAYORDER"); |
|
2437 |
strSQL.Append(" From Constructionbaseinfo As A2"); |
|
2438 |
strSQL.Append(" Inner Join constructionbaseinfodetail As B2"); |
|
2439 |
strSQL.Append(" On B2.ConstructionCode = A2.ConstructionCode"); |
|
2440 |
strSQL.AppendFormat(" And B2.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstrDepartmentName); |
|
2441 |
strSQL.Append(" Left Join departmentmaster As C2"); |
|
2442 |
strSQL.Append(" On C2.DepartmentCode = A2.ConstrDepCode"); |
|
2443 |
strSQL.AppendFormat(" Where A2.ConstructionPeriod = {0}", nTargetCount); |
|
2444 |
strSQL.Append(" And A2.ConstrDepCode != 0"); |
|
2445 |
|
|
2446 |
strSQL.Append(" Union Select"); |
|
2447 |
strSQL.Append(" A3.ConstrSubDepCode As DEPARTMENTCODE"); |
|
2448 |
strSQL.Append(", B3.DetailString As DEPARTMENTSTRING"); |
|
2449 |
strSQL.Append(", ifnull(C3.DisplayOrder, 10) As DISPLAYORDER"); |
|
2450 |
strSQL.Append(" From Constructionbaseinfo As A3"); |
|
2451 |
strSQL.Append(" Inner Join constructionbaseinfodetail As B3"); |
|
2452 |
strSQL.Append(" On B3.ConstructionCode = A3.ConstructionCode"); |
|
2453 |
strSQL.AppendFormat(" And B3.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstrSubDepartmentName); |
|
2454 |
strSQL.Append(" Left Join departmentmaster As C3"); |
|
2455 |
strSQL.Append(" On C3.DepartmentCode = A3.ConstrSubDepCode"); |
|
2456 |
strSQL.AppendFormat(" Where A3.ConstructionPeriod = {0}", nTargetCount); |
|
2457 |
strSQL.Append(" And A3.ConstrSubDepCode != 0"); |
|
2458 |
|
|
2459 |
strSQL.Append(" Union Select"); |
|
2460 |
strSQL.Append(" A4.ConstrInstrDepCode As DEPARTMENTCODE"); |
|
2461 |
strSQL.Append(", B4.DetailString As DEPARTMENTSTRING"); |
|
2462 |
strSQL.Append(", ifnull(C4.DisplayOrder, 10) As DISPLAYORDER"); |
|
2463 |
strSQL.Append(" From Constructionbaseinfo As A4"); |
|
2464 |
strSQL.Append(" Inner Join constructionbaseinfodetail As B4"); |
|
2465 |
strSQL.Append(" On B4.ConstructionCode = A4.ConstructionCode"); |
|
2466 |
strSQL.AppendFormat(" And B4.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.InstrDepartmentName); |
|
2467 |
strSQL.Append(" Left Join departmentmaster As C4"); |
|
2468 |
strSQL.Append(" On C4.DepartmentCode = A4.ConstrInstrDepCode"); |
|
2469 |
strSQL.AppendFormat(" Where A4.ConstructionPeriod = {0}", nTargetCount); |
|
2470 |
strSQL.Append(" And A4.ConstrInstrDepCode != 0"); |
|
2471 |
strSQL.Append(") As A"); |
|
2472 |
} |
|
2473 |
|
|
2474 |
if (bNowSeason) |
|
2475 |
{ // ??????????? |
|
2476 |
strSQL.Append(" WHERE"); |
|
2477 |
|
|
2478 |
// ??????????????? |
|
2479 |
strSQL.AppendFormat(" A.DELETEFLG = {0}", (int)CommonDefine.DataRowDeleteDef.Exists); |
|
2480 |
DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(nTargetCount, false); |
|
2481 |
|
|
2482 |
strSQL.AppendFormat(" And DATE(A.StartDate) <= DATE('{0}')", dtDefaultEnd.ToShortDateString()); |
|
2483 |
} |
|
2484 |
else |
|
2485 |
{ // ?????????? |
|
2486 |
strSQL.Append(", CONSTRUCTIONBASEINFO C"); |
|
2487 |
strSQL.Append(" WHERE"); |
|
2488 |
|
|
2489 |
strSQL.AppendFormat(" (C.ConstructionPeriod = {0}", nTargetCount); |
|
2490 |
strSQL.Append(" And A.DepartmentCode IN(C.SalesDepCode, C.ConstrDepCode, C.ConstrSubDepCode, C.ConstrInstrDepCode))"); |
|
2491 |
} |
|
2492 |
strSQL.Append(" GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER"); |
|
2493 |
strSQL.Append(" ORDER BY A.DISPLAYORDER ASC"); |
|
2494 |
} |
|
2495 |
catch (Exception ex) |
|
2496 |
{ |
|
2497 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
2498 |
} |
|
2499 |
} |
|
2500 |
#endregion |
|
2501 |
|
|
2394 | 2502 |
#region ?????R???{?{?b?N?X?Z?b?g |
2395 | 2503 |
/// <summary> |
2396 | 2504 |
/// ?????R???{?{?b?N?X????????Z?b?g???? |
... | ... | |
2403 | 2511 |
// ?????}?X?^?????????? |
2404 | 2512 |
int nPeriod = GetTargetYear(); |
2405 | 2513 |
StringBuilder strSQL = new StringBuilder(); |
2406 |
CommonMotions.CreateDepCombBoxSQL(ref strSQL, nPeriod, true);
|
|
2514 |
CreateDepCombBoxSQL(ref strSQL, nPeriod);
|
|
2407 | 2515 |
|
2408 | 2516 |
ArrayList dmList = new ArrayList(); |
2409 | 2517 |
// ?????}?X?^??? |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs | ||
---|---|---|
4455 | 4455 |
// 経費データを取得する |
4456 | 4456 |
int nGroupCount = (int)GridColumn.GroupCount; |
4457 | 4457 |
int nLineCnt = (int)GridColumn.DataLineCount; |
4458 |
int nFixFlg = (int)GridColumn.FixFlg; |
|
4459 | 4458 |
DataGridViewRow[] RowList = dgv.Rows.Cast<DataGridViewRow>() |
4460 |
.Where(x => CommonMotions.cnvInt(x.Cells[nGroupCount].Value) == (int)DataGroup.Expenses |
|
4461 |
&& CommonMotions.cnvString(x.Cells[nFixFlg].Value) == string.Empty) |
|
4459 |
.Where(x => CommonMotions.cnvInt(x.Cells[nGroupCount].Value) == (int)DataGroup.Expenses) |
|
4462 | 4460 |
.OrderBy(y => CommonMotions.cnvInt(y.Cells[nLineCnt].Value)) |
4463 | 4461 |
.ToArray(); |
4464 | 4462 |
int nCnt = 1; |
... | ... | |
4471 | 4469 |
CurRec.SeqNo = (nCnt++); // 枝番 |
4472 | 4470 |
int RCnt = (int)GridColumn.ComponentCode; // 経費コード |
4473 | 4471 |
CurRec.NameCode = CommonMotions.cnvInt(CurRow.Cells[RCnt].Value); |
4472 |
if (CurRec.NameCode < 1) continue; |
|
4474 | 4473 |
RCnt = (int)GridColumn.Percent; // 経費率 |
4475 | 4474 |
CurRec.ExpensesRaito = CommonMotions.cnvDouble(CurRow.Cells[RCnt].Value); |
4476 | 4475 |
RCnt = dgv.ColumnCount + (int)ColPayTotal.Totals; // 経費金額 |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs | ||
---|---|---|
83 | 83 |
/// ?????? |
84 | 84 |
/// </summary> |
85 | 85 |
Dispose, |
86 |
/// <summary> |
|
87 |
/// ?[?????? |
|
88 |
/// </summary> |
|
89 |
Fraction, |
|
86 | 90 |
} |
87 | 91 |
#endregion |
88 | 92 |
|
... | ... | |
231 | 235 |
, "??@??@??@???@??@" |
232 | 236 |
, "?w?@?@???@?@?i?@?@" |
233 | 237 |
, "???@?o?@??@???@" |
234 |
, "????????????@" }; |
|
238 |
, "????????????@" |
|
239 |
, "?[?@???@???@???@"}; |
|
235 | 240 |
/// <summary> |
236 | 241 |
/// ?u???b?N????^?C?g?? |
237 | 242 |
/// </summary> |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs | ||
---|---|---|
979 | 979 |
|
980 | 980 |
// ----- 処分費 |
981 | 981 |
GetEstimateDataDispose(); |
982 |
|
|
982 |
|
|
983 |
// ----- 端数処理金額 |
|
984 |
GetEstimateDataFraction(); |
|
985 |
|
|
983 | 986 |
// ----- 工事費 |
984 | 987 |
CreateBlockTotal((int)BlockName.TotalCosts); |
985 | 988 |
|
... | ... | |
1500 | 1503 |
// データ表示 |
1501 | 1504 |
EstimateBudgetDetail Datarec = new EstimateBudgetDetail(); |
1502 | 1505 |
Datarec.GroupCount = (int)GroupName_EstimateBudget.PurchasePrice; // グループ番号 |
1503 |
Datarec.FirstString = GroupTitle[(int)GroupName_EstimateBudget.PurchasePrice]; // 構成名称 |
|
1506 |
Datarec.FirstString = GroupTitle[(int)GroupName_EstimateBudget.PurchasePrice]; // 構成名称
|
|
1504 | 1507 |
Datarec.NegotiationPrice = 0; // 交渉時金額 |
1505 | 1508 |
DisplayGridData(1, Datarec); |
1506 | 1509 |
|
... | ... | |
1674 | 1677 |
} |
1675 | 1678 |
#endregion |
1676 | 1679 |
|
1680 |
#region 見積データの端数を引き込む |
|
1681 |
/// <summary> |
|
1682 |
/// 見積データの端数を引き込む |
|
1683 |
/// </summary> |
|
1684 |
/// <returns></returns> |
|
1685 |
private void GetEstimateDataFraction() |
|
1686 |
{ |
|
1687 |
IOEstimateData esDB = new IOEstimateData(); |
|
1688 |
try |
|
1689 |
{ |
|
1690 |
string TargetCode = FrmEstimateInput.TotalTitleName.First(x => x.Value.Equals("端 数 処 理")).Key; |
|
1691 |
|
|
1692 |
StringBuilder strSQL = new StringBuilder(); |
|
1693 |
strSQL.Append("SELECT COMPONENTCODE, ITEMNAME, SPECNAME, PRICEVALUE, FIXEDITEMCODE"); |
|
1694 |
strSQL.Append(" FROM ESTIMATEDATA"); |
|
1695 |
strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode); |
|
1696 |
strSQL.AppendFormat(" AND FixedItemCode = '{0}'", TargetCode); |
|
1697 |
|
|
1698 |
ArrayList arList = new ArrayList(); |
|
1699 |
if (!esDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
1700 |
|
|
1701 |
// データ無は処理しない |
|
1702 |
if (arList.Count == 0) return; |
|
1703 |
|
|
1704 |
// 空行セット |
|
1705 |
InsertBlankLine(2); |
|
1706 |
// タイトルセット |
|
1707 |
DispTitle(GroupTitle[(int)GroupName_EstimateBudget.Fraction], (int)TitleDivision.Group); |
|
1708 |
|
|
1709 |
DataGridView dgv = dgvAllDisplay; |
|
1710 |
int icnt = 1; |
|
1711 |
double dSumaryWork = 0; |
|
1712 |
double dTotal = 0; |
|
1713 |
foreach (object[] wrkobj in arList) |
|
1714 |
{ |
|
1715 |
dSumaryWork = CommonMotions.cnvInt(wrkobj[3]); |
|
1716 |
string ComponentName = string.Empty; |
|
1717 |
string ItemName = string.Empty; |
|
1718 |
int CompomentCode = 0; |
|
1719 |
if (!CommonMotions.chkObjectIsNull(wrkobj[1])) ComponentName = wrkobj[1].ToString(); |
|
1720 |
if (!CommonMotions.chkObjectIsNull(wrkobj[2])) ItemName = wrkobj[2].ToString(); |
|
1721 |
if (!CommonMotions.chkObjectIsNull(wrkobj[0])) CompomentCode = CommonMotions.cnvInt(wrkobj[0]); |
|
1722 |
|
|
1723 |
// データ表示 |
|
1724 |
int iItemCode = CommonMotions.cnvInt(wrkobj[4]); |
|
1725 |
|
|
1726 |
EstimateBudgetDetail Datarec = new EstimateBudgetDetail(); |
|
1727 |
Datarec.GroupCount = (int)GroupName_EstimateBudget.Dispose; // グループ番号 |
|
1728 |
Datarec.ComponentCode = CompomentCode; // 構成キー |
|
1729 |
Datarec.ItemCode = iItemCode; // 工種キー |
|
1730 |
Datarec.FirstString = ComponentName; // 構成名称 |
|
1731 |
Datarec.SecondString = ItemName; // 工種名称・協力会社名 |
|
1732 |
Datarec.EstimatePrice = dSumaryWork; // 見積時金額 |
|
1733 |
Datarec.NegotiationPrice = dSumaryWork; // 交渉時金額 |
|
1734 |
DisplayGridData(icnt++, Datarec); |
|
1735 |
dTotal += dSumaryWork; |
|
1736 |
// クリア |
|
1737 |
dSumaryWork = 0; |
|
1738 |
int nLineCnt = dgv.RowCount - 1; |
|
1739 |
// 端数処理は入力させない |
|
1740 |
dgv.Rows[nLineCnt].Cells[(int)DispGridColumn.EstimatePrice].ReadOnly = true; |
|
1741 |
dgv.Rows[nLineCnt].Cells[(int)DispGridColumn.NegotiationPrice].ReadOnly = true; |
|
1742 |
} |
|
1743 |
|
|
1744 |
// 小計 |
|
1745 |
string strDspName = GroupTitle[(int)GroupName_EstimateBudget.Fraction] + s_TotaFixlName; |
|
1746 |
CreateTotalLine(strDspName, dTotal, dTotal, (int)TitleDivision.Group, (int)GroupName_EstimateBudget.Fraction); |
|
1747 |
|
|
1748 |
} |
|
1749 |
catch (Exception ex) |
|
1750 |
{ |
|
1751 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1752 |
} |
|
1753 |
finally |
|
1754 |
{ |
|
1755 |
esDB.close(); esDB = null; |
|
1756 |
} |
|
1757 |
} |
|
1758 |
#endregion |
|
1759 |
|
|
1677 | 1760 |
#region 共通費算出番号を取得する |
1678 | 1761 |
/// <summary> |
1679 | 1762 |
/// 工事種別より共通費算出番号を取得する |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs | ||
---|---|---|
271 | 271 |
newpage.EntryDGV.CurrentCellChanged += new System.EventHandler(this.dgvEntryData_CurrentCellChanged); |
272 | 272 |
//newpage.EntryDGV.EditingControlShowing += new System.Windows.Forms.DataGridViewEditingControlShowingEventHandler(this.dgvEntryData_EditingControlShowing); |
273 | 273 |
newpage.EntryDGV.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvEntryData_Scroll); |
274 |
newpage.EntryDGV.SelectionChanged += new System.EventHandler(this.dgvEntryData_SelectionChanged);
|
|
274 |
newpage.EntryDGV.SelectionChanged += new System.EventHandler(this.dgvEntryData_SelectionChanged); |
|
275 | 275 |
newpage.EntryDGV.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvEntryData_KeyDown); |
276 | 276 |
//newpage.EntryDGV.KeyPress += new System.Windows.Forms.KeyPressEventHandler(dgvEntryData_KeyPress); |
277 | 277 |
newpage.EntryDGV.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvEntryData_MouseUp); |
... | ... | |
1842 | 1842 |
btnDispUp.Visible = false; // 行アップボタン |
1843 | 1843 |
btnDispDown.Visible = false; // 行ダウンボタン |
1844 | 1844 |
btnMasterIn.Visible = false; // 小項目マスタ追加ボタン |
1845 |
if(bRef) btnRequestPrint.Visible = false; // 見積依頼印刷ボタン |
|
1845 |
if (bRef) btnRequestPrint.Visible = false; // 見積依頼印刷ボタン
|
|
1846 | 1846 |
|
1847 | 1847 |
TabCollections.DrawButton = false; // タブ閉じるボタン非表示 |
1848 | 1848 |
} |
... | ... | |
4303 | 4303 |
return false; |
4304 | 4304 |
} |
4305 | 4305 |
|
4306 |
if (m_ConstructionBaseInfo.TyingFlg!=(int)ConstructionBaseInfo.TyingFlgDef.Tying)
|
|
4306 |
if (m_ConstructionBaseInfo.TyingFlg != (int)ConstructionBaseInfo.TyingFlgDef.Tying)
|
|
4307 | 4307 |
{ |
4308 | 4308 |
// 通常起動処理 |
4309 | 4309 |
if (!NormalModeExecute()) |
... | ... | |
4669 | 4669 |
SmallList.Clear(); |
4670 | 4670 |
MciList.Clear(); |
4671 | 4671 |
SubConstr.Clear(); |
4672 |
|
|
4672 |
|
|
4673 | 4673 |
// 積算見積データ取得 |
4674 | 4674 |
strSQL.Clear(); |
4675 | 4675 |
strSQL.Append("SELECT A.*, B.*, C.COMPANYNAME FROM ESTIMATEDATADETAIL A"); |
... | ... | |
5572 | 5572 |
/// <returns></returns> |
5573 | 5573 |
//private bool WritePointOutComment(IOPointingOutComment CommentDB) |
5574 | 5574 |
//{ |
5575 |
//try
|
|
5576 |
//{
|
|
5577 |
// // 最初に削除
|
|
5578 |
// string strSQL = CommentDB.CreatePrimarykeyString(m_ConstructionCode);
|
|
5579 |
// CommentDB.DeleteAction(strSQL, false);
|
|
5575 |
//try |
|
5576 |
//{ |
|
5577 |
// // 最初に削除 |
|
5578 |
// string strSQL = CommentDB.CreatePrimarykeyString(m_ConstructionCode); |
|
5579 |
// CommentDB.DeleteAction(strSQL, false); |
|
5580 | 5580 |
|
5581 |
// int SeqCount = 1;
|
|
5582 |
// int PageCnt = 1;
|
|
5583 |
// // 表示ページよりコメントを抜き出して登録を行う
|
|
5584 |
// foreach (EstimateInputPage CurEntryPage in m_EntryPage)
|
|
5585 |
// {
|
|
5586 |
// foreach (Control wrkCtrl in CurEntryPage.CommentShapeContainer.Controls)
|
|
5587 |
// {
|
|
5588 |
// // コメントのみを対象にする
|
|
5589 |
// if (!wrkCtrl.GetType().Equals(typeof(MoveTextBox))) continue;
|
|
5581 |
// int SeqCount = 1; |
|
5582 |
// int PageCnt = 1; |
|
5583 |
// // 表示ページよりコメントを抜き出して登録を行う |
|
5584 |
// foreach (EstimateInputPage CurEntryPage in m_EntryPage) |
|
5585 |
// { |
|
5586 |
// foreach (Control wrkCtrl in CurEntryPage.CommentShapeContainer.Controls) |
|
5587 |
// { |
|
5588 |
// // コメントのみを対象にする |
|
5589 |
// if (!wrkCtrl.GetType().Equals(typeof(MoveTextBox))) continue; |
|
5590 | 5590 |
|
5591 |
// PointingOutComment ComRec = new PointingOutComment();
|
|
5592 |
// ComRec.ConstructionCode = m_ConstructionCode;
|
|
5593 |
// ComRec.ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateInput;
|
|
5594 |
// ComRec.SeqNo = SeqCount++;
|
|
5595 |
// ComRec.PageCount = PageCnt;
|
|
5596 |
// ComRec.PersonCode = ((MoveTextBox)wrkCtrl).ContinerCode;
|
|
5597 |
// ComRec.DrowColor = String.Format("0x{0:X2}{1:X2}{2:X2}"
|
|
5598 |
// , wrkCtrl.BackColor.R, wrkCtrl.BackColor.G, wrkCtrl.BackColor.B);
|
|
5599 |
// ComRec.CommentMessage = wrkCtrl.Text;
|
|
5600 |
// ComRec.StartPointX = ((MoveTextBox)wrkCtrl).ParentPoint.X;
|
|
5601 |
// ComRec.StartPointY = ((MoveTextBox)wrkCtrl).ParentPoint.Y;
|
|
5602 |
// ComRec.CurrentPointX = ((MoveTextBox)wrkCtrl).Location.X;
|
|
5603 |
// ComRec.CurrentPointY = ((MoveTextBox)wrkCtrl).Location.Y;
|
|
5604 |
// ComRec.CurrentWidth = ((MoveTextBox)wrkCtrl).Width;
|
|
5605 |
// ComRec.CurrentHeight = ((MoveTextBox)wrkCtrl).Height;
|
|
5591 |
// PointingOutComment ComRec = new PointingOutComment(); |
|
5592 |
// ComRec.ConstructionCode = m_ConstructionCode; |
|
5593 |
// ComRec.ProcessNo = (int)ClsExcute.ProcessExecuteNo.EstimateInput; |
|
5594 |
// ComRec.SeqNo = SeqCount++; |
|
5595 |
// ComRec.PageCount = PageCnt; |
|
5596 |
// ComRec.PersonCode = ((MoveTextBox)wrkCtrl).ContinerCode; |
|
5597 |
// ComRec.DrowColor = String.Format("0x{0:X2}{1:X2}{2:X2}" |
|
5598 |
// , wrkCtrl.BackColor.R, wrkCtrl.BackColor.G, wrkCtrl.BackColor.B); |
|
5599 |
// ComRec.CommentMessage = wrkCtrl.Text; |
|
5600 |
// ComRec.StartPointX = ((MoveTextBox)wrkCtrl).ParentPoint.X; |
|
5601 |
// ComRec.StartPointY = ((MoveTextBox)wrkCtrl).ParentPoint.Y; |
|
5602 |
// ComRec.CurrentPointX = ((MoveTextBox)wrkCtrl).Location.X; |
|
5603 |
// ComRec.CurrentPointY = ((MoveTextBox)wrkCtrl).Location.Y; |
|
5604 |
// ComRec.CurrentWidth = ((MoveTextBox)wrkCtrl).Width; |
|
5605 |
// ComRec.CurrentHeight = ((MoveTextBox)wrkCtrl).Height; |
|
5606 | 5606 |
|
5607 |
// // 追加処理
|
|
5608 |
// if (!CommentDB.InsertAction(ComRec, false))
|
|
5609 |
// {
|
|
5610 |
// return false;
|
|
5611 |
// }
|
|
5612 |
// }
|
|
5613 |
// PageCnt++;
|
|
5614 |
// }
|
|
5607 |
// // 追加処理 |
|
5608 |
// if (!CommentDB.InsertAction(ComRec, false)) |
|
5609 |
// { |
|
5610 |
// return false; |
|
5611 |
// } |
|
5612 |
// } |
|
5613 |
// PageCnt++; |
|
5614 |
// } |
|
5615 | 5615 |
|
5616 |
// return true; |
|
5617 |
//} |
|
5618 |
//catch (System.Exception ex) |
|
5619 |
//{ |
|
5620 |
// logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
5621 |
// return false; |
|
5622 |
//} |
|
5616 |
// return true; |
|
5623 | 5617 |
//} |
5618 |
//catch (System.Exception ex) |
|
5619 |
//{ |
|
5620 |
// logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
5621 |
// return false; |
|
5622 |
//} |
|
5623 |
//} |
|
5624 | 5624 |
#endregion |
5625 | 5625 |
|
5626 | 5626 |
#region 指摘事項データ読込み |
... | ... | |
5630 | 5630 |
/// <returns></returns> |
5631 | 5631 |
//private bool ReadPointOutComment() |
5632 | 5632 |
//{ |
5633 |
//IOPointingOutComment CommentDB = new IOPointingOutComment();
|
|
5634 |
//IOMPersonInCharge picDB = new IOMPersonInCharge();
|
|
5635 |
//try
|
|
5636 |
//{
|
|
5637 |
// string strSQL = CommentDB.CreatePrimarykeyString(m_ConstructionCode);
|
|
5638 |
// strSQL += " ORDER BY PageCount";
|
|
5639 |
// List<PointingOutComment> CommentList = new List<PointingOutComment>();
|
|
5640 |
// if (!CommentDB.SelectAction(strSQL, ref CommentList)) return false;
|
|
5641 |
// if (CommentList.Count == 0) return true;
|
|
5633 |
//IOPointingOutComment CommentDB = new IOPointingOutComment(); |
|
5634 |
//IOMPersonInCharge picDB = new IOMPersonInCharge(); |
|
5635 |
//try |
|
5636 |
//{ |
|
5637 |
// string strSQL = CommentDB.CreatePrimarykeyString(m_ConstructionCode); |
|
5638 |
// strSQL += " ORDER BY PageCount"; |
|
5639 |
// List<PointingOutComment> CommentList = new List<PointingOutComment>(); |
|
5640 |
// if (!CommentDB.SelectAction(strSQL, ref CommentList)) return false; |
|
5641 |
// if (CommentList.Count == 0) return true; |
|
5642 | 5642 |
|
5643 |
// // コメントを抜き出して表示を行う
|
|
5644 |
// foreach (PointingOutComment ComRec in CommentList)
|
|
5645 |
// {
|
|
5646 |
// int TabCnt = ComRec.PageCount - 1;
|
|
5647 |
// ShapeContainer wrkCtrl = m_EntryPage[TabCnt].CommentShapeContainer;
|
|
5643 |
// // コメントを抜き出して表示を行う |
|
5644 |
// foreach (PointingOutComment ComRec in CommentList) |
|
5645 |
// { |
|
5646 |
// int TabCnt = ComRec.PageCount - 1; |
|
5647 |
// ShapeContainer wrkCtrl = m_EntryPage[TabCnt].CommentShapeContainer; |
|
5648 | 5648 |
|
5649 |
// // コメントボックス追加
|
|
5650 |
// MoveTextBox NewComment = new MoveTextBox();
|
|
5651 |
// NewComment.ParentPoint = new Point(ComRec.StartPointX, ComRec.StartPointY);
|
|
5652 |
// NewComment.StartPoint = new Point(ComRec.CurrentPointX, ComRec.CurrentPointY);
|
|
5649 |
// // コメントボックス追加 |
|
5650 |
// MoveTextBox NewComment = new MoveTextBox(); |
|
5651 |
// NewComment.ParentPoint = new Point(ComRec.StartPointX, ComRec.StartPointY); |
|
5652 |
// NewComment.StartPoint = new Point(ComRec.CurrentPointX, ComRec.CurrentPointY); |
|
5653 | 5653 |
|
5654 |
// NewComment.Width = ComRec.CurrentWidth;
|
|
5655 |
// NewComment.Height = ComRec.CurrentHeight;
|
|
5656 |
// NewComment.DrowColor = CommonMotions.getBackForeColor(ComRec.DrowColor, CommonDefine.PalceOfColor.BackColor);
|
|
5657 |
// NewComment.Text = ComRec.CommentMessage;
|
|
5654 |
// NewComment.Width = ComRec.CurrentWidth; |
|
5655 |
// NewComment.Height = ComRec.CurrentHeight; |
|
5656 |
// NewComment.DrowColor = CommonMotions.getBackForeColor(ComRec.DrowColor, CommonDefine.PalceOfColor.BackColor); |
|
5657 |
// NewComment.Text = ComRec.CommentMessage; |
|
5658 | 5658 |
|
5659 |
// NewComment.ContinerCode = ComRec.PersonCode;
|
|
5660 |
// // 権限により変更可能かどうかを確認する
|
|
5661 |
// if (!GetCommentEditPermission(ComRec.PersonCode)) NewComment.ReadOnly = true;
|
|
5659 |
// NewComment.ContinerCode = ComRec.PersonCode; |
|
5660 |
// // 権限により変更可能かどうかを確認する |
|
5661 |
// if (!GetCommentEditPermission(ComRec.PersonCode)) NewComment.ReadOnly = true; |
|
5662 | 5662 |
|
5663 |
// string strPerson = picDB.CreatePrimarykeyString(ComRec.PersonCode);
|
|
5664 |
// PersonInChargeMaster picRec = new PersonInChargeMaster();
|
|
5665 |
// picDB.SelectAction(strPerson, ref picRec);
|
|
5666 |
// NewComment.ToolTipString = string.Format("指摘者:{0}", picRec.PersonName);
|
|
5663 |
// string strPerson = picDB.CreatePrimarykeyString(ComRec.PersonCode); |
|
5664 |
// PersonInChargeMaster picRec = new PersonInChargeMaster(); |
|
5665 |
// picDB.SelectAction(strPerson, ref picRec); |
|
5666 |
// NewComment.ToolTipString = string.Format("指摘者:{0}", picRec.PersonName); |
|
5667 | 5667 |
|
5668 |
// wrkCtrl.Controls.Add(NewComment);
|
|
5669 |
// }
|
|
5668 |
// wrkCtrl.Controls.Add(NewComment); |
|
5669 |
// } |
|
5670 | 5670 |
|
5671 |
// return true; |
|
5672 |
//} |
|
5673 |
//catch (System.Exception ex) |
|
5674 |
//{ |
|
5675 |
// logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
5676 |
// return false; |
|
5677 |
//} |
|
5678 |
//finally |
|
5679 |
//{ |
|
5680 |
// CommentDB.close(); CommentDB = null; |
|
5681 |
// picDB.close(); picDB = null; |
|
5682 |
//} |
|
5671 |
// return true; |
|
5683 | 5672 |
//} |
5673 |
//catch (System.Exception ex) |
|
5674 |
//{ |
|
5675 |
// logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
5676 |
// return false; |
|
5677 |
//} |
|
5678 |
//finally |
|
5679 |
//{ |
|
5680 |
// CommentDB.close(); CommentDB = null; |
|
5681 |
// picDB.close(); picDB = null; |
|
5682 |
//} |
|
5683 |
//} |
|
5684 | 5684 |
#endregion |
5685 | 5685 |
|
5686 | 5686 |
#region コメント編集判定 |
branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs | ||
---|---|---|
62 | 62 |
this.label8 = new System.Windows.Forms.Label(); |
63 | 63 |
this.txtInput2 = new System.Windows.Forms.TextBox(); |
64 | 64 |
this.label9 = new System.Windows.Forms.Label(); |
65 |
this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX(); |
|
65 | 66 |
this.txtInput4 = new System.Windows.Forms.TextBox(); |
66 | 67 |
this.label2 = new System.Windows.Forms.Label(); |
67 | 68 |
this.label7 = new System.Windows.Forms.Label(); |
... | ... | |
77 | 78 |
this.label13 = new System.Windows.Forms.Label(); |
78 | 79 |
this.label14 = new System.Windows.Forms.Label(); |
79 | 80 |
this.label16 = new System.Windows.Forms.Label(); |
81 |
this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
80 | 82 |
this.txtInput5 = new System.Windows.Forms.TextBox(); |
81 | 83 |
this.txtInput8 = new System.Windows.Forms.TextBox(); |
82 | 84 |
this.txtInput9 = new System.Windows.Forms.TextBox(); |
85 |
this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
83 | 86 |
this.label17 = new System.Windows.Forms.Label(); |
87 |
this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
84 | 88 |
this.label18 = new System.Windows.Forms.Label(); |
85 | 89 |
this.lblSecRank = new System.Windows.Forms.Label(); |
86 | 90 |
this.lblSecRange = new System.Windows.Forms.Label(); |
... | ... | |
92 | 96 |
this.label15 = new System.Windows.Forms.Label(); |
93 | 97 |
this.txtInput12 = new System.Windows.Forms.TextBox(); |
94 | 98 |
this.label23 = new System.Windows.Forms.Label(); |
99 |
this.dgvSalary = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
100 |
this.SalaryColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
101 |
this.SalaryColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
102 |
this.SalaryColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
103 |
this.dgvRefDepartment = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
104 |
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
105 |
this.TextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
106 |
this.cmbRefDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
95 | 107 |
this.btnRefDepDel = new System.Windows.Forms.Button(); |
96 | 108 |
this.btnRefDepAdd = new System.Windows.Forms.Button(); |
109 |
this.dgvAssignment = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
110 |
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
111 |
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
112 |
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
97 | 113 |
this.BtnDepartMentAdd = new System.Windows.Forms.Button(); |
98 | 114 |
this.BtnDepartMentDel = new System.Windows.Forms.Button(); |
99 | 115 |
this.txtInput13 = new System.Windows.Forms.TextBox(); |
... | ... | |
107 | 123 |
this.btnChrgToEmp = new System.Windows.Forms.Button(); |
108 | 124 |
this.btnEmpToChrg = new System.Windows.Forms.Button(); |
109 | 125 |
this.label20 = new System.Windows.Forms.Label(); |
110 |
this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX(); |
|
111 |
this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
112 |
this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
113 |
this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
114 |
this.dgvSalary = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
115 |
this.SalaryColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
116 |
this.SalaryColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
117 |
this.SalaryColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
118 |
this.dgvRefDepartment = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
119 |
this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
120 |
this.TextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
121 |
this.cmbRefDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX(); |
|
122 |
this.dgvAssignment = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
|
123 |
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
124 |
this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
125 |
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
|
126 | 126 |
this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
127 | 127 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
128 | 128 |
this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
133 | 133 |
this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
134 | 134 |
this.panel1.SuspendLayout(); |
135 | 135 |
this.tableLayoutPanel1.SuspendLayout(); |
136 |
this.panel2.SuspendLayout(); |
|
137 |
this.panel3.SuspendLayout(); |
|
138 | 136 |
((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).BeginInit(); |
139 | 137 |
((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).BeginInit(); |
140 | 138 |
((System.ComponentModel.ISupportInitialize)(this.dgvAssignment)).BeginInit(); |
139 |
this.panel2.SuspendLayout(); |
|
140 |
this.panel3.SuspendLayout(); |
|
141 | 141 |
((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit(); |
142 | 142 |
this.SuspendLayout(); |
143 | 143 |
// |
... | ... | |
444 | 444 |
this.label9.Text = "終了年月日"; |
445 | 445 |
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
446 | 446 |
// |
447 |
// txtInput3 |
|
448 |
// |
|
449 |
this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
450 |
this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable; |
|
451 |
this.txtInput3.Location = new System.Drawing.Point(148, 111); |
|
452 |
this.txtInput3.MaxLength = 11; |
|
453 |
this.txtInput3.Name = "txtInput3"; |
|
454 |
this.txtInput3.Size = new System.Drawing.Size(139, 23); |
|
455 |
this.txtInput3.TabIndex = 3; |
|
456 |
this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged); |
|
457 |
this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated); |
|
458 |
// |
|
447 | 459 |
// txtInput4 |
448 | 460 |
// |
449 | 461 |
this.txtInput4.Anchor = System.Windows.Forms.AnchorStyles.Left; |
... | ... | |
642 | 654 |
this.label16.Text = "台帳計算対象"; |
643 | 655 |
this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
644 | 656 |
// |
657 |
// cmbDepartment |
|
658 |
// |
|
659 |
this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
660 |
this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 3); |
|
661 |
this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
662 |
this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
663 |
this.cmbDepartment.FormattingEnabled = true; |
|
664 |
this.cmbDepartment.Location = new System.Drawing.Point(148, 362); |
|
665 |
this.cmbDepartment.Name = "cmbDepartment"; |
|
666 |
this.cmbDepartment.Size = new System.Drawing.Size(429, 24); |
|
667 |
this.cmbDepartment.TabIndex = 8; |
|
668 |
this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange); |
|
669 |
// |
|
645 | 670 |
// txtInput5 |
646 | 671 |
// |
647 | 672 |
this.txtInput5.Anchor = System.Windows.Forms.AnchorStyles.Left; |
... | ... | |
677 | 702 |
this.txtInput9.TabIndex = 12; |
678 | 703 |
this.txtInput9.TextChanged += new System.EventHandler(this.valueChange); |
679 | 704 |
// |
705 |
// cmbLedgerFlg |
|
706 |
// |
|
707 |
this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
708 |
this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
709 |
this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
710 |
this.cmbLedgerFlg.FormattingEnabled = true; |
|
711 |
this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 647); |
|
712 |
this.cmbLedgerFlg.Name = "cmbLedgerFlg"; |
|
713 |
this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24); |
|
714 |
this.cmbLedgerFlg.TabIndex = 13; |
|
715 |
this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange); |
|
716 |
// |
|
680 | 717 |
// label17 |
681 | 718 |
// |
682 | 719 |
this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left; |
... | ... | |
690 | 727 |
this.label17.Text = "機密区分"; |
691 | 728 |
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
692 | 729 |
// |
730 |
// cmbSecManage |
|
731 |
// |
|
732 |
this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
733 |
this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2); |
|
734 |
this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
735 |
this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
736 |
this.cmbSecManage.FormattingEnabled = true; |
|
737 |
this.cmbSecManage.Location = new System.Drawing.Point(148, 682); |
|
738 |
this.cmbSecManage.Name = "cmbSecManage"; |
|
739 |
this.cmbSecManage.Size = new System.Drawing.Size(284, 24); |
|
740 |
this.cmbSecManage.TabIndex = 14; |
|
741 |
this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged); |
|
742 |
this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange); |
|
743 |
// |
|
693 | 744 |
// label18 |
694 | 745 |
// |
695 | 746 |
this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left; |
... | ... | |
833 | 884 |
this.label23.Text = "円(公認分)"; |
834 | 885 |
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
835 | 886 |
// |
836 |
// btnRefDepDel |
|
837 |
// |
|
838 |
this.btnRefDepDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
839 |
| System.Windows.Forms.AnchorStyles.Left) |
|
840 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
841 |
this.btnRefDepDel.BackColor = System.Drawing.Color.Red; |
|
842 |
this.btnRefDepDel.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
843 |
this.btnRefDepDel.ForeColor = System.Drawing.Color.White; |
|
844 |
this.btnRefDepDel.Location = new System.Drawing.Point(438, 998); |
|
845 |
this.btnRefDepDel.Name = "btnRefDepDel"; |
|
846 |
this.btnRefDepDel.Size = new System.Drawing.Size(139, 29); |
|
847 |
this.btnRefDepDel.TabIndex = 33; |
|
848 |
this.btnRefDepDel.TabStop = false; |
|
849 |
this.btnRefDepDel.Text = "参照部署削除"; |
|
850 |
this.btnRefDepDel.UseVisualStyleBackColor = false; |
|
851 |
this.btnRefDepDel.Click += new System.EventHandler(this.btnRefDepDel_Click); |
|
852 |
// |
|
853 |
// btnRefDepAdd |
|
854 |
// |
|
855 |
this.btnRefDepAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
856 |
| System.Windows.Forms.AnchorStyles.Left) |
|
857 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
858 |
this.btnRefDepAdd.BackColor = System.Drawing.Color.Green; |
|
859 |
this.btnRefDepAdd.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
860 |
this.btnRefDepAdd.ForeColor = System.Drawing.Color.White; |
|
861 |
this.btnRefDepAdd.Location = new System.Drawing.Point(293, 998); |
|
862 |
this.btnRefDepAdd.Name = "btnRefDepAdd"; |
|
863 |
this.btnRefDepAdd.Size = new System.Drawing.Size(139, 29); |
|
864 |
this.btnRefDepAdd.TabIndex = 32; |
|
865 |
this.btnRefDepAdd.TabStop = false; |
|
866 |
this.btnRefDepAdd.Text = "参照部署追加"; |
|
867 |
this.btnRefDepAdd.UseVisualStyleBackColor = false; |
|
868 |
this.btnRefDepAdd.Click += new System.EventHandler(this.btnRefDepAdd_Click); |
|
869 |
// |
|
870 |
// BtnDepartMentAdd |
|
871 |
// |
|
872 |
this.BtnDepartMentAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
873 |
| System.Windows.Forms.AnchorStyles.Left) |
|
874 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
875 |
this.BtnDepartMentAdd.BackColor = System.Drawing.Color.Green; |
|
876 |
this.BtnDepartMentAdd.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
877 |
this.BtnDepartMentAdd.ForeColor = System.Drawing.Color.White; |
|
878 |
this.BtnDepartMentAdd.Location = new System.Drawing.Point(293, 393); |
|
879 |
this.BtnDepartMentAdd.Name = "BtnDepartMentAdd"; |
|
880 |
this.BtnDepartMentAdd.Size = new System.Drawing.Size(139, 29); |
|
881 |
this.BtnDepartMentAdd.TabIndex = 32; |
|
882 |
this.BtnDepartMentAdd.TabStop = false; |
|
883 |
this.BtnDepartMentAdd.Text = "配属追加"; |
|
884 |
this.BtnDepartMentAdd.UseVisualStyleBackColor = false; |
|
885 |
this.BtnDepartMentAdd.Click += new System.EventHandler(this.BtnDepartMentAdd_Click); |
|
886 |
// |
|
887 |
// BtnDepartMentDel |
|
888 |
// |
|
889 |
this.BtnDepartMentDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
890 |
| System.Windows.Forms.AnchorStyles.Left) |
|
891 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
892 |
this.BtnDepartMentDel.BackColor = System.Drawing.Color.Red; |
|
893 |
this.BtnDepartMentDel.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
894 |
this.BtnDepartMentDel.ForeColor = System.Drawing.Color.White; |
|
895 |
this.BtnDepartMentDel.Location = new System.Drawing.Point(438, 393); |
|
896 |
this.BtnDepartMentDel.Name = "BtnDepartMentDel"; |
|
897 |
this.BtnDepartMentDel.Size = new System.Drawing.Size(139, 29); |
|
898 |
this.BtnDepartMentDel.TabIndex = 33; |
|
899 |
this.BtnDepartMentDel.TabStop = false; |
|
900 |
this.BtnDepartMentDel.Text = "配属履歴削除"; |
|
901 |
this.BtnDepartMentDel.UseVisualStyleBackColor = false; |
|
902 |
this.BtnDepartMentDel.Click += new System.EventHandler(this.BtnDepartMentDel_Click); |
|
903 |
// |
|
904 |
// txtInput13 |
|
905 |
// |
|
906 |
this.txtInput13.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
907 |
this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable; |
|
908 |
this.txtInput13.Location = new System.Drawing.Point(148, 396); |
|
909 |
this.txtInput13.MaxLength = 11; |
|
910 |
this.txtInput13.Name = "txtInput13"; |
|
911 |
this.txtInput13.Size = new System.Drawing.Size(139, 23); |
|
912 |
this.txtInput13.TabIndex = 9; |
|
913 |
this.txtInput13.TextChanged += new System.EventHandler(this.txtInput_TextChanged); |
|
914 |
this.txtInput13.Validated += new System.EventHandler(this.txtInput_Validated); |
|
915 |
// |
|
916 |
// label24 |
|
917 |
// |
|
918 |
this.label24.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
919 |
this.label24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
920 |
this.label24.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
921 |
this.label24.ForeColor = System.Drawing.Color.Black; |
|
922 |
this.label24.Location = new System.Drawing.Point(3, 395); |
|
923 |
this.label24.Name = "label24"; |
|
924 |
this.label24.Size = new System.Drawing.Size(139, 25); |
|
925 |
this.label24.TabIndex = 30; |
|
926 |
this.label24.Text = "配属年月日"; |
|
927 |
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
928 |
// |
|
929 |
// lblSecurtyManegement |
|
930 |
// |
|
931 |
this.lblSecurtyManegement.BackColor = System.Drawing.Color.White; |
|
932 |
this.lblSecurtyManegement.Location = new System.Drawing.Point(1127, 4); |
|
933 |
this.lblSecurtyManegement.Name = "lblSecurtyManegement"; |
|
934 |
this.lblSecurtyManegement.Size = new System.Drawing.Size(83, 26); |
|
935 |
this.lblSecurtyManegement.TabIndex = 19; |
|
936 |
this.lblSecurtyManegement.Visible = false; |
|
937 |
// |
|
938 |
// rdbMode2 |
|
939 |
// |
|
940 |
this.rdbMode2.AutoSize = true; |
|
941 |
this.rdbMode2.Location = new System.Drawing.Point(234, 5); |
|
942 |
this.rdbMode2.Name = "rdbMode2"; |
|
943 |
this.rdbMode2.Size = new System.Drawing.Size(94, 20); |
|
944 |
this.rdbMode2.TabIndex = 21; |
|
945 |
this.rdbMode2.Text = "削除一覧"; |
|
946 |
this.rdbMode2.UseVisualStyleBackColor = true; |
|
947 |
this.rdbMode2.CheckedChanged += new System.EventHandler(this.rdbMode_CheckedChanged); |
|
948 |
// |
|
949 |
// rdbMode1 |
|
950 |
// |
|
951 |
this.rdbMode1.AutoSize = true; |
|
952 |
this.rdbMode1.Checked = true; |
|
953 |
this.rdbMode1.Location = new System.Drawing.Point(132, 5); |
|
954 |
this.rdbMode1.Name = "rdbMode1"; |
|
955 |
this.rdbMode1.Size = new System.Drawing.Size(94, 20); |
|
956 |
this.rdbMode1.TabIndex = 21; |
|
957 |
this.rdbMode1.TabStop = true; |
|
958 |
this.rdbMode1.Text = "通常一覧"; |
|
959 |
this.rdbMode1.UseVisualStyleBackColor = true; |
|
960 |
this.rdbMode1.CheckedChanged += new System.EventHandler(this.rdbMode_CheckedChanged); |
|
961 |
// |
|
962 |
// panel2 |
|
963 |
// |
|
964 |
this.panel2.BackColor = System.Drawing.Color.FloralWhite; |
|
965 |
this.panel2.Controls.Add(this.label19); |
|
966 |
this.panel2.Controls.Add(this.rdbMode2); |
|
967 |
this.panel2.Controls.Add(this.rdbMode1); |
|
968 |
this.panel2.Location = new System.Drawing.Point(8, 68); |
|
969 |
this.panel2.Name = "panel2"; |
|
970 |
this.panel2.Size = new System.Drawing.Size(540, 30); |
|
971 |
this.panel2.TabIndex = 23; |
|
972 |
// |
|
973 |
// label19 |
|
974 |
// |
|
975 |
this.label19.BackColor = System.Drawing.Color.Transparent; |
|
976 |
this.label19.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; |
|
977 |
this.label19.ForeColor = System.Drawing.Color.Black; |
|
978 |
this.label19.Location = new System.Drawing.Point(4, 5); |
|
979 |
this.label19.Name = "label19"; |
|
980 |
this.label19.Size = new System.Drawing.Size(120, 20); |
|
981 |
this.label19.TabIndex = 24; |
|
982 |
this.label19.Text = "一覧表示内容"; |
|
983 |
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
984 |
// |
|
985 |
// panel3 |
|
986 |
// |
|
987 |
this.panel3.BackColor = System.Drawing.Color.FloralWhite; |
|
988 |
this.panel3.Controls.Add(this.btnChrgToEmp); |
|
989 |
this.panel3.Controls.Add(this.btnEmpToChrg); |
|
990 |
this.panel3.Controls.Add(this.label20); |
|
991 |
this.panel3.Location = new System.Drawing.Point(740, 41); |
|
992 |
this.panel3.Name = "panel3"; |
|
993 |
this.panel3.Size = new System.Drawing.Size(470, 30); |
|
994 |
this.panel3.TabIndex = 24; |
|
995 |
// |
|
996 |
// btnChrgToEmp |
|
997 |
// |
|
998 |
this.btnChrgToEmp.BackColor = System.Drawing.Color.LimeGreen; |
|
999 |
this.btnChrgToEmp.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1000 |
this.btnChrgToEmp.ForeColor = System.Drawing.Color.Black; |
|
1001 |
this.btnChrgToEmp.Location = new System.Drawing.Point(132, 0); |
|
1002 |
this.btnChrgToEmp.Name = "btnChrgToEmp"; |
|
1003 |
this.btnChrgToEmp.Size = new System.Drawing.Size(160, 30); |
|
1004 |
this.btnChrgToEmp.TabIndex = 25; |
|
1005 |
this.btnChrgToEmp.Text = "正社員 => 常用者"; |
|
1006 |
this.btnChrgToEmp.UseVisualStyleBackColor = false; |
|
1007 |
this.btnChrgToEmp.Click += new System.EventHandler(this.btnChrgToEmp_Click); |
|
1008 |
// |
|
1009 |
// btnEmpToChrg |
|
1010 |
// |
|
1011 |
this.btnEmpToChrg.BackColor = System.Drawing.Color.Green; |
|
1012 |
this.btnEmpToChrg.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1013 |
this.btnEmpToChrg.ForeColor = System.Drawing.Color.White; |
|
1014 |
this.btnEmpToChrg.Location = new System.Drawing.Point(300, 0); |
|
1015 |
this.btnEmpToChrg.Name = "btnEmpToChrg"; |
|
1016 |
this.btnEmpToChrg.Size = new System.Drawing.Size(160, 30); |
|
1017 |
this.btnEmpToChrg.TabIndex = 26; |
|
1018 |
this.btnEmpToChrg.Text = "正社員 <= 常用者"; |
|
1019 |
this.btnEmpToChrg.UseVisualStyleBackColor = false; |
|
1020 |
this.btnEmpToChrg.Click += new System.EventHandler(this.btnEmpToChrg_Click); |
|
1021 |
// |
|
1022 |
// label20 |
|
1023 |
// |
|
1024 |
this.label20.BackColor = System.Drawing.Color.Transparent; |
|
1025 |
this.label20.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; |
|
1026 |
this.label20.ForeColor = System.Drawing.Color.Black; |
|
1027 |
this.label20.Location = new System.Drawing.Point(4, 5); |
|
1028 |
this.label20.Name = "label20"; |
|
1029 |
this.label20.Size = new System.Drawing.Size(120, 20); |
|
1030 |
this.label20.TabIndex = 24; |
|
1031 |
this.label20.Text = "データ変更"; |
|
1032 |
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
1033 |
// |
|
1034 |
// txtInput3 |
|
1035 |
// |
|
1036 |
this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
1037 |
this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable; |
|
1038 |
this.txtInput3.Location = new System.Drawing.Point(148, 111); |
|
1039 |
this.txtInput3.MaxLength = 11; |
|
1040 |
this.txtInput3.Name = "txtInput3"; |
|
1041 |
this.txtInput3.Size = new System.Drawing.Size(139, 23); |
|
1042 |
this.txtInput3.TabIndex = 3; |
|
1043 |
this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged); |
|
1044 |
this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated); |
|
1045 |
// |
|
1046 |
// cmbDepartment |
|
1047 |
// |
|
1048 |
this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
1049 |
this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 3); |
|
1050 |
this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
1051 |
this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
1052 |
this.cmbDepartment.FormattingEnabled = true; |
|
1053 |
this.cmbDepartment.Location = new System.Drawing.Point(148, 360); |
|
1054 |
this.cmbDepartment.Name = "cmbDepartment"; |
|
1055 |
this.cmbDepartment.Size = new System.Drawing.Size(429, 24); |
|
1056 |
this.cmbDepartment.TabIndex = 8; |
|
1057 |
this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange); |
|
1058 |
// |
|
1059 |
// cmbLedgerFlg |
|
1060 |
// |
|
1061 |
this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
1062 |
this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
1063 |
this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
1064 |
this.cmbLedgerFlg.FormattingEnabled = true; |
|
1065 |
this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 645); |
|
1066 |
this.cmbLedgerFlg.Name = "cmbLedgerFlg"; |
|
1067 |
this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24); |
|
1068 |
this.cmbLedgerFlg.TabIndex = 13; |
|
1069 |
this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange); |
|
1070 |
// |
|
1071 |
// cmbSecManage |
|
1072 |
// |
|
1073 |
this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
1074 |
this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2); |
|
1075 |
this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
|
1076 |
this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
|
1077 |
this.cmbSecManage.FormattingEnabled = true; |
|
1078 |
this.cmbSecManage.Location = new System.Drawing.Point(148, 680); |
|
1079 |
this.cmbSecManage.Name = "cmbSecManage"; |
|
1080 |
this.cmbSecManage.Size = new System.Drawing.Size(284, 24); |
|
1081 |
this.cmbSecManage.TabIndex = 14; |
|
1082 |
this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged); |
|
1083 |
this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange); |
|
1084 |
// |
|
1085 | 887 |
// dgvSalary |
1086 | 888 |
// |
1087 | 889 |
this.dgvSalary.AllowUserToAddRows = false; |
... | ... | |
1220 | 1022 |
this.cmbRefDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; |
1221 | 1023 |
this.cmbRefDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup; |
1222 | 1024 |
this.cmbRefDepartment.FormattingEnabled = true; |
1223 |
this.cmbRefDepartment.Location = new System.Drawing.Point(148, 965);
|
|
1025 |
this.cmbRefDepartment.Location = new System.Drawing.Point(148, 967);
|
|
1224 | 1026 |
this.cmbRefDepartment.Name = "cmbRefDepartment"; |
1225 | 1027 |
this.cmbRefDepartment.Size = new System.Drawing.Size(429, 24); |
1226 | 1028 |
this.cmbRefDepartment.TabIndex = 19; |
1227 | 1029 |
this.cmbRefDepartment.TextChanged += new System.EventHandler(this.valueChange); |
1228 | 1030 |
// |
1031 |
// btnRefDepDel |
|
1032 |
// |
|
1033 |
this.btnRefDepDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
1034 |
| System.Windows.Forms.AnchorStyles.Left) |
|
1035 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
1036 |
this.btnRefDepDel.BackColor = System.Drawing.Color.Red; |
|
1037 |
this.btnRefDepDel.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1038 |
this.btnRefDepDel.ForeColor = System.Drawing.Color.White; |
|
1039 |
this.btnRefDepDel.Location = new System.Drawing.Point(438, 998); |
|
1040 |
this.btnRefDepDel.Name = "btnRefDepDel"; |
|
1041 |
this.btnRefDepDel.Size = new System.Drawing.Size(139, 29); |
|
1042 |
this.btnRefDepDel.TabIndex = 33; |
|
1043 |
this.btnRefDepDel.TabStop = false; |
|
1044 |
this.btnRefDepDel.Text = "参照部署削除"; |
|
1045 |
this.btnRefDepDel.UseVisualStyleBackColor = false; |
|
1046 |
this.btnRefDepDel.Click += new System.EventHandler(this.btnRefDepDel_Click); |
|
1047 |
// |
|
1048 |
// btnRefDepAdd |
|
1049 |
// |
|
1050 |
this.btnRefDepAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
1051 |
| System.Windows.Forms.AnchorStyles.Left) |
|
1052 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
1053 |
this.btnRefDepAdd.BackColor = System.Drawing.Color.Green; |
|
1054 |
this.btnRefDepAdd.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1055 |
this.btnRefDepAdd.ForeColor = System.Drawing.Color.White; |
|
1056 |
this.btnRefDepAdd.Location = new System.Drawing.Point(293, 998); |
|
1057 |
this.btnRefDepAdd.Name = "btnRefDepAdd"; |
|
1058 |
this.btnRefDepAdd.Size = new System.Drawing.Size(139, 29); |
|
1059 |
this.btnRefDepAdd.TabIndex = 32; |
|
1060 |
this.btnRefDepAdd.TabStop = false; |
|
1061 |
this.btnRefDepAdd.Text = "参照部署追加"; |
|
1062 |
this.btnRefDepAdd.UseVisualStyleBackColor = false; |
|
1063 |
this.btnRefDepAdd.Click += new System.EventHandler(this.btnRefDepAdd_Click); |
|
1064 |
// |
|
1229 | 1065 |
// dgvAssignment |
1230 | 1066 |
// |
1231 | 1067 |
this.dgvAssignment.AllowUserToAddRows = false; |
... | ... | |
1299 | 1135 |
this.dataGridViewTextBoxColumn3.Visible = false; |
1300 | 1136 |
this.dataGridViewTextBoxColumn3.Width = 5; |
1301 | 1137 |
// |
1138 |
// BtnDepartMentAdd |
|
1139 |
// |
|
1140 |
this.BtnDepartMentAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
1141 |
| System.Windows.Forms.AnchorStyles.Left) |
|
1142 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
1143 |
this.BtnDepartMentAdd.BackColor = System.Drawing.Color.Green; |
|
1144 |
this.BtnDepartMentAdd.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1145 |
this.BtnDepartMentAdd.ForeColor = System.Drawing.Color.White; |
|
1146 |
this.BtnDepartMentAdd.Location = new System.Drawing.Point(293, 393); |
|
1147 |
this.BtnDepartMentAdd.Name = "BtnDepartMentAdd"; |
|
1148 |
this.BtnDepartMentAdd.Size = new System.Drawing.Size(139, 29); |
|
1149 |
this.BtnDepartMentAdd.TabIndex = 32; |
|
1150 |
this.BtnDepartMentAdd.TabStop = false; |
|
1151 |
this.BtnDepartMentAdd.Text = "配属追加"; |
|
1152 |
this.BtnDepartMentAdd.UseVisualStyleBackColor = false; |
|
1153 |
this.BtnDepartMentAdd.Click += new System.EventHandler(this.BtnDepartMentAdd_Click); |
|
1154 |
// |
|
1155 |
// BtnDepartMentDel |
|
1156 |
// |
|
1157 |
this.BtnDepartMentDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) |
|
1158 |
| System.Windows.Forms.AnchorStyles.Left) |
|
1159 |
| System.Windows.Forms.AnchorStyles.Right))); |
|
1160 |
this.BtnDepartMentDel.BackColor = System.Drawing.Color.Red; |
|
1161 |
this.BtnDepartMentDel.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1162 |
this.BtnDepartMentDel.ForeColor = System.Drawing.Color.White; |
|
1163 |
this.BtnDepartMentDel.Location = new System.Drawing.Point(438, 393); |
|
1164 |
this.BtnDepartMentDel.Name = "BtnDepartMentDel"; |
|
1165 |
this.BtnDepartMentDel.Size = new System.Drawing.Size(139, 29); |
|
1166 |
this.BtnDepartMentDel.TabIndex = 33; |
|
1167 |
this.BtnDepartMentDel.TabStop = false; |
|
1168 |
this.BtnDepartMentDel.Text = "配属履歴削除"; |
|
1169 |
this.BtnDepartMentDel.UseVisualStyleBackColor = false; |
|
1170 |
this.BtnDepartMentDel.Click += new System.EventHandler(this.BtnDepartMentDel_Click); |
|
1171 |
// |
|
1172 |
// txtInput13 |
|
1173 |
// |
|
1174 |
this.txtInput13.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
1175 |
this.txtInput13.ImeMode = System.Windows.Forms.ImeMode.Disable; |
|
1176 |
this.txtInput13.Location = new System.Drawing.Point(148, 396); |
|
1177 |
this.txtInput13.MaxLength = 11; |
|
1178 |
this.txtInput13.Name = "txtInput13"; |
|
1179 |
this.txtInput13.Size = new System.Drawing.Size(139, 23); |
|
1180 |
this.txtInput13.TabIndex = 9; |
|
1181 |
this.txtInput13.TextChanged += new System.EventHandler(this.txtInput_TextChanged); |
|
1182 |
this.txtInput13.Validated += new System.EventHandler(this.txtInput_Validated); |
|
1183 |
// |
|
1184 |
// label24 |
|
1185 |
// |
|
1186 |
this.label24.Anchor = System.Windows.Forms.AnchorStyles.Left; |
|
1187 |
this.label24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); |
|
1188 |
this.label24.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
|
1189 |
this.label24.ForeColor = System.Drawing.Color.Black; |
|
1190 |
this.label24.Location = new System.Drawing.Point(3, 395); |
|
1191 |
this.label24.Name = "label24"; |
|
1192 |
this.label24.Size = new System.Drawing.Size(139, 25); |
|
1193 |
this.label24.TabIndex = 30; |
|
1194 |
this.label24.Text = "配属年月日"; |
|
1195 |
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
|
1196 |
// |
|
1197 |
// lblSecurtyManegement |
|
1198 |
// |
|
1199 |
this.lblSecurtyManegement.BackColor = System.Drawing.Color.White; |
|
1200 |
this.lblSecurtyManegement.Location = new System.Drawing.Point(1127, 4); |
|
1201 |
this.lblSecurtyManegement.Name = "lblSecurtyManegement"; |
|
1202 |
this.lblSecurtyManegement.Size = new System.Drawing.Size(83, 26); |
|
1203 |
this.lblSecurtyManegement.TabIndex = 19; |
|
1204 |
this.lblSecurtyManegement.Visible = false; |
|
1205 |
// |
|
1206 |
// rdbMode2 |
|
1207 |
// |
|
1208 |
this.rdbMode2.AutoSize = true; |
|
1209 |
this.rdbMode2.Location = new System.Drawing.Point(234, 5); |
|
1210 |
this.rdbMode2.Name = "rdbMode2"; |
|
1211 |
this.rdbMode2.Size = new System.Drawing.Size(94, 20); |
|
1212 |
this.rdbMode2.TabIndex = 21; |
|
1213 |
this.rdbMode2.Text = "削除一覧"; |
|
1214 |
this.rdbMode2.UseVisualStyleBackColor = true; |
|
1215 |
this.rdbMode2.CheckedChanged += new System.EventHandler(this.rdbMode_CheckedChanged); |
|
1216 |
// |
|
1217 |
// rdbMode1 |
|
1218 |
// |
|
1219 |
this.rdbMode1.AutoSize = true; |
|
1220 |
this.rdbMode1.Checked = true; |
|
1221 |
this.rdbMode1.Location = new System.Drawing.Point(132, 5); |
他の形式にエクスポート: Unified diff