リビジョン 284
承認者マスタ起動バグ修正
工事情報新規入力時に他の画面を選択をデータ登録を自動にして起動する様に変更
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 94;
|
|
| 17 |
public static int s_SystemVersion = 95;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
|---|---|---|
| 3161 | 3161 |
try |
| 3162 | 3162 |
{
|
| 3163 | 3163 |
// 起動・編集フラグ |
| 3164 |
int ProcessNo = (int)MaintenanceExecuteNo.ApprovalRoute; |
|
| 3164 |
int ProcessNo = (int)MaintenanceExecuteNo.ApprovalRouteList;
|
|
| 3165 | 3165 |
int EditFlg = (int)CommonDefine.ProcessDataEdit.Reference; |
| 3166 | 3166 |
if (!ClsSecurityPermission.GetExecutePermission(ProcessNo, ref EditFlg)) |
| 3167 | 3167 |
{
|
| branches/src/ProcessManagement/ProcessManagement/DataModel/BillingPaymentSummary.cs | ||
|---|---|---|
| 8 | 8 |
{
|
| 9 | 9 |
public class BillingPaymentSummary |
| 10 | 10 |
{
|
| 11 |
#region 定数 |
|
| 12 |
public enum ChargePaymentKindDef |
|
| 13 |
{
|
|
| 14 |
/// <summary> |
|
| 15 |
/// 0：請求(総務） |
|
| 16 |
/// </summary> |
|
| 17 |
Billing = 0, |
|
| 18 |
/// <summary> |
|
| 19 |
/// 1：支払(工事担当) |
|
| 20 |
/// </summary> |
|
| 21 |
Payment, |
|
| 22 |
} |
|
| 23 |
#endregion |
|
| 24 |
|
|
| 11 | 25 |
#region メンバ変数 |
| 12 |
private int m_CompanyCode = 0; // 協力会社コード |
|
| 13 |
private int m_TargetDate = 0; // 対象年月 |
|
| 14 |
private int m_ChargePaymentKind = 0; // 請求支払区分 |
|
| 15 |
private DateTime m_Payday = DateTime.Now; // 支払日 |
|
| 16 |
private long m_BillPriceStotal = 0; // 請求金額小計 |
|
| 17 |
private double m_ConsumptionTaxRate = 0; // 消費税率 |
|
| 18 |
private long m_ConsumptionTaxPrice = 0; // 消費税額 |
|
| 19 |
private long m_HighwPriceStotal = 0; // 高速代小計 |
|
| 20 |
private long m_HardwPriceStotal = 0; // 金物代小計 |
|
| 21 |
private long m_IndsWasteTaxStotal = 0; // 産廃税小計 |
|
| 22 |
private double m_CnstrPriceRate = 0; // 協力金比率 |
|
| 23 |
private long m_CnstrPriceStotal = 0; // 協力金小計 |
|
| 24 |
private long m_BillingPriceTotal = 0; // 請求金額合計 |
|
| 26 |
private int m_CompanyCode = 0; // 協力会社コード
|
|
| 27 |
private int m_TargetDate = 0; // 対象年月
|
|
| 28 |
private int m_ChargePaymentKind = 0; // 請求支払区分
|
|
| 29 |
private DateTime m_Payday = DateTime.Now; // 支払日
|
|
| 30 |
private long m_BillPriceStotal = 0; // 請求金額小計
|
|
| 31 |
private double m_ConsumptionTaxRate = 0; // 消費税率
|
|
| 32 |
private long m_ConsumptionTaxPrice = 0; // 消費税額
|
|
| 33 |
private long m_HighwPriceStotal = 0; // 高速代小計
|
|
| 34 |
private long m_HardwPriceStotal = 0; // 金物代小計
|
|
| 35 |
private long m_IndsWasteTaxStotal = 0; // 産廃税小計
|
|
| 36 |
private double m_CnstrPriceRate = 0; // 協力金比率
|
|
| 37 |
private long m_CnstrPriceStotal = 0; // 協力金小計
|
|
| 38 |
private long m_BillingPriceTotal = 0; // 請求金額合計
|
|
| 25 | 39 |
private DateTime m_EntryDate = DateTime.Now; // 登録日付 |
| 26 | 40 |
private DateTime m_UpdateDate = DateTime.Now; // 更新日付 |
| 27 | 41 |
#endregion |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs | ||
|---|---|---|
| 230 | 230 |
InitDepPersonCode(); |
| 231 | 231 |
|
| 232 | 232 |
// ?C?x???g?Z?b?g |
| 233 |
SetControlEvent((int)EventDef.ConstPro | (int)EventDef.Person | (int)EventDef.Person);
|
|
| 233 |
SetControlEvent((int)EventDef.ConstPro | (int)EventDef.Department | (int)EventDef.Person);
|
|
| 234 | 234 |
|
| 235 | 235 |
// ?????\?? |
| 236 | 236 |
InitDataLoad(); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/ProcessControl.cs | ||
|---|---|---|
| 164 | 164 |
{
|
| 165 | 165 |
try |
| 166 | 166 |
{
|
| 167 |
if (m_ConstructionCode == 0) |
|
| 168 |
{ // ----- 新規時はデータ登録
|
|
| 169 |
if (!DataEntryProcess(false)) return; |
|
| 170 |
// ボタンメニュー作成 |
|
| 171 |
CreateProcessContextMenu(false); |
|
| 172 |
} |
|
| 173 |
else if (m_bChengeAns) |
|
| 174 |
{ // ----- データ変更有時はデータ登録
|
|
| 175 |
if (!DataEntryProcess(false)) return; |
|
| 176 |
} |
|
| 177 |
|
|
| 167 | 178 |
// ボタンの真上にメニューを表示する |
| 168 | 179 |
int h = m_ProcessContextMenuStrip.Height * -1; |
| 169 | 180 |
m_ProcessContextMenuStrip.Show(btnOtherProc, new Point(0, h)); |
| ... | ... | |
| 249 | 260 |
{
|
| 250 | 261 |
try |
| 251 | 262 |
{
|
| 252 |
// データ変更有時はデータ登録 |
|
| 253 |
if (m_bChengeAns) |
|
| 254 |
{
|
|
| 255 |
if (!DataEntryProcess(false)) return; |
|
| 256 |
} |
|
| 257 |
|
|
| 258 | 263 |
// 起動テーブルをクリアする |
| 259 | 264 |
ClsExcute.ClearProcess(); |
| 260 | 265 |
|
| ... | ... | |
| 294 | 299 |
return; |
| 295 | 300 |
} |
| 296 | 301 |
|
| 297 |
// データ変更有時はデータ登録 |
|
| 298 |
if (m_bChengeAns) |
|
| 299 |
{
|
|
| 300 |
if (!DataEntryProcess(false)) return; |
|
| 301 |
} |
|
| 302 |
|
|
| 303 | 302 |
// 増減工事はサブフォームを表示する |
| 304 | 303 |
int SelConstrCode = m_ConstructionCode; |
| 305 | 304 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 359 | 358 |
return; |
| 360 | 359 |
} |
| 361 | 360 |
|
| 362 |
// データ変更有時はデータ登録 |
|
| 363 |
if (m_bChengeAns) |
|
| 364 |
{
|
|
| 365 |
if (!DataEntryProcess(false)) return; |
|
| 366 |
} |
|
| 367 |
|
|
| 368 | 361 |
// 増減工事はサブフォームを表示する |
| 369 | 362 |
int SelConstrCode = m_ConstructionCode; |
| 370 | 363 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 420 | 413 |
return; |
| 421 | 414 |
} |
| 422 | 415 |
|
| 423 |
// データ変更有時はデータ登録 |
|
| 424 |
if (m_bChengeAns) |
|
| 425 |
{
|
|
| 426 |
if (!DataEntryProcess(false)) return; |
|
| 427 |
} |
|
| 428 |
|
|
| 429 | 416 |
// 増減工事はサブフォームを表示する |
| 430 | 417 |
int SelConstrCode = m_ConstructionCode; |
| 431 | 418 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 481 | 468 |
return; |
| 482 | 469 |
} |
| 483 | 470 |
|
| 484 |
// データ変更有時はデータ登録 |
|
| 485 |
if (m_bChengeAns) |
|
| 486 |
{
|
|
| 487 |
if (!DataEntryProcess(false)) return; |
|
| 488 |
} |
|
| 489 |
|
|
| 490 | 471 |
// 増減工事はサブフォームを表示する |
| 491 | 472 |
int SelConstrCode = m_ConstructionCode; |
| 492 | 473 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 542 | 523 |
return; |
| 543 | 524 |
} |
| 544 | 525 |
|
| 545 |
// データ変更有時はデータ登録 |
|
| 546 |
if (m_bChengeAns) |
|
| 547 |
{
|
|
| 548 |
if (!DataEntryProcess(false)) return; |
|
| 549 |
} |
|
| 550 |
|
|
| 551 | 526 |
// 増減工事はサブフォームを表示する |
| 552 | 527 |
int SelConstrCode = m_ConstructionCode; |
| 553 | 528 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 603 | 578 |
return; |
| 604 | 579 |
} |
| 605 | 580 |
|
| 606 |
// データ変更有時はデータ登録 |
|
| 607 |
if (m_bChengeAns) |
|
| 608 |
{
|
|
| 609 |
if (!DataEntryProcess(false)) return; |
|
| 610 |
} |
|
| 611 |
|
|
| 612 | 581 |
// 増減工事はサブフォームを表示する |
| 613 | 582 |
int SelConstrCode = m_ConstructionCode; |
| 614 | 583 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 663 | 632 |
return; |
| 664 | 633 |
} |
| 665 | 634 |
|
| 666 |
// データ変更有時はデータ登録 |
|
| 667 |
if (m_bChengeAns) |
|
| 668 |
{
|
|
| 669 |
if (!DataEntryProcess(false)) return; |
|
| 670 |
} |
|
| 671 |
|
|
| 672 | 635 |
// 増減工事はサブフォームを表示する |
| 673 | 636 |
int SelConstrCode = m_ConstructionCode; |
| 674 | 637 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 725 | 688 |
return; |
| 726 | 689 |
} |
| 727 | 690 |
|
| 728 |
// データ変更有時はデータ登録 |
|
| 729 |
if (m_bChengeAns) |
|
| 730 |
{
|
|
| 731 |
if (!DataEntryProcess(false)) return; |
|
| 732 |
} |
|
| 733 |
|
|
| 734 | 691 |
// 増減工事はサブフォームを表示する |
| 735 | 692 |
int SelConstrCode = m_ConstructionCode; |
| 736 | 693 |
if (rdbExistsFluctuation.Checked || lblJointLabel.Visible) |
| ... | ... | |
| 786 | 743 |
return; |
| 787 | 744 |
} |
| 788 | 745 |
|
| 789 |
// データ変更有時はデータ登録 |
|
| 790 |
if (m_bChengeAns) |
|
| 791 |
{
|
|
| 792 |
if (!DataEntryProcess(false)) return; |
|
| 793 |
} |
|
| 794 |
|
|
| 795 | 746 |
// 工事詳細台帳入力起動 |
| 796 | 747 |
frm = new FrmConstructionLedger(); |
| 797 | 748 |
ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = s_CurrentProcessNo; |
| ... | ... | |
| 831 | 782 |
return; |
| 832 | 783 |
} |
| 833 | 784 |
|
| 834 |
// データ変更有時はデータ登録 |
|
| 835 |
if (m_bChengeAns) |
|
| 836 |
{
|
|
| 837 |
if (!DataEntryProcess(false)) return; |
|
| 838 |
} |
|
| 839 |
|
|
| 840 | 785 |
// 交通費及び購入品等入力起動 |
| 841 | 786 |
frm = new FrmTAndPCosts(); |
| 842 | 787 |
ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = s_CurrentProcessNo; |
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.0.94")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.94")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.0.95")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.0.95")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff