プロジェクト

全般

プロフィール

リビジョン 93

堀内約8年前に追加

メニュー不具合修正・非受注時更新修正・注文書入力修正・注文書明細データIO変更

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsApprovalPermission.cs
421 421
                string strSQL = "SELECT A.DISPLAYORDER, A.APPROVALPERSON, A.APPROVALAUTHORITY, B.SEQNO, B.APPROVALSTATUS";
422 422
                strSQL += " FROM APPROVALMASTER A";
423 423
                strSQL += " LEFT JOIN PERSONAPPROVAL B ON B.PERSONCODEAPPROVAL = A.APPROVALPERSON AND B.APPROVALCODE = A.APPROVALCODE";
424
                strSQL += string.Format(" AND B.ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d')", OrderDate.ToShortDateString());
424
                strSQL += string.Format(" AND DATE(B.ORDERDATE) = STR_TO_DATE('{0}','%Y/%m/%d')", OrderDate.ToShortDateString());
425 425
                strSQL += string.Format(" AND B.ORDERNO = {0} AND B.SEQNO != {1}", OrderNo, s_PrimartyRecord);
426 426
                strSQL += string.Format(" WHERE A.APPROVALCODE = {0}", ApprovalCode);
427 427
                strSQL += " AND A.DEPARTMENTCODE = (SELECT C.DEPARTMENTCODE FROM PERSONINCHARGEMASTER C";
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsCalendar.cs
77 77
                int Holidays = 0;
78 78

  
79 79
                string strSQL = "SELECT COUNT(*) FROM HOLIDAYCALENDERMASTER";
80
                strSQL += string.Format(" WHERE STR_TO_DATE('{0}','%Y/%m/%d') <= HOLIDAY", Startdate.ToShortDateString());
81
                strSQL += string.Format(" AND HOLIDAY <= STR_TO_DATE('{0}','%Y/%m/%d')", Complatedate.ToShortDateString());
80
                strSQL += string.Format(" WHERE STR_TO_DATE('{0}','%Y/%m/%d') <= DATE(HOLIDAY)", Startdate.ToShortDateString());
81
                strSQL += string.Format(" AND DATE(HOLIDAY) <= STR_TO_DATE('{0}','%Y/%m/%d')", Complatedate.ToShortDateString());
82 82

  
83 83
                ArrayList datalist = new ArrayList();
84 84
                if (!calDB.ExecuteReader(strSQL, ref datalist)) return 0;
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
89 89
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Lease)
90 90
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.StoragePlace)
91 91
                                                                , GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Lodging));
92
                strDelSQL += string.Format(" AND TARGETMONTH = STR_TO_DATE('{0}','%Y/%m/%d')", (TargetMonth + "/01"));
92
                strDelSQL += string.Format(" AND DATE(TARGETMONTH) = STR_TO_DATE('{0}','%Y/%m/%d')", (TargetMonth + "/01"));
93 93
                LedgerExcuteDB.ExecuteNonQuery(strDelSQL, false);
94 94

  
95 95
                for (int i = (int)CommonDefine.CostDataNo.Transport; i <= (int)CommonDefine.CostDataNo.Lodging; i++)
......
537 537
                    int NowValue = 0;
538 538
                    string strExecout = "SELECT PAYMENTAMOUNT FROM CONSTRUCTIONLEDGEREXCUTE";
539 539
                    strExecout += LedgerExDB.CreatePrimarykeyString(CurRec.ConstructionCode, CurRec.GroupCount, CurRec.LineCount);
540
                    strExecout += string.Format(" AND TargetMonth = STR_TO_DATE('{0}', '%y/%m/%d')", DateTimeUtil.BeginOfMonth(TargetDate).ToShortDateString());
540
                    strExecout += string.Format(" AND DATE(TargetMonth) = STR_TO_DATE('{0}', '%y/%m/%d')", DateTimeUtil.BeginOfMonth(TargetDate).ToShortDateString());
541 541
                    ArrayList arExecList = new ArrayList();
542 542
                    LedgerExDB.ExecuteReader(strExecout, ref arExecList, false);
543 543
                    if (arExecList.Count != 0)
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
80 80
            CostomerRegistList = 33,            // 33:発注者登録申請一覧
81 81
            CostomerRegist = 34,                // 34:発注者登録申請
82 82
            SubConstrRegistList = 35,           // 35:協力会社登録申請一覧
83
            SubConstrRegist = 36                // 36:協力会社登録申請
83
            SubConstrRegist = 36,               // 36:協力会社登録申請
84
            PriceOfBudget = 37,                 // 37:台帳状況確認画面
84 85
        }
85 86
        #endregion
86 87

  
......
181 182
                                                                                { (int)ProcessExecuteNo.CostomerRegistList,     "発注者登録申請一覧-表示"},
182 183
                                                                                { (int)ProcessExecuteNo.CostomerRegist,         "発注者登録申請-入力"},
183 184
                                                                                { (int)ProcessExecuteNo.SubConstrRegistList,    "協力会社登録申請一覧-表示"},
184
                                                                                { (int)ProcessExecuteNo.SubConstrRegist,        "協力会社登録申請-入力"}
185
                                                                                { (int)ProcessExecuteNo.SubConstrRegist,        "協力会社登録申請-入力"},
186
                                                                                { (int)ProcessExecuteNo.PriceOfBudget,          "工事台帳状態確認-表示"},
185 187
        };
186 188

  
187 189
        #endregion
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
36 36
        /// 非受注へ移す期間(受注できずに見積提出日より以下の日数を過ぎれば非受注へ移動)
37 37
        /// </summary>
38 38
        private const int s_NonOrderDay = 93;
39

  
40
        /// <summary>
41
        /// 非受注時メッセージ
42
        /// </summary>
43
        private const string s_NonOrderComment = "受注できずに見積提出日より{0}日を過ぎましたので非受注とします。";
39 44
        #endregion
40 45

  
41 46
        #region 変数
......
833 838
        private bool ChangeNonOrdersData()
834 839
        {
835 840
            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
841
            IOConstructionBaseInfoDetail DetailDB = new IOConstructionBaseInfoDetail();
836 842
            try
837 843
            {
838 844
                int iCode1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("非 受 注")).Key;
......
840 846
                int iCode3 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("見積提出")).Key;
841 847

  
842 848
                // 対象データが存在するかを確認する
843
                string strSQL = "SELECT COUNT(*) FROM CONSTRUCTIONBASEINFO WHERE DATE(ESTIMATESSUBMITTEDDATE) != STR_TO_DATE('0001/01/01','%Y/%m/%d')";
844
                strSQL += string.Format(" AND DATE(DATE_ADD(ESTIMATESSUBMITTEDDATE, INTERVAL {0} DAY))", s_NonOrderDay);
845
                strSQL += string.Format(" < STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.Now.ToShortDateString());
846
                strSQL += string.Format(" AND CONSTRUCTIONSTATUSFLG IN({0}, {1})", iCode2, iCode3);
847
                strSQL += string.Format(" AND ESTIMATETYPE IN ({0}, {1})", (int)CommonDefine.BaseInfoEstimateType.Normal, (int)CommonDefine.BaseInfoEstimateType.GetBudget);
849
                string strSQL = "SELECT A.CONSTRUCTIONCODE, B.DETAILSTRING FROM CONSTRUCTIONBASEINFO A";
850
                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFODETAIL B ON B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
851
                strSQL += string.Format(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.OrdersDecisionComment);
852

  
853
                string strWHERE = " WHERE DATE(A.ESTIMATESSUBMITTEDDATE) != STR_TO_DATE('0001/01/01', '%Y/%m/%d')";
854
                strWHERE += string.Format(" AND DATE(DATE_ADD(ESTIMATESSUBMITTEDDATE, INTERVAL '{0}' DAY))", s_NonOrderDay);
855
                strWHERE += string.Format(" < STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.Now.ToShortDateString());
856
                strWHERE += string.Format(" AND A.CONSTRUCTIONSTATUSFLG IN({0}, {1})", iCode2, iCode3);
857
                strWHERE += string.Format(" AND A.ESTIMATETYPE IN ({0}, {1})", (int)CommonDefine.BaseInfoEstimateType.Normal, (int)CommonDefine.BaseInfoEstimateType.GetBudget);
858
                strSQL += strWHERE;
848 859
                ArrayList arList = new ArrayList();
849 860
                if (!BaseDB.ExecuteReader(strSQL, ref arList))
850 861
                {
851
                    logger.ErrorFormat("工事基本情報更新エラー 非受注案件移行処理失敗:{0}:{1}", CommonMotions.GetMethodName(), strSQL);
862
                    logger.ErrorFormat("工事基本情報読込エラー 非受注案件移行処理失敗:{0}:{1}", CommonMotions.GetMethodName(), strSQL);
852 863
                    return false;
853 864
                }
854
                object[] wrkcount = (object[])arList[0];
855
                if (Common.CommonMotions.cnvInt(wrkcount[0]) == 0) return true;
865
                // ----- 対象データが存在しなければ抜ける
866
                if (arList.Count == 0) return true;
856 867

  
857
                // 対象データが存在すれば更新する
858
                strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO SET CONSTRUCTIONSTATUSFLG = {0},", iCode1);
859
                strSQL += string.Format(" NONORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.Today.ToShortDateString());
860
                strSQL += " WHERE CONSTRUCTIONCODE IN";
861
                strSQL += " (SELECT CONSTRUCTIONCODE from ("; // MySql対応(Updateの副問合せ対応)
862
                strSQL += " (SELECT CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO WHERE DATE(ESTIMATESSUBMITTEDDATE) != STR_TO_DATE('0001/01/01','%Y/%m/%d')";
863
                strSQL += string.Format(" AND DATE(DATE_ADD(ESTIMATESSUBMITTEDDATE, INTERVAL {0} DAY))", s_NonOrderDay);
864
                strSQL += string.Format(" < STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.Now.ToShortDateString());
865
                strSQL += string.Format(" AND CONSTRUCTIONSTATUSFLG IN({0}, {1})", iCode2, iCode3);
866
                strSQL += string.Format(" AND ESTIMATETYPE IN ({0}, {1}))", (int)CommonDefine.BaseInfoEstimateType.Normal, (int)CommonDefine.BaseInfoEstimateType.GetBudget);
867
                strSQL += " ) AS TMP )"; // MySql対応(Updateの副問合せ対応)
868
                if (!BaseDB.ExecuteNonQuery(strSQL))
868
                // ----- 対象データが存在すれば更新する
869
                BaseDB.connect(); BaseDB.beginTran();
870
                DetailDB.connect(); DetailDB.beginTran();
871

  
872
                // 工事基本情報データ
873
                strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO A SET A.CONSTRUCTIONSTATUSFLG = {0},", iCode1);
874
                strSQL += string.Format(" A.NONORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.Today.ToShortDateString());
875
                strSQL += strWHERE;
876
                if (!BaseDB.ExecuteNonQuery(strSQL, false))
869 877
                {
878
                    BaseDB.rollback();
870 879
                    logger.ErrorFormat("工事基本情報更新エラー 非受注案件移行処理失敗:{0}:{1}", CommonMotions.GetMethodName(), strSQL);
871 880
                    return false;
872 881
                }
873 882

  
883
                // 工事基本情報明細データ
884
                string strMsg = string.Format(s_NonOrderComment, s_NonOrderDay);
885
                string strOrgMsg = string.Empty;
886
                foreach (object[] objRec in arList)
887
                {
888
                    strOrgMsg = string.Empty;
889
                    strOrgMsg = CommonMotions.cnvString(objRec[1]);
890
                    if (strOrgMsg.Length != 0)
891
                    {
892
                        strOrgMsg += "\n";
893
                        strOrgMsg += strMsg;
894
                        if (strOrgMsg.Length > 120) strOrgMsg = strOrgMsg.Substring(0, 120);
895
                        if (!DetailDB.UpdateFeild(CommonMotions.cnvInt(objRec[0]),
896
                                                    (int)IOConstructionBaseInfoDetail.TableColumn.DETAILSTRING,
897
                                                    strOrgMsg,
898
                                                    false,
899
                                                    (int)ConstructionBaseInfoDetail.DetailDataNo.OrdersDecisionComment))
900
                        {
901
                            BaseDB.rollback();
902
                            DetailDB.rollback();
903
                            logger.ErrorFormat("工事基本情報明細更新エラー 非受注案件移行処理失敗:{0}:{1}", CommonMotions.GetMethodName(), strSQL);
904
                            return false;
905
                        }
906
                    }
907
                    else
908
                    {
909
                        if (!CreateBaseInfoDetail(DetailDB, CommonMotions.cnvInt(objRec[0]), strMsg))
910
                        {
911
                            BaseDB.rollback();
912
                            DetailDB.rollback();
913
                            logger.ErrorFormat("工事基本情報明細作成エラー 非受注案件移行処理失敗:{0}:{1}", CommonMotions.GetMethodName(), strSQL);
914
                            return false;
915
                        }
916
                    }
917
                }
918

  
874 919
                return true;
875 920
            }
876 921
            catch (Exception ex)
......
880 925
            }
881 926
            finally
882 927
            {
928
                BaseDB.commit();
929
                DetailDB.commit();
883 930
                BaseDB.close(); BaseDB = null;
931
                DetailDB.close(); DetailDB = null;
884 932
            }
885 933
        }
886 934
        #endregion
887 935

  
936
        #region 工事基本情報明細作成(受注決定申送りコメント)
937
        /// <summary>
938
        /// 工事基本情報明細作成(受注決定申送りコメント)
939
        /// </summary>
940
        /// <returns></returns>
941
        private bool CreateBaseInfoDetail(IOConstructionBaseInfoDetail DetailDB, int ConstrCode, string strMsg)
942
        {
943
            try
944
            {
945
                ConstructionBaseInfoDetail work = new ConstructionBaseInfoDetail();
946
                work.ConstructionCode = ConstrCode;
947
                work.DetailNo = (int)ConstructionBaseInfoDetail.DetailDataNo.OrdersDecisionComment;
948
                work.DetailString = strMsg;
949

  
950
                if (!DetailDB.InsertAction(work, false)) return false;
951

  
952
                return true;
953
            }
954
            catch (Exception ex)
955
            {
956
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
957
                return false;
958
            }
959
        }
960
        #endregion
961

  
888 962
        #region 工事詳細台帳の給与を加算する
889 963
        /// <summary>
890 964
        /// 工事詳細台帳の給与を加算する
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOActionScheduleData.cs
312 312
            string strWork = string.Empty;
313 313
            try
314 314
            {
315
                strWork = string.Format(" Where TargetDate = STR_TO_DATE('{0}','%Y/%m/%d')", TargetDate.ToShortDateString());
315
                strWork = string.Format(" Where DATE(TargetDate) = STR_TO_DATE('{0}','%Y/%m/%d')", TargetDate.ToShortDateString());
316 316
                if(PersonCode != 0)
317 317
                    strWork += string.Format(" And PersonCode = {0}", PersonCode.ToString());
318 318

  
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOBankBusinessDayMaster.cs
70 70

  
71 71
            try
72 72
            {
73
                // SQL作成(oracleのDateTime型が変換できないのでCharに変換しておく)
73
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
74 74
                strcmd = "SELECT";
75 75
                strcmd += "  YearMonth, BankBusinessDay, Note, DeleteFlg";
76 76
                strcmd += " ,DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')";
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOPurchaseOrderDetail.cs
47 47
            UnitPrice,		        // 単価
48 48
            OrdersLinePrice,		// 金額
49 49
            SourceCode,             // 予算作成時工事番号
50
            SourceLineCnt,	        // 注文書作成時台帳行番号
50 51

  
51 52
            EntryDate,
52 53
            UpdateDate,
......
87 88
            strcmd += ", UnitPrice";		        // 単価
88 89
            strcmd += ", OrdersLinePrice";		    // 金額
89 90
            strcmd += ", SourceCode";               // 予算作成時工事番号
91
            strcmd += ", SourceLineCnt";	        // 注文書作成時台帳行番号
90 92

  
91 93
            strcmd += ", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')";
92 94
            strcmd += ", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')";
......
185 187
            {
186 188

  
187 189
                strcmd = "INSERT INTO PurchaseOrderDetail";
188
                strcmd += " (";
189
                strcmd += "  ConstructionCode";	        // 工事コード
190
                strcmd += ", SeqNo";                    // 注文書枝番
191
                strcmd += ", GroupCount";               // グループ番号
192
                strcmd += ", LineCount";                // 行番号
193
                strcmd += ", ComponentCode";            // 構成キー
194
                strcmd += ", ItemCode";		            // 工種キー
195
                strcmd += ", FirstString";              // 工種品名
196
                strcmd += ", SecondString";             // 内容内訳
197
                strcmd += ", UnitCount";		        // 数量
198
                strcmd += ", UnitName";		            // 単位
199
                strcmd += ", UnitPrice";		        // 単価
200
                strcmd += ", OrdersLinePrice";		    // 金額
201
                strcmd += ", SourceCode";               // 予算作成時工事番号
202
                strcmd += ", EntryDate";
203
                strcmd += ", UpdateDate";
204
                strcmd += ")";
205 190

  
206
                strcmd += " VALUES (";
191
                strcmd += "(";
192
                bool bFirst = true;
193
                foreach (var gender in Enum.GetValues(typeof(TableColumn)))
194
                {
195
                    if (!bFirst) strcmd += " ,";
196
                    strcmd += gender.ToString();
197
                    bFirst = false;
198
                }
199
                strcmd += ") VALUES (";
207 200

  
201

  
208 202
                strcmd += string.Format("  {0}", work.ConstructionCode);        // 工事番号
209 203

  
210 204
                strcmd += string.Format(", {0}", work.SeqNo);                   // 注文書枝番
......
219 213
                strcmd += string.Format(", {0}", work.UnitPrice);		        // 単価
220 214
                strcmd += string.Format(", {0}", work.OrdersLinePrice);         // 金額
221 215
                strcmd += string.Format(", {0}", work.SourceCode);              // 予算作成時工事番号
216
                strcmd += string.Format(", {0}", work.SourceLineCnt);	        // 注文書作成時台帳行番号
222 217

  
223 218
                strcmd += ", NOW()";
224 219
                strcmd += ", NOW()";
......
292 287
                strcmd += string.Format(", UnitPrice = {0}", data.UnitPrice);		                // 単価
293 288
                strcmd += string.Format(", OrdersLinePrice = {0}", data.OrdersLinePrice);		    // 金額
294 289
                strcmd += string.Format(", SourceCode = {0}", data.SourceCode);                     // 予算作成時工事番号
290
                strcmd += string.Format(", SourceLineCnt = {0}", data.SourceLineCnt);	            // 注文書作成時台帳行番号
295 291

  
296 292
                strcmd += ", UpdateDate = STR_TO_DATE(DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%'),'%Y/%m/%d %H:%i:%s')";
297 293
                strcmd += AddSQLString;
......
389 385
                    case (int)TableColumn.SourceCode:       // 予算作成時工事番号
390 386
                        strcmd += string.Format(" SourceCode = {0}", ((int)value).ToString());
391 387
                        break;
388
                    case (int)TableColumn.SourceLineCnt:	            // 注文書作成時台帳行番号
389
                        strcmd += string.Format(" SourceLineCnt = {0}", ((int)value).ToString());
390
                        break;
392 391
                }
393 392

  
394 393
                strcmd += ", UpdateDate = STR_TO_DATE(DATE_FORMAT(NOW(),'%Y/%m/%d %H:%i:%'),'%Y/%m/%d %H:%i:%s')";
......
432 431
                wrk.UnitPrice = double.Parse(objwrk[(int)TableColumn.UnitPrice].ToString());		            // 単価
433 432
                wrk.OrdersLinePrice = double.Parse(objwrk[(int)TableColumn.OrdersLinePrice].ToString());		// 金額
434 433
                wrk.SourceCode = int.Parse(objwrk[(int)TableColumn.SourceCode].ToString());                     // 予算作成時工事番号
434
                wrk.SourceLineCnt = int.Parse(objwrk[(int)TableColumn.SourceLineCnt].ToString());	            // 注文書作成時台帳行番号
435 435

  
436 436
                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
437 437
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
branches/src/ProcessManagement/ProcessManagement/DataModel/PurchaseOrderDetail.cs
27 27
        private double  m_UnitPrice = 0;	                // 単価
28 28
        private double  m_OrdersLinePrice = 0;	            // 金額
29 29
        private double  m_SourceCode = 0;                   // 予算作成時工事番号
30
        private int     m_SourceLineCnt = 0;                // 注文書作成時台帳行番号
30 31

  
31 32
        private DateTime m_EntryDate = DateTime.Now;        // 登録日付
32 33
        private DateTime m_UpdateDate = DateTime.Now;       // 更新日付
......
141 142
            get { return m_SourceCode; }
142 143
            set { m_SourceCode = value; }
143 144
        }
145
        /// <summary>
146
        /// 注文書作成時台帳行番号
147
        /// </summary>
148
        public int SourceLineCnt
149
        {
150
            get { return m_SourceLineCnt; }
151
            set { m_SourceLineCnt = value; }
152
        }
144 153

  
145 154
        /// <summary>
146 155
        /// 登録日付
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPersonAuxiliary.cs
635 635
                strSQL += " LEFT JOIN DEPARTMENTMASTER C ON C.DEPARTMENTCODE = B.DEPARTMENTCODE";
636 636
                strSQL += string.Format(" LEFT JOIN PERSONAPPROVAL D ON D.PERSONCODE = {0}", m_PersonCode);
637 637
                strSQL += string.Format(" And D.APPROVALCODE = {0}", m_ApprovalCode);
638
                strSQL += string.Format(" And D.ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d')",m_OrderDate.ToShortDateString());
638
                strSQL += string.Format(" And DAATE(D.ORDERDATE) = STR_TO_DATE('{0}','%Y/%m/%d')",m_OrderDate.ToShortDateString());
639 639
                strSQL += string.Format(" And D.ORDERNO = {0}", m_OrderNo);
640 640
                strSQL += " And D.SEQNO <> 1";
641 641
                strSQL += " AND D.PERSONCODEAPPROVAL = A.APPROVALPERSON";
......
817 817
                        strSQL = string.Format("UPDATE ATTENDANCEDATA SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
818 818
                        strSQL += string.Format(" ORDERNO = {0}", m_OrderNo);
819 819
                        strSQL += string.Format(" WHERE PersonCode = {0}",m_PersonCode);
820
                        strSQL += string.Format(" AND AttendanceMonth = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
820
                        strSQL += string.Format(" AND DATE(AttendanceMonth) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
821 821
                        break;
822 822
                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:
823 823
                        strSQL = string.Format("UPDATE COSTOMERREGIST SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
824 824
                        strSQL += string.Format(" ORDERNO = {0}", m_OrderNo);
825 825
                        strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
826
                        strSQL += string.Format(" AND CREATEDATE = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
826
                        strSQL += string.Format(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
827 827
                        strSQL += string.Format(" AND SEQNO = {0}", m_SearchSeqNo);
828 828
                        break;
829 829
                    case (int)ClsExcute.ApprovalListNo.SubConstregistApproval:
830 830
                        strSQL = string.Format("UPDATE SUBCONSTRREGIST SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", m_OrderDate.ToShortDateString());
831 831
                        strSQL += string.Format(" ORDERNO = {0}", m_OrderNo);
832 832
                        strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
833
                        strSQL += string.Format(" AND CREATEDATE = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
833
                        strSQL += string.Format(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}' ,'%Y/%m/%d')", m_SearchDate.ToShortDateString());
834 834
                        strSQL += string.Format(" AND SEQNO = {0}", m_SearchSeqNo);
835 835
                        break;
836 836
                    default:
......
871 871
                        strSQL = string.Format("UPDATE ATTENDANCEDATA SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", DateTime.MinValue.ToShortDateString());
872 872
                        strSQL = " ORDERNO = 0";
873 873
                        strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
874
                        strSQL += string.Format(" AND AttendanceMonth = STR_TO_DATE('{0}','%Y/%m/%d')", m_OrderDate.ToShortDateString());
874
                        strSQL += string.Format(" AND DATE(AttendanceMonth) = STR_TO_DATE('{0}','%Y/%m/%d')", m_OrderDate.ToShortDateString());
875 875
                        break;
876 876
                    case (int)ClsExcute.ApprovalListNo.CostomerRegistApproval:
877 877
                        strSQL = string.Format("UPDATE COSTOMERREGIST SET ORDERDATE = STR_TO_DATE('{0}','%Y/%m/%d'),", DateTime.MinValue.ToShortDateString());
878 878
                        strSQL += " ORDERNO = 0";
879 879
                        strSQL += string.Format(" WHERE PersonCode = {0}", m_PersonCode);
880
                        strSQL += string.Format(" AND CREATEDATE = STR_TO_DATE('{0}','%Y/%m/%d')", m_SearchDate.ToShortDateString());
880
                        strSQL += string.Format(" AND DATE(CREATEDATE) = STR_TO_DATE('{0}','%Y/%m/%d')", m_SearchDate.ToShortDateString());
881 881
                        strSQL += string.Format(" AND SEQNO = {0}", m_SearchSeqNo);
882 882
                        break;
883 883
                    default:
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
848 848
                {
849 849
                    strSQL += string.Format(" WHERE B1.CONSTRUCTIONCODE = {0}", SourceCode);
850 850
                }
851
                strSQL += string.Format(" AND B1.PRINTOUTDATE != TO_DATE('{0}')) B", DateTime.MinValue.ToShortDateString());
851
                strSQL += string.Format(" AND DATE(B1.PRINTOUTDATE) != STR_TO_DATE('{0}', '%Y/%m/%d')) B", DateTime.MinValue.ToShortDateString());
852 852

  
853 853
                ArrayList arList = new ArrayList();
854 854
                if (!OrderDB.ExecuteReader(strSQL, ref arList)) return;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
1563 1563
                DateTime dtToday = GetPrevDateFieldValue(sender);
1564 1564

  
1565 1565
                // ??????o????J?E???g
1566
                // int sepStrCnt = txtbox.Text.Length - txtbox.Text.Replace("/", "").Length;
1567 1566
                if (CommonMotions.chkNumeric(txtbox.Text))
1568 1567
                {   // ??????????
1569 1568
                    if (txtbox.Text.ToString().Length <= 4)
1570 1569
                    {
1571
                        //txtbox.Text = m_dispControl[(int)Dispcount.ConstructionYear].Text
1572 1570
                        txtbox.Text = dtToday.Year.ToString()
1573 1571
                                        + "/" + CommonMotions.cnvInt(txtbox.Text.Substring(0, 2)).ToString("00")
1574 1572
                                        + "/" + CommonMotions.cnvInt(txtbox.Text.Substring(2)).ToString("00");
......
1578 1576
                {   // 99/99?????
1579 1577
                    if (txtbox.Text.ToString().Length <= 5)
1580 1578
                    {
1581
                        //txtbox.Text = m_dispControl[(int)Dispcount.ConstructionYear].Text
1582 1579
                        txtbox.Text = dtToday.Year.ToString()
1583 1580
                                        + "/" + CommonMotions.cnvInt(txtbox.Text.Substring(0, txtbox.Text.IndexOf("/"))).ToString("00")
1584 1581
                                        + "/" + CommonMotions.cnvInt(txtbox.Text.Substring(txtbox.Text.IndexOf("/") + 1)).ToString("00");
......
1588 1585

  
1589 1586
                // ???N?x?`?F?b?N
1590 1587
                txtbox.Text = DTNextYearChange(txtbox).ToShortDateString();
1591
                //txtbox.Text = DTNextYearChange(ClsCommon.cnvDate(txtbox.Text)).ToShortDateString();
1592 1588

  
1593 1589
                if (!CommonMotions.chkDate(txtbox.Text.ToString())) return;
1594 1590

  
1595 1591
                txtbox.Text = DateTime.Parse(txtbox.Text.ToString()).ToShortDateString();
1596 1592

  
1593
                ValidatedDate(txtbox);
1594

  
1597 1595
                m_bChengeAns = true;
1598 1596
            }
1599 1597
            catch (Exception ex)
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
2344 2344
                strSQL += string.Format(" AND (TYINGFLG = {0} OR TYINGFLG = {1})"
2345 2345
                                        , (int)CommonDefine.BaseInfoTyingFlg.Parent, (int)CommonDefine.BaseInfoTyingFlg.Tying);
2346 2346
                //strSQL += string.Format(" AND CONSTRUCTIONPERIODSTART != TO_DATE('{0}')", DateTime.MinValue.ToShortDateString());
2347
                strSQL += string.Format(" AND CONSTRUCTIONPERIODSTART != STR_TO_DATE('{0}', '%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
2347
                strSQL += string.Format(" AND DATE(CONSTRUCTIONPERIODSTART) != STR_TO_DATE('{0}', '%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
2348 2348
                ArrayList Arlist = new ArrayList();
2349 2349
                if (!BaseDB.ExecuteReader(strSQL, ref Arlist, false)) return;
2350 2350
                if (Arlist.Count == 0) return;
......
4111 4111
            }
4112 4112
        }
4113 4113
        #endregion
4114

  
4115
        #region ?_??H???????????z???????????
4116
        /// <summary>
4117
        /// ?_??H???????????z???????????
4118
        /// </summary>
4119
        /// <param name="txtbox"></param>
4120
        private void ValidatedDate(TextBox txtbox)
4121
        {
4122
            try
4123
            {
4124
                bool bTarget = false;
4125
                if (txtbox.Name.Equals(m_DspCtrl[(int)DspCnt.ConstructionPeriodStart].Name)) bTarget = true;    // 48: ?_??H???J?n
4126
                if (txtbox.Name.Equals(m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd].Name)) bTarget = true;      // 49: ?_??H??????
4127
                if (txtbox.Name.Equals(m_DspCtrl[(int)DspCnt.ConstructionPeriodStart2].Name)) bTarget = true;	// 62: ?_??H???J?n?i???????j
4128
                if (txtbox.Name.Equals(m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd2].Name)) bTarget = true;		// 63: ?_??H???????i???????j
4129

  
4130
                // ????O??????????
4131
                if (!bTarget) return;
4132

  
4133
                // ?w????????
4134
                int Period = CommonMotions.cnvInt(m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text);              //  2: ?H????
4135
                DateTime dtStart = DateTime.Now;
4136
                DateTime dtEnd = DateTime.Now;
4137
                int iYear = 0;
4138
                int month = 0;
4139
                int day = 0;
4140
                bool bPeriod = true;
4141
                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
4142
                {   // ?c???
4143
                    iYear = CommonMotions.PeriodCountToYear(Period);
4144
                    bPeriod = true;
4145
                }
4146
                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
4147
                dtStart = new DateTime(iYear, month, day);
4148
                dtEnd = dtStart.AddYears(1).AddDays(-1);     // ?I????{1?N?|1??
4149

  
4150
                // ?{?H?????
4151
                DateTime dtCStart = CommonMotions.cnvDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodStart].Text);     // 48: ?_??H???J?n
4152
                DateTime dtCStart2 = CommonMotions.cnvDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodStart2].Text);   // 62: ?_??H???J?n?i???????j
4153
                if (dtCStart2 == DateTime.MinValue) dtCStart2 = dtCStart;
4154
                if (dtCStart2 < dtCStart) dtCStart = dtCStart2;
4155

  
4156
                DateTime dtCEnd = CommonMotions.cnvDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd].Text);         // 49: ?_??H??????
4157
                DateTime dtCEnd2 = CommonMotions.cnvDate(m_DspCtrl[(int)DspCnt.ConstructionPeriodEnd2].Text);		// 63: ?_??H???????i???????j
4158
                if (dtCEnd2 == DateTime.MinValue) dtCEnd2 = dtCEnd;
4159
                if (dtCEnd < dtCEnd2) dtCEnd = dtCEnd2;
4160

  
4161
                // ???????????O
4162
                if (dtCStart < dtStart)
4163
                {
4164
                    if(MessageBox.Show("?_??H?????H????\n????v???????????O???w????????\n?v??????X????????H",
4165
                                    "?_??H?????H???`?F?b?N",
4166
                                    MessageBoxButtons.YesNo, MessageBoxIcon.Information)==DialogResult.Yes)
4167
                    {
4168
                        int NewPeriod = Period;
4169
                        for (int i = 1; i < 10; i++)
4170
                        {
4171
                            dtStart = new DateTime((iYear - i), month, day);
4172
                            dtEnd = dtStart.AddYears(1).AddDays(-1);
4173
                            if (dtStart <= dtCStart && dtCStart <= dtEnd)
4174
                            {
4175
                                NewPeriod -= i;
4176
                                break;
4177
                            }
4178
                        }
4179
                        m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text = NewPeriod.ToString();
4180
                        return;
4181
                    }
4182
                }
4183
                if (dtEnd < dtCEnd)
4184
                {
4185
                    if (MessageBox.Show("?_??H??????????\n????v????????????~???w????????\n?v??????X????????H",
4186
                                    "?_??H?????????`?F?b?N",
4187
                                    MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes)
4188
                    {
4189
                        int NewPeriod = Period;
4190
                        for (int i = 1; i < 10; i++)
4191
                        {
4192
                            dtStart = new DateTime((iYear + i), month, day);
4193
                            dtEnd = dtStart.AddYears(1).AddDays(-1);
4194
                            if (dtStart <= dtCEnd && dtCEnd <= dtEnd)
4195
                            {
4196
                                NewPeriod += i;
4197
                                break;
4198
                            }
4199
                        }
4200
                        m_DspCtrl[(int)DspCnt.ConstructionPeriod].Text = NewPeriod.ToString();
4201
                        return;
4202
                    }
4203
                }
4204
            }
4205
            catch (Exception ex)
4206
            {
4207
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
4208
            }
4209
        }
4210
        #endregion
4114 4211
    }
4115 4212
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
1303 1303
                    {
1304 1304
                        case 0:
1305 1305
                            //strGetDate += string.Format(" AND ConstructionPeriodStart != TO_DATE('{0}','YYYY/MM/DD')", DateTime.MinValue.ToShortDateString());
1306
                            strGetDate += string.Format(" AND ConstructionPeriodStart != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1306
                            strGetDate += string.Format(" AND DATE(ConstructionPeriodStart) != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1307 1307
                            break;
1308 1308
                        case 1:
1309 1309
                            //strGetDate += string.Format(" AND ConstructionPeriodStart2 != TO_DATE('{0}','YYYY/MM/DD')", DateTime.MinValue.ToShortDateString());
1310
                            strGetDate += string.Format(" AND ConstructionPeriodStart2 != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1310
                            strGetDate += string.Format(" AND DATE(ConstructionPeriodStart2) != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1311 1311
                            break;
1312 1312
                        case 2:
1313 1313
                            //strGetDate += string.Format(" AND ConstructionPeriodEnd != TO_DATE('{0}','YYYY/MM/DD')", DateTime.MinValue.ToShortDateString());
1314
                            strGetDate += string.Format(" AND ConstructionPeriodEnd != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1314
                            strGetDate += string.Format(" AND DATE(ConstructionPeriodEnd) != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1315 1315
                            break;
1316 1316
                        case 3:
1317 1317
                            //strGetDate += string.Format(" AND ConstructionPeriodEnd2 != TO_DATE('{0}','YYYY/MM/DD')", DateTime.MinValue.ToShortDateString());
1318
                            strGetDate += string.Format(" AND ConstructionPeriodEnd2 != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1318
                            strGetDate += string.Format(" AND DATE(ConstructionPeriodEnd2) != STR_TO_DATE('{0}','%Y/%m/%d')", DateTime.MinValue.ToShortDateString());
1319 1319
                            break;
1320 1320
                    }
1321 1321

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs
171 171
                                                            "?w ?? ?? ?U ??",
172 172
                                                            "?S??????^???z"};
173 173
        #endregion
174

  
175
        #region ???v???Z?X????
176
        /// <summary>
177
        /// ???v???Z?X????
178
        /// </summary>
179
        private static int s_CurrentProcessNo = (int)ClsExcute.ProcessExecuteNo.ConstructionLedgerList;
174 180
        #endregion
175 181

  
182
        #endregion
183

  
176 184
        #region ???
177 185
        /// <summary>
178 186
        /// ?t?B?[???h?l????t???O
......
259 267
        private bool m_NextProcFlg = false;
260 268
        #endregion
261 269

  
262
        #region ????m?F???
263
        /// <summary>
264
        /// ????m?F???
265
        /// </summary>
266
        private FrmPriceOfBudget m_PriceOfBudget = null;
267 270
        #endregion
268 271

  
269
        #endregion
270

  
271 272
        #region ?v???p?e?B
272 273

  
273 274
        #region ?N???t???O
......
389 390
        {
390 391
            try
391 392
            {
393
                // ?t?H?[????Close????????????N???[?Y????
394
                TerminatingProcess();
395

  
392 396
                if (m_CloseingProcessOff) return;
393 397

  
394
                // ????m?F?????\???????????N???[?Y????
395
                if (m_PriceOfBudget != null)
396
                {
397
                    m_PriceOfBudget.Dispose();
398
                    m_PriceOfBudget = null;
399
                }
400

  
401 398
                // ?O?v???Z?X????
402 399
                ClsExcute.BackProcess();
403 400
            }
......
445 442
        /// <param name="e"></param>
446 443
        private void btnLedgerStatus_Click(object sender, EventArgs e)
447 444
        {
448
            // ?t?H?[?????\?????????????O??\???????????
449
            if (m_PriceOfBudget != null)
450
            {
451
                m_PriceOfBudget.Activate();
452
                return;
453
            }
454
            // ?O??\??
445
            // ???\??
455 446
            DispPriceOfBudget();
456 447
        }
457 448
        #endregion
458 449

  
459
        #region ????m?F???N???[?Y
460
        /// <summary>
461
        /// ????m?F????N???[?Y????????
462
        /// </summary>
463
        /// <param name="sender"></param>
464
        /// <param name="e"></param>
465
        private void FrmPriceOfBudget_FormClosed(object sender, FormClosedEventArgs e)
466
        {
467
            try
468
            {
469
                this.Activate();
470

  
471
                // ?n???h???N???A
472
                m_PriceOfBudget.Dispose();
473
                m_PriceOfBudget = null;
474
            }
475
            catch (Exception ex)
476
            {
477
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
478
            }
479
        }
480
        #endregion
481

  
482 450
        #region ?t?H?[?????[?h
483 451
        /// <summary>
484 452
        /// ?????t?H?[?????[?h
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
73 73
            else
74 74
            {
75 75
                int Master = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key;
76
                if (CommonMotions.LoginUserSecurity.SecRank == Master) btnLedgerStatus.Visible = true;
77
                else btnLedgerStatus.Visible = false;
76
                // ??????{?^???\??
77
                int editflg = 0;
78
                btnLedgerStatus.Visible = ClsSecurityPermission.GetExecutePermission((int)ClsExcute.ProcessExecuteNo.PriceOfBudget, ref editflg);
78 79
            }
79 80
        }
80 81
        #endregion
......
146 147
        }
147 148
        #endregion
148 149

  
150
        #region ?I????????
151
        /// <summary>
152
        /// ?I?????T?u?t?H?[???N???[?Y
153
        /// </summary>
154
        private void TerminatingProcess()
155
        {
156
            try
157
            {
158
                // ?t?H?[????Close????????????N???[?Y????
159
                for (int i = 0; i < ClsExcute.SubFormHandleList.Length; i++)
160
                {
161
                    PreserveSubFormHandle Handle = ClsExcute.SubFormHandleList[i];
162

  
163
                    // ???????N???????????O??????????
164
                    if (Handle.ProcessNo != s_CurrentProcessNo) continue;
165

  
166
                    // ??????????????
167
                    if (i == s_CurrentProcessNo)
168
                    {
169
                        ClsExcute.SubFormHandleList[i].SubFormHandle = null;
170
                        ClsExcute.SubFormHandleList[i].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
171
                        continue;
172
                    }
173

  
174
                    // ?N?????????????????????
175
                    if (Handle.SubFormHandle == null) continue;
176

  
177
                    // ???N???[?Y
178
                    Handle.SubFormHandle.Close();
179
                    if (Handle.SubFormHandle != null) Handle.SubFormHandle.Dispose();
180
                    ClsExcute.SubFormHandleList[i].SubFormHandle = null;
181

  
182
                }
183
            }
184
            catch (System.Exception ex)
185
            {
186
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
187
            }
188
        }
189
        #endregion
190

  
149 191
        #region ????SQL??Z?L?????e?B??????????????
150 192
        /// <summary>
151 193
        /// ????SQL??Z?L?????e?B??????????????
......
2353 2395
        {
2354 2396
            try
2355 2397
            {
2356
                // ????m?F???\??
2357
                m_PriceOfBudget = new FrmPriceOfBudget();
2398
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PriceOfBudget;
2399
                // ?t?H?[??????????O???
2400
                FrmPriceOfBudget frm = (FrmPriceOfBudget)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
2358 2401

  
2402
                // ?\???S?????????????????????
2403
                if (frm != null)
2404
                {
2405
                    frm.Activate();
2406
                    return;
2407
                }
2408

  
2409
                // ????m?F???
2410
                frm = new FrmPriceOfBudget();
2411
                ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = s_CurrentProcessNo;
2412
                ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = (Form)frm;
2413

  
2359 2414
                // ??u???
2360
                m_PriceOfBudget.LocationPoint = new Point(this.Right, this.Top);
2415
                frm.LocationPoint = new Point(this.Right, this.Top);
2361 2416

  
2362 2417
                // ?^?X?N?o?[??\???????
2363 2418
                //m_PriceOfBudget.ShowInTaskbar = false;
2364 2419

  
2365 2420
                // ?N???[?X?h?n???h????????????`????
2366
                m_PriceOfBudget.FormClosed += new FormClosedEventHandler(FrmPriceOfBudget_FormClosed);
2367
                m_PriceOfBudget.Show();
2421
                frm.FormClosed += new FormClosedEventHandler(FrmPriceOfBudget_FormClosed);
2422
                frm.Show();
2368 2423
            }
2369 2424
            catch (System.Exception ex)
2370 2425
            {
......
2373 2428
        }
2374 2429
        #endregion
2375 2430

  
2431
        #region ????m?F???N???[?Y
2432
        /// <summary>
2433
        /// ????m?F????N???[?Y????????
2434
        /// </summary>
2435
        /// <param name="sender"></param>
2436
        /// <param name="e"></param>
2437
        private void FrmPriceOfBudget_FormClosed(object sender, FormClosedEventArgs e)
2438
        {
2439
            try
2440
            {
2441
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PriceOfBudget;
2442
                FrmPriceOfBudget frm = (FrmPriceOfBudget)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
2443

  
2444
                // ?n???h???N???A
2445
                if (ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle != null)
2446
                {
2447
                    ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle.Dispose();
2448
                    ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle = null;
2449
                    ClsExcute.SubFormHandleList[ProcessNo].ProcessNo = (int)ClsExcute.ProcessExecuteNo.MainMenu;
2450
                }
2451

  
2452
                this.Activate();
2453
            }
2454
            catch (Exception ex)
2455
            {
2456
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
2457
            }
2458
        }
2459
        #endregion
2460

  
2376 2461
        #region ??????????O?C???S??????Z?b?g????
2377 2462
        /// <summary>
2378 2463
        /// ??????????O?C???S??????Z?b?g????
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistAuxiliary.cs
551 551
                strSQL += " LEFT JOIN PERSONINCHARGEMASTER B ON B.PERSONCODE = A.PERSONCODE";
552 552
                strSQL += " LEFT JOIN DEPARTMENTMASTER C ON C.DEPARTMENTCODE = B.DEPARTMENTCODE";
553 553
                strSQL += string.Format(" WHERE A.PersonCode = {0}", m_PersonCode);
554
                strSQL += string.Format(" AND A.CreateDate = TO_DATE('{0}')", m_CreateDate.ToShortDateString());
554
                strSQL += string.Format(" AND DATE(A.CreateDate) = STR_TO_DATE('{0}', '%Y/%m/%d')", m_CreateDate.ToShortDateString());
555 555
                strSQL += string.Format(" AND A.SeqNo = {0}", m_SeqNo);
556 556

  
557 557
                if (!crDB.ExecuteReader(strSQL, ref crList)) return false;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/PrintFormat.cs
205 205
            {
206 206
                string strSQL = "SELECT * FROM PROCEEDINGSDATAATTEND A";
207 207
                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", DailyRec.ConstructionCode);
208
                strSQL += string.Format(" AND A.PROCEEDINGSDATADATE = STR_TO_DATE('{0}','%Y/%m/%d')", DailyRec.ProceedingsDataDate.ToShortDateString());
208
                strSQL += string.Format(" AND DATE(A.PROCEEDINGSDATADATE) = STR_TO_DATE('{0}','%Y/%m/%d')", DailyRec.ProceedingsDataDate.ToShortDateString());
209 209
                strSQL += string.Format(" AND A.STARTMEETINGTIME = {0}", DailyRec.StartMeetingTime);
210 210
                strSQL += " ORDER BY A.SEQNO";
211 211
                DailyDB.ExecuteReader(strSQL, ref AttendList);
......
229 229
            {
230 230
                string strSQL = "SELECT * FROM PROCEEDINGSDATADETAIL A";
231 231
                strSQL += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", DailyRec.ConstructionCode);
232
                strSQL += string.Format(" AND A.PROCEEDINGSDATADATE = STR_TO_DATE('{0}','%Y/%m/%d')", DailyRec.ProceedingsDataDate.ToShortDateString());
232
                strSQL += string.Format(" AND DATE(A.PROCEEDINGSDATADATE) = STR_TO_DATE('{0}','%Y/%m/%d')", DailyRec.ProceedingsDataDate.ToShortDateString());
233 233
                strSQL += string.Format(" AND A.STARTMEETINGTIME = {0}", DailyRec.StartMeetingTime);
234 234
                strSQL += " ORDER BY A.SEQNO";
235 235

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstruction.designer.cs
30 30
        /// </summary>
31 31
        private void InitializeComponent()
32 32
        {
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
52
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
53
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
52
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
53
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
54 54
            this.label1 = new System.Windows.Forms.Label();
55 55
            this.btnDataDelete = new System.Windows.Forms.Button();
56 56
            this.btnDataEntry = new System.Windows.Forms.Button();
......
82 82
            this.btnLineDel = new System.Windows.Forms.Button();
83 83
            this.btnLineAdd = new System.Windows.Forms.Button();
84 84
            this.pnlBase = new System.Windows.Forms.Panel();
85
            this.label20 = new System.Windows.Forms.Label();
86
            this.panel3 = new System.Windows.Forms.Panel();
87
            this.label6 = new System.Windows.Forms.Label();
85 88
            this.btnSubJob = new System.Windows.Forms.Button();
86 89
            this.label39 = new System.Windows.Forms.Label();
87 90
            this.label48 = new System.Windows.Forms.Label();
......
143 146
            this.label13 = new System.Windows.Forms.Label();
144 147
            this.label12 = new System.Windows.Forms.Label();
145 148
            this.label7 = new System.Windows.Forms.Label();
146
            this.label6 = new System.Windows.Forms.Label();
147 149
            this.lblCellTotal = new System.Windows.Forms.Label();
148 150
            this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
149 151
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
166 168
            this.btnCancel = new System.Windows.Forms.Button();
167 169
            this.btnFirst = new System.Windows.Forms.Button();
168 170
            this.btnFinal = new System.Windows.Forms.Button();
169
            this.panel3 = new System.Windows.Forms.Panel();
170 171
            this.panel1.SuspendLayout();
171 172
            this.pnlApproval.SuspendLayout();
172 173
            this.pnlApprovalButton.SuspendLayout();
173 174
            this.pnlBase.SuspendLayout();
175
            this.panel3.SuspendLayout();
174 176
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX4)).BeginInit();
175 177
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX3)).BeginInit();
176 178
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX2)).BeginInit();
177 179
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX1)).BeginInit();
178 180
            ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
179 181
            this.panel2.SuspendLayout();
180
            this.panel3.SuspendLayout();
181 182
            this.SuspendLayout();
182 183
            // 
183 184
            // label1
......
579 580
            | System.Windows.Forms.AnchorStyles.Right)));
580 581
            this.pnlBase.AutoScroll = true;
581 582
            this.pnlBase.BackColor = System.Drawing.Color.WhiteSmoke;
583
            this.pnlBase.Controls.Add(this.label20);
582 584
            this.pnlBase.Controls.Add(this.panel3);
583 585
            this.pnlBase.Controls.Add(this.label39);
584 586
            this.pnlBase.Controls.Add(this.label48);
......
626 628
            this.pnlBase.Size = new System.Drawing.Size(1320, 490);
627 629
            this.pnlBase.TabIndex = 36;
628 630
            // 
631
            // label20
632
            // 
633
            this.label20.AutoSize = true;
634
            this.label20.ForeColor = System.Drawing.Color.Red;
635
            this.label20.Location = new System.Drawing.Point(612, 854);
636
            this.label20.Name = "label20";
637
            this.label20.Size = new System.Drawing.Size(603, 16);
638
            this.label20.TabIndex = 77;
639
            this.label20.Text = "未巡回の場合は未巡回と記入して下さい。(記入例:未巡回(電話確認)等)";
640
            // 
641
            // panel3
642
            // 
643
            this.panel3.BackColor = System.Drawing.Color.White;
644
            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
645
            this.panel3.Controls.Add(this.label6);
646
            this.panel3.Controls.Add(this.btnSubJob);
647
            this.panel3.Location = new System.Drawing.Point(53, 10);
648
            this.panel3.Name = "panel3";
649
            this.panel3.Size = new System.Drawing.Size(200, 40);
650
            this.panel3.TabIndex = 76;
651
            // 
652
            // label6
653
            // 
654
            this.label6.BackColor = System.Drawing.Color.White;
655
            this.label6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
656
            this.label6.Location = new System.Drawing.Point(8, 4);
657
            this.label6.Name = "label6";
658
            this.label6.Size = new System.Drawing.Size(80, 30);
659
            this.label6.TabIndex = 37;
660
            this.label6.Text = "職  種";
661
            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
662
            // 
629 663
            // btnSubJob
630 664
            // 
631 665
            this.btnSubJob.BackColor = System.Drawing.Color.SeaGreen;
......
733 767
            | System.Windows.Forms.AnchorStyles.Right)));
734 768
            this.dataGridViewEX4.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
735 769
            this.dataGridViewEX4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
736
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
737
            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
738
            dataGridViewCellStyle22.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
739
            dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;
740
            dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
741
            dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
742
            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
743
            this.dataGridViewEX4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
770
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
771
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
772
            dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
773
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
774
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
775
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
776
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
777
            this.dataGridViewEX4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
744 778
            this.dataGridViewEX4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
745 779
            this.dataGridViewEX4.ColumnHeadersVisible = false;
746 780
            this.dataGridViewEX4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
767 801
            // 
768 802
            // dataGridViewTextBoxColumn18
769 803
            // 
770
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
771
            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle23;
804
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
805
            this.dataGridViewTextBoxColumn18.DefaultCellStyle = dataGridViewCellStyle2;
772 806
            this.dataGridViewTextBoxColumn18.Frozen = true;
773 807
            this.dataGridViewTextBoxColumn18.HeaderText = "№";
774 808
            this.dataGridViewTextBoxColumn18.Name = "dataGridViewTextBoxColumn18";
......
779 813
            // 
780 814
            // dataGridViewTextBoxColumn19
781 815
            // 
782
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
783
            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle24;
816
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
817
            this.dataGridViewTextBoxColumn19.DefaultCellStyle = dataGridViewCellStyle3;
784 818
            this.dataGridViewTextBoxColumn19.HeaderText = "時間帯固定";
785 819
            this.dataGridViewTextBoxColumn19.Name = "dataGridViewTextBoxColumn19";
786 820
            this.dataGridViewTextBoxColumn19.ReadOnly = true;
......
789 823
            // 
790 824
            // Column9
791 825
            // 
792
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
793
            this.Column9.DefaultCellStyle = dataGridViewCellStyle25;
826
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
827
            this.Column9.DefaultCellStyle = dataGridViewCellStyle4;
794 828
            this.Column9.HeaderText = "時間帯";
795 829
            this.Column9.Name = "Column9";
796 830
            this.Column9.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
851 885
            | System.Windows.Forms.AnchorStyles.Right)));
852 886
            this.dataGridViewEX3.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
853 887
            this.dataGridViewEX3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
854
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
855
            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
856
            dataGridViewCellStyle26.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
857
            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
858
            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
859
            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
860
            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
861
            this.dataGridViewEX3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26;
888
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
889
            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
890
            dataGridViewCellStyle5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
891
            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
892
            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
893
            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
894
            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
895
            this.dataGridViewEX3.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
862 896
            this.dataGridViewEX3.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
863 897
            this.dataGridViewEX3.ColumnHeadersVisible = false;
864 898
            this.dataGridViewEX3.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
884 918
            // 
885 919
            // dataGridViewTextBoxColumn15
886 920
            // 
887
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
888
            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle27;
921
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
922
            this.dataGridViewTextBoxColumn15.DefaultCellStyle = dataGridViewCellStyle6;
889 923
            this.dataGridViewTextBoxColumn15.Frozen = true;
890 924
            this.dataGridViewTextBoxColumn15.HeaderText = "№";
891 925
            this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15";
......
1005 1039
            | System.Windows.Forms.AnchorStyles.Right)));
1006 1040
            this.dataGridViewEX2.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
1007 1041
            this.dataGridViewEX2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1008
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1009
            dataGridViewCellStyle28.BackColor = System.Drawing.SystemColors.Control;
1010
            dataGridViewCellStyle28.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1011
            dataGridViewCellStyle28.ForeColor = System.Drawing.SystemColors.WindowText;
1012
            dataGridViewCellStyle28.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1013
            dataGridViewCellStyle28.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1014
            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1015
            this.dataGridViewEX2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle28;
1042
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1043
            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
1044
            dataGridViewCellStyle7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1045
            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
1046
            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1047
            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1048
            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1049
            this.dataGridViewEX2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
1016 1050
            this.dataGridViewEX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1017 1051
            this.dataGridViewEX2.ColumnHeadersVisible = false;
1018 1052
            this.dataGridViewEX2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
1041 1075
            // 
1042 1076
            // dataGridViewTextBoxColumn9
1043 1077
            // 
1044
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1045
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle29;
1078
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1079
            this.dataGridViewTextBoxColumn9.DefaultCellStyle = dataGridViewCellStyle8;
1046 1080
            this.dataGridViewTextBoxColumn9.Frozen = true;
1047 1081
            this.dataGridViewTextBoxColumn9.HeaderText = "№";
1048 1082
            this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9";
......
1061 1095
            // 
1062 1096
            // dataGridViewTextBoxColumn11
1063 1097
            // 
1064
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1065
            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle30;
1098
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1099
            this.dataGridViewTextBoxColumn11.DefaultCellStyle = dataGridViewCellStyle9;
1066 1100
            this.dataGridViewTextBoxColumn11.HeaderText = "数量";
1067 1101
            this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11";
1068 1102
            this.dataGridViewTextBoxColumn11.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
1212 1246
            | System.Windows.Forms.AnchorStyles.Right)));
1213 1247
            this.dataGridViewEX1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
1214 1248
            this.dataGridViewEX1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1215
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1216
            dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
1217
            dataGridViewCellStyle31.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1218
            dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
1219
            dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1220
            dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1221
            dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1222
            this.dataGridViewEX1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
1249
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1250
            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control;
1251
            dataGridViewCellStyle10.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1252
            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText;
1253
            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1254
            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1255
            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1256
            this.dataGridViewEX1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10;
1223 1257
            this.dataGridViewEX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1224 1258
            this.dataGridViewEX1.ColumnHeadersVisible = false;
1225 1259
            this.dataGridViewEX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
1250 1284
            // 
1251 1285
            // dataGridViewTextBoxColumn1
1252 1286
            // 
1253
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1254
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle32;
1287
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1288
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle11;
1255 1289
            this.dataGridViewTextBoxColumn1.Frozen = true;
1256 1290
            this.dataGridViewTextBoxColumn1.HeaderText = "№";
1257 1291
            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
......
1294 1328
            // 
1295 1329
            // dataGridViewTextBoxColumn6
1296 1330
            // 
1297
            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1298
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle33;
1331
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1332
            this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle12;
1299 1333
            this.dataGridViewTextBoxColumn6.HeaderText = "開始";
1300 1334
            this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
1301 1335
            this.dataGridViewTextBoxColumn6.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
1304 1338
            // 
1305 1339
            // dataGridViewTextBoxColumn7
1306 1340
            // 
1307
            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1308
            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle34;
1341
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1342
            this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle13;
1309 1343
            this.dataGridViewTextBoxColumn7.HeaderText = "";
1310 1344
            this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
1311 1345
            this.dataGridViewTextBoxColumn7.ReadOnly = true;
......
1315 1349
            // 
1316 1350
            // dataGridViewTextBoxColumn8
1317 1351
            // 
1318
            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1319
            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle35;
1352
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1353
            this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle14;
1320 1354
            this.dataGridViewTextBoxColumn8.HeaderText = "終了";
1321 1355
            this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
1322 1356
            this.dataGridViewTextBoxColumn8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
1429 1463
            this.label7.Text = "業 者 名";
1430 1464
            this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
1431 1465
            // 
1432
            // label6
1433
            // 
1434
            this.label6.BackColor = System.Drawing.Color.White;
1435
            this.label6.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
1436
            this.label6.Location = new System.Drawing.Point(8, 4);
1437
            this.label6.Name = "label6";
1438
            this.label6.Size = new System.Drawing.Size(80, 30);
1439
            this.label6.TabIndex = 37;
1440
            this.label6.Text = "職  種";
1441
            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
1442
            // 
1443 1466
            // lblCellTotal
1444 1467
            // 
1445 1468
            this.lblCellTotal.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
......
1462 1485
            | System.Windows.Forms.AnchorStyles.Right)));
1463 1486
            this.dgvAllDisplay.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
1464 1487
            this.dgvAllDisplay.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1465
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1466
            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control;
1467
            dataGridViewCellStyle36.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1468
            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText;
1469
            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1470
            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1471
            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1472
            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36;
1488
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1489
            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
1490
            dataGridViewCellStyle15.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1491
            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
1492
            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1493
            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1494
            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1495
            this.dgvAllDisplay.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
1473 1496
            this.dgvAllDisplay.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1474 1497
            this.dgvAllDisplay.ColumnHeadersVisible = false;
1475 1498
            this.dgvAllDisplay.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
1502 1525
            // 
1503 1526
            // Column1
1504 1527
            // 
1505
            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1506
            this.Column1.DefaultCellStyle = dataGridViewCellStyle37;
1528
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1529
            this.Column1.DefaultCellStyle = dataGridViewCellStyle16;
1507 1530
            this.Column1.Frozen = true;
1508 1531
            this.Column1.HeaderText = "№";
1509 1532
            this.Column1.Name = "Column1";
......
1523 1546
            // 
1524 1547
            // Column2
1525 1548
            // 
1526
            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1527
            this.Column2.DefaultCellStyle = dataGridViewCellStyle38;
1549
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1550
            this.Column2.DefaultCellStyle = dataGridViewCellStyle17;
1528 1551
            this.Column2.Frozen = true;
1529 1552
            this.Column2.HeaderText = "職種名称";
1530 1553
            this.Column2.Name = "Column2";
......
1544 1567
            // 
1545 1568
            // Column3
1546 1569
            // 
1547
            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1548
            this.Column3.DefaultCellStyle = dataGridViewCellStyle39;
1570
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1571
            this.Column3.DefaultCellStyle = dataGridViewCellStyle18;
1549 1572
            this.Column3.Frozen = true;
1550 1573
            this.Column3.HeaderText = "業者名";
1551 1574
            this.Column3.Name = "Column3";
......
1556 1579
            // 
1557 1580
            // Column4
1558 1581
            // 
1559
            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1560
            this.Column4.DefaultCellStyle = dataGridViewCellStyle40;
1582
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1583
            this.Column4.DefaultCellStyle = dataGridViewCellStyle19;
1561 1584
            this.Column4.HeaderText = "当日";
1562 1585
            this.Column4.Name = "Column4";
1563 1586
            this.Column4.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
1566 1589
            // 
1567 1590
            // Column5
1568 1591
            // 
1569
            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1570
            this.Column5.DefaultCellStyle = dataGridViewCellStyle41;
1592
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1593
            this.Column5.DefaultCellStyle = dataGridViewCellStyle20;
1571 1594
            this.Column5.HeaderText = "累計";
1572 1595
            this.Column5.Name = "Column5";
1573 1596
            this.Column5.ReadOnly = true;
......
1593 1616
            // 
1594 1617
            // Column8
1595 1618
            // 
1596
            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1597
            this.Column8.DefaultCellStyle = dataGridViewCellStyle42;
1619
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1620
            this.Column8.DefaultCellStyle = dataGridViewCellStyle21;
1598 1621
            this.Column8.HeaderText = "人員";
1599 1622
            this.Column8.Name = "Column8";
1600 1623
            this.Column8.Resizable = System.Windows.Forms.DataGridViewTriState.False;
......
1732 1755
            this.btnFinal.UseVisualStyleBackColor = false;
1733 1756
            this.btnFinal.Click += new System.EventHandler(this.btnFinal_Click);
1734 1757
            // 
1735
            // panel3
1736
            // 
1737
            this.panel3.BackColor = System.Drawing.Color.White;
1738
            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1739
            this.panel3.Controls.Add(this.label6);
1740
            this.panel3.Controls.Add(this.btnSubJob);
1741
            this.panel3.Location = new System.Drawing.Point(53, 10);
1742
            this.panel3.Name = "panel3";
1743
            this.panel3.Size = new System.Drawing.Size(200, 40);
1744
            this.panel3.TabIndex = 76;
1745
            // 
1746 1758
            // FrmDRConstruction
1747 1759
            // 
1748 1760
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
1782 1794
            this.pnlApprovalButton.ResumeLayout(false);
1783 1795
            this.pnlBase.ResumeLayout(false);
1784 1796
            this.pnlBase.PerformLayout();
1797
            this.panel3.ResumeLayout(false);
1785 1798
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX4)).EndInit();
1786 1799
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX3)).EndInit();
1787 1800
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX2)).EndInit();
1788 1801
            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEX1)).EndInit();
1789 1802
            ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).EndInit();
1790 1803
            this.panel2.ResumeLayout(false);
1791
            this.panel3.ResumeLayout(false);
1792 1804
            this.ResumeLayout(false);
1793 1805

  
1794 1806
        }
......
1911 1923
        private System.Windows.Forms.Button btnFinal;
1912 1924
        private System.Windows.Forms.Button btnSubJob;
1913 1925
        private System.Windows.Forms.Panel panel3;
1926
        private System.Windows.Forms.Label label20;
1914 1927
    }
1915 1928
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/FrmDRConstructionAuxiliary.cs
883 883
                ArrayList arList = new ArrayList();
884 884
                if (!DetailDB.ExecuteReader(strSQL, ref arList) || arList.Count == 0)
885 885
                {
886
                    // データ無は空行を表示する
887
                    dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Detail]);
888
                    // 合計表示
889
                    lblGrid1Total1.Text = "0.0";
890
                    double work = GetTotalHeadCount();
891
                    if (work==0)
892
                        lblGrid1Total2.Text = work.ToString("#,#.#");
893
                    else
894
                        lblGrid1Total2.Text = work.ToString("#,0.0");
895
                    lblGrid1Total3.Text = "0.0";
896
                    return;
886
                    if (!MaxDateCheck(ref arList))
887
                    {
888
                        // データ無は空行を表示する
889
                        dgv.Rows.Add(s_MinRowCountGrid[(int)DataGridDefine.Detail]);
890
                        // 合計表示
891
                        lblGrid1Total1.Text = "0.0";
892
                        double work = GetTotalHeadCount();
893
                        if (work == 0)
894
                            lblGrid1Total2.Text = work.ToString("#,#.#");
895
                        else
896
                            lblGrid1Total2.Text = work.ToString("#,0.0");
897
                        lblGrid1Total3.Text = "0.0";
898
                        return;
899
                    }
897 900
                }
898 901

  
899 902
                // グリッド表示
......
961 964
        }
962 965
        #endregion
963 966

  
967
        #region 現在指定日がデータの最終日より大きいかをチェックする
968
        /// <summary>
969
        /// 現在指定日がデータの最終日より大きいかをチェックする
970
        /// </summary>
971
        /// <returns></returns>
972
        private bool MaxDateCheck(ref ArrayList DispList)
973
        {
974
            IODailyDataDetail DetailDB = new IODailyDataDetail();
975
            try
976
            {
977
                DateTime MaxDate = GetFPNDataDate((int)ReadData.Final);
978
                if (MaxDate > dTPCreateDate.Value) return false;
979

  
980
                // 明細データ取得
981
                string strSQL = "SELECT A.JOBCATEGORYCODE";
982
                strSQL += ", B.JOBCATEGORYNAME";
983
                strSQL += ", A.COMPANYCODE";
984
                strSQL += ", C.COMPANYNAME";
985
                strSQL += ", A.NEXTDAYHEADCOUNT";
986
                strSQL += ", (A.TOTALHEADCOUNT + A.NEXTDAYHEADCOUNT)";
987
                strSQL += ", A.NEXTDAYWORK";
988
                strSQL += ", ''";
989
                strSQL += ", 0";
990
                strSQL += " FROM DAILYDATADETAIL A";
991
                strSQL += " LEFT JOIN SUBCONTRACTORJOBCATEGORY B ON A.JOBCATEGORYCODE = B.JOBCATEGORYCODE";
992
                strSQL += " LEFT JOIN SUBCONTRACTORMASTER C ON A.COMPANYCODE = C.COMPANYCODE";
993
                strSQL += DetailDB.CreatePrimarykeyString(m_PersonCode, MaxDate, m_ConstructionCode, 0);
994
                strSQL += " ORDER BY A.SEQNO";
995
                DetailDB.ExecuteReader(strSQL, ref DispList);
996

  
997
                return true;
998
            }
999
            catch (Exception ex)
1000
            {
1001
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1002
                return false;
1003
            }
1004
            finally
1005
            {
1006
                DetailDB.close(); DetailDB = null;
1007
            }
1008
        }
1009
        #endregion
1010

  
964 1011
        #region 作業内容グリッドの合計を計算する
965 1012
        /// <summary>
966 1013
        /// 作業内容グリッドの合計を計算する
......
1856 1903
                bAns = DailyDataCheck();
1857 1904
                bRet &= bAns;
1858 1905

  
1906
                bool[] bDailyDataField = new bool[4];
1907
                Array.Clear(bDailyDataField, 0, bDailyDataField.Length);
1908
                CommonMotions.chgBackColor(m_DgvArray[4].Rows[0].Cells[(int)DispGridColumn5.ContentsText], true);
1909
                CommonMotions.chgBackColor(m_DgvArray[4].Rows[3].Cells[(int)DispGridColumn5.ContentsText], true);
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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