プロジェクト

全般

プロフィール

リビジョン 383

堀内6年以上前に追加

製品版設定クラス追加
承認➝確認処理修正中
IOクラス、UpdateFieldメソッドパラメータ順修正

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs
14 14
        /// <summary>
15 15
        /// 本体バージョン
16 16
        /// </summary>
17
        public static int s_SystemVersion = 232;
17
        public static int s_SystemVersion = 233;
18 18

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
1348 1348
                        // ----- 存在する場合は明細データを更新
1349 1349
                        // 請求内容の更新
1350 1350
                        if (!DetailDB.UpdateFeild(DetailRec.ConstructionCode
1351
                                                    ,(int)IOConstructionLedgerDetail.TableColumn.SecondString
1352
                                                    , DetailRec.SecondString
1353 1351
                                                    , DetailRec.GroupCount
1354 1352
                                                    , DetailRec.LineCount
1353
                                                    , (int)IOConstructionLedgerDetail.TableColumn.SecondString
1354
                                                    , DetailRec.SecondString
1355 1355
                                                    , false))
1356 1356
                        {
1357 1357
                            return false;
......
1436 1436

  
1437 1437
                // ----- 明細文字をセットする
1438 1438
                if (!DetailDB.UpdateFeild(DetailRec.ConstructionCode,
1439
                                            DetailRec.GroupCount,
1440
                                            DetailRec.LineCount,
1439 1441
                                            (int)IOConstructionLedgerDetail.TableColumn.SecondString,
1440 1442
                                            DetailRec.SecondString,
1441
                                            DetailRec.GroupCount,
1442
                                            DetailRec.LineCount,
1443 1443
                                            false))
1444 1444
                {
1445 1445
                    return false;
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsCommonApproval.cs
264 264
            IOPersonApproval ApprDB = new IOPersonApproval();
265 265
            try
266 266
            {
267
                if (!ApprDB.UpdateFeild(PersonCode,
268
                                        ApprovalCode,
269
                                        OrderDate,
270
                                        (int)IOPersonApproval.ColumnName.ApprovalStatus,
271
                                        Status,
272
                                        true,
273
                                        OrderNo,
274
                                        s_PrimartyRecord)) return false;
267
                if (!ApprDB.UpdateFeild(PersonCode
268
                                        , ApprovalCode
269
                                        , OrderDate
270
                                        , OrderNo
271
                                        , s_PrimartyRecord
272
                                        , (int)IOPersonApproval.ColumnName.ApprovalStatus
273
                                        , Status
274
                                        , true)) return false;
275 275

  
276 276
                return true;
277 277
            }
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
1003 1003
                        strOrgMsg += "\n";
1004 1004
                        strOrgMsg += strMsg;
1005 1005
                        if (strOrgMsg.Length > 120) strOrgMsg = strOrgMsg.Substring(0, 120);
1006
                        if (!DetailDB.UpdateFeild(CommonMotions.cnvInt(objRec[0]),
1007
                                                    (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING,
1008
                                                    strOrgMsg,
1009
                                                    false,
1010
                                                    (int)ConstructionBaseInfoDetail.DataNoDef.OrdersDecisionComment))
1006
                        if (!DetailDB.UpdateFeild(CommonMotions.cnvInt(objRec[0])
1007
                                                    , (int)ConstructionBaseInfoDetail.DataNoDef.OrdersDecisionComment
1008
                                                    , (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING
1009
                                                    , strOrgMsg
1010
                                                    , false))
1011 1011
                        {
1012 1012
                            BaseDB.rollback();
1013 1013
                            DetailDB.rollback();
trunk/src/ProcessManagement/ProcessManagement/Common/ProductDefine.cs
1
using System;
2
using System.Collections.Generic;
3
using System.Linq;
4
using System.Text;
5
using System.Diagnostics;
6
using System.Windows.Forms;
7
using System.Drawing;
8
using System.IO;
9
using System.Text.RegularExpressions;
10
using System.Data;
11
using System.Security.Cryptography;
12
using System.Globalization;
13

  
14
using ProcessManagement.Common;
15
using ProcessManagement.DB.IOAccess;
16
using ProcessManagement.DataModel;
17
using ProcessManagement.DB.Core;
18

  
19
namespace ProcessManagement.Common
20
{
21
    /// <summary>
22
    /// 製品定義クラス
23
    /// </summary>
24
    public static class ProductDefine
25
    {
26
        #region 定数
27
        #region 製品種別定義
28
        /// <summary>
29
        /// 製品種別定義
30
        /// </summary>
31
        public enum ProductTypeDef
32
        {
33
            /// <summary>
34
            ///  0:ヒョウ工務店社内
35
            /// </summary>
36
            Originals = 0,
37
            /// <summary>
38
            ///  1:製品版1
39
            /// </summary>
40
            MassProductionType1,
41
        }
42
        #endregion
43
        #endregion
44

  
45
        #region メンバ変数
46
        /// <summary>
47
        /// 製品種別
48
        /// </summary>
49
        private static int      m_ProductType = (int)ProductTypeDef.MassProductionType1;
50
        #endregion
51

  
52
        #region コンストラクタ
53
        #endregion
54

  
55
        #region プロパティ
56
        /// <summary>
57
        /// 製品種別
58
        /// </summary>
59
        public static int ProductType
60
        {
61
            get { return m_ProductType; }
62
        }
63
        #endregion
64
    }
65
}
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionBaseInfoDetail.cs
345 345
        /// 1項目の更新を行う
346 346
        /// </summary>
347 347
        /// <returns></returns>
348
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int DetailNo = 0)
348
        public bool UpdateFeild(int ConstructionCode, int DetailNo, int FeildNo, object value, bool bConnect = true)
349 349
        {
350 350
            StringBuilder strcmd = new StringBuilder();
351 351
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOConstructionLedgerDetail.cs
484 484
        /// 1項目の更新を行う(キー指定)
485 485
        /// </summary>
486 486
        /// <returns></returns>
487
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, int GroupCount = 0, int LineCount = 0, bool bConnect = true)
487
        public bool UpdateFeild(int ConstructionCode, int GroupCount, int LineCount, int FeildNo, object value, bool bConnect = true)
488 488
        {
489 489
            StringBuilder strcmd = new StringBuilder();
490 490
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOEstimateBudgetDetail.cs
355 355
        /// 1項目の更新を行う
356 356
        /// </summary>
357 357
        /// <returns></returns>
358
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true)
358
        public bool UpdateFeild(int ConstructionCode, int GroupCount, int LineCount, int FeildNo, object value, bool bConnect = true)
359 359
        {
360 360
            StringBuilder strcmd = new StringBuilder();
361 361
            try
......
390 390
                        strcmd.AppendFormat(" SecondString = '{0}'", value.ToString());
391 391
                        break;
392 392
                    case (int)TableColumn.EstimatePrice:        // 見積時金額
393
                        strcmd.AppendFormat(" EstimatePrice = {0}", ((double)value).ToString());
393
                        strcmd.AppendFormat(" EstimatePrice = {0}", ((int)value).ToString());
394 394
                        break;
395 395
                    case (int)TableColumn.NegotiationPrice:     // 交渉時金額
396
                        strcmd.AppendFormat(" NegotiationPrice = {0}", ((double)value).ToString());
396
                        strcmd.AppendFormat(" NegotiationPrice = {0}", ((int)value).ToString());
397 397
                        break;
398 398
                    case (int)TableColumn.Notes:                // 注意事項
399 399
                        strcmd.AppendFormat(" Notes = '{0}'", value.ToString());
......
401 401
                }
402 402

  
403 403
                strcmd.Append(", UpdateDate = NOW()");
404
                strcmd.Append(CreatePrimarykeyString(ConstructionCode));
404
                strcmd.Append(CreatePrimarykeyString(ConstructionCode, GroupCount, LineCount));
405 405

  
406 406
                if (!ExecuteNonQuery(strcmd.ToString(), bConnect)) return false;
407 407

  
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApproval.cs
353 353
        /// 1項目の更新を行う
354 354
        /// </summary>
355 355
        /// <returns></returns>
356
        public bool UpdateFeild(int PersonCode, int ApprovalCode, DateTime OrderDate, int FeildNo, object value, bool bConnect = true, int OrderNo = 0, int SeqNo = 0)
356
        public bool UpdateFeild(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo, int SeqNo, int FeildNo, object value, bool bConnect = true)
357 357
        {
358 358
            StringBuilder strcmd = new StringBuilder();
359 359
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApprovalCommnet.cs
341 341
        /// 1項目の更新を行う
342 342
        /// </summary>
343 343
        /// <returns></returns>
344
        public bool UpdateFeild(int PersonCode, int ApprovalCode, DateTime OrderDate, int FeildNo, object value, bool bConnect = true, int OrderNo = 0, int CommentNo = 0)
344
        public bool UpdateFeild(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo, int CommentNo, int FeildNo, object value, bool bConnect = true)
345 345
        {
346 346
            StringBuilder strcmd = new StringBuilder();
347 347
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPersonApprovalDetail.cs
350 350
        /// 1項目の更新を行う
351 351
        /// </summary>
352 352
        /// <returns></returns>
353
        public bool UpdateFeild(int PersonCode, int ApprovalCode, DateTime OrderDate, int FeildNo, object value, bool bConnect = true, int OrderNo = 0, int SeqNo = 0)
353
        public bool UpdateFeild(int PersonCode, int ApprovalCode, DateTime OrderDate, int OrderNo, int SeqNo, int FeildNo, object value, bool bConnect = true)
354 354
        {
355 355
            StringBuilder strcmd = new StringBuilder();
356 356
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProcessApprovalCommnet.cs
337 337
        /// 1項目の更新を行う
338 338
        /// </summary>
339 339
        /// <returns></returns>
340
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int ApprovalCode = 0, int OrderNo = 0, int SeqNo = 0)
340
        public bool UpdateFeild(int ConstructionCode, int ApprovalCode, int OrderNo, int SeqNo, int FeildNo, object value, bool bConnect = true)
341 341
        {
342 342
            StringBuilder strcmd = new StringBuilder();
343 343
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOProcessApprovalDetail.cs
330 330
        /// 1項目の更新を行う
331 331
        /// </summary>
332 332
        /// <returns></returns>
333
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int ApprovalCode = 0, int OrderNo = 0, int SeqNo = 0)
333
        public bool UpdateFeild(int ConstructionCode, int ApprovalCode, int OrderNo, int SeqNo, int FeildNo, object value, bool bConnect = true)
334 334
        {
335 335
            StringBuilder strcmd = new StringBuilder();
336 336
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrder.cs
464 464
        /// 1項目の更新を行う
465 465
        /// </summary>
466 466
        /// <returns></returns>
467
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int SeqNo = 0)
467
        public bool UpdateFeild(int ConstructionCode, int SeqNo, int FeildNo, object value, bool bConnect = true)
468 468
        {
469 469
            StringBuilder strcmd = new StringBuilder();
470 470
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrderDate.cs
345 345
        /// 1項目の更新を行う
346 346
        /// </summary>
347 347
        /// <returns></returns>
348
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int SeqNo = 0)
348
        public bool UpdateFeild(int ConstructionCode, int SeqNo, int FeildNo, object value, bool bConnect = true)
349 349
        {
350 350
            StringBuilder strcmd = new StringBuilder();
351 351
            try
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORequestOrderDate.cs
322 322
        /// 1項目の更新を行う
323 323
        /// </summary>
324 324
        /// <returns></returns>
325
        public bool UpdateFeild(int ConstructionCode, int FeildNo, object value, bool bConnect = true, int InvoiceNo = 0)
325
        public bool UpdateFeild(int ConstructionCode, int InvoiceNo, int FeildNo, object value, bool bConnect = true)
326 326
        {
327 327
            StringBuilder strcmd = new StringBuilder();
328 328
            try
trunk/src/ProcessManagement/ProcessManagement/DataModel/SystemMaster.cs
56 56
        private DateTime    m_ConstrBeginDate = DateTime.MinValue.Date;         // 期首日(工事年度)
57 57
        private DateTime    m_BusinessCompDate = DateTime.MinValue.Date;        // 営業期期末日
58 58
        private DateTime    m_ConstrCompDate = DateTime.MinValue.Date;          // 工事年度期末日
59
        private int         m_ConstructionNoBase = 0;	        // 工事番号基準値
59
        private int         m_ConstructionNoBase = -1;	        // 工事番号基準値
60 60

  
61 61
        private string      m_SloganString1 = string.Empty;	    // 標語
62 62
        private string      m_SloganString2 = string.Empty;	    // 標語
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs
632 632
                    }
633 633
                }
634 634
                // ?\???f?[?^??\????????
635
                if (!pAppDB.UpdateFeild(m_PersonCode,
636
                                    m_ApprovalCode,
637
                                    m_OrderDate,
638
                                    (int)IOPersonApproval.ColumnName.ApprovalStatus,
639
                                    (int)CommonDefine.ApprovalStatus.Petition,
640
                                    false))
635
                if (!pAppDB.UpdateFeild(m_PersonCode
636
                                    , m_ApprovalCode
637
                                    , m_OrderDate
638
                                    , 0
639
                                    , 0
640
                                    , (int)IOPersonApproval.ColumnName.ApprovalStatus
641
                                    , (int)CommonDefine.ApprovalStatus.Petition
642
                                    , false))
641 643
                {
642 644
                    pAppDB.rollback();
643 645
                    return;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs
1179 1179
                if (bExists && DetailRec.CompanyCode != ConstructorCode)
1180 1180
                {
1181 1181
                    if (!LedgerDDB.UpdateFeild(DetailRec.ConstructionCode,
1182
                                            DetailRec.GroupCount,
1183
                                            DetailRec.LineCount,
1182 1184
                                            (int)IOConstructionLedgerDetail.TableColumn.OperatingFlg,
1183 1185
                                            (int)ConstructionLedgerDetail.SalOpeKindDef.Complate,
1184
                                            DetailRec.GroupCount,
1185
                                            DetailRec.LineCount,
1186 1186
                                            false)) return false;
1187 1187
                
1188 1188
                    // ???^?????????w?????O?S????x???z????????
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
3712 3712
                    if (CurRec[0].DetailString == work.DetailString) continue;
3713 3713

  
3714 3714
                    if (!cbidDB.UpdateFeild(work.ConstructionCode
3715
                                            , work.DetailNo
3715 3716
                                            , (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING
3716 3717
                                            , work.DetailString
3717
                                            , false
3718
                                            , work.DetailNo))
3718
                                            , false))
3719 3719
                    {
3720 3720
                        MessageBox.Show("?H????{????F?X?V?o?^????s????????B", "?o?^?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3721 3721
                        return false;
......
3786 3786
                    }
3787 3787

  
3788 3788
                    if (!cbidDB.UpdateFeild(DepRec.ConstructionCode
3789
                                            , DepRec.DetailNo
3789 3790
                                            , (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING
3790 3791
                                            , DepRec.DetailString
3791
                                            , false
3792
                                            , DepRec.DetailNo))
3792
                                            , false))
3793 3793
                    {
3794 3794
                        MessageBox.Show("?H????{????F?????X?V?o?^????s????????B", "?o?^?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
3795 3795
                        return false;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
1181 1181
                // 工事情報明細をコピーで作成
1182 1182
                if (!DetailDB.RecordCopyAction(SaveCode, m_ConstructionCode, false)) return false;
1183 1183
                // 名前変更
1184
                if (!DetailDB.UpdateFeild(m_ConstructionCode, (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING
1185
                                            , m_ConstructionName, false, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName)) return false;
1184
                if (!DetailDB.UpdateFeild(m_ConstructionCode
1185
                                            , (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName
1186
                                            , (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING
1187
                                            , m_ConstructionName
1188
                                            , false
1189
                                            )) return false;
1186 1190

  
1187 1191
                return true;
1188 1192
            }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
8783 8783
                    int SALARYDAYS = CommonMotions.cnvInt(CurObj[7]);
8784 8784
                    string DETAILSTRING = CommonMotions.cnvString(CurObj[8]);
8785 8785

  
8786
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.SalaryFlg, (object)SALARYFLG, GROUPCOUNT, LINECOUNT, false))
8786
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.SalaryFlg, (object)SALARYFLG, false))
8787 8787
                    {
8788 8788
                        LedgerDB.rollback();
8789 8789
                        LDetailDB.rollback();
8790 8790
                        return;
8791 8791
                    }
8792
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.SalaryDays, (object)SALARYDAYS, GROUPCOUNT, LINECOUNT, false))
8792
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.SalaryDays, (object)SALARYDAYS, false))
8793 8793
                    {
8794 8794
                        LedgerDB.rollback();
8795 8795
                        LDetailDB.rollback();
8796 8796
                        return;
8797 8797
                    }
8798
                    int OpeFlg =(int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing;
8799
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.OperatingFlg, (object)OpeFlg, GROUPCOUNT, LINECOUNT, false))
8798
                    int OpeFlg = (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing;
8799
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.OperatingFlg, (object)OpeFlg, false))
8800 8800
                    {
8801 8801
                        LedgerDB.rollback();
8802 8802
                        LDetailDB.rollback();
......
8834 8834
                    int SALARYDAYS = CommonMotions.cnvInt(CurObj[7]);
8835 8835
                    string DETAILSTRING = CommonMotions.cnvString(CurObj[8]);
8836 8836

  
8837
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.SalaryFlg, (object)SALARYFLG, GROUPCOUNT, LINECOUNT, false))
8837
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.SalaryFlg, (object)SALARYFLG, false))
8838 8838
                    {
8839 8839
                        LedgerDB.rollback();
8840 8840
                        LDetailDB.rollback();
8841 8841
                        return;
8842 8842
                    }
8843
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.SalaryDays, (object)SALARYDAYS, GROUPCOUNT, LINECOUNT, false))
8843
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.SalaryDays, (object)SALARYDAYS, false))
8844 8844
                    {
8845 8845
                        LedgerDB.rollback();
8846 8846
                        LDetailDB.rollback();
8847 8847
                        return;
8848 8848
                    }
8849 8849
                    int OpeFlg = (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing;
8850
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.OperatingFlg, (object)OpeFlg, GROUPCOUNT, LINECOUNT, false))
8850
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.OperatingFlg, (object)OpeFlg, false))
8851 8851
                    {
8852 8852
                        LedgerDB.rollback();
8853 8853
                        LDetailDB.rollback();
......
8885 8885
                    int SALARYDAYS = CommonMotions.cnvInt(CurObj[7]);
8886 8886
                    string DETAILSTRING = CommonMotions.cnvString(CurObj[8]);
8887 8887

  
8888
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.SalaryFlg, (object)SALARYFLG, GROUPCOUNT, LINECOUNT, false))
8888
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.SalaryFlg, (object)SALARYFLG, false))
8889 8889
                    {
8890 8890
                        LedgerDB.rollback();
8891 8891
                        LDetailDB.rollback();
8892 8892
                        return;
8893 8893
                    }
8894
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.SalaryDays, (object)SALARYDAYS, GROUPCOUNT, LINECOUNT, false))
8894
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.SalaryDays, (object)SALARYDAYS, false))
8895 8895
                    {
8896 8896
                        LedgerDB.rollback();
8897 8897
                        LDetailDB.rollback();
8898 8898
                        return;
8899 8899
                    }
8900 8900
                    int OpeFlg = (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing;
8901
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, (int)IOConstructionLedgerDetail.TableColumn.OperatingFlg, (object)OpeFlg, GROUPCOUNT, LINECOUNT, false))
8901
                    if (!LDetailDB.UpdateFeild(CONSTRUCTIONCODE, GROUPCOUNT, LINECOUNT, (int)IOConstructionLedgerDetail.TableColumn.OperatingFlg, (object)OpeFlg, false))
8902 8902
                    {
8903 8903
                        LedgerDB.rollback();
8904 8904
                        LDetailDB.rollback();
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSplit/FrmConstructionSplitAuxiliary.cs
761 761

  
762 762
                // ----- 工事情報明細
763 763
                // 名前変更
764
                if (!DetailDB.UpdateFeild(m_ConstructionCode, (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING
765
                                            , lblNewName.Text, false, (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName)) return false;
764
                if (!DetailDB.UpdateFeild(m_ConstructionCode
765
                                            , (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName
766
                                            , (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING
767
                                            , lblNewName.Text
768
                                            , false)) return false;
766 769

  
767 770
                return true;
768 771
            }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs
325 325
                List<EstimateDataDetail> DetailList = new List<EstimateDataDetail>();
326 326
                StringBuilder strSQL = new StringBuilder();
327 327
                strSQL.Append(DetailDB.CreatePrimarykeyString(m_ConstructionCode));
328
                strSQL.Append(" And (");
328
                strSQL.Append(" And ComponentCode In (");
329 329
                int i = 0;
330
                //foreach (int Comp in ClsComCostsStatic.s_BiddingCode)
331 330
                foreach (int Comp in m_CommonCosts.BiddingCode)
332 331
                {
333
                    if (i != 0) strSQL.Append(" Or");
334
                    strSQL.AppendFormat(" ComponentCode = {0}", Comp);
332
                    if (i == 0) strSQL.AppendFormat("{0}", Comp);
333
                    strSQL.AppendFormat(", {0}", Comp);
335 334
                    i++;
336 335
                }
337 336
                strSQL.Append(")");
......
1064 1063
                strSQL.Append("SELECT B.COMPONENTNAME,A.ITEMNAME,SUM(A.LINETOTAL),A.COMPONENTCODE,A.ITEMCODE");
1065 1064
                strSQL.Append(" FROM ESTIMATEDATADETAIL A, COMPONENTMASTER B");
1066 1065
                strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);                 // 対象工事のみ
1067
                //strSQL.AppendFormat(" AND A.COMPONENTCODE != {0}", ClsComCostsStatic.s_CommunityCompCode);     // 共通仮設費以外を対象にする
1068
                strSQL.AppendFormat(" AND A.COMPONENTCODE != {0}", m_CommonCosts.CommonTemporyPublic);        // 共通仮設費以外を対象にする
1066
                strSQL.AppendFormat(" AND A.COMPONENTCODE != {0}", m_CommonCosts.CommonTemporyPublic);      // 共通仮設費以外を対象にする
1069 1067
                strSQL.Append(" And A.MYEXPENSESFLG = 0");                                                  // 経費を除外する
1070 1068
                strSQL.AppendFormat(" And A.COMPANYCODE = {0}",
1071 1069
                            CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Key);       // 自社施工のみ
......
1147 1145
            {
1148 1146
                StringBuilder strSQL = new StringBuilder();
1149 1147
                strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
1150
                //strSQL.AppendFormat(" AND COMPONENTCODE = {0}", ClsComCostsStatic.s_CommunityCompCode);    // 共通仮設費を対象にする
1151
                strSQL.AppendFormat(" AND COMPONENTCODE = {0}", m_CommonCosts.CommonTemporyPublic);       // 共通仮設費を対象にする
1148
                strSQL.AppendFormat(" AND COMPONENTCODE = {0}", m_CommonCosts.CommonTemporyPublic);     // 共通仮設費を対象にする
1152 1149
                strSQL.Append(" AND COMPANYCODE != 0");                                                 // 会社割当のあるものを対象
1153 1150
                strSQL.Append(" ORDER BY PageCount, LineCount");
1154 1151

  
......
1170 1167
                    // 民間のデータセット
1171 1168
                    EstimateBudgetDetail Datarec = new EstimateBudgetDetail();
1172 1169
                    Datarec.GroupCount = (int)GroupName.CommonTemp;  // グループ番号
1173
                    //Datarec.ComponentCode = ClsComCostsStatic.s_CommunityCompCode;     // 構成キー
1174
                    Datarec.ComponentCode = m_CommonCosts.CommonTemporyPublic;        // 構成キー
1170
                    Datarec.ComponentCode = m_CommonCosts.CommonTemporyPublic;      // 構成キー
1175 1171
                    Datarec.ItemCode = DetailRec.ItemCode;	                        // 工種キー
1176 1172
                    Datarec.FirstString = DetailRec.ItemName;                       // 構成名称
1177 1173
                    Datarec.EstimatePrice = DetailRec.LineTotal;                    // 見積時金額
......
1218 1214
                // ----- 積み上げ共通仮設費
1219 1215
                StringBuilder strSQL = new StringBuilder();
1220 1216
                strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
1221
                //strSQL.AppendFormat(" AND COMPONENTCODE = {0}", ClsComCostsStatic.s_CommunityCompCode);        // 共通仮設費を対象にする
1222
                //strSQL.AppendFormat(" AND ITEMCODE = {0}", ClsComCostsStatic.s_PileUpCommonTempory);           // 積み上げ共通仮設費を対象とする
1223
                strSQL.AppendFormat(" AND COMPONENTCODE = {0}", m_CommonCosts.CommonTemporyPublic);           // 共通仮設費を対象にする
1224
                strSQL.AppendFormat(" AND ITEMCODE = {0}", m_CommonCosts.PileUpComTempoPublic);              // 積み上げ共通仮設費を対象とする
1217
                strSQL.AppendFormat(" AND COMPONENTCODE = {0}", m_CommonCosts.CommonTemporyPublic);         // 共通仮設費を対象にする
1218
                strSQL.AppendFormat(" AND ITEMCODE = {0}", m_CommonCosts.PileUpComTempoPublic);             // 積み上げ共通仮設費を対象とする
1225 1219
                strSQL.Append(" AND COMPANYCODE != 0");                                                     // 会社割当のあるものを対象
1226 1220
                strSQL.Append(" ORDER BY PageCount, LineCount");                                            // 見積入力と同じ並びにする
1227 1221
                List<EstimateDataDetail> DetailList = new List<EstimateDataDetail>();
......
1237 1231
                foreach (EstimateDataDetail DetailRec in DetailList)
1238 1232
                {
1239 1233
                    EstimateBudgetDetail Datarec = new EstimateBudgetDetail();
1240
                    Datarec.GroupCount = (int)GroupName.CommonPileUp;    // グループ番号
1241
                    //Datarec.ComponentCode = ClsComCostsStatic.s_CommunityCompCode;         // 構成キー
1242
                    Datarec.ComponentCode = m_CommonCosts.CommonTemporyPublic;            // 構成キー
1234
                    Datarec.GroupCount = (int)GroupName.CommonPileUp;                   // グループ番号
1235
                    Datarec.ComponentCode = m_CommonCosts.CommonTemporyPublic;          // 構成キー
1243 1236
                    Datarec.ItemCode = DetailRec.ItemCode;	                            // 工種キー
1244 1237
                    Datarec.FirstString = DetailRec.ItemName;                           // 構成名称
1245 1238
                    Datarec.EstimatePrice = DetailRec.LineTotal;                        // 見積時金額
......
1344 1337
                strSQL.Append(" LEFT JOIN (SELECT E.COMPONENTCODE, E.ITEMCODE, SUM(E.LINETOTAL) TOTAL FROM ESTIMATEDATADETAIL E");
1345 1338
                strSQL.AppendFormat(" WHERE E.CONSTRUCTIONCODE = {0} GROUP BY E.COMPONENTCODE, E.ITEMCODE) D ON A.ITEMCODE = D.ITEMCODE", m_ConstructionCode);
1346 1339

  
1347
                strSQL.Append(", COMMONCOSTLARGE B, COMMONCOSTMIDDLE C");
1340
                strSQL.Append(", COMMONCOSTLARGE B");
1341
                strSQL.Append(", COMMONCOSTMIDDLE C");
1348 1342
                
1349
                //strSQL.AppendFormat(" WHERE A.LARGECODE = {0}", ClsComCostsStatic.s_CommunityCompCode);
1350 1343
                strSQL.AppendFormat(" WHERE A.LARGECODE = {0}", m_CommonCosts.CommonTemporyPublic);
1351 1344
                strSQL.Append(" AND A.LARGECODE = B.LARGECODE");
1352 1345
                strSQL.Append(" AND A.LARGECODE = C.LARGECODE");
......
1448 1441
                strSQL.Append("SELECT COMPONENTCODE, ITEMNAME, SPECNAME, PRICEVALUE, FIXEDITEMCODE");
1449 1442
                strSQL.Append(" FROM ESTIMATEDATA");
1450 1443
                strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
1451
                //strSQL.AppendFormat(" AND (COMPONENTCODE <> {0}", ClsComCostsStatic.s_MaterialDisposal);
1452
                //strSQL.AppendFormat(" AND COMPONENTCODE <> {0}", ClsComCostsStatic.s_FieldManagementCompCode);
1453
                //strSQL.AppendFormat(" AND COMPONENTCODE <> {0})", ClsComCostsStatic.s_NormalManagementCompCode);
1454 1444
                strSQL.AppendFormat(" AND (COMPONENTCODE <> {0}", m_CommonCosts.MaterialDisposalPublic);
1455 1445
                strSQL.AppendFormat(" AND COMPONENTCODE <> {0}", m_CommonCosts.FieldManagementPublic);
1456 1446
                strSQL.AppendFormat(" AND COMPONENTCODE <> {0})", m_CommonCosts.NormalManagementPublic);
......
1529 1519
                strSQL.Append("SELECT COMPONENTCODE, ITEMNAME, SPECNAME, PRICEVALUE, FIXEDITEMCODE");
1530 1520
                strSQL.Append(" FROM ESTIMATEDATA");
1531 1521
                strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
1532
                //strSQL.AppendFormat(" AND COMPONENTCODE = {0}", ClsComCostsStatic.s_MaterialDisposal);
1533 1522
                strSQL.AppendFormat(" AND COMPONENTCODE = {0}", m_CommonCosts.MaterialDisposalPublic);
1534 1523
                strSQL.Append(" ORDER BY COMPONENTCODE");
1535 1524

  
......
1680 1669
            {
1681 1670
                int ExecNo = -1;
1682 1671
                bool bNRChk = false;
1683
                //for (int i = 0; i < ClsComCostsStatic.s_ConstructionType.GetLength(0); i++)
1684
                //{
1685
                //    for (int ii = 0; ii < ClsComCostsStatic.s_ConstructionType.GetLength(i); ii++)
1686
                //    {
1687
                //        if (m_ConstructionBaseInfo.ConstructionType == ClsComCostsStatic.s_ConstructionType[i, ii])
1688
                //        {
1689
                //            ExecNo = i;
1690
                //            bDataExist = true;
1691
                //            break;
1692
                //        }
1693
                //    }
1694
                //    if (bDataExist) break;
1695
                //}
1696 1672

  
1697 1673
                // 公共工事判定(新設)
1698 1674
                foreach (int nCode in m_CommonCosts.CreateConstrType)
......
1805 1781
                EstimateData DataRec = new EstimateData();
1806 1782
                StringBuilder strSQL = new StringBuilder();
1807 1783
                strSQL.Append(DataDB.CreatePrimarykeyString(m_ConstructionCode));
1808
                //strSQL.AppendFormat(" AND ComponentCode = {0}", ClsComCostsStatic.s_FieldManagementCompCode);
1809 1784
                strSQL.AppendFormat(" AND ComponentCode = {0}", m_CommonCosts.FieldManagementPublic);
1810 1785
                DataDB.SelectAction(strSQL.ToString(), ref DataRec);
1811 1786

  
1812 1787
                EstimateBudgetDetail DetailRec = new EstimateBudgetDetail();
1813 1788
                DetailRec.GroupCount = (int)GroupName.FieldManage;                          // グループ番号
1814
                //DetailRec.ComponentCode = ClsComCostsStatic.s_FieldManagementCompCode;      // 構成キー
1815
                DetailRec.ComponentCode = m_CommonCosts.FieldManagementPublic;            // 構成キー
1789
                DetailRec.ComponentCode = m_CommonCosts.FieldManagementPublic;              // 構成キー
1816 1790
                DetailRec.FirstString = DataRec.ItemName;                                   // 構成名称
1817 1791
                DetailRec.EstimatePrice = DataRec.PriceValue;                               // 見積時金額
1818 1792
                DetailRec.NegotiationPrice = DataRec.PriceValue;                            // 交渉時金額
......
1850 1824
                // 積み上げ現場管理費行セット
1851 1825
                EstimateBudgetDetail Datarec = new EstimateBudgetDetail();
1852 1826
                Datarec.GroupCount = (int)GroupName.FieldManagePileUp;                       // グループ番号
1853
                //Datarec.ComponentCode = ClsComCostsStatic.s_CommunityCompCode;                                 // 構成キー
1854
                Datarec.ComponentCode = m_CommonCosts.CommonTemporyPublic;                    // 構成キー
1827
                Datarec.ComponentCode = m_CommonCosts.CommonTemporyPublic;                  // 構成キー
1855 1828
                Datarec.FirstString = GroupTitle[(int)GroupName.FieldManagePileUp].Trim();  // 構成名称
1856 1829

  
1857 1830
                DisplayGridData(1, Datarec);
......
1910 1883
                EstimateData DataRec = new EstimateData();
1911 1884
                StringBuilder strSQL = new StringBuilder();
1912 1885
                strSQL.Append(DataDB.CreatePrimarykeyString(m_ConstructionCode));
1913
                //strSQL.AppendFormat(" AND ComponentCode = {0}", ClsComCostsStatic.s_NormalManagementCompCode);
1914 1886
                strSQL.AppendFormat(" AND ComponentCode = {0}", m_CommonCosts.NormalManagementPublic);
1915 1887
                DataDB.SelectAction(strSQL.ToString(), ref DataRec);
1916 1888

  
1917 1889
                EstimateBudgetDetail DetailRec = new EstimateBudgetDetail();
1918 1890
                DetailRec.GroupCount = (int)GroupName.UsualManage;                          // グループ番号
1919
                //DetailRec.ComponentCode = ClsComCostsStatic.s_NormalManagementCompCode;     // 構成キー
1920
                DetailRec.ComponentCode = m_CommonCosts.NormalManagementPublic;           // 構成キー
1891
                DetailRec.ComponentCode = m_CommonCosts.NormalManagementPublic;             // 構成キー
1921 1892
                DetailRec.FirstString = DataRec.ItemName;                                   // 構成名称
1922 1893
                DetailRec.EstimatePrice = DataRec.PriceValue;                               // 見積時金額
1923 1894
                DetailRec.NegotiationPrice = DataRec.PriceValue;                            // 交渉時金額
......
2999 2970
                m_dispLabelControl[(int)DispControl.ConstructionTime].Text = m_ConstructionTimes.ToString("0.00");
3000 2971

  
3001 2972
                DataGridViewEX dgv = dgvAllDisplay;
3002
                int nGroupCount=0;
3003
                int nComponentCode=0;
3004
                int nSubContractorCode=0;
3005
                string strFirstString=string.Empty;
3006
                string strSecondString=string.Empty;
2973
                int nGroupCount = 0;
2974
                int nComponentCode = 0;
2975
                int nSubContractorCode = 0;
2976
                string strFirstString = string.Empty;
2977
                string strSecondString = string.Empty;
3007 2978
                int GetData = -1;
3008 2979
                foreach (DataGridViewRow wrkRow in dgv.Rows)
3009 2980
                {
......
3250 3221
                strSQL.Append(" count(*)");
3251 3222
                strSQL.Append(" FROM ESTIMATEDATADETAIL A");
3252 3223
                strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);                                     // 対象工事のみ
3253
                //strSQL.AppendFormat(" And A.COMPONENTCODE != {0}", ClsComCostsStatic.s_CommunityCompCode);                         // 共通仮設費以外を対象にする
3254
                strSQL.AppendFormat(" And A.COMPONENTCODE != {0}", m_CommonCosts.CommonTemporyPublic);                            // 共通仮設費以外を対象にする
3224
                strSQL.AppendFormat(" And A.COMPONENTCODE != {0}", m_CommonCosts.CommonTemporyPublic);                          // 共通仮設費以外を対象にする
3255 3225
                strSQL.Append(" And A.MYEXPENSESFLG = 0");                                                                      // 経費を除外する
3256 3226
                strSQL.AppendFormat(" And A.COMPANYCODE != {0}",
3257 3227
                                                    CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Key);   // 自社施工・会社割当無を除外する
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInput.cs
1142 1142
        /// <param name="e"></param>
1143 1143
        private void btnPetition_Click(object sender, EventArgs e)
1144 1144
        {
1145
            IOEstimateData EstimateDB = new IOEstimateData();
1146 1145
            try
1147 1146
            {
1148
                // ??Z?\?Z?f?[?^??????????o?^????
1149
                StringBuilder strSQL = new StringBuilder();
1150
                strSQL.Append(EstimateDB.CreatePrimarykeyString(m_ConstructionCode));
1151
                EstimateData DataRec = new EstimateData();
1152
                if (!EstimateDB.SelectAction(strSQL.ToString(), ref DataRec)) m_bChengeAns = true;
1153 1147

  
1154
                // ?f?[?^??X?L????f?[?^?o?^
1155
                if (m_bChengeAns) if (!DataEntryProcess()) return;
1148
                switch (ProductDefine.ProductType)
1149
                {
1150
                    case (int)ProductDefine.ProductTypeDef.Originals:
1151
                        // ?{?^???????\??????
1152
                        if (!PettionProcess()) return;
1153
                        break;
1154
                    case (int)ProductDefine.ProductTypeDef.MassProductionType1:
1155
                        // ??l???F????
1156
                        if (!OneApprovalProcess()) return;
1157
                        break;
1158
                    default:
1159
                        break;
1160
                }
1156 1161

  
1157
                // ?????t?`?F?b?N
1158
                if (!CheckConstructor()) return;
1159

  
1160
                // ?\???E???F????????`?F?b?N
1161
                if (!CheckApprovalSequence()) return;
1162

  
1163
                // ?N?????
1164
                int NowPoint = ClsExcute.NextProcess((int)ClsExcute.SubFormExecuteNo.ApprovalScreen);
1165

  
1166
                // ?H?????
1167
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(m_ConstructionBaseInfo.ConstructionCode);
1168

  
1169
                // ???F?@?\???
1170
                int iApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals(s_MyProcessName)).Key;
1171
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(iApprovalCode);
1172

  
1173
                // ??t???
1174
                ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add(CommonDefine.s_Default_OrderNo);
1175

  
1176 1162
                // ?e?t?H?[???I??
1177 1163
                m_ParentEnd = true;
1178 1164

  
......
1186 1172
            {
1187 1173
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1188 1174
            }
1189
            finally
1190
            {
1191
                EstimateDB.close(); EstimateDB = null;
1192
            }
1193 1175
        }
1194 1176
        #endregion
1195 1177

  
......
1240 1222
        }
1241 1223
        #endregion
1242 1224

  
1243
        #region ?????t?H?[?????[?h
1225
        #region ?t?H?[?????[?h
1244 1226
        /// <summary>
1245
        /// ?????t?H?[?????[?h
1227
        /// ?t?H?[?????[?h
1246 1228
        /// </summary>
1247 1229
        /// <param name="sender"></param>
1248 1230
        /// <param name="e"></param>
......
1282 1264
            // ?\???E???F?\??????
1283 1265
            ClsCommonApproval.CtrlConstrAppPanel((int)ClsExcute.ApprovalListNo.EstimateApproval
1284 1266
                                                    , m_ConstructionCode
1285
                                                    , 1
1267
                                                    , CommonDefine.s_Default_OrderNo
1286 1268
                                                    , m_ApplPnlList);
1287 1269

  
1288 1270
            // 2?????[?h??e??????F??A???????\???????
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
4847 4847
            IOEstimateData edDB = new IOEstimateData();
4848 4848
            IOEstimateDataBody edbDB = new IOEstimateDataBody();
4849 4849
            IOEstimateDataDetail eddDB = new IOEstimateDataDetail();
4850
            IOEstimateBudget ebDB = new IOEstimateBudget();
4851
            IOEstimateBudgetDetail ebdDB = new IOEstimateBudgetDetail();
4850 4852
            //IOPointingOutComment CommentDB = new IOPointingOutComment();
4851 4853
            FrmRadioButtonNextProcess frm = new FrmRadioButtonNextProcess();
4852 4854
            try
......
4865 4867
                edDB.connect(); edDB.beginTran();
4866 4868
                edbDB.connect(); edbDB.beginTran();
4867 4869
                eddDB.connect(); eddDB.beginTran();
4870
                ebDB.connect(); ebDB.beginTran();
4871
                ebdDB.connect(); ebdDB.beginTran();
4868 4872
                //CommentDB.connect(); CommentDB.beginTran();
4869 4873

  
4870 4874
                // 積算見積データ
......
4891 4895
                    return false;
4892 4896
                }
4893 4897

  
4898
                // 積算予算書データを更新する
4899
                if (!UpDateEstimateBudget(edDB, eddDB, ebDB, ebdDB))
4900
                {
4901
                    eddDB.rollback();
4902
                    edbDB.rollback();
4903
                    edDB.rollback();
4904
                    ebDB.rollback();
4905
                    ebdDB.rollback();
4906
                    return false;
4907
                }
4908

  
4894 4909
                // 指摘事項セーブ
4895 4910
                //if (!WritePointOutComment(CommentDB))
4896 4911
                //{
......
4905 4920
                edDB.commit();
4906 4921
                edbDB.commit();
4907 4922
                eddDB.commit();
4923
                ebDB.commit();
4924
                ebdDB.commit();
4908 4925
                //CommentDB.commit();
4909 4926

  
4910 4927
                // データ変更フラグOff
......
4924 4941
                edDB.close(); edDB = null;
4925 4942
                edbDB.close(); edbDB = null;
4926 4943
                eddDB.close(); eddDB = null;
4944
                ebDB.close(); ebDB = null;
4945
                ebdDB.close(); ebdDB = null;
4927 4946
                //CommentDB.close(); CommentDB = null;
4928 4947
            }
4929 4948
        }
4930 4949
        #endregion
4931 4950

  
4951
        #region 積算予算書データを更新する
4952
        /// <summary>
4953
        /// 積算予算書データを更新する
4954
        /// </summary>
4955
        /// <returns></returns>
4956
        private bool UpDateEstimateBudget(IOEstimateData edDB
4957
                                            , IOEstimateDataDetail eddDB
4958
                                            , IOEstimateBudget ebDB
4959
                                            , IOEstimateBudgetDetail ebdDB)
4960
        {
4961
            try
4962
            {
4963

  
4964
                // ----- ①積算予算書があって承認がされていないかをチェックする
4965
                // 積算予算書存在&承認チェックSQL作成
4966
                StringBuilder strSQL = new StringBuilder();
4967
                UpChkEstimateBudgetSQL(ref strSQL);
4968
                ArrayList arList = new ArrayList();
4969
                ebDB.ExecuteReader(strSQL.ToString(), ref arList, false);
4970
                // データが無ければ処理しない
4971
                if (arList.Count < 1) return true;
4972
                object[] vs = (object[])arList[0];
4973
                // データがあって承認されていれば処理しない
4974
                if (CommonMotions.cnvInt(vs[1]) == (int)CommonDefine.ApprovalStatus.Approval) return true;
4975

  
4976
                // ----- ② 自社施工費以外を更新する
4977
                if (!UpDateEstimateBudget1(ebdDB)) return false;
4978

  
4979
                // ----- ③ 自社施工費を更新する
4980
                if (!UpDateEstimateBudget2(ebdDB)) return false;
4981

  
4982
                return true;
4983
            }
4984
            catch (System.Exception ex)
4985
            {
4986
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
4987
                return false;
4988
            }
4989
        }
4990
        #endregion
4991

  
4992
        #region 積算予算書存在&承認チェックSQL作成
4993
        /// <summary>
4994
        /// 積算予算書存在&承認チェックSQL作成
4995
        /// </summary>
4996
        private void UpChkEstimateBudgetSQL(ref StringBuilder strSQL)
4997
        {
4998
            try
4999
            {
5000
                // 積算予算書があって承認がされていないかをチェックするデータ取得SQL
5001
                strSQL.Append("SELECT");
5002
                strSQL.Append(" A.ConstructionCode");
5003
                strSQL.Append(", B.ApprovalStatus");
5004
                strSQL.Append(" FROM EstimateBudget As A");
5005
                strSQL.Append(" Left Join ProcessApproval As B");
5006
                strSQL.Append("       On B.ConstructionCode = A.ConstructionCode");
5007
                strSQL.AppendFormat(" And B.ApprovalCode = {0}", (int)ClsExcute.ApprovalListNo.EstimateBudgetApproval);
5008
                strSQL.AppendFormat(" And B.OrderNo = {0}", (int)CommonDefine.s_Default_OrderNo);
5009
                strSQL.Append("       And B.SeqNo = 1");
5010
                strSQL.Append(" Where");
5011
                strSQL.AppendFormat(" A.ConstructionCode = {0}", m_ConstructionCode);
5012
            }
5013
            catch (System.Exception ex)
5014
            {
5015
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
5016
            }
5017
        }
5018
        #endregion
5019

  
5020
        #region 積算予算書の自社施工費以外の更新
5021
        /// <summary>
5022
        /// 積算予算書の自社施工費以外の更新
5023
        /// </summary>
5024
        private bool UpDateEstimateBudget1(IOEstimateBudgetDetail ebdDB)
5025
        {
5026
            try
5027
            {
5028
                StringBuilder strSQL = new StringBuilder();
5029
                // 自社施工費以外を更新するデータ取得SQL
5030
                strSQL.Append("Select A.*");
5031
                strSQL.Append(", B.EstimatePrice");
5032
                strSQL.Append(", B.NegotiationPrice");
5033
                strSQL.Append(", B.GroupCount");
5034
                strSQL.Append(", B.LineCount");
5035
                strSQL.Append(" From (SELECT");
5036
                strSQL.Append("  AA.ConstructionCode");
5037
                strSQL.Append(", AA.ComponentCode");
5038
                strSQL.Append(", AA.CompanyCode");
5039
                strSQL.Append(", Sum(AA.LineTotal) As EstimateValue");
5040
                strSQL.Append("  FROM estimatedatadetail AS AA");
5041
                strSQL.AppendFormat("  Where AA.ConstructionCode = {0}", m_ConstructionCode);
5042
                strSQL.Append("  And AA.CompanyCode > 0");
5043
                strSQL.Append("  Group By");
5044
                strSQL.Append("  AA.ConstructionCode");
5045
                strSQL.Append(", AA.ComponentCode");
5046
                strSQL.Append(", AA.CompanyCode) AS A");
5047
                strSQL.Append(" LEFT JOIN estimatebudgetdetail AS B");
5048
                strSQL.Append("       On B.ConstructionCode = A.ConstructionCode");
5049
                strSQL.Append("       And B.ComponentCode = A.ComponentCode");
5050
                strSQL.Append("       And B.CompanyCode = A.CompanyCode");
5051
                strSQL.AppendFormat(" Where A.ConstructionCode = {0}", m_ConstructionCode);
5052
                strSQL.Append(" And A.EstimateValue != B.EstimatePrice");
5053

  
5054
                ArrayList arList = new ArrayList();
5055
                if (!ebdDB.ExecuteReader(strSQL.ToString(), ref arList, false)) return false;
5056

  
5057
                foreach (object[] CurRec in arList)
5058
                {
5059
                    int nEstimateValue = CommonMotions.cnvInt(CurRec[3]);
5060
                    int nEstimatePrice = CommonMotions.cnvInt(CurRec[4]);
5061
                    // 積算見積の業者毎金額と積算予算の見積金額が同じならば処理しない
5062
                    if (nEstimateValue == nEstimatePrice) continue;
5063

  
5064
                    int nGroupCode = CommonMotions.cnvInt(CurRec[6]);
5065
                    int nLineCount = CommonMotions.cnvInt(CurRec[7]);
5066
                    if (!ebdDB.UpdateFeild(m_ConstructionCode
5067
                                            , nGroupCode
5068
                                            , nLineCount
5069
                                            , (int)IOEstimateBudgetDetail.TableColumn.EstimatePrice
5070
                                            , nEstimateValue
5071
                                            , false))
5072
                    {
5073
                        MessageBox.Show("積算予算書データ(自社施工費以外)の更新に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
5074
                        return false;
5075
                    }
5076
                }
5077

  
5078
                return true;
5079
            }
5080
            catch (System.Exception ex)
5081
            {
5082
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
5083
                return false;
5084
            }
5085
        }
5086
        #endregion
5087

  
5088
        #region 積算予算書の自社施工費更新
5089
        /// <summary>
5090
        /// 積算予算書の自社施工費更新
5091
        /// </summary>
5092
        private bool UpDateEstimateBudget2(IOEstimateBudgetDetail ebdDB)
5093
        {
5094
            try
5095
            {
5096
                StringBuilder strSQL = new StringBuilder();
5097
                strSQL.Append("Select");
5098
                strSQL.Append(" A.ConstructionCode");
5099
                strSQL.Append(", A.ComponentCode");
5100
                strSQL.Append(", A.CompanyCode");
5101
                strSQL.Append(", A.ItemName");
5102
                strSQL.Append(", A.LineTotal");
5103
                strSQL.Append(", B.EstimatePrice");
5104
                strSQL.Append(", B.NegotiationPrice");
5105
                strSQL.Append(", B.GroupCount");
5106
                strSQL.Append(", B.LineCount");
5107
                strSQL.Append(" From estimatedatadetail AS A");
5108
                strSQL.Append(" LEFT JOIN estimatebudgetdetail AS B");
5109
                strSQL.Append("       On B.ConstructionCode = A.ConstructionCode");
5110
                strSQL.AppendFormat(" And B.GroupCount = {0}",(int)FrmEstimateBudget.GroupName.MyConstruction);
5111
                strSQL.Append("       And B.SecondString = A.ItemName");
5112
                strSQL.Append(" Where");
5113
                strSQL.AppendFormat(" A.ConstructionCode = {0}", m_ConstructionCode);
5114
                strSQL.AppendFormat(" And A.CompanyCode = {0}"
5115
                                        , CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Key);
5116
                strSQL.Append(" And A.LineTotal != B.EstimatePrice");
5117

  
5118
                ArrayList arList = new ArrayList();
5119
                if (!ebdDB.ExecuteReader(strSQL.ToString(), ref arList, false)) return false;
5120
                foreach (object[] CurRec in arList)
5121
                {
5122
                    int nEstimateValue = CommonMotions.cnvInt(CurRec[4]);
5123
                    int nEstimatePrice = CommonMotions.cnvInt(CurRec[5]);
5124
                    // 積算見積の業者毎金額と積算予算の見積金額が同じならば処理しない
5125
                    if (nEstimateValue == nEstimatePrice) continue;
5126

  
5127
                    int nGroupCode = CommonMotions.cnvInt(CurRec[7]);
5128
                    int nLineCount = CommonMotions.cnvInt(CurRec[8]);
5129
                    if (!ebdDB.UpdateFeild(m_ConstructionCode
5130
                                            , nGroupCode
5131
                                            , nLineCount
5132
                                            , (int)IOEstimateBudgetDetail.TableColumn.EstimatePrice
5133
                                            , nEstimateValue
5134
                                            , false))
5135
                    {
5136
                        MessageBox.Show("積算予算書データ(自社施工費)の更新に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
5137
                        return false;
5138
                    }
5139
                }
5140

  
5141
                return true;
5142
            }
5143
            catch (System.Exception ex)
5144
            {
5145
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
5146
                return false;
5147
            }
5148
        }
5149
        #endregion
5150

  
4932 5151
        #region データ削除処理
4933 5152
        /// <summary>
4934 5153
        /// 削除ボタン押下後の削除処理
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/FrmPurchaseOrderPrintAuxiliary.cs
434 434
                    // 枝番取得
435 435
                    GridSeqNo = CommonMotions.cnvInt(GridCurRow.Cells[(int)GridColumn.SeqNo].Value);
436 436
                    // 印刷日セット
437
                    if (!OrderDB.UpdateFeild(m_ConstructionCode, (int)IOPurchaseOrder.TableColumn.PrintoutDate, CreateDate, false, GridSeqNo))
437
                    if (!OrderDB.UpdateFeild(m_ConstructionCode, GridSeqNo, (int)IOPurchaseOrder.TableColumn.PrintoutDate, CreateDate, false))
438 438
                    {
439 439
                        OrderDB.rollback();
440 440
                        return false;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqBillingStatInput/FrmBillingStatInputAuxiliary.cs
249 249

  
250 250
                    if (bExists)
251 251
                    {
252
                        if (!OrderDateDB.UpdateFeild(ConstrCode, (int)IORequestOrderDate.TableColumn.SendDate, dtSend, false, m_InvoiceNo))
252
                        if (!OrderDateDB.UpdateFeild(ConstrCode, m_InvoiceNo, (int)IORequestOrderDate.TableColumn.SendDate, dtSend, false))
253 253
                        {
254 254
                            MessageBox.Show("?????????t?f?[?^?X?V?G???[", "?X?V?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
255 255
                            OrderDateDB.rollback();
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.cs
303 303
            // オブジェクトハンドル取得
304 304
            SetDisplayObject();
305 305

  
306
            // 製品版対応
307
            SetMasProDisplay();
308

  
306 309
            // 初期表示
307 310
            InitDataLoad();
308 311

  
......
610 613
                    // カレントディレクトリを取得する
611 614
                    stCurrentDir = System.IO.Directory.GetCurrentDirectory();
612 615
                }
613
                fbd.SelectedPath = @stCurrentDir;
616
                fbd.SelectedPath = stCurrentDir;
614 617
                //ユーザーが新しいフォルダを作成できるようにする
615 618
                //デフォルトでTrue
616 619
                fbd.ShowNewFolderButton = true;
......
725 728
                if (!ocDB.SelectAction(strSQL, ref wrklist)) return;
726 729

  
727 730
                // データ表示
728
                m_dispControl[(int)Dispcount.SystemCode].Text = wrklist.SystemCode.ToString();                      // 会社コード
729
                m_dispControl[(int)Dispcount.CompanyName1].Text = wrklist.CompanyName1;                             // 会社名1
730
                m_dispControl[(int)Dispcount.CompanyName2].Text = wrklist.CompanyName2;                             // 会社名2
731
                m_dispControl[(int)Dispcount.CEOName].Text = wrklist.CEOName;                                       // 代表者氏名
732
                m_dispControl[(int)Dispcount.CEOPositionName].Text = wrklist.CEOPositionName;                       // 役職名
733
                m_dispControl[(int)Dispcount.ZipCode].Text = wrklist.ZipCode;                                       // 郵便番号
734
                m_dispControl[(int)Dispcount.Address1].Text = wrklist.Address1;                                     // 住所1
735
                m_dispControl[(int)Dispcount.Address2].Text = wrklist.Address2;                                     // 住所2
736
                m_dispControl[(int)Dispcount.Address3].Text = wrklist.Address3;                                     // 住所3
737
                m_dispControl[(int)Dispcount.PhoneNumber].Text = wrklist.PhoneNumber;                               // 電話番号
738
                m_dispControl[(int)Dispcount.FaxNumber].Text = wrklist.FaxNumber;                                   // FAX番号
739
                m_dispControl[(int)Dispcount.HomePageURL].Text = wrklist.HomePageURL;                               // ホームページ
740
                m_dispControl[(int)Dispcount.FilePath1].Text = wrklist.ExcelSavePath;                               // Excel保存パス
731
                m_dispControl[(int)Dispcount.SystemCode].Text = wrklist.SystemCode.ToString();                          // 会社コード
732
                m_dispControl[(int)Dispcount.CompanyName1].Text = wrklist.CompanyName1;                                 // 会社名1
733
                m_dispControl[(int)Dispcount.CompanyName2].Text = wrklist.CompanyName2;                                 // 会社名2
734
                m_dispControl[(int)Dispcount.CEOName].Text = wrklist.CEOName;                                           // 代表者氏名
735
                m_dispControl[(int)Dispcount.CEOPositionName].Text = wrklist.CEOPositionName;                           // 役職名
736
                m_dispControl[(int)Dispcount.ZipCode].Text = wrklist.ZipCode;                                           // 郵便番号
737
                m_dispControl[(int)Dispcount.Address1].Text = wrklist.Address1;                                         // 住所1
738
                m_dispControl[(int)Dispcount.Address2].Text = wrklist.Address2;                                         // 住所2
739
                m_dispControl[(int)Dispcount.Address3].Text = wrklist.Address3;                                         // 住所3
740
                m_dispControl[(int)Dispcount.PhoneNumber].Text = wrklist.PhoneNumber;                                   // 電話番号
741
                m_dispControl[(int)Dispcount.FaxNumber].Text = wrklist.FaxNumber;                                       // FAX番号
742
                m_dispControl[(int)Dispcount.HomePageURL].Text = wrklist.HomePageURL;                                   // ホームページ
743
                m_dispControl[(int)Dispcount.FilePath1].Text = @wrklist.ExcelSavePath;                                  // Excel保存パス
741 744

  
742
                m_dispControl[(int)Dispcount.BusinessPeriod].Text = wrklist.BusinessPeriod.ToString();              // 営業期数
743
                m_dispControl[(int)Dispcount.ConstrYear].Text = wrklist.ConstrYear.ToString();          // 工事年度
744
                m_dispControl[(int)Dispcount.BusinessBeginDate].Text = wrklist.BusinessBeginDate.ToShortDateString();// 営業期首日
745
                m_dispControl[(int)Dispcount.ConstrBeginDate].Text = wrklist.ConstrBeginDate.ToShortDateString();   // 工事期首日
746
                m_dispControl[(int)Dispcount.BusinessCompDate].Text = wrklist.BusinessCompDate.ToShortDateString(); // 営業期末日
747
                m_dispControl[(int)Dispcount.ConstrCompDate].Text = wrklist.ConstrCompDate.ToShortDateString();     // 工事期末日
748
                if (wrklist.ConstructionNoBase == 0)                                                                // 工事年度
745
                m_dispControl[(int)Dispcount.BusinessPeriod].Text = wrklist.BusinessPeriod.ToString();                  // 営業期数
746
                m_dispControl[(int)Dispcount.ConstrYear].Text = wrklist.ConstrYear.ToString();                          // 工事年度
747
                m_dispControl[(int)Dispcount.BusinessBeginDate].Text = wrklist.BusinessBeginDate.ToShortDateString();   // 営業期首日
748
                m_dispControl[(int)Dispcount.ConstrBeginDate].Text = wrklist.ConstrBeginDate.ToShortDateString();       // 工事期首日
749
                m_dispControl[(int)Dispcount.BusinessCompDate].Text = wrklist.BusinessCompDate.ToShortDateString();     // 営業期末日
750
                m_dispControl[(int)Dispcount.ConstrCompDate].Text = wrklist.ConstrCompDate.ToShortDateString();         // 工事期末日
751
                bool bConstrBase = true;
752
                if (wrklist.ConstructionNoBase == (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod)                     // 工事番号基準値
753
                {
749 754
                    radioButton1.Checked = true;
750
                else
755
                    bConstrBase = false;
756
                }
757
                else if (wrklist.ConstructionNoBase == (int)SystemMaster.ConstrNoBaseDef.ConstructionYear)
758
                {
751 759
                    radioButton2.Checked = true;
760
                    bConstrBase = false;
761
                }
762
                // 基準値設定は初期時しか変更できない
763
                panel1.Enabled = bConstrBase;
752 764

  
753 765
                m_dispControl[(int)Dispcount.ConsumptionTax].Text = string.Format("{0:f2}", wrklist.ConsumptionTax);                // 消費税
754 766
                m_dispControl[(int)Dispcount.CooperationRate].Text = string.Format("{0:f2}", wrklist.CooperationRate);              // 協力金比率
......
1111 1123
                // 工事番号基準値
1112 1124
                if (radioButton1.Checked)
1113 1125
                    work.ConstructionNoBase = (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod;
1114
                else
1126
                else if (radioButton2.Checked)
1115 1127
                    work.ConstructionNoBase = (int)SystemMaster.ConstrNoBaseDef.ConstructionYear;
1116 1128

  
1117 1129
                // 消費税
......
1136 1148

  
1137 1149
                // Excel保存パス
1138 1150
                if (m_dispControl[(int)Dispcount.FilePath1].Text.Length != 0)
1139
                    work.ExcelSavePath = m_dispControl[(int)Dispcount.FilePath1].Text;
1151
                    work.ExcelSavePath = m_dispControl[(int)Dispcount.FilePath1].Text.Replace("\\","\\\\");
1140 1152

  
1141 1153
                // 標語
1142 1154
                if (m_dispControl[(int)Dispcount.SloganString1].Text.Length != 0)
......
1157 1169

  
1158 1170
                if (workList.Count == 0)
1159 1171
                {
1160
                    // データがない場合
1161
                    workList.Clear();
1162
                    workList.Add(work);
1163 1172
                    // データ登録
1164
                    if(!ocDB.InsertAction(workList, false))
1173
                    if(!ocDB.InsertAction(work, false))
1165 1174
                    {
1166 1175
                        MessageBox.Show("登録に失敗しました。", "登録エラー", MessageBoxButtons.OK, MessageBoxIcon.Error);
1167 1176
                        return false;
......
1358 1367
            }
1359 1368
        }
1360 1369
        #endregion
1370

  
1371
        #region 製品版対応
1372
        /// <summary>
1373
        /// 製品版対応
1374
        /// </summary>
1375
        private void SetMasProDisplay()
1376
        {
1377
            try
1378
            {
1379
                // 製品版Type1は消費税以外の設定を消す
1380
                if(ProductDefine.ProductType == (int)ProductDefine.ProductTypeDef.MassProductionType1)
1381
                {
1382
                    foreach(Control CurCtrl in tableLayoutPanel2.Controls)
1383
                    {
1384
                        if (CurCtrl.Name.Equals("label15")
1385
                            || CurCtrl.Name.Equals("label17")
1386
                            || CurCtrl.Name.Equals("txtInput13")) continue;
1387
                        
1388
                        // 上記以外は表示しない
1389
                        CurCtrl.Visible = false;
1390
                    }
1391
                }
1392
            }
1393
            catch (System.Exception ex)
1394
            {
1395
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1396
            }
1397
        }
1398
        #endregion
1361 1399
    }
1362 1400
}
trunk/src/ProcessManagement/ProcessManagement/Forms/Master/System/FrmSystem.designer.cs
35 35
            this.btnEnd = new System.Windows.Forms.Button();
36 36
            this.label1 = new System.Windows.Forms.Label();
37 37
            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
38
            this.txtInput17 = new System.Windows.Forms.TextBox();
38 39
            this.txtInput16 = new System.Windows.Forms.TextBox();
39
            this.txtInput17 = new System.Windows.Forms.TextBox();
40 40
            this.groupBoxEx5 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
41 41
            this.tableLayoutPanel5 = new System.Windows.Forms.TableLayoutPanel();
42 42
            this.txtInput18 = new System.Windows.Forms.TextBox();
......
168 168
            this.label1.Text = "会 社 情 報 登 録 画 面";
169 169
            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
170 170
            // 
171
            // txtInput17
172
            // 
173
            this.txtInput17.Anchor = System.Windows.Forms.AnchorStyles.Left;
174
            this.txtInput17.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
175
            this.txtInput17.ImeMode = System.Windows.Forms.ImeMode.Disable;
176
            this.txtInput17.Location = new System.Drawing.Point(366, 3);
177
            this.txtInput17.MaxLength = 5;
178
            this.txtInput17.Name = "txtInput17";
179
            this.txtInput17.Size = new System.Drawing.Size(91, 27);
180
            this.txtInput17.TabIndex = 14;
181
            this.txtInput17.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
182
            this.toolTip1.SetToolTip(this.txtInput17, "西暦で入力してください。");
183
            this.txtInput17.TextChanged += new System.EventHandler(this.valueChange);
184
            // 
171 185
            // txtInput16
172 186
            // 
173 187
            this.txtInput16.Anchor = System.Windows.Forms.AnchorStyles.Left;
......
182 196
            this.toolTip1.SetToolTip(this.txtInput16, "1期から入力してください。。");
183 197
            this.txtInput16.TextChanged += new System.EventHandler(this.valueChange);
184 198
            // 
185
            // txtInput17
186
            // 
187
            this.txtInput17.Anchor = System.Windows.Forms.AnchorStyles.Left;
188
            this.txtInput17.Font = new System.Drawing.Font("Century", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
189
            this.txtInput17.ImeMode = System.Windows.Forms.ImeMode.Disable;
190
            this.txtInput17.Location = new System.Drawing.Point(366, 3);
191
            this.txtInput17.MaxLength = 5;
192
            this.txtInput17.Name = "txtInput17";
193
            this.txtInput17.Size = new System.Drawing.Size(91, 27);
194
            this.txtInput17.TabIndex = 14;
195
            this.txtInput17.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
196
            this.toolTip1.SetToolTip(this.txtInput17, "西暦で入力してください。");
197
            this.txtInput17.TextChanged += new System.EventHandler(this.valueChange);
198
            // 
199 199
            // groupBoxEx5
200 200
            // 
201 201
            this.groupBoxEx5.BackColor = System.Drawing.Color.SkyBlue;
......
442 442
            this.panel1.Anchor = System.Windows.Forms.AnchorStyles.Left;
443 443
            this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
444 444
            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
445
            this.tableLayoutPanel4.SetColumnSpan(this.panel1, 3);
445
            this.tableLayoutPanel4.SetColumnSpan(this.panel1, 4);
446 446
            this.panel1.Controls.Add(this.radioButton2);
447 447
            this.panel1.Controls.Add(this.radioButton1);
448 448
            this.panel1.Location = new System.Drawing.Point(123, 123);
449 449
            this.panel1.Name = "panel1";
450
            this.panel1.Size = new System.Drawing.Size(234, 24);
450
            this.panel1.Size = new System.Drawing.Size(334, 24);
451 451
            this.panel1.TabIndex = 33;
452 452
            // 
453 453
            // radioButton2
454 454
            // 
455 455
            this.radioButton2.AutoSize = true;
456
            this.radioButton2.Location = new System.Drawing.Point(111, 1);
456
            this.radioButton2.Location = new System.Drawing.Point(170, 1);
457 457
            this.radioButton2.Name = "radioButton2";
458 458
            this.radioButton2.Size = new System.Drawing.Size(94, 20);
459 459
            this.radioButton2.TabIndex = 0;
......
463 463
            // radioButton1
464 464
            // 
465 465
            this.radioButton1.AutoSize = true;
466
            this.radioButton1.Checked = true;
467
            this.radioButton1.Location = new System.Drawing.Point(5, 1);
466
            this.radioButton1.Location = new System.Drawing.Point(43, 1);
468 467
            this.radioButton1.Name = "radioButton1";
469
            this.radioButton1.Size = new System.Drawing.Size(77, 20);
468
            this.radioButton1.Size = new System.Drawing.Size(95, 20);
470 469
            this.radioButton1.TabIndex = 0;
471
            this.radioButton1.TabStop = true;
472
            this.radioButton1.Text = "営業期";
470
            this.radioButton1.Text = "営 業 期";
473 471
            this.radioButton1.UseVisualStyleBackColor = true;
474 472
            // 
475 473
            // label32
......
588 586
            // 
589 587
            this.btnHistory.Anchor = System.Windows.Forms.AnchorStyles.Left;
590 588
            this.btnHistory.BackColor = System.Drawing.Color.LightGray;
591
            this.tableLayoutPanel4.SetColumnSpan(this.btnHistory, 3);
589
            this.tableLayoutPanel4.SetColumnSpan(this.btnHistory, 2);
592 590
            this.btnHistory.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
593 591
            this.btnHistory.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
594 592
            this.btnHistory.Location = new System.Drawing.Point(246, 93);
595 593
            this.btnHistory.Name = "btnHistory";
596
            this.btnHistory.Size = new System.Drawing.Size(230, 24);
594
            this.btnHistory.Size = new System.Drawing.Size(211, 24);
597 595
            this.btnHistory.TabIndex = 41;
598 596
            this.btnHistory.TabStop = false;
599 597
            this.btnHistory.Text = "過去履歴";
......
653 651
            this.btnFilePath.Size = new System.Drawing.Size(123, 25);
654 652
            this.btnFilePath.TabIndex = 42;
655 653
            this.btnFilePath.TabStop = false;
656
            this.btnFilePath.Text = "保存場所";
654
            this.btnFilePath.Text = "保存場所参照";
657 655
            this.btnFilePath.UseVisualStyleBackColor = false;
658 656
            this.btnFilePath.Click += new System.EventHandler(this.btnFilePath_Click);
659 657
            // 
......
1406 1404
        private System.Windows.Forms.Label label20;
1407 1405
        private System.Windows.Forms.Label label19;
1408 1406
        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBoxEx4;
1409
        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
1410
        private System.Windows.Forms.Label label22;
1411
        private System.Windows.Forms.Label label23;
1412
        private System.Windows.Forms.TextBox txtInput16;
1413
        private System.Windows.Forms.TextBox txtInput17;
1414
        private System.Windows.Forms.Label label24;
1415
        private System.Windows.Forms.Label label25;
1416 1407
        private System.Windows.Forms.ToolTip toolTip1;
1417 1408
        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBoxEx5;
1418 1409
        private System.Windows.Forms.TextBox txtInput18;
1419 1410
        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel5;
1420 1411
        private System.Windows.Forms.TextBox txtInput19;
1421 1412
        private System.Windows.Forms.TextBox txtInput20;
1422
        private System.Windows.Forms.Label label7;
1423
        private System.Windows.Forms.TextBox txtInput21;
1424
        private System.Windows.Forms.Label label11;
1425
        private System.Windows.Forms.TextBox txtInput22;
1426
        private System.Windows.Forms.Panel panel1;
1427
        private System.Windows.Forms.Label label12;
1428
        private System.Windows.Forms.RadioButton radioButton2;
1429
        private System.Windows.Forms.RadioButton radioButton1;
1430 1413
        private System.Windows.Forms.Label label13;
1431 1414
        private System.Windows.Forms.TextBox txtCoopRate;
1432 1415
        private System.Windows.Forms.Label label14;
......
1441 1424
        private System.Windows.Forms.Label label30;
1442 1425
        private System.Windows.Forms.TextBox txtInput26;
1443 1426
        private System.Windows.Forms.Label label31;
1427
        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel4;
1428
        private System.Windows.Forms.Label label22;
1429
        private System.Windows.Forms.TextBox txtInput16;
1430
        private System.Windows.Forms.Label label24;
1431
        private System.Windows.Forms.Label label23;
1432
        private System.Windows.Forms.TextBox txtInput17;
1433
        private System.Windows.Forms.Label label25;
1434
        private System.Windows.Forms.Label label7;
1435
        private System.Windows.Forms.TextBox txtInput21;
1436
        private System.Windows.Forms.Label label11;
1437
        private System.Windows.Forms.TextBox txtInput22;
1438
        private System.Windows.Forms.Label label12;
1439
        private System.Windows.Forms.Panel panel1;
1440
        private System.Windows.Forms.RadioButton radioButton2;
1441
        private System.Windows.Forms.RadioButton radioButton1;
1444 1442
        private System.Windows.Forms.Label label32;
1445 1443
        private System.Windows.Forms.Label label33;
1446 1444
        private System.Windows.Forms.Label label34;
trunk/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.Designer.cs
29 29
        private void InitializeComponent()
30 30
        {
31 31
            this.components = new System.ComponentModel.Container();
32
            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
33
            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
34
            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
35
            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
36
            System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
37
            System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
38
            System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
39
            System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
40
            System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series();
41 32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
42 33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
43 34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
......
229 220
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle188 = new System.Windows.Forms.DataGridViewCellStyle();
230 221
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle189 = new System.Windows.Forms.DataGridViewCellStyle();
231 222
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle190 = new System.Windows.Forms.DataGridViewCellStyle();
223
            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
224
            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
225
            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
226
            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
227
            System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
228
            System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
229
            System.Windows.Forms.DataVisualization.Charting.Series series5 = new System.Windows.Forms.DataVisualization.Charting.Series();
230
            System.Windows.Forms.DataVisualization.Charting.Series series6 = new System.Windows.Forms.DataVisualization.Charting.Series();
231
            System.Windows.Forms.DataVisualization.Charting.Series series7 = new System.Windows.Forms.DataVisualization.Charting.Series();
232 232
            this.lblTitle = new System.Windows.Forms.Label();
233 233
            this.btnEnd = new System.Windows.Forms.Button();
234 234
            this.tabMenu = new System.Windows.Forms.TabControl();
235 235
            this.tabPage1 = new System.Windows.Forms.TabPage();
236
            this.dgvBusinessMessage = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
237
            this.dataGridViewTextBoxColumn79 = new System.Windows.Forms.DataGridViewTextBoxColumn();
238
            this.dataGridViewTextBoxColumn80 = new System.Windows.Forms.DataGridViewTextBoxColumn();
239
            this.dataGridViewTextBoxColumn81 = new System.Windows.Forms.DataGridViewTextBoxColumn();
240
            this.dataGridViewTextBoxColumn82 = new System.Windows.Forms.DataGridViewTextBoxColumn();
241
            this.dataGridViewTextBoxColumn83 = new System.Windows.Forms.DataGridViewTextBoxColumn();
242
            this.Column24 = new System.Windows.Forms.DataGridViewTextBoxColumn();
243
            this.dataGridViewTextBoxColumn84 = new System.Windows.Forms.DataGridViewTextBoxColumn();
244
            this.dataGridViewTextBoxColumn85 = new System.Windows.Forms.DataGridViewTextBoxColumn();
236 245
            this.tabPage2 = new System.Windows.Forms.TabPage();
237 246
            this.btnMessageEntry = new System.Windows.Forms.Button();
247
            this.dgvMessageBoard = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
248
            this.Column05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
249
            this.Column06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
250
            this.Column03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
251
            this.Column01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
252
            this.Column02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
253
            this.Column04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
254
            this.Column07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
238 255
            this.tabPage3 = new System.Windows.Forms.TabPage();
239 256
            this.label31 = new System.Windows.Forms.Label();
240 257
            this.label27 = new System.Windows.Forms.Label();
241 258
            this.label26 = new System.Windows.Forms.Label();
242 259
            this.label29 = new System.Windows.Forms.Label();
243 260
            this.label25 = new System.Windows.Forms.Label();
261
            this.dgvApproval = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
262
            this.ApprovalColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
263
            this.ApprovalColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
264
            this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
265
            this.ApprovalColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
266
            this.ApprovalColumn03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
267
            this.ApprovalColumn04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
268
            this.ApprovalColumn05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
269
            this.ApprovalColumn06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
270
            this.ApprovalColumn07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
271
            this.ApprovalColumn08 = new System.Windows.Forms.DataGridViewTextBoxColumn();
272
            this.ApprovalColumn09 = new System.Windows.Forms.DataGridViewTextBoxColumn();
273
            this.ApprovalColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
274
            this.ApprovalColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
275
            this.Column47 = new System.Windows.Forms.DataGridViewTextBoxColumn();
244 276
            this.tabPage4 = new System.Windows.Forms.TabPage();
245 277
            this.label5 = new System.Windows.Forms.Label();
246 278
            this.label6 = new System.Windows.Forms.Label();
247 279
            this.label7 = new System.Windows.Forms.Label();
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

他の形式にエクスポート: Unified diff