リビジョン 297
承認画面:申請時コメント削除バグ修正
工事情報削除時：承認明細・コメント削除追加
注文書印刷フォーマット変更
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 107;
|
|
| 17 |
public static int s_SystemVersion = 109;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeBaseInfoData.cs | ||
|---|---|---|
| 111 | 111 |
IODailyDataMaterials DB25 = new IODailyDataMaterials(); // 日報データ (資材) |
| 112 | 112 |
IODailyDataSubcontractors DB26 = new IODailyDataSubcontractors(); // 日報データ (協力業者指示) |
| 113 | 113 |
IODailyDataField DB27 = new IODailyDataField(); // 日報データ (現場巡回) |
| 114 |
IOProcessApprovalDetail DB28 = new IOProcessApprovalDetail(); // 承認明細データ |
|
| 115 |
IOProcessApprovalComment DB29 = new IOProcessApprovalComment(); // 承認コメントデータ |
|
| 114 | 116 |
try |
| 115 | 117 |
{
|
| 116 | 118 |
// 工事情報存在確認 |
| ... | ... | |
| 142 | 144 |
DB07.connect(); DB08.connect(); DB09.connect(); DB10.connect(); DB11.connect(); DB12.connect(); |
| 143 | 145 |
DB13.connect(); DB14.connect(); DB15.connect(); DB16.connect(); DB17.connect(); DB18.connect(); |
| 144 | 146 |
DB19.connect(); DB20.connect(); DB21.connect(); DB22.connect(); DB23.connect(); DB24.connect(); |
| 145 |
DB25.connect(); DB26.connect(); DB27.connect(); |
|
| 147 |
DB25.connect(); DB26.connect(); DB27.connect(); DB28.connect(); DB29.connect();
|
|
| 146 | 148 |
|
| 147 | 149 |
DB01.beginTran(); DB02.beginTran(); DB03.beginTran(); DB04.beginTran(); DB05.beginTran(); DB06.beginTran(); |
| 148 | 150 |
DB07.beginTran(); DB08.beginTran(); DB09.beginTran(); DB10.beginTran(); DB11.beginTran(); DB12.beginTran(); |
| 149 | 151 |
DB13.beginTran(); DB14.beginTran(); DB15.beginTran(); DB16.beginTran(); DB17.beginTran(); DB18.beginTran(); |
| 150 | 152 |
DB19.beginTran(); DB20.beginTran(); DB21.beginTran(); DB22.beginTran(); DB23.beginTran(); DB24.beginTran(); |
| 151 |
DB25.beginTran(); DB26.beginTran(); DB27.beginTran(); |
|
| 153 |
DB25.beginTran(); DB26.beginTran(); DB27.beginTran(); DB28.beginTran(); DB29.beginTran();
|
|
| 152 | 154 |
|
| 153 | 155 |
bool ProcSuccess = true; |
| 154 | 156 |
string strRemove = string.Empty; |
| ... | ... | |
| 183 | 185 |
DB25.DeleteAction(strRemove, false); |
| 184 | 186 |
DB26.DeleteAction(strRemove, false); |
| 185 | 187 |
DB27.DeleteAction(strRemove, false); |
| 188 |
DB28.DeleteAction(strRemove, false); |
|
| 189 |
DB29.DeleteAction(strRemove, false); |
|
| 186 | 190 |
|
| 187 | 191 |
if (BaseRec.JoinFlg == (int)ConstructionBaseInfo.JoinFlgDef.JoinParent |
| 188 | 192 |
|| BaseRec.TyingFlg == (int)ConstructionBaseInfo.TyingFlgDef.Parent) |
| ... | ... | |
| 240 | 244 |
} |
| 241 | 245 |
} |
| 242 | 246 |
} |
| 243 |
// ＤＢ終了処理
|
|
| 244 |
if (ProcSuccess) |
|
| 247 |
// RollBack
|
|
| 248 |
if (!ProcSuccess)
|
|
| 245 | 249 |
{
|
| 246 |
DB01.commit(); DB02.commit(); DB03.commit(); DB04.commit(); DB05.commit(); DB06.commit(); |
|
| 247 |
DB07.commit(); DB08.commit(); DB09.commit(); DB10.commit(); DB11.commit(); DB12.commit(); |
|
| 248 |
DB13.commit(); DB14.commit(); DB15.commit(); DB16.commit(); DB17.commit(); DB18.commit(); |
|
| 249 |
DB19.commit(); DB20.commit(); DB21.commit(); DB22.commit(); DB23.commit(); DB24.commit(); |
|
| 250 |
DB25.commit(); DB26.commit(); DB27.commit(); |
|
| 251 |
} |
|
| 252 |
else |
|
| 253 |
{
|
|
| 254 | 250 |
DB01.rollback(); DB02.rollback(); DB03.rollback(); DB04.rollback(); DB05.rollback(); DB06.rollback(); |
| 255 | 251 |
DB07.rollback(); DB08.rollback(); DB09.rollback(); DB10.rollback(); DB11.rollback(); DB12.rollback(); |
| 256 | 252 |
DB13.rollback(); DB14.rollback(); DB15.rollback(); DB16.rollback(); DB17.rollback(); DB18.rollback(); |
| 257 | 253 |
DB19.rollback(); DB20.rollback(); DB21.rollback(); DB22.rollback(); DB23.rollback(); DB24.rollback(); |
| 258 |
DB25.rollback(); DB26.rollback(); DB27.rollback(); |
|
| 254 |
DB25.rollback(); DB26.rollback(); DB27.rollback(); DB28.rollback(); DB29.rollback();
|
|
| 259 | 255 |
} |
| 260 | 256 |
|
| 257 |
// ＤＢ終了処理 |
|
| 258 |
DB01.commit(); DB02.commit(); DB03.commit(); DB04.commit(); DB05.commit(); DB06.commit(); |
|
| 259 |
DB07.commit(); DB08.commit(); DB09.commit(); DB10.commit(); DB11.commit(); DB12.commit(); |
|
| 260 |
DB13.commit(); DB14.commit(); DB15.commit(); DB16.commit(); DB17.commit(); DB18.commit(); |
|
| 261 |
DB19.commit(); DB20.commit(); DB21.commit(); DB22.commit(); DB23.commit(); DB24.commit(); |
|
| 262 |
DB25.commit(); DB26.commit(); DB27.commit(); DB28.commit(); DB29.commit(); |
|
| 263 |
|
|
| 261 | 264 |
return ProcSuccess; |
| 262 | 265 |
} |
| 263 | 266 |
catch (Exception ex) |
| ... | ... | |
| 271 | 274 |
DB07.close(); DB08.close(); DB09.close(); DB10.close(); DB11.close(); DB12.close(); |
| 272 | 275 |
DB13.close(); DB14.close(); DB15.close(); DB16.close(); DB17.close(); DB18.close(); |
| 273 | 276 |
DB19.close(); DB20.close(); DB21.close(); DB22.close(); DB23.close(); DB24.close(); |
| 274 |
DB25.close(); DB26.close(); DB27.close(); |
|
| 277 |
DB25.close(); DB26.close(); DB27.close(); DB28.close(); DB29.close();
|
|
| 275 | 278 |
|
| 276 | 279 |
DB01 = null; DB02 = null; DB03 = null; DB04 = null; DB05 = null; DB06 = null; |
| 277 | 280 |
DB07 = null; DB08 = null; DB09 = null; DB10 = null; DB11 = null; DB12 = null; |
| 278 | 281 |
DB13 = null; DB14 = null; DB15 = null; DB16 = null; DB17 = null; DB18 = null; |
| 279 | 282 |
DB19 = null; DB20 = null; DB21 = null; DB22 = null; DB23 = null; DB24 = null; |
| 280 |
DB25 = null; DB26 = null; DB27 = null; |
|
| 283 |
DB25 = null; DB26 = null; DB27 = null; DB28 = null; DB29 = null;
|
|
| 281 | 284 |
} |
| 282 | 285 |
} |
| 283 | 286 |
#endregion |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs | ||
|---|---|---|
| 574 | 574 |
// ?\???f?[?^?? |
| 575 | 575 |
if (!DataUpdate(Rec)) return; |
| 576 | 576 |
|
| 577 |
// ?R?????g???c??????????? |
|
| 578 |
RemoveCommentData(); |
|
| 579 |
|
|
| 580 | 577 |
// ?\??????????????? |
| 581 | 578 |
PettionNextProcess(); |
| 582 | 579 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs | ||
|---|---|---|
| 577 | 577 |
// ?\?????f?[?^???t??????Z?b?g???? |
| 578 | 578 |
SetApprovalOrderNo(); |
| 579 | 579 |
|
| 580 |
// ?R?????g???c??????????? |
|
| 581 |
RemoveCommentData(); |
|
| 582 |
|
|
| 583 | 580 |
// ???????b?Z?[?W |
| 584 | 581 |
CommonMotions.EntryEndMessage("?H???\???f?[?^", "?\??");
|
| 585 | 582 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
|---|---|---|
| 1043 | 1043 |
strSQL.Append(" And A4.ApprovalCode = A3.ApprovalCode");
|
| 1044 | 1044 |
strSQL.Append(" And A4.OrderNo = A3.OrderNo");
|
| 1045 | 1045 |
strSQL.Append(" And A4.SeqNo = 1");
|
| 1046 |
|
|
| 1047 |
strSQL.Append(" Inner Join constructionbaseinfo AS Base");
|
|
| 1048 |
strSQL.Append(" On Base.ConstructionCode = A1.ConstructionCode");
|
|
| 1049 |
strSQL.Append(" Inner Join constructiontypemaster As ConstrType");
|
|
| 1050 |
strSQL.Append(" On ConstrType.TypeCode = Base.ConstructionType");
|
|
| 1051 |
|
|
| 1046 | 1052 |
strSQL.AppendFormat(" WHERE A1.CONSTRUCTIONCODE = {0}", ParentCode);
|
| 1047 | 1053 |
strSQL.AppendFormat(" And A1.SOURCECODE = {0}", SourceCode);
|
| 1048 | 1054 |
strSQL.AppendFormat(" AND A1.GROUPCOUNT = {0}", (int)FrmConstructionLedger.DataGroup.ConstructionCosts);
|
| 1049 | 1055 |
strSQL.Append(" AND A1.COMPANYCODE > 0");
|
| 1056 |
strSQL.AppendFormat(" And A1.PurchaseOrderFlg <> {0}",(int)ConstructionLedgerDetail.PurOrderFlgDef.NotMakingData);
|
|
| 1057 |
|
|
| 1050 | 1058 |
strSQL.AppendFormat(" And A1.EXECUTIONAMOUNT >= {0}", CommonDefine.s_PrintOutPrice);
|
| 1051 |
strSQL.AppendFormat(" And A1.PurchaseOrderFlg <> {0}",(int)ConstructionLedgerDetail.PurOrderFlgDef.NotMakingData);
|
|
| 1059 |
|
|
| 1052 | 1060 |
strSQL.Append(" Order By");
|
| 1053 | 1061 |
strSQL.Append(" A1.PURCHASEORDERFLG");
|
| 1054 | 1062 |
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.designer.cs | ||
|---|---|---|
| 89 | 89 |
this.panel2 = new System.Windows.Forms.Panel(); |
| 90 | 90 |
this.lblCellTotal = new System.Windows.Forms.Label(); |
| 91 | 91 |
this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
| 92 |
this.btnDispDown = new System.Windows.Forms.Button(); |
|
| 93 |
this.btnDispUp = new System.Windows.Forms.Button(); |
|
| 94 |
this.btnOtherProc = new System.Windows.Forms.Button(); |
|
| 95 |
this.btnAssistantChange = new System.Windows.Forms.Button(); |
|
| 96 |
this.btnInstractorChange = new System.Windows.Forms.Button(); |
|
| 97 |
this.btnChangePrice = new System.Windows.Forms.Button(); |
|
| 98 |
this.button1 = new System.Windows.Forms.Button(); |
|
| 99 |
this.button2 = new System.Windows.Forms.Button(); |
|
| 100 | 92 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 101 | 93 |
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 102 | 94 |
this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| ... | ... | |
| 124 | 116 |
this.Column24 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 125 | 117 |
this.Column25 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 126 | 118 |
this.Column26 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
| 119 |
this.btnDispDown = new System.Windows.Forms.Button(); |
|
| 120 |
this.btnDispUp = new System.Windows.Forms.Button(); |
|
| 121 |
this.btnOtherProc = new System.Windows.Forms.Button(); |
|
| 122 |
this.btnAssistantChange = new System.Windows.Forms.Button(); |
|
| 123 |
this.btnInstractorChange = new System.Windows.Forms.Button(); |
|
| 124 |
this.btnChangePrice = new System.Windows.Forms.Button(); |
|
| 125 |
this.button1 = new System.Windows.Forms.Button(); |
|
| 126 |
this.button2 = new System.Windows.Forms.Button(); |
|
| 127 | 127 |
this.panel1.SuspendLayout(); |
| 128 | 128 |
this.pnlGroup2.SuspendLayout(); |
| 129 | 129 |
this.pnlGroup1.SuspendLayout(); |
| ... | ... | |
| 605 | 605 |
this.label13.Name = "label13"; |
| 606 | 606 |
this.label13.Size = new System.Drawing.Size(114, 25); |
| 607 | 607 |
this.label13.TabIndex = 35; |
| 608 |
this.label13.Text = "担当指導員";
|
|
| 608 |
this.label13.Text = "指 導 員";
|
|
| 609 | 609 |
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; |
| 610 | 610 |
// |
| 611 | 611 |
// label5 |
| ... | ... | |
| 852 | 852 |
this.dgvAllDisplay.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dgvAllDisplay_KeyDown); |
| 853 | 853 |
this.dgvAllDisplay.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvAllDisplay_MouseUp); |
| 854 | 854 |
// |
| 855 |
// btnDispDown |
|
| 856 |
// |
|
| 857 |
this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
| 858 |
this.btnDispDown.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 859 |
this.btnDispDown.Location = new System.Drawing.Point(1300, 418); |
|
| 860 |
this.btnDispDown.Name = "btnDispDown"; |
|
| 861 |
this.btnDispDown.Size = new System.Drawing.Size(40, 40); |
|
| 862 |
this.btnDispDown.TabIndex = 42; |
|
| 863 |
this.btnDispDown.TabStop = false; |
|
| 864 |
this.btnDispDown.Text = "▼"; |
|
| 865 |
this.btnDispDown.UseVisualStyleBackColor = true; |
|
| 866 |
this.btnDispDown.Visible = false; |
|
| 867 |
this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click); |
|
| 868 |
// |
|
| 869 |
// btnDispUp |
|
| 870 |
// |
|
| 871 |
this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
| 872 |
this.btnDispUp.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 873 |
this.btnDispUp.Location = new System.Drawing.Point(1300, 354); |
|
| 874 |
this.btnDispUp.Name = "btnDispUp"; |
|
| 875 |
this.btnDispUp.Size = new System.Drawing.Size(40, 40); |
|
| 876 |
this.btnDispUp.TabIndex = 41; |
|
| 877 |
this.btnDispUp.TabStop = false; |
|
| 878 |
this.btnDispUp.Text = "▲"; |
|
| 879 |
this.btnDispUp.UseVisualStyleBackColor = true; |
|
| 880 |
this.btnDispUp.Visible = false; |
|
| 881 |
this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click); |
|
| 882 |
// |
|
| 883 |
// btnOtherProc |
|
| 884 |
// |
|
| 885 |
this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
| 886 |
this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen; |
|
| 887 |
this.btnOtherProc.Location = new System.Drawing.Point(7, 656); |
|
| 888 |
this.btnOtherProc.Name = "btnOtherProc"; |
|
| 889 |
this.btnOtherProc.Size = new System.Drawing.Size(160, 30); |
|
| 890 |
this.btnOtherProc.TabIndex = 95; |
|
| 891 |
this.btnOtherProc.TabStop = false; |
|
| 892 |
this.btnOtherProc.Text = "他の画面へ"; |
|
| 893 |
this.btnOtherProc.UseVisualStyleBackColor = false; |
|
| 894 |
this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click); |
|
| 895 |
// |
|
| 896 |
// btnAssistantChange |
|
| 897 |
// |
|
| 898 |
this.btnAssistantChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 899 |
this.btnAssistantChange.BackColor = System.Drawing.Color.Beige; |
|
| 900 |
this.btnAssistantChange.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
|
|
| 901 |
this.btnAssistantChange.Location = new System.Drawing.Point(381, 656); |
|
| 902 |
this.btnAssistantChange.Name = "btnAssistantChange"; |
|
| 903 |
this.btnAssistantChange.Size = new System.Drawing.Size(130, 30); |
|
| 904 |
this.btnAssistantChange.TabIndex = 96; |
|
| 905 |
this.btnAssistantChange.Text = "副担当者変更"; |
|
| 906 |
this.btnAssistantChange.UseVisualStyleBackColor = false; |
|
| 907 |
this.btnAssistantChange.Visible = false; |
|
| 908 |
this.btnAssistantChange.Click += new System.EventHandler(this.btnAssistantChange_Click); |
|
| 909 |
// |
|
| 910 |
// btnInstractorChange |
|
| 911 |
// |
|
| 912 |
this.btnInstractorChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 913 |
this.btnInstractorChange.BackColor = System.Drawing.Color.MistyRose; |
|
| 914 |
this.btnInstractorChange.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
|
|
| 915 |
this.btnInstractorChange.Location = new System.Drawing.Point(519, 656); |
|
| 916 |
this.btnInstractorChange.Name = "btnInstractorChange"; |
|
| 917 |
this.btnInstractorChange.Size = new System.Drawing.Size(130, 30); |
|
| 918 |
this.btnInstractorChange.TabIndex = 97; |
|
| 919 |
this.btnInstractorChange.Text = "指導員変更"; |
|
| 920 |
this.btnInstractorChange.UseVisualStyleBackColor = false; |
|
| 921 |
this.btnInstractorChange.Visible = false; |
|
| 922 |
this.btnInstractorChange.Click += new System.EventHandler(this.btnInstractorChange_Click); |
|
| 923 |
// |
|
| 924 |
// btnChangePrice |
|
| 925 |
// |
|
| 926 |
this.btnChangePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 927 |
this.btnChangePrice.BackColor = System.Drawing.Color.Gold; |
|
| 928 |
this.btnChangePrice.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
|
|
| 929 |
this.btnChangePrice.Location = new System.Drawing.Point(243, 656); |
|
| 930 |
this.btnChangePrice.Name = "btnChangePrice"; |
|
| 931 |
this.btnChangePrice.Size = new System.Drawing.Size(130, 30); |
|
| 932 |
this.btnChangePrice.TabIndex = 99; |
|
| 933 |
this.btnChangePrice.Text = "受注金額変更"; |
|
| 934 |
this.btnChangePrice.UseVisualStyleBackColor = false; |
|
| 935 |
this.btnChangePrice.Visible = false; |
|
| 936 |
this.btnChangePrice.Click += new System.EventHandler(this.btnChangePrice_Click); |
|
| 937 |
// |
|
| 938 |
// button1 |
|
| 939 |
// |
|
| 940 |
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 941 |
this.button1.Location = new System.Drawing.Point(1300, 540); |
|
| 942 |
this.button1.Name = "button1"; |
|
| 943 |
this.button1.Size = new System.Drawing.Size(37, 35); |
|
| 944 |
this.button1.TabIndex = 100; |
|
| 945 |
this.button1.Text = "○"; |
|
| 946 |
this.button1.UseVisualStyleBackColor = true; |
|
| 947 |
this.button1.Visible = false; |
|
| 948 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
|
| 949 |
// |
|
| 950 |
// button2 |
|
| 951 |
// |
|
| 952 |
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 953 |
this.button2.Location = new System.Drawing.Point(1300, 581); |
|
| 954 |
this.button2.Name = "button2"; |
|
| 955 |
this.button2.Size = new System.Drawing.Size(37, 35); |
|
| 956 |
this.button2.TabIndex = 101; |
|
| 957 |
this.button2.Text = "１"; |
|
| 958 |
this.button2.UseVisualStyleBackColor = true; |
|
| 959 |
this.button2.Visible = false; |
|
| 960 |
this.button2.Click += new System.EventHandler(this.button2_Click); |
|
| 961 |
// |
|
| 962 | 855 |
// Column1 |
| 963 | 856 |
// |
| 964 | 857 |
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; |
| ... | ... | |
| 1237 | 1130 |
this.Column26.Visible = false; |
| 1238 | 1131 |
this.Column26.Width = 5; |
| 1239 | 1132 |
// |
| 1133 |
// btnDispDown |
|
| 1134 |
// |
|
| 1135 |
this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
| 1136 |
this.btnDispDown.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 1137 |
this.btnDispDown.Location = new System.Drawing.Point(1300, 418); |
|
| 1138 |
this.btnDispDown.Name = "btnDispDown"; |
|
| 1139 |
this.btnDispDown.Size = new System.Drawing.Size(40, 40); |
|
| 1140 |
this.btnDispDown.TabIndex = 42; |
|
| 1141 |
this.btnDispDown.TabStop = false; |
|
| 1142 |
this.btnDispDown.Text = "▼"; |
|
| 1143 |
this.btnDispDown.UseVisualStyleBackColor = true; |
|
| 1144 |
this.btnDispDown.Visible = false; |
|
| 1145 |
this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click); |
|
| 1146 |
// |
|
| 1147 |
// btnDispUp |
|
| 1148 |
// |
|
| 1149 |
this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
| 1150 |
this.btnDispUp.Font = new System.Drawing.Font("ＭＳ 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
|
|
| 1151 |
this.btnDispUp.Location = new System.Drawing.Point(1300, 354); |
|
| 1152 |
this.btnDispUp.Name = "btnDispUp"; |
|
| 1153 |
this.btnDispUp.Size = new System.Drawing.Size(40, 40); |
|
| 1154 |
this.btnDispUp.TabIndex = 41; |
|
| 1155 |
this.btnDispUp.TabStop = false; |
|
| 1156 |
this.btnDispUp.Text = "▲"; |
|
| 1157 |
this.btnDispUp.UseVisualStyleBackColor = true; |
|
| 1158 |
this.btnDispUp.Visible = false; |
|
| 1159 |
this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click); |
|
| 1160 |
// |
|
| 1161 |
// btnOtherProc |
|
| 1162 |
// |
|
| 1163 |
this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
| 1164 |
this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen; |
|
| 1165 |
this.btnOtherProc.Location = new System.Drawing.Point(7, 656); |
|
| 1166 |
this.btnOtherProc.Name = "btnOtherProc"; |
|
| 1167 |
this.btnOtherProc.Size = new System.Drawing.Size(160, 30); |
|
| 1168 |
this.btnOtherProc.TabIndex = 95; |
|
| 1169 |
this.btnOtherProc.TabStop = false; |
|
| 1170 |
this.btnOtherProc.Text = "他の画面へ"; |
|
| 1171 |
this.btnOtherProc.UseVisualStyleBackColor = false; |
|
| 1172 |
this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click); |
|
| 1173 |
// |
|
| 1174 |
// btnAssistantChange |
|
| 1175 |
// |
|
| 1176 |
this.btnAssistantChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 1177 |
this.btnAssistantChange.BackColor = System.Drawing.Color.Beige; |
|
| 1178 |
this.btnAssistantChange.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
|
|
| 1179 |
this.btnAssistantChange.Location = new System.Drawing.Point(381, 656); |
|
| 1180 |
this.btnAssistantChange.Name = "btnAssistantChange"; |
|
| 1181 |
this.btnAssistantChange.Size = new System.Drawing.Size(130, 30); |
|
| 1182 |
this.btnAssistantChange.TabIndex = 96; |
|
| 1183 |
this.btnAssistantChange.Text = "副担当者変更"; |
|
| 1184 |
this.btnAssistantChange.UseVisualStyleBackColor = false; |
|
| 1185 |
this.btnAssistantChange.Visible = false; |
|
| 1186 |
this.btnAssistantChange.Click += new System.EventHandler(this.btnAssistantChange_Click); |
|
| 1187 |
// |
|
| 1188 |
// btnInstractorChange |
|
| 1189 |
// |
|
| 1190 |
this.btnInstractorChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 1191 |
this.btnInstractorChange.BackColor = System.Drawing.Color.MistyRose; |
|
| 1192 |
this.btnInstractorChange.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
|
|
| 1193 |
this.btnInstractorChange.Location = new System.Drawing.Point(519, 656); |
|
| 1194 |
this.btnInstractorChange.Name = "btnInstractorChange"; |
|
| 1195 |
this.btnInstractorChange.Size = new System.Drawing.Size(130, 30); |
|
| 1196 |
this.btnInstractorChange.TabIndex = 97; |
|
| 1197 |
this.btnInstractorChange.Text = "指導員変更"; |
|
| 1198 |
this.btnInstractorChange.UseVisualStyleBackColor = false; |
|
| 1199 |
this.btnInstractorChange.Visible = false; |
|
| 1200 |
this.btnInstractorChange.Click += new System.EventHandler(this.btnInstractorChange_Click); |
|
| 1201 |
// |
|
| 1202 |
// btnChangePrice |
|
| 1203 |
// |
|
| 1204 |
this.btnChangePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 1205 |
this.btnChangePrice.BackColor = System.Drawing.Color.Gold; |
|
| 1206 |
this.btnChangePrice.Font = new System.Drawing.Font("ＭＳ 明朝", 9.75F, System.Drawing.FontStyle.Bold);
|
|
| 1207 |
this.btnChangePrice.Location = new System.Drawing.Point(243, 656); |
|
| 1208 |
this.btnChangePrice.Name = "btnChangePrice"; |
|
| 1209 |
this.btnChangePrice.Size = new System.Drawing.Size(130, 30); |
|
| 1210 |
this.btnChangePrice.TabIndex = 99; |
|
| 1211 |
this.btnChangePrice.Text = "受注金額変更"; |
|
| 1212 |
this.btnChangePrice.UseVisualStyleBackColor = false; |
|
| 1213 |
this.btnChangePrice.Visible = false; |
|
| 1214 |
this.btnChangePrice.Click += new System.EventHandler(this.btnChangePrice_Click); |
|
| 1215 |
// |
|
| 1216 |
// button1 |
|
| 1217 |
// |
|
| 1218 |
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 1219 |
this.button1.Location = new System.Drawing.Point(1300, 540); |
|
| 1220 |
this.button1.Name = "button1"; |
|
| 1221 |
this.button1.Size = new System.Drawing.Size(37, 35); |
|
| 1222 |
this.button1.TabIndex = 100; |
|
| 1223 |
this.button1.Text = "○"; |
|
| 1224 |
this.button1.UseVisualStyleBackColor = true; |
|
| 1225 |
this.button1.Visible = false; |
|
| 1226 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
|
| 1227 |
// |
|
| 1228 |
// button2 |
|
| 1229 |
// |
|
| 1230 |
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
| 1231 |
this.button2.Location = new System.Drawing.Point(1300, 581); |
|
| 1232 |
this.button2.Name = "button2"; |
|
| 1233 |
this.button2.Size = new System.Drawing.Size(37, 35); |
|
| 1234 |
this.button2.TabIndex = 101; |
|
| 1235 |
this.button2.Text = "１"; |
|
| 1236 |
this.button2.UseVisualStyleBackColor = true; |
|
| 1237 |
this.button2.Visible = false; |
|
| 1238 |
this.button2.Click += new System.EventHandler(this.button2_Click); |
|
| 1239 |
// |
|
| 1240 | 1240 |
// FrmConstructionLedger |
| 1241 | 1241 |
// |
| 1242 | 1242 |
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs | ||
|---|---|---|
| 697 | 697 |
IOConstructionBaseInfoDetail BaseDetailDB = new IOConstructionBaseInfoDetail(); |
| 698 | 698 |
IODailyDataConstruction DailyDB = new IODailyDataConstruction(); |
| 699 | 699 |
IOMPersonInCharge PersonDB = new IOMPersonInCharge(); |
| 700 |
//IOMConstructionType TypeDB = new IOMConstructionType(); |
|
| 701 | 700 |
try |
| 702 | 701 |
{
|
| 703 | 702 |
// 工事番号・名称取得 |
| ... | ... | |
| 741 | 740 |
BaseDetailDB.close(); BaseDetailDB = null; |
| 742 | 741 |
DailyDB.close(); DailyDB = null; |
| 743 | 742 |
PersonDB.close(); PersonDB = null; |
| 744 |
//TypeDB.close(); TypeDB = null; |
|
| 745 | 743 |
} |
| 746 | 744 |
} |
| 747 | 745 |
#endregion |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs | ||
|---|---|---|
| 1281 | 1281 |
} |
| 1282 | 1282 |
#endregion |
| 1283 | 1283 |
|
| 1284 |
#region ?w?b?_?[??o????^??\?????? |
|
| 1285 |
/// <summary> |
|
| 1286 |
/// ?w?b?_?[??o????^??\?????? |
|
| 1287 |
/// </summary> |
|
| 1288 |
private void SetPayrollHeader(int OnSalary, int TotalSalary, int[] CostValue, DateTime DspSTDate, DateTime DspEdDate) |
|
| 1289 |
{
|
|
| 1290 |
try |
|
| 1291 |
{
|
|
| 1292 |
// ----- ?\?????? |
|
| 1293 |
// ?U?????^???z?\?? |
|
| 1294 |
lblCalcValue1.Text = OnSalary.ToString("#,0");
|
|
| 1295 |
|
|
| 1296 |
// ???^???\?? |
|
| 1297 |
lblPayroll.Text = TotalSalary.ToString("#,0");
|
|
| 1298 |
|
|
| 1299 |
// ???^???z?v?Z?E?\?? |
|
| 1300 |
int TotalValue = OnSalary - TotalSalary; |
|
| 1301 |
lblTotalValue.Text = TotalValue.ToString("#,0");
|
|
| 1302 |
lblCalcValue3.Text = TotalValue.ToString("#,0");
|
|
| 1303 |
|
|
| 1304 |
// ???S??????v???z?\?? |
|
| 1305 |
lblCalcValue2.Text = CostValue[0].ToString("#,0");
|
|
| 1306 |
|
|
| 1307 |
// ?w???????v???z?\?? |
|
| 1308 |
lblTotalValue2.Text = CostValue[1].ToString("#,0");
|
|
| 1309 |
|
|
| 1310 |
// ?S???O???v?v?Z |
|
| 1311 |
int CalcTotal1 = CostValue[0] + CostValue[1]; |
|
| 1312 |
lblTotalCalcValue1.Text = CalcTotal1.ToString("#,0");
|
|
| 1313 |
lblTotalCalcValue2.Text = CalcTotal1.ToString("#,0");
|
|
| 1314 |
|
|
| 1315 |
// ?l????v |
|
| 1316 |
int CalcTotal = TotalValue + CalcTotal1; |
|
| 1317 |
lblTotalCalcValue.Text = CalcTotal.ToString("#,0");
|
|
| 1318 |
|
|
| 1319 |
// ???^?v?Z?J?n???E?I???? |
|
| 1320 |
lblStartDate.Text = DspSTDate.ToShortDateString(); |
|
| 1321 |
lblEndDate.Text = DspEdDate.ToShortDateString(); |
|
| 1322 |
} |
|
| 1323 |
catch (Exception ex) |
|
| 1324 |
{
|
|
| 1325 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 1326 |
} |
|
| 1327 |
} |
|
| 1328 |
#endregion |
|
| 1329 |
|
|
| 1330 | 1284 |
#region ????m?F????\?????? |
| 1331 | 1285 |
/// <summary> |
| 1332 | 1286 |
/// ????m?F????\?????? |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintCommon.cs | ||
|---|---|---|
| 107 | 107 |
/// <summary> |
| 108 | 108 |
/// 図形サイズ【縦・横】（図形名称順） |
| 109 | 109 |
/// </summary> |
| 110 |
private static float[,] s_ShapeSize = new float[1, 2] { { 25.51f, 25.51f } }; // 判子サイズ
|
|
| 110 |
private static float[,] s_ShapeSize = new float[1, 2] { { 32.00f, 32.00f } }; // 判子サイズ
|
|
| 111 | 111 |
/// <summary> |
| 112 | 112 |
/// 判子フォントサイズ |
| 113 | 113 |
/// </summary> |
| 114 |
private static float[] s_EstimateSeal1FontSize = { 16f, 8f, 8f, 8f, 6f };
|
|
| 114 |
private static float[] s_EstimateSeal1FontSize = { 16f, 10f, 10f, 8f, 6f };
|
|
| 115 | 115 |
/// <summary> |
| 116 |
/// 判子位置(Key:X Value:Y) |
|
| 116 |
/// 判子位置(Key:X Value:Y)左から
|
|
| 117 | 117 |
/// </summary> |
| 118 |
private static float[,] s_CoverSealPoint = new float[4, 2] {{323.25f, 183.75f}, // 社長
|
|
| 119 |
{392.50f, 183.75f}, // 専務
|
|
| 120 |
{460.00f, 183.75f}, // 所属長
|
|
| 121 |
{527.50f, 183.75f} }; // 担当
|
|
| 118 |
private static float[,] s_CoverSealPoint = new float[4, 2] {{357.50f, 202.75f}, // 承認者1
|
|
| 119 |
{425.50f, 202.75f}, // 承認者2
|
|
| 120 |
{490.50f, 202.75f}, // 承認者3
|
|
| 121 |
{560.50f, 202.75f} }; // 承認者4
|
|
| 122 | 122 |
#endregion |
| 123 | 123 |
|
| 124 | 124 |
#region 変数 |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/PrintFormat1.cs | ||
|---|---|---|
| 56 | 56 |
|
| 57 | 57 |
// 1ページ目印刷 |
| 58 | 58 |
List<string> strParaList = new List<string>(); |
| 59 |
CommonDefine.RetunAnswer rtAns = PrintPageSimple(strParaList); |
|
| 59 |
CommonDefine.RetunAnswer rtAns = PrintPageSimple(ref strParaList);
|
|
| 60 | 60 |
if (rtAns != CommonDefine.RetunAnswer.Answer0) |
| 61 | 61 |
{
|
| 62 | 62 |
m_rtAns = rtAns; |
| ... | ... | |
| 91 | 91 |
} |
| 92 | 92 |
for (int ix = 0; ix < m_UsedExcel.ExcelBadCharcter.Length; ix++) |
| 93 | 93 |
{
|
| 94 |
|
|
| 95 | 94 |
wrkFile = wrkFile.Replace(m_UsedExcel.ExcelBadCharcter[ix], ""); |
| 96 | 95 |
} |
| 97 | 96 |
// ファイル名作成 |
| ... | ... | |
| 215 | 214 |
shapedef.ShapeWidth = s_ShapeSize[0, 0]; // 図形描画サイズ Width |
| 216 | 215 |
shapedef.ShapeHeight = s_ShapeSize[0, 1]; // 図形描画サイズ Height |
| 217 | 216 |
|
| 218 |
int PrintPos = 9; // Jは9
|
|
| 217 |
int PrintPos = 10; // Kは10
|
|
| 219 | 218 |
for (int i = 0; i < 4; i++, PrintPos += 2) |
| 220 | 219 |
{
|
| 221 | 220 |
if (PorsonTable[i] == 0) continue; |
| ... | ... | |
| 231 | 230 |
|
| 232 | 231 |
// タイトル印字 |
| 233 | 232 |
string strChar = CommonMotions.cnvNumberToAlphaCharacter(PrintPos); |
| 234 |
if (TitleTable[i].Length != 0) m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString(strChar, 14), TitleTable[i]);
|
|
| 233 |
if (TitleTable[i].Length != 0) m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString(strChar, 16), TitleTable[i]);
|
|
| 235 | 234 |
} |
| 236 | 235 |
} |
| 237 | 236 |
catch (Exception ex) |
| ... | ... | |
| 251 | 250 |
/// ページ印刷 |
| 252 | 251 |
/// </summary> |
| 253 | 252 |
/// <returns></returns> |
| 254 |
private CommonDefine.RetunAnswer PrintPageSimple(List<string> strParaList) |
|
| 253 |
private CommonDefine.RetunAnswer PrintPageSimple(ref List<string> strParaList)
|
|
| 255 | 254 |
{
|
| 256 | 255 |
IOConstructionBaseInfoDetail InfoDetailDB = new IOConstructionBaseInfoDetail(); |
| 257 | 256 |
IOPurchaseOrder OrderDB = new IOPurchaseOrder(); |
| ... | ... | |
| 260 | 259 |
try |
| 261 | 260 |
{
|
| 262 | 261 |
// 工事名称取得 |
| 263 |
string strSQL = InfoDetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName); |
|
| 262 |
StringBuilder strSQL = new StringBuilder(); |
|
| 263 |
strSQL.Append(InfoDetailDB.CreatePrimarykeyString(m_ConstructionCode, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName)); |
|
| 264 | 264 |
ConstructionBaseInfoDetail workRec = new ConstructionBaseInfoDetail(); |
| 265 |
if (!InfoDetailDB.SelectAction(strSQL, ref workRec)) return CommonDefine.RetunAnswer.Answer2; |
|
| 265 |
if (!InfoDetailDB.SelectAction(strSQL.ToString(), ref workRec)) return CommonDefine.RetunAnswer.Answer2;
|
|
| 266 | 266 |
strParaList.Add(workRec.DetailString); |
| 267 | 267 |
|
| 268 | 268 |
// 注文書データ取得 |
| 269 |
strSQL = OrderDB.CreatePrimarykeyString(m_ConstructionCode) + " ORDER BY SEQNO"; |
|
| 269 |
strSQL.Clear(); |
|
| 270 |
strSQL.AppendFormat("{0} ORDER BY SEQNO", OrderDB.CreatePrimarykeyString(m_ConstructionCode));
|
|
| 270 | 271 |
List<PurchaseOrder> OrderList = new List<PurchaseOrder>(); |
| 271 |
if (!OrderDB.SelectAction(strSQL, ref OrderList)) return CommonDefine.RetunAnswer.Answer3; |
|
| 272 |
if (!OrderDB.SelectAction(strSQL.ToString(), ref OrderList)) return CommonDefine.RetunAnswer.Answer3;
|
|
| 272 | 273 |
if (OrderList.Count == 0) return CommonDefine.RetunAnswer.Answer3; |
| 273 | 274 |
|
| 274 | 275 |
string strPageName = string.Empty; |
| ... | ... | |
| 278 | 279 |
if (!PrintTargetCheck(OrderRec.SeqNo)) continue; |
| 279 | 280 |
|
| 280 | 281 |
// 協力会社名取得 |
| 281 |
strSQL = ContractorDB.CreatePrimarykeyString(OrderRec.CompanyCode); |
|
| 282 |
strSQL.Clear(); |
|
| 283 |
strSQL.Append(ContractorDB.CreatePrimarykeyString(OrderRec.CompanyCode)); |
|
| 282 | 284 |
SubContractorMaster ContractorRec = new SubContractorMaster(); |
| 283 |
if (!ContractorDB.SelectAction(strSQL, ref ContractorRec)) return CommonDefine.RetunAnswer.Answer6; |
|
| 285 |
if (!ContractorDB.SelectAction(strSQL.ToString(), ref ContractorRec)) return CommonDefine.RetunAnswer.Answer6;
|
|
| 284 | 286 |
|
| 285 | 287 |
// 注文書シートの取得 |
| 286 | 288 |
m_UsedExcel.ExcelSheetGet(SheetName[(int)enumSheetName.OrderSheet], true, ContractorRec.CompanyName); |
| ... | ... | |
| 347 | 349 |
} |
| 348 | 350 |
|
| 349 | 351 |
// ブロック２編集 |
| 350 |
RARet = SetBlock2Data(63, OrderRec, workRec.DetailString);
|
|
| 352 |
RARet = SetBlock2Data(151, OrderRec, workRec.DetailString);
|
|
| 351 | 353 |
if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet; |
| 352 | 354 |
|
| 353 | 355 |
// 中断処理 |
| ... | ... | |
| 359 | 361 |
} |
| 360 | 362 |
|
| 361 | 363 |
// ブロック３編集 |
| 362 |
RARet = SetBlock3Data(63, OrderRec);
|
|
| 364 |
RARet = SetBlock3Data(151, OrderRec);
|
|
| 363 | 365 |
if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet; |
| 364 | 366 |
|
| 365 | 367 |
// 中断処理 |
| ... | ... | |
| 371 | 373 |
} |
| 372 | 374 |
|
| 373 | 375 |
// ブロック４編集 |
| 374 |
RARet = SetBlock4Data(63, OrderRec);
|
|
| 376 |
RARet = SetBlock4Data(151, OrderRec);
|
|
| 375 | 377 |
if (RARet != CommonDefine.RetunAnswer.Answer0) return RARet; |
| 376 | 378 |
|
| 377 | 379 |
// 中断処理 |
| ... | ... | |
| 382 | 384 |
return CommonDefine.RetunAnswer.Answer0; |
| 383 | 385 |
} |
| 384 | 386 |
|
| 385 |
// ページ名称セット |
|
| 386 |
strPageName = string.Format("{0}約款", ContractorRec.CompanyName);
|
|
| 387 |
// 約款ページ取得 |
|
| 388 |
m_UsedExcel.ExcelSheetGet(SheetName[(int)enumSheetName.Clause], true, strPageName); |
|
| 389 |
// 約款ページ行サイズ変更 |
|
| 390 |
m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultRowSize);
|
|
| 391 |
// 約款ページ列サイズ変更 |
|
| 392 |
m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultColumnSize, false);
|
|
| 393 |
// 約款ページ縦・横セット |
|
| 394 |
m_UsedExcel.ExcelFitCountSet(2, 1); |
|
| 387 |
//// ページ名称セット
|
|
| 388 |
//strPageName = string.Format("{0}約款", ContractorRec.CompanyName);
|
|
| 389 |
//// 約款ページ取得
|
|
| 390 |
//m_UsedExcel.ExcelSheetGet(SheetName[(int)enumSheetName.Clause], true, strPageName);
|
|
| 391 |
//// 約款ページ行サイズ変更
|
|
| 392 |
//m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultRowSize);
|
|
| 393 |
//// 約款ページ列サイズ変更
|
|
| 394 |
//m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultColumnSize, false);
|
|
| 395 |
//// 約款ページ縦・横セット
|
|
| 396 |
//m_UsedExcel.ExcelFitCountSet(2, 1);
|
|
| 395 | 397 |
|
| 398 |
//// ページ名称セット（2017/11/29 とりあえず約款を2枚印刷） |
|
| 399 |
//strPageName = string.Format("{0}約款", ContractorRec.CompanyName);
|
|
| 400 |
//// 約款ページ取得 |
|
| 401 |
//m_UsedExcel.ExcelSheetGet(SheetName[(int)enumSheetName.Clause], true, strPageName); |
|
| 402 |
//// 約款ページ行サイズ変更 |
|
| 403 |
//m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultRowSize);
|
|
| 404 |
//// 約款ページ列サイズ変更 |
|
| 405 |
//m_UsedExcel.ExcelRaneSizeSet("A1:O88", s_DefaultColumnSize, false);
|
|
| 406 |
//// 約款ページ縦・横セット |
|
| 407 |
//m_UsedExcel.ExcelFitCountSet(2, 1); |
|
| 396 | 408 |
|
| 397 | 409 |
// コントロールの表示を変更する |
| 398 | 410 |
this.Invoke(m_progressDlg, new object[] { ++m_ProgressCount });
|
| ... | ... | |
| 457 | 469 |
break; |
| 458 | 470 |
} |
| 459 | 471 |
|
| 460 |
m_UsedExcel.ExcelCellSet("A6", "〒" + ContractorRec.ZipCode); // 発注先 郵便番号
|
|
| 461 |
m_UsedExcel.ExcelCellSet("A7", strA2); // 発注先 住所1
|
|
| 462 |
m_UsedExcel.ExcelCellSet("B8", strA3); // 発注先 住所2
|
|
| 463 |
m_UsedExcel.ExcelCellSet("B10", strA4); // 発注先 会社
|
|
| 472 |
m_UsedExcel.ExcelCellSet("B8", "〒" + ContractorRec.ZipCode); // 発注先 郵便番号
|
|
| 473 |
m_UsedExcel.ExcelCellSet("B9", strA2); // 発注先 住所1
|
|
| 474 |
m_UsedExcel.ExcelCellSet("C10", strA3); // 発注先 住所2
|
|
| 475 |
m_UsedExcel.ExcelCellSet("C12", strA4); // 発注先 会社
|
|
| 464 | 476 |
|
| 465 |
m_UsedExcel.ExcelCellSet("L8", "〒" + CommonMotions.SystemMasterData.ZipCode); // 自社 郵便番号
|
|
| 466 |
m_UsedExcel.ExcelCellSet("L9", CommonMotions.SystemMasterData.Address1 +
|
|
| 477 |
m_UsedExcel.ExcelCellSet("M10", "〒" + CommonMotions.SystemMasterData.ZipCode); // 自社 郵便番号
|
|
| 478 |
m_UsedExcel.ExcelCellSet("M11", CommonMotions.SystemMasterData.Address1 +
|
|
| 467 | 479 |
CommonMotions.SystemMasterData.Address2 + |
| 468 | 480 |
CommonMotions.SystemMasterData.Address3); // 自社 住所1 |
| 469 |
m_UsedExcel.ExcelCellSet("L10", CommonMotions.SystemMasterData.CompanyName1 +
|
|
| 481 |
m_UsedExcel.ExcelCellSet("M12", CommonMotions.SystemMasterData.CompanyName1 +
|
|
| 470 | 482 |
CommonMotions.SystemMasterData.CompanyName2); // 自社 会社名 |
| 471 |
m_UsedExcel.ExcelCellSet("L11", "TEL " + CommonMotions.SystemMasterData.PhoneNumber); // 自社 電話番号
|
|
| 472 |
m_UsedExcel.ExcelCellSet("L12", "FAX " + CommonMotions.SystemMasterData.FaxNumber); // 自社 FAX番号
|
|
| 483 |
m_UsedExcel.ExcelCellSet("M13", "TEL " + CommonMotions.SystemMasterData.PhoneNumber); // 自社 電話番号
|
|
| 484 |
m_UsedExcel.ExcelCellSet("M14", "FAX " + CommonMotions.SystemMasterData.FaxNumber); // 自社 FAX番号
|
|
| 473 | 485 |
|
| 474 | 486 |
|
| 475 | 487 |
// 判子印字 |
| ... | ... | |
| 543 | 555 |
strStartDate = string.Format("{0} 年 月 日", CommonMotions.GetNameOfAnEra(m_ConstructionBaseInfo.ConstructionPeriodStart));
|
| 544 | 556 |
} |
| 545 | 557 |
|
| 546 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (21 + startLine)), ConstractionName); // 工事名称
|
|
| 547 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("N", (21 + startLine)), strCreateDate); // 作成日付
|
|
| 558 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("E", (23 + startLine)), ConstractionName); // 工事名称
|
|
| 559 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("O", (23 + startLine)), strCreateDate); // 作成日付
|
|
| 548 | 560 |
|
| 549 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (22 + startLine)), PlaceString); // 施工及び納入場所
|
|
| 550 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (23 + startLine)), m_ConstructionCode.ToString()); // 工事番号
|
|
| 551 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (23 + startLine)),
|
|
| 561 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("E", (24 + startLine)), PlaceString); // 施工及び納入場所
|
|
| 562 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("E", (25 + startLine)), m_ConstructionCode.ToString()); // 工事番号
|
|
| 563 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("J", (25 + startLine)),
|
|
| 552 | 564 |
string.Format("{0}-{1}", m_ConstructionCode, OrderRec.SeqNo.ToString("000"))); // 発注番号
|
| 553 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("L", (23 + startLine)), PaymentTermsString); // 支払い条件
|
|
| 565 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("M", (25 + startLine)), PaymentTermsString); // 支払い条件
|
|
| 554 | 566 |
|
| 555 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (24 + startLine)), strStartDate); // 工期開始日
|
|
| 567 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("E", (26 + startLine)), strStartDate); // 工期開始日
|
|
| 556 | 568 |
|
| 557 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (24 + startLine))
|
|
| 569 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("J", (26 + startLine))
|
|
| 558 | 570 |
, m_ConstructionBaseInfo.ConstructionPeriodEnd.ToShortDateString()); // 工期終了日 |
| 559 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", (25 + startLine)),
|
|
| 571 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("E", (27 + startLine)),
|
|
| 560 | 572 |
string.Format("￥{0}", OrderRec.OrderPrice.ToString("#,0"))); // 発注金額（税別）
|
| 561 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", (25 + startLine)), PersonRec.PersonName); // 現場担当者
|
|
| 573 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("J", (27 + startLine)), PersonRec.PersonName); // 現場担当者
|
|
| 562 | 574 |
|
| 563 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("L", (25 + startLine)),
|
|
| 575 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("M", (27 + startLine)),
|
|
| 564 | 576 |
string.Format("現金 {0} ％", OrderRec.CashRatio.ToString("0.0"))); // 現金割合
|
| 565 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("O", (25 + startLine)),
|
|
| 577 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("P", (27 + startLine)),
|
|
| 566 | 578 |
string.Format("手形 {0} ％", (100 - OrderRec.CashRatio).ToString("0.0"))); // 手形割合
|
| 567 | 579 |
|
| 568 | 580 |
return CommonDefine.RetunAnswer.Answer0; |
| ... | ... | |
| 602 | 614 |
if (!OrderDetailDB.SelectAction(strSQL, ref DetailList)) return CommonDefine.RetunAnswer.Answer4; |
| 603 | 615 |
if (DetailList.Count == 0) return CommonDefine.RetunAnswer.Answer4; |
| 604 | 616 |
|
| 605 |
int Linecnt = 28 + startLine;
|
|
| 617 |
int Linecnt = 30 + startLine;
|
|
| 606 | 618 |
foreach (PurchaseOrderDetail DetailRec in DetailList) |
| 607 | 619 |
{
|
| 608 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("A", Linecnt), DetailRec.FirstString); // 工種/品名
|
|
| 609 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", Linecnt), DetailRec.SecondString); // 内容内訳
|
|
| 610 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("I", Linecnt),
|
|
| 620 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("B", Linecnt), DetailRec.FirstString); // 工種/品名
|
|
| 621 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("E", Linecnt), DetailRec.SecondString); // 内容内訳
|
|
| 622 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("J", Linecnt),
|
|
| 611 | 623 |
DetailRec.UnitCount.ToString("#,0")); // 数量
|
| 612 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("M", Linecnt),
|
|
| 624 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("L", Linecnt),
|
|
| 613 | 625 |
DetailRec.UnitPrice.ToString("#,#")); // 単価
|
| 614 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("K", Linecnt), DetailRec.UnitName); // 単位
|
|
| 615 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("O", Linecnt),
|
|
| 626 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("L", Linecnt), DetailRec.UnitName); // 単位
|
|
| 627 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("P", Linecnt),
|
|
| 616 | 628 |
DetailRec.OrdersLinePrice.ToString("#,0")); // 金額
|
| 617 | 629 |
Linecnt++; |
| 618 | 630 |
} |
| 619 | 631 |
// セル結合 |
| 620 |
m_UsedExcel.ExcelCellMerge(m_UsedExcel.CreateCellString("D", Linecnt), m_UsedExcel.CreateCellString("L", Linecnt));
|
|
| 632 |
m_UsedExcel.ExcelCellMerge(m_UsedExcel.CreateCellString("E", Linecnt), m_UsedExcel.CreateCellString("M", Linecnt));
|
|
| 621 | 633 |
// データセット |
| 622 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("D", Linecnt),
|
|
| 634 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("E", Linecnt),
|
|
| 623 | 635 |
string.Format(s_LastRowString, CommonMotions.cnvJapaneseCalendar(OrderRec.LastRowStringDate))); // 最終行文字列 |
| 624 | 636 |
|
| 625 | 637 |
return CommonDefine.RetunAnswer.Answer0; |
| ... | ... | |
| 657 | 669 |
// 発注条件はない場合がある |
| 658 | 670 |
if (DetailList.Count == 0) return CommonDefine.RetunAnswer.Answer0; |
| 659 | 671 |
|
| 660 |
int Linecnt = 44 + startLine;
|
|
| 672 |
int Linecnt = 46 + startLine;
|
|
| 661 | 673 |
foreach (PurchaseOrderDetail DetailRec in DetailList) |
| 662 | 674 |
{
|
| 663 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("J", Linecnt), DetailRec.FirstString); // 発注条件
|
|
| 675 |
m_UsedExcel.ExcelCellSet(m_UsedExcel.CreateCellString("K", Linecnt), DetailRec.FirstString); // 発注条件
|
|
| 664 | 676 |
Linecnt++; |
| 665 | 677 |
} |
| 666 | 678 |
|
| ... | ... | |
| 689 | 701 |
IOMSubContractor ContractorDB = new IOMSubContractor(); |
| 690 | 702 |
try |
| 691 | 703 |
{
|
| 692 |
m_UsedExcel.ExcelCellSet("A72", "〒" + CommonMotions.SystemMasterData.ZipCode); // 自社 郵便番号
|
|
| 693 |
m_UsedExcel.ExcelCellSet("A73", CommonMotions.SystemMasterData.Address1 +
|
|
| 704 |
m_UsedExcel.ExcelCellSet("B162", "〒" + CommonMotions.SystemMasterData.ZipCode); // 自社 郵便番号
|
|
| 705 |
m_UsedExcel.ExcelCellSet("B163", CommonMotions.SystemMasterData.Address1 +
|
|
| 694 | 706 |
CommonMotions.SystemMasterData.Address2 + |
| 695 | 707 |
CommonMotions.SystemMasterData.Address3); // 自社 住所 |
| 696 |
m_UsedExcel.ExcelCellSet("B76", CommonMotions.SystemMasterData.CompanyName1 +
|
|
| 708 |
m_UsedExcel.ExcelCellSet("C166", CommonMotions.SystemMasterData.CompanyName1 +
|
|
| 697 | 709 |
CommonMotions.SystemMasterData.CompanyName2); // 自社 会社名 |
| 698 | 710 |
|
| 699 | 711 |
// 協力会社名取得 |
| ... | ... | |
| 724 | 736 |
break; |
| 725 | 737 |
} |
| 726 | 738 |
|
| 727 |
m_UsedExcel.ExcelCellSet("L74", "〒" + ContractorRec.ZipCode); // 発注先 郵便番号
|
|
| 728 |
m_UsedExcel.ExcelCellSet("L75", strA2); // 発注先 住所1
|
|
| 729 |
m_UsedExcel.ExcelCellSet("L76", strA3); // 発注先 住所2
|
|
| 730 |
m_UsedExcel.ExcelCellSet("L77", strA4); // 発注先 会社
|
|
| 739 |
m_UsedExcel.ExcelCellSet("M164", "〒" + ContractorRec.ZipCode); // 発注先 郵便番号
|
|
| 740 |
m_UsedExcel.ExcelCellSet("M165", strA2); // 発注先 住所1
|
|
| 741 |
m_UsedExcel.ExcelCellSet("M166", strA3); // 発注先 住所2
|
|
| 742 |
m_UsedExcel.ExcelCellSet("M167", strA4); // 発注先 会社
|
|
| 731 | 743 |
|
| 732 | 744 |
return CommonDefine.RetunAnswer.Answer0; |
| 733 | 745 |
} |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.1.7")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.7")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.1.9")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.9")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff