リビジョン 307
申請・承認時コメント修正可能に修正
積算見積入力、単位「式」入力時ロックバグ修正
工事日報、同一工事の担当者別工数を統合修正
請求まとめ修正中
branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
---|---|---|
14 | 14 |
/// <summary> |
15 | 15 |
/// 本体バージョン |
16 | 16 |
/// </summary> |
17 |
public static int s_SystemVersion = 122;
|
|
17 |
public static int s_SystemVersion = 124;
|
|
18 | 18 |
|
19 | 19 |
/// <summary> |
20 | 20 |
/// コピー・環境バージョン |
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs | ||
---|---|---|
422 | 422 |
Range = CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.None].Key; |
423 | 423 |
|
424 | 424 |
// 担当者マスタより保護区分マスタを取得する |
425 |
string strSQL = "SELECT A.SECCODE, A.SECNAME, A.SECRANK, A.SECRANGE FROM SECURITYMASTER A"; |
|
426 |
strSQL += string.Format(" WHERE A.SECCODE = {0}", SecCode); |
|
425 |
StringBuilder strSQL = new StringBuilder(); |
|
426 |
strSQL.Append("SELECT A.SECCODE, A.SECNAME, A.SECRANK, A.SECRANGE FROM SECURITYMASTER A"); |
|
427 |
strSQL.AppendFormat(" WHERE A.SECCODE = {0}", SecCode); |
|
427 | 428 |
|
428 | 429 |
ArrayList arList = new ArrayList(); |
429 |
if (!SecDB.ExecuteReader(strSQL, ref arList)) return Rank; |
|
430 |
if (!SecDB.ExecuteReader(strSQL.ToString(), ref arList)) return Rank;
|
|
430 | 431 |
|
431 | 432 |
if (arList.Count == 0) return Rank; |
432 | 433 |
object[] objRec = (object[])arList[0]; |
... | ... | |
502 | 503 |
Range = CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.None].Key; |
503 | 504 |
|
504 | 505 |
// 担当者マスタより保護区分マスタを取得する |
505 |
string strSQL = "SELECT A.PERSONCODE, A.PERSONNAME, B.SECNAME, B.SECRANK, B.SECRANGE"; |
|
506 |
strSQL += " FROM PERSONINCHARGEMASTER A, SECURITYMASTER B"; |
|
507 |
strSQL += " WHERE B.SECCODE = A.SECCODE"; |
|
508 |
strSQL += string.Format(" AND A.PERSONCODE = {0}", PersonCode); |
|
506 |
StringBuilder strSQL = new StringBuilder(); |
|
507 |
strSQL.Append("SELECT"); |
|
508 |
strSQL.Append(" A.PERSONCODE"); |
|
509 |
strSQL.Append(", A.PERSONNAME"); |
|
510 |
strSQL.Append(", B.SECNAME"); |
|
511 |
strSQL.Append(", B.SECRANK"); |
|
512 |
strSQL.Append(", B.SECRANGE "); |
|
513 |
strSQL.Append(" FROM"); |
|
514 |
strSQL.Append(" PERSONINCHARGEMASTER A"); |
|
515 |
strSQL.Append(", SECURITYMASTER B"); |
|
516 |
strSQL.Append(" WHERE"); |
|
517 |
strSQL.Append(" B.SECCODE = A.SECCODE"); |
|
518 |
strSQL.AppendFormat(" AND A.PERSONCODE = {0}", PersonCode); |
|
509 | 519 |
|
510 | 520 |
ArrayList arList = new ArrayList(); |
511 |
if (!SecDB.ExecuteReader(strSQL, ref arList)) return Rank; |
|
521 |
if (!SecDB.ExecuteReader(strSQL.ToString(), ref arList)) return Rank;
|
|
512 | 522 |
|
513 | 523 |
if (arList.Count == 0) return Rank; |
514 | 524 |
object[] objRec = (object[])arList[0]; |
... | ... | |
565 | 575 |
try |
566 | 576 |
{ |
567 | 577 |
DepList.Clear(); |
568 |
string strSQL = string.Empty;
|
|
578 |
StringBuilder strSQL = new StringBuilder();
|
|
569 | 579 |
|
570 | 580 |
// 全部署対象の範囲コードを取得する |
571 | 581 |
int AllPathRange = CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.AllPath].Key; |
... | ... | |
584 | 594 |
// 対象者のセキュリティ範囲が全部署対応ならば全部署をセットする |
585 | 595 |
if (TargetRange == AllPathRange) |
586 | 596 |
{ |
587 |
strSQL = "SELECT DEPARTMENTCODE, DEPARTMENTSTRING, DISPLAYORDER";
|
|
588 |
strSQL += " FROM DEPARTMENTMASTER";
|
|
589 |
strSQL += " WHERE DELETEFLG = 0 ORDER BY DISPLAYORDER";
|
|
597 |
strSQL.Append("SELECT DEPARTMENTCODE, DEPARTMENTSTRING, DISPLAYORDER");
|
|
598 |
strSQL.Append(" FROM DEPARTMENTMASTER");
|
|
599 |
strSQL.Append(" WHERE DELETEFLG = 0 ORDER BY DISPLAYORDER");
|
|
590 | 600 |
} |
591 | 601 |
else |
592 | 602 |
{ |
593 | 603 |
// 参照部署マスタより部署を取得する |
594 |
strSQL = "SELECT A.DEPARTMENTCODE, B.DEPARTMENTSTRING, A.AFFILIATIONFLG, A.PERSONCODE";
|
|
595 |
strSQL += " FROM PERSONDEPARTMENTMASTER A, DEPARTMENTMASTER B";
|
|
596 |
strSQL += " WHERE B.DEPARTMENTCODE = A.DEPARTMENTCODE";
|
|
597 |
strSQL += string.Format(" AND A.PERSONCODE = {0}", PersonCode);
|
|
604 |
strSQL.Append("SELECT A.DEPARTMENTCODE, B.DEPARTMENTSTRING, A.AFFILIATIONFLG, A.PERSONCODE");
|
|
605 |
strSQL.Append(" FROM PERSONDEPARTMENTMASTER A, DEPARTMENTMASTER B");
|
|
606 |
strSQL.Append(" WHERE B.DEPARTMENTCODE = A.DEPARTMENTCODE");
|
|
607 |
strSQL.AppendFormat(" AND A.PERSONCODE = {0}", PersonCode);
|
|
598 | 608 |
} |
599 | 609 |
ArrayList arList = new ArrayList(); |
600 |
if (!PersonDepDB.ExecuteReader(strSQL, ref arList)) return false; |
|
610 |
if (!PersonDepDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
601 | 611 |
|
602 | 612 |
if (arList.Count == 0) return false; |
603 | 613 |
foreach (object[] objRec in arList) |
... | ... | |
662 | 672 |
try |
663 | 673 |
{ |
664 | 674 |
// 担当者マスタより保護区分マスタを取得する |
665 |
string strSQL = "SELECT A.PERSONCODE, A.PERSONNAME, B.SECCODE, B.SECNAME"; |
|
666 |
strSQL += " FROM PERSONINCHARGEMASTER A, SECURITYMASTER B"; |
|
667 |
strSQL += " WHERE B.SECCODE = A.SECCODE"; |
|
668 |
strSQL += string.Format(" AND A.PERSONCODE = {0}", PersonCode); |
|
675 |
StringBuilder strSQL = new StringBuilder(); |
|
676 |
strSQL.Append("SELECT A.PERSONCODE, A.PERSONNAME, B.SECCODE, B.SECNAME"); |
|
677 |
strSQL.Append(" FROM PERSONINCHARGEMASTER A, SECURITYMASTER B"); |
|
678 |
strSQL.Append(" WHERE B.SECCODE = A.SECCODE"); |
|
679 |
strSQL.AppendFormat(" AND A.PERSONCODE = {0}", PersonCode); |
|
669 | 680 |
|
670 | 681 |
ArrayList arList = new ArrayList(); |
671 |
if (!SecDB.ExecuteReader(strSQL, ref arList)) return false; |
|
682 |
if (!SecDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
672 | 683 |
|
673 | 684 |
if (arList.Count == 0) return false; |
674 | 685 |
object[] objRec = (object[])arList[0]; |
... | ... | |
888 | 899 |
} |
889 | 900 |
#endregion |
890 | 901 |
|
902 |
#region ログイン者が対象部署にアクセスできるかを返す |
|
903 |
/// <summary> |
|
904 |
/// ログイン者が対象部署にアクセスできるかを返す |
|
905 |
/// </summary> |
|
906 |
/// <returns></returns> |
|
907 |
public static bool LoginPersonAccess(int TargetDepartment) |
|
908 |
{ |
|
909 |
IOMPersonInCharge PersonDB = new IOMPersonInCharge(); |
|
910 |
try |
|
911 |
{ |
|
912 |
StringBuilder strSQL = new StringBuilder(); |
|
913 |
strSQL.Append("SELECT"); |
|
914 |
strSQL.Append(" A.PERSONCODE"); |
|
915 |
strSQL.Append(", A.PERSONNAME"); |
|
916 |
strSQL.Append(", B.SECNAME"); |
|
917 |
strSQL.Append(", B.SECRANK"); |
|
918 |
strSQL.Append(", B.SECRANGE"); |
|
919 |
strSQL.Append(", C.DepartmentCode"); |
|
920 |
strSQL.Append(", D.DepartmentString"); |
|
921 |
strSQL.Append(" FROM"); |
|
922 |
strSQL.Append(" PERSONINCHARGEMASTER As A"); |
|
923 |
strSQL.Append(" Left Join persondepartmentmaster As C"); |
|
924 |
strSQL.Append(" On C.PersonCode = A.PersonCode"); |
|
925 |
strSQL.Append(" Left Join departmentmaster As D"); |
|
926 |
strSQL.Append(" On D.DepartmentCode = C.DepartmentCode"); |
|
927 |
strSQL.Append(" Inner join SECURITYMASTER As B"); |
|
928 |
strSQL.Append(" On B.SECCODE = A.SECCODE"); |
|
929 |
strSQL.AppendFormat(" WHERE A.PersonCode = {0}", CommonMotions.LoginUserData.PersonCode); |
|
930 |
strSQL.AppendFormat(" And C.DepartmentCode = {0}", TargetDepartment); |
|
931 |
|
|
932 |
ArrayList arData = new ArrayList(); |
|
933 |
if (!PersonDB.ExecuteReader(strSQL.ToString(), ref arData)) return false; |
|
934 |
if (arData.Count < 1) return false; |
|
935 |
|
|
936 |
return true; |
|
937 |
} |
|
938 |
catch (Exception ex) |
|
939 |
{ |
|
940 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
941 |
return false; |
|
942 |
} |
|
943 |
finally |
|
944 |
{ |
|
945 |
PersonDB.close(); PersonDB = null; |
|
946 |
} |
|
947 |
} |
|
948 |
#endregion |
|
949 |
|
|
891 | 950 |
#region 対象者が対象データにアクセスできるかを返す |
892 | 951 |
/// <summary> |
893 | 952 |
/// 対象者が対象データにアクセスできるかを返す |
... | ... | |
989 | 1048 |
try |
990 | 1049 |
{ |
991 | 1050 |
// 工事情報を取得する |
992 |
string strBase = "SELECT A.CONSTRUCTIONCODE,"; |
|
993 |
strBase += " A.SALESPERSONCODE, B.DEPARTMENTCODE,"; |
|
994 |
strBase += " A.CONSTRUCTIONPERSONCODE, C.DEPARTMENTCODE,"; |
|
995 |
strBase += " D.PERSONCODE, D.DEPARTMENTCODE,"; |
|
996 |
strBase += " E.PERSONCODE, E.DEPARTMENTCODE,"; |
|
997 |
strBase += " A.CONSTRUCTIONSTATUSFLG,"; |
|
998 |
strBase += " A.TRANSFERCONSTRUCTION,"; |
|
999 |
strBase += " F.DEPARTMENTCODE"; |
|
1000 |
strBase += " FROM CONSTRUCTIONBASEINFO A"; |
|
1001 |
strBase += " LEFT JOIN PERSONINCHARGEMASTER B ON B.PERSONCODE = A.SALESPERSONCODE"; |
|
1002 |
strBase += " LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.CONSTRUCTIONPERSONCODE"; |
|
1003 |
strBase += " LEFT JOIN PERSONINCHARGEMASTER D ON D.PERSONCODE = A.CONSTRSUBPERSONCODE"; |
|
1004 |
strBase += " LEFT JOIN PERSONINCHARGEMASTER E ON E.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR"; |
|
1005 |
strBase += " LEFT JOIN PERSONINCHARGEMASTER F ON F.PERSONCODE = A.TRANSFERCONSTRUCTION"; |
|
1006 |
strBase += BaseDB.CreatePrimarykeyString(ConstructionCode); |
|
1051 |
StringBuilder strBase = new StringBuilder(); |
|
1052 |
strBase.Append("SELECT A.CONSTRUCTIONCODE,"); |
|
1053 |
strBase.Append(" A.SALESPERSONCODE, B.DEPARTMENTCODE,"); |
|
1054 |
strBase.Append(" A.CONSTRUCTIONPERSONCODE, C.DEPARTMENTCODE,"); |
|
1055 |
strBase.Append(" D.PERSONCODE, D.DEPARTMENTCODE,"); |
|
1056 |
strBase.Append(" E.PERSONCODE, E.DEPARTMENTCODE,"); |
|
1057 |
strBase.Append(" A.CONSTRUCTIONSTATUSFLG,"); |
|
1058 |
strBase.Append(" A.TRANSFERCONSTRUCTION,"); |
|
1059 |
strBase.Append(" F.DEPARTMENTCODE"); |
|
1060 |
strBase.Append(" FROM CONSTRUCTIONBASEINFO A"); |
|
1061 |
strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER B ON B.PERSONCODE = A.SALESPERSONCODE"); |
|
1062 |
strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.CONSTRUCTIONPERSONCODE"); |
|
1063 |
strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER D ON D.PERSONCODE = A.CONSTRSUBPERSONCODE"); |
|
1064 |
strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER E ON E.PERSONCODE = A.CONSTRUCTIONINSTRUCTOR"); |
|
1065 |
strBase.Append(" LEFT JOIN PERSONINCHARGEMASTER F ON F.PERSONCODE = A.TRANSFERCONSTRUCTION"); |
|
1066 |
strBase.Append(BaseDB.CreatePrimarykeyString(ConstructionCode)); |
|
1007 | 1067 |
|
1008 | 1068 |
ArrayList arBaseList = new ArrayList(); |
1009 |
if (!BaseDB.ExecuteReader(strBase, ref arBaseList)) return false; |
|
1069 |
if (!BaseDB.ExecuteReader(strBase.ToString(), ref arBaseList)) return false;
|
|
1010 | 1070 |
if (arBaseList.Count == 0) return false; |
1011 | 1071 |
|
1012 | 1072 |
object[] objBaseRec = (object[])arBaseList[0]; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs | ||
---|---|---|
804 | 804 |
EditTreeViewComment(); |
805 | 805 |
} |
806 | 806 |
#endregion |
807 |
|
|
808 |
#region ?R?????g?_?u???N???b?N |
|
809 |
/// <summary> |
|
810 |
/// ?R?????g?_?u???N???b?N |
|
811 |
/// </summary> |
|
812 |
/// <param name="sender"></param> |
|
813 |
/// <param name="e"></param> |
|
814 |
private void tvDispData_DoubleClick(object sender, EventArgs e) |
|
815 |
{ |
|
816 |
EditTreeViewComment(); |
|
817 |
} |
|
818 |
#endregion |
|
807 | 819 |
} |
808 | 820 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.designer.cs | ||
---|---|---|
31 | 31 |
private void InitializeComponent() |
32 | 32 |
{ |
33 | 33 |
this.components = new System.ComponentModel.Container(); |
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
34 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
35 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
36 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
37 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
38 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
39 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
40 |
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
|
|
41 | 41 |
this.label1 = new System.Windows.Forms.Label(); |
42 | 42 |
this.btnEnd = new System.Windows.Forms.Button(); |
43 | 43 |
this.panel2 = new System.Windows.Forms.Panel(); |
... | ... | |
144 | 144 |
this.dgvEntryData.AllowUserToResizeRows = false; |
145 | 145 |
this.dgvEntryData.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); |
146 | 146 |
this.dgvEntryData.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; |
147 |
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
148 |
dataGridViewCellStyle8.BackColor = System.Drawing.Color.Black;
|
|
149 |
dataGridViewCellStyle8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
150 |
dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White;
|
|
151 |
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
152 |
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
153 |
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
154 |
this.dgvEntryData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
|
|
147 |
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
148 |
dataGridViewCellStyle1.BackColor = System.Drawing.Color.Black;
|
|
149 |
dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
150 |
dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
|
|
151 |
dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
|
152 |
dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
|
153 |
dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
|
|
154 |
this.dgvEntryData.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
|
|
155 | 155 |
this.dgvEntryData.ColumnHeadersHeight = 24; |
156 | 156 |
this.dgvEntryData.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; |
157 | 157 |
this.dgvEntryData.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { |
... | ... | |
187 | 187 |
// |
188 | 188 |
// Column02 |
189 | 189 |
// |
190 |
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
191 |
dataGridViewCellStyle9.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
192 |
dataGridViewCellStyle9.ForeColor = System.Drawing.Color.Black;
|
|
193 |
this.Column02.DefaultCellStyle = dataGridViewCellStyle9;
|
|
190 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
191 |
dataGridViewCellStyle2.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
192 |
dataGridViewCellStyle2.ForeColor = System.Drawing.Color.Black;
|
|
193 |
this.Column02.DefaultCellStyle = dataGridViewCellStyle2;
|
|
194 | 194 |
this.Column02.Frozen = true; |
195 | 195 |
this.Column02.HeaderText = "№"; |
196 | 196 |
this.Column02.Name = "Column02"; |
... | ... | |
201 | 201 |
// |
202 | 202 |
// Column03 |
203 | 203 |
// |
204 |
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
205 |
this.Column03.DefaultCellStyle = dataGridViewCellStyle10;
|
|
204 |
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
205 |
this.Column03.DefaultCellStyle = dataGridViewCellStyle3;
|
|
206 | 206 |
this.Column03.Frozen = true; |
207 | 207 |
this.Column03.HeaderText = "承認者名"; |
208 | 208 |
this.Column03.Name = "Column03"; |
... | ... | |
213 | 213 |
// |
214 | 214 |
// Column06 |
215 | 215 |
// |
216 |
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
217 |
this.Column06.DefaultCellStyle = dataGridViewCellStyle11;
|
|
216 |
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
217 |
this.Column06.DefaultCellStyle = dataGridViewCellStyle4;
|
|
218 | 218 |
this.Column06.Frozen = true; |
219 | 219 |
this.Column06.HeaderText = "承認状態"; |
220 | 220 |
this.Column06.Name = "Column06"; |
... | ... | |
225 | 225 |
// |
226 | 226 |
// Column07 |
227 | 227 |
// |
228 |
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
229 |
dataGridViewCellStyle12.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
230 |
this.Column07.DefaultCellStyle = dataGridViewCellStyle12;
|
|
228 |
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
229 |
dataGridViewCellStyle5.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
|
|
230 |
this.Column07.DefaultCellStyle = dataGridViewCellStyle5;
|
|
231 | 231 |
this.Column07.Frozen = true; |
232 | 232 |
this.Column07.HeaderText = "処理日付"; |
233 | 233 |
this.Column07.Name = "Column07"; |
... | ... | |
238 | 238 |
// |
239 | 239 |
// Column04 |
240 | 240 |
// |
241 |
dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
242 |
this.Column04.DefaultCellStyle = dataGridViewCellStyle13;
|
|
241 |
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
242 |
this.Column04.DefaultCellStyle = dataGridViewCellStyle6;
|
|
243 | 243 |
this.Column04.HeaderText = "所 属"; |
244 | 244 |
this.Column04.Name = "Column04"; |
245 | 245 |
this.Column04.ReadOnly = true; |
... | ... | |
249 | 249 |
// |
250 | 250 |
// Column05 |
251 | 251 |
// |
252 |
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
253 |
this.Column05.DefaultCellStyle = dataGridViewCellStyle14;
|
|
252 |
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
|
|
253 |
this.Column05.DefaultCellStyle = dataGridViewCellStyle7;
|
|
254 | 254 |
this.Column05.HeaderText = "役 職"; |
255 | 255 |
this.Column05.Name = "Column05"; |
256 | 256 |
this.Column05.ReadOnly = true; |
... | ... | |
760 | 760 |
this.tvDispData.Name = "tvDispData"; |
761 | 761 |
this.tvDispData.Size = new System.Drawing.Size(544, 308); |
762 | 762 |
this.tvDispData.TabIndex = 158; |
763 |
this.tvDispData.DoubleClick += new System.EventHandler(this.tvDispData_DoubleClick); |
|
763 | 764 |
// |
764 | 765 |
// FrmApprovalPerson |
765 | 766 |
// |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.resx | ||
---|---|---|
138 | 138 |
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |
139 | 139 |
<value>17, 17</value> |
140 | 140 |
</metadata> |
141 |
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> |
|
142 |
<value>17, 17</value> |
|
143 |
</metadata> |
|
144 | 141 |
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> |
145 | 142 |
<value>35</value> |
146 | 143 |
</metadata> |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs | ||
---|---|---|
1446 | 1446 |
strNodeText = strNodeText.Substring(strNodeText.IndexOf("-") + 1); |
1447 | 1447 |
} |
1448 | 1448 |
|
1449 |
// 書込み者以外は表示のみ |
|
1450 |
if (!CutOffPersonName().Equals(CommonMotions.LoginUserData.PersonName)) |
|
1451 |
{ |
|
1452 |
frm.LockFlag = (int)FrmInputComment.LockFlagDef.Locked; |
|
1453 |
} |
|
1449 | 1454 |
// コメント入力画面表示 |
1450 | 1455 |
frm.EditFlag = (int)FrmInputComment.EditFlagDef.EditData; |
1451 | 1456 |
frm.CommentString = strNodeText; |
... | ... | |
1527 | 1532 |
} |
1528 | 1533 |
#endregion |
1529 | 1534 |
|
1535 |
#region コメント行より担当者名を取得する |
|
1536 |
/// <summary> |
|
1537 |
/// コメント行より担当者名を取得する |
|
1538 |
/// </summary> |
|
1539 |
/// <returns></returns> |
|
1540 |
private string CutOffPersonName() |
|
1541 |
{ |
|
1542 |
try |
|
1543 |
{ |
|
1544 |
TreeNode TargetNodes = tvDispData.SelectedNode; |
|
1545 |
string strNodeText = TargetNodes.Text; |
|
1546 |
|
|
1547 |
strNodeText = strNodeText.Substring(strNodeText.IndexOf("-") + 1); |
|
1548 |
strNodeText = strNodeText.Substring(0, strNodeText.IndexOf("-")); |
|
1549 |
|
|
1550 |
return strNodeText; |
|
1551 |
} |
|
1552 |
catch (Exception ex) |
|
1553 |
{ |
|
1554 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1555 |
return string.Empty; |
|
1556 |
} |
|
1557 |
} |
|
1558 |
#endregion |
|
1559 |
|
|
1530 | 1560 |
#region 登録時情報 |
1531 | 1561 |
/// <summary> |
1532 | 1562 |
/// 登録時コメント番号 |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs | ||
---|---|---|
778 | 778 |
EditTreeViewComment(); |
779 | 779 |
} |
780 | 780 |
#endregion |
781 |
|
|
782 |
#region ?R?????g?_?u???N???b?N |
|
783 |
/// <summary> |
|
784 |
/// ?R?????g?_?u???N???b?N |
|
785 |
/// </summary> |
|
786 |
/// <param name="sender"></param> |
|
787 |
/// <param name="e"></param> |
|
788 |
private void tvDispData_DoubleClick(object sender, EventArgs e) |
|
789 |
{ |
|
790 |
EditTreeViewComment(); |
|
791 |
} |
|
792 |
#endregion |
|
781 | 793 |
} |
782 | 794 |
} |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.designer.cs | ||
---|---|---|
531 | 531 |
this.tvDispData.Name = "tvDispData"; |
532 | 532 |
this.tvDispData.Size = new System.Drawing.Size(544, 308); |
533 | 533 |
this.tvDispData.TabIndex = 158; |
534 |
this.tvDispData.DoubleClick += new System.EventHandler(this.tvDispData_DoubleClick); |
|
534 | 535 |
// |
535 | 536 |
// lblLabel15 |
536 | 537 |
// |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
---|---|---|
1444 | 1444 |
strNodeText = strNodeText.Substring(strNodeText.IndexOf("-") + 1); |
1445 | 1445 |
} |
1446 | 1446 |
|
1447 |
// 書込み者以外は表示のみ |
|
1448 |
if (!CutOffPersonName().Equals(CommonMotions.LoginUserData.PersonName)) |
|
1449 |
{ |
|
1450 |
frm.LockFlag = (int)FrmInputComment.LockFlagDef.Locked; |
|
1451 |
} |
|
1447 | 1452 |
// コメント入力画面表示 |
1448 | 1453 |
frm.EditFlag = (int)FrmInputComment.EditFlagDef.EditData; |
1449 |
frm.CommentString = strNodeText; |
|
1454 |
frm.CommentString = strNodeText.Replace("\r\n", "");
|
|
1450 | 1455 |
frm.ShowDialog(); |
1451 | 1456 |
if (frm.EndButton == DialogResult.No) return; |
1452 | 1457 |
|
... | ... | |
1489 | 1494 |
} |
1490 | 1495 |
#endregion |
1491 | 1496 |
|
1492 |
#region 指示連絡コメント削除処理 |
|
1497 |
#region 指示連絡コメント削除処理(未使用)
|
|
1493 | 1498 |
/// <summary> |
1494 |
/// 指示連絡コメント削除処理 |
|
1499 |
/// 指示連絡コメント削除処理(未使用)
|
|
1495 | 1500 |
/// </summary> |
1496 | 1501 |
private void RemoveTreeViewComment() |
1497 | 1502 |
{ |
... | ... | |
1525 | 1530 |
} |
1526 | 1531 |
#endregion |
1527 | 1532 |
|
1533 |
#region ログイン者がコメントにアクセスできるかを返す |
|
1534 |
/// <summary> |
|
1535 |
/// ログイン者がコメントにアクセスできるかを返す |
|
1536 |
/// </summary> |
|
1537 |
/// <returns></returns> |
|
1538 |
private bool CheckCommentAcess() |
|
1539 |
{ |
|
1540 |
IOMPersonInCharge PersonDB = new IOMPersonInCharge(); |
|
1541 |
try |
|
1542 |
{ |
|
1543 |
// 管理者はOK |
|
1544 |
if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode) return true; |
|
1545 |
|
|
1546 |
// コメントより担当者名取得 |
|
1547 |
string ChargePerson = CutOffPersonName(); |
|
1548 |
|
|
1549 |
// 担当者検索 |
|
1550 |
PersonInChargeMaster PersonRec = new PersonInChargeMaster(); |
|
1551 |
StringBuilder strSQL = new StringBuilder(); |
|
1552 |
strSQL.AppendFormat(" Where PERSONNAME = '{0}'", ChargePerson); |
|
1553 |
if (!PersonDB.SelectAction(strSQL.ToString(), ref PersonRec)) return false; |
|
1554 |
|
|
1555 |
// ログイン者が担当者の場合はアクセスOK |
|
1556 |
if (CommonMotions.LoginUserData.PersonCode == PersonRec.PersonCode) return true; |
|
1557 |
|
|
1558 |
// ログイン者が一般権限者の場合は他のデータにアクセスできない |
|
1559 |
int nNormal = (int)CommonDefine.SecurityRankPos.NormalAuthority; |
|
1560 |
if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[nNormal].Key) return false; |
|
1561 |
|
|
1562 |
// アクセス権チェック |
|
1563 |
if (!ClsSecurityPermission.LoginPersonAccess(PersonRec.DepartmentCode)) return false; |
|
1564 |
|
|
1565 |
return true; |
|
1566 |
} |
|
1567 |
catch (Exception ex) |
|
1568 |
{ |
|
1569 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1570 |
return false; |
|
1571 |
} |
|
1572 |
finally |
|
1573 |
{ |
|
1574 |
PersonDB.close(); PersonDB = null; |
|
1575 |
} |
|
1576 |
} |
|
1577 |
#endregion |
|
1578 |
|
|
1579 |
#region コメント行より担当者名を取得する |
|
1580 |
/// <summary> |
|
1581 |
/// コメント行より担当者名を取得する |
|
1582 |
/// </summary> |
|
1583 |
/// <returns></returns> |
|
1584 |
private string CutOffPersonName() |
|
1585 |
{ |
|
1586 |
try |
|
1587 |
{ |
|
1588 |
TreeNode TargetNodes = tvDispData.SelectedNode; |
|
1589 |
string strNodeText = TargetNodes.Text; |
|
1590 |
|
|
1591 |
strNodeText = strNodeText.Substring(strNodeText.IndexOf("-") + 1); |
|
1592 |
strNodeText = strNodeText.Substring(0, strNodeText.IndexOf("-")); |
|
1593 |
|
|
1594 |
return strNodeText; |
|
1595 |
} |
|
1596 |
catch (Exception ex) |
|
1597 |
{ |
|
1598 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1599 |
return string.Empty; |
|
1600 |
} |
|
1601 |
} |
|
1602 |
#endregion |
|
1603 |
|
|
1528 | 1604 |
#region 登録時情報 |
1529 | 1605 |
/// <summary> |
1530 | 1606 |
/// 登録時コメント番号 |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs | ||
---|---|---|
722 | 722 |
SetConstructionTime(); |
723 | 723 |
|
724 | 724 |
// 担当者取得 |
725 |
int Person = m_ConstructionBaseInfo.ConstructionPersonCode;
|
|
725 |
int Person = m_PersonCode; |
|
726 | 726 |
strSQL = PersonDB.CreatePrimarykeyString(Person); |
727 | 727 |
PersonInChargeMaster PersonRec = new PersonInChargeMaster(); |
728 | 728 |
PersonDB.SelectAction(strSQL, ref PersonRec); |
... | ... | |
864 | 864 |
dgv.Rows.Clear(); |
865 | 865 |
|
866 | 866 |
// 明細データ取得 |
867 |
string strSQL = "SELECT A.JOBCATEGORYCODE"; |
|
868 |
strSQL += ", B.JOBCATEGORYNAME"; |
|
869 |
strSQL += ", A.COMPANYCODE"; |
|
870 |
strSQL += ", C.COMPANYNAME"; |
|
871 |
strSQL += ", A.TODAYHEADCOUNT"; |
|
872 |
strSQL += ", A.TOTALHEADCOUNT"; |
|
873 |
strSQL += ", A.TODAYWORK"; |
|
874 |
strSQL += ", A.NEXTDAYWORK"; |
|
875 |
strSQL += ", A.NEXTDAYHEADCOUNT"; |
|
876 |
strSQL += " FROM DAILYDATADETAIL A"; |
|
877 |
strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE"; |
|
878 |
strSQL += " LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE"; |
|
879 |
strSQL += DetailDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0); |
|
880 |
strSQL += " ORDER BY A.SEQNO"; |
|
867 |
StringBuilder strSQL = new StringBuilder(); |
|
868 |
strSQL.Append("SELECT"); |
|
869 |
strSQL.Append(" A.JOBCATEGORYCODE"); |
|
870 |
strSQL.Append(", B.JOBCATEGORYNAME"); |
|
871 |
strSQL.Append(", A.COMPANYCODE"); |
|
872 |
strSQL.Append(", C.COMPANYNAME"); |
|
873 |
strSQL.Append(", A.TODAYHEADCOUNT"); |
|
874 |
strSQL.Append(", A.TOTALHEADCOUNT"); |
|
875 |
strSQL.Append(", A.TODAYWORK"); |
|
876 |
strSQL.Append(", A.NEXTDAYWORK"); |
|
877 |
strSQL.Append(", A.NEXTDAYHEADCOUNT"); |
|
878 |
strSQL.Append(" FROM DAILYDATADETAIL A"); |
|
879 |
strSQL.Append(" LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE"); |
|
880 |
strSQL.Append(" LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE"); |
|
881 |
strSQL.Append(DetailDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0)); |
|
882 |
strSQL.Append(" ORDER BY A.SEQNO"); |
|
881 | 883 |
ArrayList arList = new ArrayList(); |
882 |
if (!DetailDB.ExecuteReader(strSQL, ref arList) || arList.Count == 0) |
|
884 |
if (!DetailDB.ExecuteReader(strSQL.ToString(), ref arList) || arList.Count == 0)
|
|
883 | 885 |
{ |
884 | 886 |
if (!MaxDateCheck(ref arList)) |
885 | 887 |
{ |
... | ... | |
976 | 978 |
if (MaxDate > dTPCreateDate.Value) return false; |
977 | 979 |
|
978 | 980 |
// 明細データ取得 |
979 |
string strSQL = "SELECT A.JOBCATEGORYCODE"; |
|
980 |
strSQL += ", B.JOBCATEGORYNAME"; |
|
981 |
strSQL += ", A.COMPANYCODE"; |
|
982 |
strSQL += ", C.COMPANYNAME"; |
|
983 |
strSQL += ", A.NEXTDAYHEADCOUNT"; |
|
984 |
strSQL += ", (A.TOTALHEADCOUNT + A.NEXTDAYHEADCOUNT)"; |
|
985 |
strSQL += ", A.NEXTDAYWORK"; |
|
986 |
strSQL += ", A.NEXTDAYWORK"; |
|
987 |
strSQL += ", 0"; |
|
988 |
strSQL += " FROM DAILYDATADETAIL A"; |
|
989 |
strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE"; |
|
990 |
strSQL += " LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE"; |
|
991 |
strSQL += DetailDB.CreatePrimarykeyString(m_PersonCode, MaxDate, m_ConstructionCode, 0); |
|
992 |
strSQL += " ORDER BY A.SEQNO"; |
|
993 |
if (!DetailDB.ExecuteReader(strSQL, ref DispList) || DispList.Count == 0) return false; |
|
981 |
StringBuilder strSQL = new StringBuilder(); |
|
982 |
strSQL.Append("SELECT"); |
|
983 |
strSQL.Append(" A.JOBCATEGORYCODE"); |
|
984 |
strSQL.Append(", B.JOBCATEGORYNAME"); |
|
985 |
strSQL.Append(", A.COMPANYCODE"); |
|
986 |
strSQL.Append(", C.COMPANYNAME"); |
|
987 |
strSQL.Append(", A.NEXTDAYHEADCOUNT"); |
|
988 |
strSQL.Append(", (A.TOTALHEADCOUNT + A.NEXTDAYHEADCOUNT)"); |
|
989 |
strSQL.Append(", A.NEXTDAYWORK"); |
|
990 |
strSQL.Append(", A.NEXTDAYWORK"); |
|
991 |
strSQL.Append(", 0"); |
|
992 |
strSQL.Append(" FROM DAILYDATADETAIL A"); |
|
993 |
strSQL.Append(" LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE"); |
|
994 |
strSQL.Append(" LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE"); |
|
995 |
strSQL.Append(DetailDB.CreatePrimarykeyString(m_PersonCode, MaxDate, m_ConstructionCode, 0)); |
|
996 |
strSQL.Append(" ORDER BY A.SEQNO"); |
|
997 |
if (!DetailDB.ExecuteReader(strSQL.ToString(), ref DispList) || DispList.Count == 0) return false; |
|
994 | 998 |
|
995 | 999 |
return true; |
996 | 1000 |
} |
... | ... | |
1051 | 1055 |
dgv.Rows.Clear(); |
1052 | 1056 |
|
1053 | 1057 |
// 明細データ取得 |
1054 |
string strSQL = VehiclesDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0); |
|
1055 |
strSQL += " ORDER BY SEQNO"; |
|
1058 |
StringBuilder strSQL = new StringBuilder(); |
|
1059 |
strSQL.Append(VehiclesDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0)); |
|
1060 |
strSQL.Append(" ORDER BY SEQNO"); |
|
1056 | 1061 |
List<DailyDataVehicles> VehiclesList = new List<DailyDataVehicles>(); |
1057 |
if (!VehiclesDB.SelectAction(strSQL, ref VehiclesList) || VehiclesList.Count == 0) |
|
1062 |
if (!VehiclesDB.SelectAction(strSQL.ToString(), ref VehiclesList) || VehiclesList.Count == 0)
|
|
1058 | 1063 |
{ |
1059 | 1064 |
// データ無は空行を表示する |
1060 | 1065 |
dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Vehicles]); |
... | ... | |
1141 | 1146 |
dgv.Rows.Clear(); |
1142 | 1147 |
|
1143 | 1148 |
// 明細データ取得 |
1144 |
string strSQL = MaterialsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0); |
|
1145 |
strSQL += " ORDER BY SEQNO"; |
|
1149 |
StringBuilder strSQL = new StringBuilder(); |
|
1150 |
strSQL.Append(MaterialsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0)); |
|
1151 |
strSQL.Append(" ORDER BY SEQNO"); |
|
1146 | 1152 |
List<DailyDataMaterials> MaterialsList = new List<DailyDataMaterials>(); |
1147 |
if (!MaterialsDB.SelectAction(strSQL, ref MaterialsList) || MaterialsList.Count == 0) |
|
1153 |
if (!MaterialsDB.SelectAction(strSQL.ToString(), ref MaterialsList) || MaterialsList.Count == 0)
|
|
1148 | 1154 |
{ |
1149 | 1155 |
// データ無は空行を表示する |
1150 | 1156 |
dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Materials]); |
... | ... | |
1200 | 1206 |
dgv.Rows.Clear(); |
1201 | 1207 |
|
1202 | 1208 |
// 明細データ取得 |
1203 |
string strSQL = SubcontractorsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0); |
|
1204 |
strSQL += " ORDER BY SEQNO"; |
|
1209 |
StringBuilder strSQL = new StringBuilder(); |
|
1210 |
strSQL.Append(SubcontractorsDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0)); |
|
1211 |
strSQL.Append(" ORDER BY SEQNO"); |
|
1205 | 1212 |
List<DailyDataSubcontractors> SubcontractorsList = new List<DailyDataSubcontractors>(); |
1206 |
if (!SubcontractorsDB.SelectAction(strSQL, ref SubcontractorsList) || SubcontractorsList.Count == 0) |
|
1213 |
if (!SubcontractorsDB.SelectAction(strSQL.ToString(), ref SubcontractorsList) || SubcontractorsList.Count == 0)
|
|
1207 | 1214 |
{ |
1208 | 1215 |
// データ無は空行を表示する |
1209 | 1216 |
dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Subcontractors]); |
... | ... | |
1254 | 1261 |
dgv.Rows.Clear(); |
1255 | 1262 |
|
1256 | 1263 |
// 明細データ取得 |
1257 |
string strSQL = FieldDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0); |
|
1258 |
strSQL += " ORDER BY SEQNO"; |
|
1264 |
StringBuilder strSQL = new StringBuilder(); |
|
1265 |
strSQL.Append(FieldDB.CreatePrimarykeyString(m_PersonCode, GetTargetToday(), m_ConstructionCode, 0)); |
|
1266 |
strSQL.Append(" ORDER BY SEQNO"); |
|
1259 | 1267 |
List<DailyDataField> SubcontractorsList = new List<DailyDataField>(); |
1260 |
FieldDB.SelectAction(strSQL, ref SubcontractorsList); |
|
1268 |
FieldDB.SelectAction(strSQL.ToString(), ref SubcontractorsList);
|
|
1261 | 1269 |
|
1262 | 1270 |
dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Field]); |
1263 | 1271 |
|
... | ... | |
2812 | 2820 |
IODailyDataConstruction DailyDB = new IODailyDataConstruction(); |
2813 | 2821 |
try |
2814 | 2822 |
{ |
2815 |
string strSQL = string.Empty; |
|
2816 |
|
|
2823 |
StringBuilder strSQL = new StringBuilder(); |
|
2817 | 2824 |
switch (ReadPoint) |
2818 | 2825 |
{ |
2819 | 2826 |
case (int)ReadData.First: |
2820 |
strSQL = "SELECT MIN(DAILYDATADATE) FROM DAILYDATACONSTRUCTION";
|
|
2821 |
strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
|
|
2827 |
case (int)ReadData.Next:
|
|
2828 |
strSQL.Append("SELECT MIN(DAILYDATADATE) FROM DAILYDATACONSTRUCTION");
|
|
2822 | 2829 |
break; |
2823 | 2830 |
case (int)ReadData.Previous: |
2824 |
strSQL = "SELECT MAX(DAILYDATADATE) FROM DAILYDATACONSTRUCTION"; |
|
2825 |
strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode); |
|
2826 |
//strSQL += string.Format(" AND TRUNC(DAILYDATADATE) < TO_DATE('{0}','YYYY/MM/DD')", dTPCreateDate.Value.ToShortDateString()); |
|
2827 |
strSQL += string.Format(" AND DATE(DAILYDATADATE) < STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString()); |
|
2831 |
case (int)ReadData.Final: |
|
2832 |
strSQL.Append("SELECT MAX(DAILYDATADATE) FROM DAILYDATACONSTRUCTION"); |
|
2828 | 2833 |
break; |
2834 |
} |
|
2835 |
|
|
2836 |
strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode); |
|
2837 |
strSQL.AppendFormat(" And PersonCode = {0}", m_PersonCode); |
|
2838 |
|
|
2839 |
switch (ReadPoint) |
|
2840 |
{ |
|
2841 |
case (int)ReadData.Previous: |
|
2842 |
strSQL.AppendFormat(" AND DATE(DAILYDATADATE) < STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString()); |
|
2843 |
break; |
|
2829 | 2844 |
case (int)ReadData.Next: |
2830 |
strSQL = "SELECT MIN(DAILYDATADATE) FROM DAILYDATACONSTRUCTION"; |
|
2831 |
strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode); |
|
2832 |
//strSQL += string.Format(" AND TRUNC(DAILYDATADATE) > TO_DATE('{0}','YYYY/MM/DD')", dTPCreateDate.Value.ToShortDateString()); |
|
2833 |
strSQL += string.Format(" AND DATE(DAILYDATADATE) > STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString()); |
|
2845 |
strSQL.AppendFormat(" AND DATE(DAILYDATADATE) > STR_TO_DATE('{0}','%Y/%m/%d')", dTPCreateDate.Value.ToShortDateString()); |
|
2834 | 2846 |
break; |
2835 |
case (int)ReadData.Final: |
|
2836 |
strSQL = "SELECT MAX(DAILYDATADATE) FROM DAILYDATACONSTRUCTION"; |
|
2837 |
strSQL += string.Format(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode); |
|
2838 |
break; |
|
2839 | 2847 |
} |
2848 |
|
|
2840 | 2849 |
ArrayList arList = new ArrayList(); |
2841 |
if (DailyDB.ExecuteReader(strSQL, ref arList)) |
|
2850 |
if (DailyDB.ExecuteReader(strSQL.ToString(), ref arList))
|
|
2842 | 2851 |
{ |
2843 | 2852 |
object[] objRec = (object[])arList[0]; |
2844 | 2853 |
dtRet = CommonMotions.cnvDate(objRec[0]); |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs | ||
---|---|---|
1332 | 1332 |
m_BeforeColumnCount = e.ColumnIndex; |
1333 | 1333 |
m_BeforeRowCount = e.RowIndex; |
1334 | 1334 |
|
1335 |
// ?P??????????P???????b?N???? |
|
1336 |
LockUnitValue(dgv.CurrentRow); |
|
1337 |
|
|
1338 | 1335 |
} |
1339 | 1336 |
catch (Exception ex) |
1340 | 1337 |
{ |
... | ... | |
1418 | 1415 |
LineReNumbering(m_EntryPage[iTabCnt].EntryDGV); |
1419 | 1416 |
} |
1420 | 1417 |
|
1418 |
// ?P??????????P???????b?N???? |
|
1419 |
LockUnitValue(m_EntryPage[iTabCnt].EntryDGV); |
|
1420 |
|
|
1421 | 1421 |
// ??????^?u??O?????????? |
1422 | 1422 |
if (m_EntryPage[iTabCnt].Cotegory != CommonDefine.TabCotegory.Item) return; |
1423 | 1423 |
|
1424 | 1424 |
if (CommonMotions.chkCellBlank(wrkRow.Cells[(int)GridItemColumn.MasterIn])) return; |
1425 | 1425 |
|
1426 |
// ????^?i???E?`??E???@????????????ReadOnly??false????? |
|
1426 |
// ????^?i???E?`??E???@????????????}?X?^?o?^?`?F?b?N??ReadOnly??false?????
|
|
1427 | 1427 |
if (ChkGridLineEffectiveness(wrkRow)) |
1428 | 1428 |
wrkRow.Cells[(int)GridItemColumn.MasterIn].ReadOnly = false; |
1429 | 1429 |
else |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs | ||
---|---|---|
5977 | 5977 |
/// 単位が【式】の場合は単価をクリアロックする |
5978 | 5978 |
/// </summary> |
5979 | 5979 |
/// <param name="CurRow"></param> |
5980 |
private void LockUnitValue(DataGridViewRow CurRow)
|
|
5980 |
private void LockUnitValue(DataGridView dgv)
|
|
5981 | 5981 |
{ |
5982 | 5982 |
try |
5983 | 5983 |
{ |
5984 |
// 単位以外は処理しない |
|
5985 |
if (dgv.CurrentCell.ColumnIndex != (int)GridItemColumn.UnitName) return; |
|
5986 |
|
|
5987 |
DataGridViewRow CurRow = dgv.CurrentRow; |
|
5984 | 5988 |
if (CurRow == null) return; |
5985 | 5989 |
|
5986 | 5990 |
string strValue = CommonMotions.cnvString(CurRow.Cells[(int)GridItemColumn.UnitName].Value).Trim(); |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/FrmEstimatePrintAuxiliary.cs | ||
---|---|---|
290 | 290 |
else if (m_PrintresRet == DialogResult.No) |
291 | 291 |
{ |
292 | 292 |
// +++++++++++++++++++++++++ 保存 +++++++++++++++++++++++++ |
293 |
string FilePath = @m_SelectSaveExcel; |
|
294 |
//// 管理ファイルにあるか? |
|
295 |
//if (FilePath.Length == 0) |
|
296 |
//{ |
|
297 |
// FilePath = CommonMotions.DFRModel.ExcelExecuteAction.SavePath.ToString(); |
|
298 |
//} |
|
293 |
string strFilePath = @m_SelectSaveExcel; |
|
299 | 294 |
// エクセル保存 |
300 |
if (CommonMotions.ChkDirPath(FilePath, true)) |
|
295 |
if (CommonMotions.ChkDirPath(strFilePath, true))
|
|
301 | 296 |
{ |
302 | 297 |
string wrkFile = "1."; |
303 | 298 |
foreach (string ww in strParaList) |
... | ... | |
310 | 305 |
wrkFile = wrkFile.Replace(m_UsedExcel.ExcelBadCharcter[ix], ""); |
311 | 306 |
} |
312 | 307 |
// ファイル名作成 |
313 |
FilePath += @"\" + @wrkFile + @s_ExcelBookName; |
|
308 |
strFilePath += @"\" + @wrkFile + @s_ExcelBookName;
|
|
314 | 309 |
|
315 | 310 |
m_UsedExcel.SaveSwitch = true; |
316 |
m_UsedExcel.ExcelSaveBook(FilePath); |
|
311 |
m_UsedExcel.ExcelSaveBook(strFilePath);
|
|
317 | 312 |
} |
318 | 313 |
} |
319 | 314 |
|
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.cs | ||
---|---|---|
661 | 661 |
|
662 | 662 |
#region ?Z???????O???? |
663 | 663 |
/// <summary> |
664 |
/// ????O?l |
|
665 |
/// </summary> |
|
666 |
object m_BeforeValue = null; |
|
667 |
int m_CheckCol = -1; |
|
668 |
int m_CheckRow = -1; |
|
669 |
/// <summary> |
|
664 | 670 |
/// ?Z???????O???? |
665 | 671 |
/// </summary> |
666 | 672 |
/// <param name="sender"></param> |
... | ... | |
690 | 696 |
} |
691 | 697 |
// ?Z?????e?I?? |
692 | 698 |
dgv.BeginEdit(true); |
699 |
|
|
700 |
// ?Z???l?? |
|
701 |
m_BeforeValue = dgv.CurrentCell.Value; |
|
702 |
m_CheckCol = e.ColumnIndex; |
|
703 |
m_CheckRow = e.RowIndex; |
|
693 | 704 |
} |
694 | 705 |
catch (System.Exception ex) |
695 | 706 |
{ |
... | ... | |
698 | 709 |
} |
699 | 710 |
#endregion |
700 | 711 |
|
712 |
#region ?O???b?h?Z???l??? |
|
713 |
/// <summary> |
|
714 |
/// ?O???b?h?Z???l??? |
|
715 |
/// </summary> |
|
716 |
/// <param name="sender"></param> |
|
717 |
/// <param name="e"></param> |
|
718 |
private void DataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) |
|
719 |
{ |
|
720 |
DataGridView dgv = (DataGridView)sender; |
|
721 |
DataGridViewRow CurRow = dgv.CurrentRow; |
|
722 |
|
|
723 |
// ??U?Z????l??X?C?x???g???????? |
|
724 |
dgv.CellValueChanged -= DataGridView_CellValueChanged; |
|
725 |
try |
|
726 |
{ |
|
727 |
if (CurRow == null) return; |
|
728 |
|
|
729 |
// ?Z???l??`?F?b?N |
|
730 |
switch (e.ColumnIndex) |
|
731 |
{ |
|
732 |
case (int)DispColumn.KyoryokuKinRitu: |
|
733 |
break; |
|
734 |
default: |
|
735 |
if (m_CheckCol == e.ColumnIndex && m_CheckRow == e.RowIndex) |
|
736 |
{ |
|
737 |
int CurVal = CommonMotions.cnvInt(dgv[e.ColumnIndex, e.RowIndex].Value); |
|
738 |
if (CommonMotions.cnvInt(m_BeforeValue) == CurVal) return; |
|
739 |
} |
|
740 |
break; |
|
741 |
} |
|
742 |
|
|
743 |
// ??X?t???O |
|
744 |
CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified; |
|
745 |
|
|
746 |
if (dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.???v) |
|
747 |
.ToArray() |
|
748 |
.Count() == 0) return; |
|
749 |
|
|
750 |
// ??????L???J??????O?????????? |
|
751 |
if (e.ColumnIndex != (int)DispColumn.KyoryokuUmu) return; |
|
752 |
|
|
753 |
//???C???f?b?N?X???m?F???? |
|
754 |
int Code_Column = 0; |
|
755 |
if (dgvCompany.Visible == true) |
|
756 |
{ |
|
757 |
Code_Column = (int)DispColumn_Company.SubConstractorCode; |
|
758 |
} |
|
759 |
else |
|
760 |
{ |
|
761 |
Code_Column = (int)DispColumn_Project.GengaCode; |
|
762 |
} |
|
763 |
|
|
764 |
// ???????? |
|
765 |
SetKyoryokukin(dgv, e.RowIndex, Code_Column); |
|
766 |
|
|
767 |
// ???v?s |
|
768 |
setGoukei(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value)); |
|
769 |
} |
|
770 |
catch (Exception ex) |
|
771 |
{ |
|
772 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
773 |
} |
|
774 |
finally |
|
775 |
{ |
|
776 |
// ?Z????l??X?C?x???g??L??????? |
|
777 |
dgv.CellValueChanged += DataGridView_CellValueChanged; |
|
778 |
} |
|
779 |
} |
|
780 |
#endregion |
|
781 |
|
|
701 | 782 |
#region ?~?{?^?? |
702 | 783 |
/// <summary> |
703 | 784 |
/// ?~?{?^?????????? |
... | ... | |
817 | 898 |
} |
818 | 899 |
#endregion |
819 | 900 |
|
820 |
#region ?\???{?^???????? |
|
821 |
/// <summary> |
|
822 |
/// ?\???{?^???????? |
|
823 |
/// </summary> |
|
824 |
/// <param name="sender"></param> |
|
825 |
/// <param name="e"></param> |
|
826 |
private void btnShowView_Click(object sender, EventArgs e) |
|
827 |
{ |
|
828 |
if (m_bChengeAns == true) |
|
829 |
{ |
|
830 |
if (MessageBox.Show("?f?[?^???X?????????A?o?^??????????X??????????????H?B", "?m?F" |
|
831 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) |
|
832 |
{ |
|
833 |
return; |
|
834 |
} |
|
835 |
} |
|
836 |
|
|
837 |
showView(); |
|
838 |
SetColumnID(); |
|
839 |
controlButton(); |
|
840 |
|
|
841 |
// ?\?? |
|
842 |
InitDataLoad(); |
|
843 |
DispGridData(); |
|
844 |
} |
|
845 |
#endregion |
|
846 |
|
|
847 | 901 |
#region ?`?F?b?N?{?b?N?X?I?? |
848 | 902 |
/// <summary> |
849 | 903 |
/// ?`?F?b?N?{?b?N?X?I?? |
... | ... | |
854 | 908 |
{ |
855 | 909 |
if (m_initDataLoad) return; |
856 | 910 |
|
857 |
btnShowView_Click(sender, e);
|
|
911 |
DispShowView();
|
|
858 | 912 |
} |
859 | 913 |
#endregion |
860 | 914 |
|
... | ... | |
868 | 922 |
{ |
869 | 923 |
if (m_initDataLoad) return; |
870 | 924 |
|
871 |
btnShowView_Click(sender, e);
|
|
925 |
DispShowView();
|
|
872 | 926 |
} |
873 | 927 |
#endregion |
874 | 928 |
|
... | ... | |
939 | 993 |
} |
940 | 994 |
#endregion |
941 | 995 |
|
942 |
#region ?O???b?h?Z???l??? |
|
943 |
/// <summary> |
|
944 |
/// ?O???b?h?Z???l??? |
|
945 |
/// </summary> |
|
946 |
/// <param name="sender"></param> |
|
947 |
/// <param name="e"></param> |
|
948 |
private void DataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) |
|
949 |
{ |
|
950 |
DataGridView dgv = (DataGridView)sender; |
|
951 |
DataGridViewRow CurRow = dgv.CurrentRow; |
|
952 |
|
|
953 |
// ??U?Z????l??X?C?x???g???????? |
|
954 |
dgv.CellValueChanged -= DataGridView_CellValueChanged; |
|
955 |
try |
|
956 |
{ |
|
957 |
if (CurRow == null) return; |
|
958 |
|
|
959 |
// ??X?t???O |
|
960 |
CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified; |
|
961 |
|
|
962 |
if (dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)DispColumn.RowType].Value) == (int)RowsTypeDef.???v) |
|
963 |
.ToArray() |
|
964 |
.Count() == 0) return; |
|
965 |
|
|
966 |
// ??????L???J??????O?????????? |
|
967 |
if (e.ColumnIndex != (int)DispColumn.KyoryokuUmu) return; |
|
968 |
|
|
969 |
//???C???f?b?N?X???m?F???? |
|
970 |
int Code_Column = 0; |
|
971 |
if (dgvCompany.Visible == true) |
|
972 |
{ |
|
973 |
Code_Column = (int)DispColumn_Company.SubConstractorCode; |
|
974 |
} |
|
975 |
else |
|
976 |
{ |
|
977 |
Code_Column = (int)DispColumn_Project.GengaCode; |
|
978 |
} |
|
979 |
|
|
980 |
// ???????? |
|
981 |
SetKyoryokukin(dgv, e.RowIndex, Code_Column); |
|
982 |
|
|
983 |
// ???v?s |
|
984 |
setGoukei(Code_Column, CommonMotions.cnvInt(dgv[Code_Column, e.RowIndex].Value)); |
|
985 |
} |
|
986 |
catch (Exception ex) |
|
987 |
{ |
|
988 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
989 |
} |
|
990 |
finally |
|
991 |
{ |
|
992 |
// ?Z????l??X?C?x???g??L??????? |
|
993 |
dgv.CellValueChanged += DataGridView_CellValueChanged; |
|
994 |
} |
|
995 |
} |
|
996 |
#endregion |
|
997 |
|
|
998 | 996 |
#region ?Z????X??R?~?b?g????????????R?~?b?g???? |
999 | 997 |
/// <summary> |
1000 | 998 |
/// ?Z????X??R?~?b?g????????????R?~?b?g???? |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryList.designer.cs | ||
---|---|---|
104 | 104 |
this.button1 = new System.Windows.Forms.Button(); |
105 | 105 |
this.btnOtherProc = new System.Windows.Forms.Button(); |
106 | 106 |
this.DataProgressBar = new System.Windows.Forms.ProgressBar(); |
107 |
this.btnShowView = new System.Windows.Forms.Button();
|
|
107 |
this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
|
|
108 | 108 |
this.btnDataUpDate = new System.Windows.Forms.Button(); |
109 |
this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx(); |
|
110 | 109 |
this.pnlApproval = new System.Windows.Forms.Panel(); |
111 | 110 |
this.lblApprovalCount = new System.Windows.Forms.Label(); |
112 | 111 |
this.btnPetition = new System.Windows.Forms.Button(); |
... | ... | |
569 | 568 |
this.DataProgressBar.TabIndex = 96; |
570 | 569 |
this.DataProgressBar.Visible = false; |
571 | 570 |
// |
572 |
// btnShowView |
|
573 |
// |
|
574 |
this.btnShowView.BackColor = System.Drawing.Color.Blue; |
|
575 |
this.btnShowView.ForeColor = System.Drawing.Color.White; |
|
576 |
this.btnShowView.Location = new System.Drawing.Point(206, 6); |
|
577 |
this.btnShowView.Margin = new System.Windows.Forms.Padding(4); |
|
578 |
this.btnShowView.Name = "btnShowView"; |
|
579 |
this.btnShowView.Size = new System.Drawing.Size(120, 30); |
|
580 |
this.btnShowView.TabIndex = 8; |
|
581 |
this.btnShowView.Text = "表 示"; |
|
582 |
this.btnShowView.UseVisualStyleBackColor = false; |
|
583 |
this.btnShowView.Visible = false; |
|
584 |
this.btnShowView.Click += new System.EventHandler(this.btnShowView_Click); |
|
585 |
// |
|
586 |
// btnDataUpDate |
|
587 |
// |
|
588 |
this.btnDataUpDate.BackColor = System.Drawing.Color.Aquamarine; |
|
589 |
this.btnDataUpDate.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
590 |
this.btnDataUpDate.ForeColor = System.Drawing.Color.Black; |
|
591 |
this.btnDataUpDate.Location = new System.Drawing.Point(206, 5); |
|
592 |
this.btnDataUpDate.Name = "btnDataUpDate"; |
|
593 |
this.btnDataUpDate.Size = new System.Drawing.Size(120, 30); |
|
594 |
this.btnDataUpDate.TabIndex = 97; |
|
595 |
this.btnDataUpDate.Text = "最新状態に更新"; |
|
596 |
this.btnDataUpDate.UseVisualStyleBackColor = false; |
|
597 |
this.btnDataUpDate.Click += new System.EventHandler(this.btnDataUpDate_Click); |
|
598 |
// |
|
599 | 571 |
// groupBoxEx1 |
600 | 572 |
// |
601 | 573 |
this.groupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) |
... | ... | |
603 | 575 |
this.groupBoxEx1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; |
604 | 576 |
this.groupBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); |
605 | 577 |
this.groupBoxEx1.BorderColor = System.Drawing.Color.Gray; |
578 |
this.groupBoxEx1.Controls.Add(this.btnDataUpDate); |
|
606 | 579 |
this.groupBoxEx1.Controls.Add(this.pnlApproval); |
607 | 580 |
this.groupBoxEx1.Controls.Add(this.pnlApprovalButton); |
608 | 581 |
this.groupBoxEx1.Controls.Add(this.label11); |
... | ... | |
624 | 597 |
this.groupBoxEx1.TabIndex = 2; |
625 | 598 |
this.groupBoxEx1.TabStop = false; |
626 | 599 |
// |
600 |
// btnDataUpDate |
|
601 |
// |
|
602 |
this.btnDataUpDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
603 |
this.btnDataUpDate.BackColor = System.Drawing.Color.Aquamarine; |
|
604 |
this.btnDataUpDate.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
605 |
this.btnDataUpDate.ForeColor = System.Drawing.Color.Black; |
|
606 |
this.btnDataUpDate.Location = new System.Drawing.Point(1193, 37); |
|
607 |
this.btnDataUpDate.Name = "btnDataUpDate"; |
|
608 |
this.btnDataUpDate.Size = new System.Drawing.Size(120, 30); |
|
609 |
this.btnDataUpDate.TabIndex = 97; |
|
610 |
this.btnDataUpDate.Text = "最新状態に更新"; |
|
611 |
this.btnDataUpDate.UseVisualStyleBackColor = false; |
|
612 |
this.btnDataUpDate.Click += new System.EventHandler(this.btnDataUpDate_Click); |
|
613 |
// |
|
627 | 614 |
// pnlApproval |
628 | 615 |
// |
629 | 616 |
this.pnlApproval.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
... | ... | |
1122 | 1109 |
this.Column24.ReadOnly = true; |
1123 | 1110 |
this.Column24.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
1124 | 1111 |
this.Column24.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
1125 |
this.Column24.Visible = false; |
|
1126 | 1112 |
// |
1127 | 1113 |
// Column137 |
1128 | 1114 |
// |
... | ... | |
1147 | 1133 |
this.Column26.Name = "Column26"; |
1148 | 1134 |
this.Column26.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
1149 | 1135 |
this.Column26.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
1150 |
this.Column26.Visible = false; |
|
1151 | 1136 |
// |
1152 | 1137 |
// Column3 |
1153 | 1138 |
// |
... | ... | |
1363 | 1348 |
// |
1364 | 1349 |
this.Column155.HeaderText = "担当者部署コード"; |
1365 | 1350 |
this.Column155.Name = "Column155"; |
1366 |
this.Column155.Visible = false; |
|
1367 | 1351 |
// |
1368 | 1352 |
// Column37 |
1369 | 1353 |
// |
... | ... | |
1752 | 1736 |
this.Column64.Name = "Column64"; |
1753 | 1737 |
this.Column64.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
1754 | 1738 |
this.Column64.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
1755 |
this.Column64.Visible = false; |
|
1756 | 1739 |
// |
1757 | 1740 |
// Column139 |
1758 | 1741 |
// |
... | ... | |
1760 | 1743 |
this.Column139.Name = "Column139"; |
1761 | 1744 |
this.Column139.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
1762 | 1745 |
this.Column139.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
1763 |
this.Column139.Visible = false; |
|
1764 | 1746 |
// |
1765 | 1747 |
// Column140 |
1766 | 1748 |
// |
... | ... | |
1768 | 1750 |
this.Column140.Name = "Column140"; |
1769 | 1751 |
this.Column140.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
1770 | 1752 |
this.Column140.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
1771 |
this.Column140.Visible = false; |
|
1772 | 1753 |
// |
1773 | 1754 |
// Column145 |
1774 | 1755 |
// |
1775 | 1756 |
this.Column145.HeaderText = "工事担当者部署コード"; |
1776 | 1757 |
this.Column145.Name = "Column145"; |
1777 | 1758 |
this.Column145.ReadOnly = true; |
1778 |
this.Column145.Visible = false; |
|
1779 | 1759 |
// |
1780 | 1760 |
// Column147 |
1781 | 1761 |
// |
1782 | 1762 |
this.Column147.HeaderText = "工事担当者"; |
1783 | 1763 |
this.Column147.Name = "Column147"; |
1784 |
this.Column147.Visible = false; |
|
1785 | 1764 |
// |
1786 | 1765 |
// Column149 |
1787 | 1766 |
// |
1788 | 1767 |
this.Column149.HeaderText = "営業担当者"; |
1789 | 1768 |
this.Column149.Name = "Column149"; |
1790 |
this.Column149.Visible = false; |
|
1791 | 1769 |
// |
1792 | 1770 |
// Column150 |
1793 | 1771 |
// |
1794 | 1772 |
this.Column150.HeaderText = "副担当者"; |
1795 | 1773 |
this.Column150.Name = "Column150"; |
1796 |
this.Column150.Visible = false; |
|
1797 | 1774 |
// |
1798 | 1775 |
// Column151 |
1799 | 1776 |
// |
1800 | 1777 |
this.Column151.HeaderText = "指導員"; |
1801 | 1778 |
this.Column151.Name = "Column151"; |
1802 |
this.Column151.Visible = false; |
|
1803 | 1779 |
// |
1804 | 1780 |
// Column152 |
1805 | 1781 |
// |
1806 | 1782 |
this.Column152.HeaderText = "営業部署コード"; |
1807 | 1783 |
this.Column152.Name = "Column152"; |
1808 |
this.Column152.Visible = false; |
|
1809 | 1784 |
// |
1810 | 1785 |
// Column153 |
1811 | 1786 |
// |
1812 | 1787 |
this.Column153.HeaderText = "副担当部署コード"; |
1813 | 1788 |
this.Column153.Name = "Column153"; |
1814 |
this.Column153.Visible = false; |
|
1815 | 1789 |
// |
1816 | 1790 |
// Column154 |
1817 | 1791 |
// |
1818 | 1792 |
this.Column154.HeaderText = "指導員部署コード"; |
1819 | 1793 |
this.Column154.Name = "Column154"; |
1820 |
this.Column154.Visible = false; |
|
1821 | 1794 |
// |
1822 | 1795 |
// dgvProject |
1823 | 1796 |
// |
... | ... | |
2046 | 2019 |
this.Project_Column4.Name = "Project_Column4"; |
2047 | 2020 |
this.Project_Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2048 | 2021 |
this.Project_Column4.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2049 |
this.Project_Column4.Visible = false; |
|
2050 | 2022 |
// |
2051 | 2023 |
// Project_Column5 |
2052 | 2024 |
// |
... | ... | |
2065 | 2037 |
this.Project_Column6.Name = "Project_Column6"; |
2066 | 2038 |
this.Project_Column6.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2067 | 2039 |
this.Project_Column6.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2068 |
this.Project_Column6.Visible = false; |
|
2069 | 2040 |
// |
2070 | 2041 |
// Column138 |
2071 | 2042 |
// |
2072 | 2043 |
this.Column138.HeaderText = "協力会社\r\nコード"; |
2073 | 2044 |
this.Column138.Name = "Column138"; |
2074 |
this.Column138.Visible = false; |
|
2075 | 2045 |
// |
2076 | 2046 |
// Project_Column7 |
2077 | 2047 |
// |
... | ... | |
2287 | 2257 |
// |
2288 | 2258 |
this.Column156.HeaderText = "担当者部署コード"; |
2289 | 2259 |
this.Column156.Name = "Column156"; |
2290 |
this.Column156.Visible = false; |
|
2291 | 2260 |
// |
2292 | 2261 |
// Column52 |
2293 | 2262 |
// |
... | ... | |
2683 | 2652 |
this.Column77.Name = "Column77"; |
2684 | 2653 |
this.Column77.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2685 | 2654 |
this.Column77.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2686 |
this.Column77.Visible = false; |
|
2687 | 2655 |
// |
2688 | 2656 |
// Column141 |
2689 | 2657 |
// |
... | ... | |
2691 | 2659 |
this.Column141.Name = "Column141"; |
2692 | 2660 |
this.Column141.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2693 | 2661 |
this.Column141.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2694 |
this.Column141.Visible = false; |
|
2695 | 2662 |
// |
2696 | 2663 |
// Column142 |
2697 | 2664 |
// |
... | ... | |
2699 | 2666 |
this.Column142.Name = "Column142"; |
2700 | 2667 |
this.Column142.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
2701 | 2668 |
this.Column142.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
2702 |
this.Column142.Visible = false; |
|
2703 | 2669 |
// |
2704 | 2670 |
// Column146 |
2705 | 2671 |
// |
2706 | 2672 |
this.Column146.HeaderText = "担当者部署コード"; |
2707 | 2673 |
this.Column146.Name = "Column146"; |
2708 | 2674 |
this.Column146.ReadOnly = true; |
2709 |
this.Column146.Visible = false; |
|
2710 | 2675 |
// |
2711 | 2676 |
// Column148 |
2712 | 2677 |
// |
2713 | 2678 |
this.Column148.HeaderText = "工事担当者"; |
2714 | 2679 |
this.Column148.Name = "Column148"; |
2715 |
this.Column148.Visible = false; |
|
2716 | 2680 |
// |
2717 | 2681 |
// dataGridViewTextBoxColumn2 |
2718 | 2682 |
// |
2719 | 2683 |
this.dataGridViewTextBoxColumn2.HeaderText = "営業担当者"; |
2720 | 2684 |
this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; |
2721 |
this.dataGridViewTextBoxColumn2.Visible = false; |
|
2722 | 2685 |
// |
2723 | 2686 |
// dataGridViewTextBoxColumn3 |
2724 | 2687 |
// |
2725 | 2688 |
this.dataGridViewTextBoxColumn3.HeaderText = "副担当者"; |
2726 | 2689 |
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; |
2727 |
this.dataGridViewTextBoxColumn3.Visible = false; |
|
2728 | 2690 |
// |
2729 | 2691 |
// dataGridViewTextBoxColumn4 |
2730 | 2692 |
// |
2731 | 2693 |
this.dataGridViewTextBoxColumn4.HeaderText = "指導員"; |
2732 | 2694 |
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; |
2733 |
this.dataGridViewTextBoxColumn4.Visible = false; |
|
2734 | 2695 |
// |
2735 | 2696 |
// dataGridViewTextBoxColumn5 |
2736 | 2697 |
// |
2737 | 2698 |
this.dataGridViewTextBoxColumn5.HeaderText = "営業部署コード"; |
2738 | 2699 |
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; |
2739 |
this.dataGridViewTextBoxColumn5.Visible = false; |
|
2740 | 2700 |
// |
2741 | 2701 |
// dataGridViewTextBoxColumn6 |
2742 | 2702 |
// |
2743 | 2703 |
this.dataGridViewTextBoxColumn6.HeaderText = "副担当部署コード"; |
2744 | 2704 |
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; |
2745 |
this.dataGridViewTextBoxColumn6.Visible = false; |
|
2746 | 2705 |
// |
2747 | 2706 |
// dataGridViewTextBoxColumn7 |
2748 | 2707 |
// |
2749 | 2708 |
this.dataGridViewTextBoxColumn7.HeaderText = "指導員部署コード"; |
2750 | 2709 |
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; |
2751 |
this.dataGridViewTextBoxColumn7.Visible = false; |
|
2752 | 2710 |
// |
2753 | 2711 |
// FrmRequestSummaryList |
2754 | 2712 |
// |
... | ... | |
2756 | 2714 |
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; |
2757 | 2715 |
this.BackColor = System.Drawing.Color.Black; |
2758 | 2716 |
this.ClientSize = new System.Drawing.Size(1340, 697); |
2759 |
this.Controls.Add(this.btnDataUpDate); |
|
2760 | 2717 |
this.Controls.Add(this.btnOtherProc); |
2761 | 2718 |
this.Controls.Add(this.button1); |
2762 |
this.Controls.Add(this.btnShowView); |
|
2763 | 2719 |
this.Controls.Add(this.CombinedOrderLabel1); |
2764 | 2720 |
this.Controls.Add(this.CombinedOrderLabel2); |
2765 | 2721 |
this.Controls.Add(this.panel1); |
... | ... | |
2772 | 2728 |
this.Controls.Add(this.label1); |
2773 | 2729 |
this.Controls.Add(this.btnEnd); |
2774 | 2730 |
this.Controls.Add(this.DataProgressBar); |
2731 |
this.Controls.Add(this.dgvProject); |
|
2775 | 2732 |
this.Controls.Add(this.dgvCompany); |
2776 |
this.Controls.Add(this.dgvProject); |
|
2777 | 2733 |
this.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
2778 | 2734 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
2779 | 2735 |
this.KeyPreview = true; |
... | ... | |
2842 | 2798 |
private System.Windows.Forms.Label label4; |
2843 | 2799 |
private System.Windows.Forms.Label label11; |
2844 | 2800 |
private System.Windows.Forms.ComboBox cmbPerson; |
2845 |
private System.Windows.Forms.Button btnShowView; |
|
2846 | 2801 |
private System.Windows.Forms.Button btnDataUpDate; |
2847 | 2802 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column135; |
2848 | 2803 |
private System.Windows.Forms.DataGridViewTextBoxColumn Column133; |
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
---|---|---|
32 | 32 |
{ |
33 | 33 |
partial class FrmRequestSummaryList |
34 | 34 |
{ |
35 |
|
|
36 |
#region ?f?[?^??\?? |
|
37 |
/// <summary> |
|
38 |
/// ?f?[?^??\?? |
|
39 |
/// </summary> |
|
40 |
/// <param name="sender"></param> |
|
41 |
/// <param name="e"></param> |
|
42 |
private void DispShowView() |
|
43 |
{ |
|
44 |
if (m_bChengeAns == true) |
|
45 |
{ |
|
46 |
if (MessageBox.Show("?f?[?^???X?????????A?o?^??????????X??????????????H?B", "?m?F" |
|
47 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Warning) == DialogResult.No) |
|
48 |
{ |
|
49 |
return; |
|
50 |
} |
|
51 |
} |
|
52 |
|
|
53 |
showView(); |
|
54 |
SetColumnID(); |
|
55 |
controlButton(); |
|
56 |
|
|
57 |
// ?\?? |
|
58 |
InitDataLoad(); |
|
59 |
DispGridData(); |
|
60 |
} |
|
61 |
#endregion |
|
62 |
|
|
35 | 63 |
#region ?p?????[?^?????Z?b?g |
36 | 64 |
/// <summary> |
37 | 65 |
/// ?p?????[?^?????Z?b?g |
... | ... | |
674 | 702 |
{ |
675 | 703 |
dgv.Columns[Column].Visible = false; |
676 | 704 |
} |
677 |
for (int Column = (int)DispColumn.TantoShoninCode; Column < (int)DispColumn.Bikou; Column++) |
|
705 |
|
|
706 |
int[] VisCol = new int[]{ |
|
707 |
dgv.Equals(dgvCompany) ? (int)DispColumn_Company.SubConstractorCode : (int)DispColumn_Project.SubConstractorCode, |
|
708 |
dgv.Equals(dgvCompany) ? (int)DispColumn_Company.CompanyCode : (int)DispColumn_Project.CompanyCode, |
|
709 |
dgv.Equals(dgvCompany) ? (int)DispColumn_Company.GengaCode : (int)DispColumn_Project.GengaCode}; |
|
710 |
|
|
711 |
for (int i = 0; i < VisCol.Length; i++) |
|
678 | 712 |
{ |
713 |
dgv.Columns[VisCol[i]].Visible = false; |
|
714 |
} |
|
715 |
|
|
716 |
for (int Column = (int)DispColumn.TantoShoninCode; Column <= (int)DispColumn.InstrDepCode; Column++) |
|
717 |
{ |
|
679 | 718 |
if (Column != (int)DispColumn.TantoShonin |
680 | 719 |
&& Column != (int)DispColumn.Shonin1 |
681 | 720 |
&& Column != (int)DispColumn.Shonin2 |
... | ... | |
686 | 725 |
&& Column != (int)DispColumn.Shonin7 |
687 | 726 |
&& Column != (int)DispColumn.Shonin8 |
688 | 727 |
&& Column != (int)DispColumn.Shonin9 |
689 |
&& Column != (int)DispColumn.Shonin10) |
|
728 |
&& Column != (int)DispColumn.Shonin10 |
|
729 |
&& Column != (int)DispColumn.Bikou) |
|
690 | 730 |
dgv.Columns[Column].Visible = false; |
691 | 731 |
} |
692 | 732 |
int TargetCol = (int)DispColumn_Project.GengaName; |
... | ... | |
1876 | 1916 |
if (bFirst) |
1877 | 1917 |
{ |
1878 | 1918 |
r.Cells[(int)DispColumn.No].Value = iNo; |
1879 |
r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode; |
|
1880 |
r.Cells[m_GoukeiCode_Column + 2].Value = k.Key.GoukeiName; |
|
1881 |
r.Cells[m_GoukeiCode_Column + 2].ToolTipText = k.Key.GoukeiName; |
|
1919 |
//r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode;
|
|
1920 |
//r.Cells[m_GoukeiCode_Column + 2].Value = k.Key.GoukeiName;
|
|
1921 |
//r.Cells[m_GoukeiCode_Column + 2].ToolTipText = k.Key.GoukeiName;
|
|
1882 | 1922 |
bFirst = false; |
1883 | 1923 |
continue; |
1884 | 1924 |
} |
1885 | 1925 |
|
1886 | 1926 |
r.Cells[(int)DispColumn.No].Value = ""; |
1887 |
r.Cells[m_GoukeiCode_Column + 1].Value = "";
|
|
1888 |
r.Cells[m_GoukeiCode_Column + 2].Value = "";
|
|
1889 |
r.Cells[m_GoukeiCode_Column + 2].ToolTipText = k.Key.GoukeiName;
|
|
1927 |
//r.Cells[m_GoukeiCode_Column + 1].Value = k.Key.GoukeiCode;
|
|
1928 |
r.Cells[m_CompanyNM_Column].Value = "";
|
|
1929 |
//r.Cells[m_CompanyNM_Column].ToolTipText = k.Key.GoukeiName;
|
|
1890 | 1930 |
} |
1891 | 1931 |
iNo++; |
1892 | 1932 |
} |
... | ... | |
1941 | 1981 |
if (bFirst) |
1942 | 1982 |
{ |
1943 | 1983 |
r.Cells[(int)DispColumn.No].Value = iNo; |
1944 |
r.Cells[m_GoukeiCode_Column + 1].Value = k.GoukeiName; |
|
1945 |
r.Cells[m_GoukeiCode_Column + 1].ToolTipText = k.GoukeiName; |
|
1984 |
//r.Cells[m_GoukeiCode_Column + 1].Value = k.GoukeiName;
|
|
1985 |
//r.Cells[m_GoukeiCode_Column + 1].ToolTipText = k.GoukeiName;
|
|
1946 | 1986 |
bFirst = false; |
1947 | 1987 |
continue; |
1948 | 1988 |
} |
1949 | 1989 |
|
1950 | 1990 |
r.Cells[(int)DispColumn.No].Value = ""; |
1951 |
r.Cells[m_GoukeiCode_Column + 1].Value = ""; |
他の形式にエクスポート: Unified diff