プロジェクト

全般

プロフィール

リビジョン 18

堀内約8年前に追加

工事台帳まとめ追加

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Common/CommonDefine.cs
1052 1052
        /// 工数単位日数
1053 1053
        /// </summary>
1054 1054
        public static double s_ManHourUnitDays = 3.0;
1055
        /// <summary>
1056
        /// 月工数単位日数
1057
        /// </summary>
1055 1058
        public static double s_ManHourUnitMonth = 30.0;
1056 1059
        #endregion
1057 1060

  
......
1350 1353
            Fluctuates,
1351 1354
        }
1352 1355
        #endregion
1356

  
1357
        #region 担当者マスタ:工事詳細台帳計算対象フラグ
1358
        /// <summary>
1359
        /// 担当者マスタ:工事詳細台帳計算対象フラグ
1360
        /// </summary>
1361
        public enum PersonLedgerDivNo
1362
        {
1363
            /// <summary>
1364
            /// 対象外
1365
            /// </summary>
1366
            CalcOuter = 0,
1367
            /// <summary>
1368
            /// 対象
1369
            /// </summary>
1370
            CalcTarget,
1371
        }
1372
        #endregion
1353 1373
    }
1354 1374
}
trunk/src/ProcessManagement/ProcessManagement/Common/CommonMotions.cs
55 55
        private static PersonInChargeMaster m_LoginUserData = new PersonInChargeMaster();
56 56

  
57 57
        /// <summary>
58
        /// システム起動チェック処理クラス
59
        /// </summary>
60
        private static ClsSystemOnceExecute m_CheckProc = null;
61
        
62
        /// <summary>
58 63
        /// 建築工事費の構成
59 64
        /// </summary>
60 65
        //private static Dictionary<int, string> m_StructureTypeName = new Dictionary<int, string>();
......
123 128
            get { return m_ProductVersionInfo; }
124 129
        }
125 130

  
131
        /// <summary>
132
        /// システム起動チェック処理クラス
133
        /// </summary>
134
        public static ClsSystemOnceExecute CheckProc
135
        {
136
            get { return m_CheckProc; }
137
        }
126 138
        #endregion
127 139

  
128 140
        #region 初期化
......
143 155
                // 管理マスタ取得
144 156
                SetSystemMaster();
145 157

  
158
                // 起動チェッククラス初期化
159
                m_CheckProc = new ClsSystemOnceExecute();
146 160
            }
147 161
            catch (Exception ex)
148 162
            {
......
151 165
        }
152 166
        #endregion
153 167

  
154
        #region プライベートメソッド
168
        #region 定義ファイル読込
155 169
        /// <summary>
156 170
        /// 定義ファイル読込
157 171
        /// </summary>
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs
63 63
            Proceedings,                        // 16:発注者打ち合わせ議事録入力
64 64
            DailyReportList,                    // 17:日報一覧
65 65
            DailyReport,                        // 18:日報全般
66
            DepartmentExpenssList,              // 19:部署別台帳一覧
66
            DepartmentExpenssList,              // 19:部署別台帳まとめ一覧
67
            ConstrLedgerPrsonList,              // 20:工事詳細台帳一覧(個人指定)
67 68
        }
68 69
        #endregion
69 70

  
......
354 355
                        case (int)ProcessExecuteNo.DepartmentExpenssList:               // 19:部署別台帳一覧
355 356
                            ProcessExecuteNo_DepartmentExpenssList(m_ProcControlPara[NowPoint]);
356 357
                            break;
358

  
359
                        case (int)ProcessExecuteNo.ConstrLedgerPrsonList:               // 20:工事詳細台帳一覧(個人指定)
360
                            ProcessExecuteNo_ConstrLedgerPersonList(m_ProcControlPara[NowPoint]);
361
                            break;
362

  
357 363
                        #endregion
358 364

  
359 365
                        #region マスタメンテ
......
1242 1248
        }
1243 1249
        #endregion
1244 1250

  
1251
        #region 工事詳細台帳一覧(個人指定)
1252
        /// <summary>
1253
        /// 工事詳細台帳一覧(個人指定)
1254
        /// </summary>
1255
        /// <returns></returns>
1256
        public static void ProcessExecuteNo_ConstrLedgerPersonList(ProcessParameter CurrentPara)
1257
        {
1258
            // 工事詳細台帳一覧
1259
            FrmConstructionLedgerList frm = new FrmConstructionLedgerList();
1260
            try
1261
            {
1262
                // 次起動プロセスセット
1263
                frm.ExecuteFlg = CurrentPara.IntExecParameter[0];
1264

  
1265
                // 初期選択無しフラグ
1266
                frm.FirstStartFlg = false;
1267

  
1268
                // 初期選択年度
1269
                frm.FirstStartPeriod = CurrentPara.IntExecParameter[1];
1270

  
1271
                // 初期選択部署コード
1272
                frm.FirstStartDepartmentCode = CurrentPara.IntExecParameter[2];
1273

  
1274
                // 初期選択担当者コード
1275
                frm.FirstStartPersonCode = CurrentPara.IntExecParameter[3];
1276

  
1277
                // フォーム表示
1278
                frm.ShowDialog();
1279
            }
1280
            catch (Exception ex)
1281
            {
1282
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1283
            }
1284
            finally
1285
            {
1286
                frm.Dispose(); frm = null;
1287
            }
1288
        }
1245 1289
        #endregion
1246 1290

  
1291
        #endregion
1292

  
1247 1293
        #region マスタメンテナンス
1248 1294
        // ----------------- メンテナンス起動
1249 1295
        #region 管理マスタ
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs
40 40
            IOMessageBoardTerget mbtDB = new IOMessageBoardTerget();
41 41
            try
42 42
            {
43
                mbdDB.connect();
44
                mbdDB.beginTran();
43
                mbdDB.connect(); mbdDB.beginTran();
44
                mbtDB.connect(); mbtDB.beginTran();
45 45

  
46
                mbtDB.connect();
47
                mbtDB.beginTran();
48

  
49 46
                // キーコードセット
50 47
                WriteData.RecordNumber = mbdDB.SelectMaxMessageBoardDataKeyCount("", false) + 1;
51 48

  
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs
43 43
        /// 初期化処理成否フラグ
44 44
        /// </summary>
45 45
        private bool m_bExecuteFlg = true;
46
        
46 47
        /// <summary>
47
        /// 検索インデックステーブル
48
        /// 状態毎期限マスタリスト
48 49
        /// </summary>
49
        private Dictionary<int, int> arrayTblIndex = new Dictionary<int, int>();
50
        private List<TermMasterList> SystemOnceExecuteTermMstList = new List<TermMasterList>();
51

  
50 52
        /// <summary>
51
        /// 状態毎期限マスタリスト
53
        /// 最終起動日
52 54
        /// </summary>
53
        private List<TermMasterList> m_arrayList = new List<TermMasterList>();
55
        DateTime m_lastsessionDate = DateTime.MinValue;
54 56
        #endregion
55 57

  
56 58
        #region コンストラクタ
......
71 73
        /// <returns></returns>
72 74
        public void FirstExecute()
73 75
        {
76
            bool ProcessFlg = true;
74 77
            try
75 78
            {
76
                DateTime lastsessionDate = DateTime.MinValue;
77

  
78 79
                // 本日の初回起動がされている場合は処理しない
79
                if (!ExecuteCheck(ref lastsessionDate)) return;
80
                if (!ExecuteCheck(ref m_lastsessionDate)) return;
81
                // 更新済みにするために日付の更新
82
                UpDateTargetDate(DateTime.Now);
80 83

  
81 84
                // 初期化に失敗したら処理しない
82 85
                if (!m_bExecuteFlg) return;
83 86

  
84 87
                // データチェック
85 88
                // 日付の期限チェックを行う
86
                SubmittedDateCheck(lastsessionDate);
89
                ProcessFlg = SubmittedDateCheck(m_lastsessionDate);
87 90

  
88 91
                // 見積有効期限切れを非受注へ移行する
89
                ChangeNonOrdersData();
92
                if (ProcessFlg) ProcessFlg &= ChangeNonOrdersData();
90 93

  
91 94
                // 工事詳細台帳の給与を加算する
92
                CalculateDaysSalary();
95
                if (ProcessFlg) ProcessFlg &= CalculateDaysSalary();
93 96

  
94
                // 日付の更新
95
                UpDateTargetDate();
97
                // エラー時は元の日付に更新
98
                if (!ProcessFlg) UpDateTargetDate(m_lastsessionDate);
96 99
            }
97 100
            catch (Exception ex)
98 101
            {
......
115 118
                int PCode = CommonDefine.ExePrimaryCode.First(x => x.Value.Equals("初回起動日付")).Key;
116 119
                // 日付読込
117 120
                string strSQL = seDB.CreatePrimarykeyString(PCode);
118
                List<SystemExecute> recordRec = new List<SystemExecute>();
119
                if (!seDB.SelectAction(strSQL, ref recordRec)) return false;
120
                if (recordRec.Count != 0)
121
                SystemExecute recordRec = new SystemExecute();
122
                if (!seDB.SelectAction(strSQL, ref recordRec))
121 123
                {
122
                    // 日付比較
123
                    if (DateTime.Today == recordRec[0].TargetDate.Date) return false;
124
                    // キーセット
125
                    recordRec.PrimaryCode = PCode;
126
                    // 起動日付
127
                    recordRec.TargetDate = DateTime.Now;
128
                    // データがないもしくはエラー時はデータ作成
129
                    if (!seDB.InsertAction(recordRec)) return false;
130
                    // 日付を1日前にする
131
                    recordRec.TargetDate = DateTime.Now.AddDays(-1);
124 132
                }
125
                
133

  
126 134
                // 前回起動日を取得する
127
                lastsessionDate = recordRec[0].TargetDate;
135
                lastsessionDate = recordRec.TargetDate;
136

  
137
                // 日付比較
138
                if (DateTime.Today == recordRec.TargetDate.Date) return false;
128 139
                
129 140
                return true;
130 141
            }
......
145 156
        /// 日付変更
146 157
        /// </summary>
147 158
        /// <returns></returns>
148
        private bool UpDateTargetDate()
159
        private bool UpDateTargetDate(DateTime TargetDate)
149 160
        {
150 161
            IOSystemExecute seDB = new IOSystemExecute();
151 162
            try
152 163
            {
153
                // 先頭のキーを取得する
154
                int PCode = 0;
155
                foreach (KeyValuePair<int, string> tmp in CommonDefine.ExePrimaryCode)
156
                {
157
                    PCode = tmp.Key;
158
                    break;
159
                }
160
                // 日付読込
161
                string strSQL = seDB.CreatePrimarykeyString(PCode);
162
                List<SystemExecute> recordRec = new List<SystemExecute>();
164
                // キーを取得する
165
                int PCode = CommonDefine.ExePrimaryCode.First(x => x.Value.Equals("初回起動日付")).Key;
163 166

  
164
                SystemExecute writeRec = new SystemExecute();
165
                writeRec.PrimaryCode = PCode;
166
                writeRec.TargetDate = DateTime.Today;
167
               
168
                if (!seDB.SelectAction(strSQL, ref recordRec)) return false;
169
                if (recordRec.Count == 0)
170
                {
171
                    seDB.InsertAction(writeRec);
172
                }
173
                else
174
                {
175
                    seDB.UpdateAction(strSQL, writeRec);
176
                }
167
                // 日付更新
168
                if (!seDB.UpdateFeild(PCode, (int)IOSystemExecute.TableColumn.TargetDate, TargetDate)) return false;
177 169

  
178 170
                return true;
179 171
            }
......
204 196
                List<TermMaster> tmList = new List<TermMaster>();
205 197
                if (!tmDB.SelectAction(strSQL, ref tmList)) return false;
206 198

  
199
                // ラストのためにループ外で定義
200
                TermMasterList CheckList = null;
201
                int iTmpStatus = -1;
207 202
                // データセット
208
                int iTmpStatus = -1;
209
                TermMasterList CheckList = null;
210
                foreach (TermMaster tmData in tmList)
203
                foreach (TermMaster tmRec in tmList)
211 204
                {
212 205
                    // キーが違えばArrayテーブルへ追加する
213
                    if (iTmpStatus != tmData.ConstructionStatusFlg)
206
                    if (iTmpStatus != tmRec.ConstructionStatusFlg)
214 207
                    {
215
                        // チェックテーブルへ追加
208
                        // チェックテーブルへ新たな状態テーブルを追加
216 209
                        CheckList = new TermMasterList();
217
                        m_arrayList.Add(CheckList);
218
                        iTmpStatus = tmData.ConstructionStatusFlg;
210
                        SystemOnceExecuteTermMstList.Add(CheckList);
211

  
212
                        // ブレイクキーの更新
213
                        iTmpStatus = tmRec.ConstructionStatusFlg;
219 214
                    }
220
                    CheckList.TermMstTBL.Add(tmData);
215
                    // 取得データをセットする
216
                    CheckList.TermMstTBL.Add(tmRec);
221 217
                }
222
                if (CheckList.TermMstTBL.Count != 0) m_arrayList.Add(CheckList);
223 218

  
219
                // バッファテーブルが空ではない場合
220
                if (CheckList.TermMstTBL.Count != 0)
221
                {
222
                    // マスターテーブルリストより最後のステータスを取得する
223
                    int SetTableStatus = SystemOnceExecuteTermMstList[SystemOnceExecuteTermMstList.Count - 1].TermMstTBL[0].ConstructionStatusFlg;
224
                    // バッファテーブルのステータスを取得する
225
                    int NowStatus = CheckList.TermMstTBL[0].ConstructionStatusFlg;
226
                    // バッファテーブルがすでにセットされていなければセットする
227
                    if (SetTableStatus != NowStatus) SystemOnceExecuteTermMstList.Add(CheckList);
228
                }
229

  
224 230
                return true;
225 231
            }
226 232
            catch (Exception ex)
......
239 245
        /// <summary>
240 246
        /// 日付の期限チェックを行う
241 247
        /// </summary>
242
        private void SubmittedDateCheck(DateTime StartDate)
248
        private bool SubmittedDateCheck(DateTime StartDate)
243 249
        {
244 250
            IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
245 251
            try
......
248 254
                string strSQL = " WHERE CONSTRUCTIONSTATUSFLG IN (SELECT DISTINCT CONSTRUCTIONSTATUSFLG FROM TERMMASTER)";
249 255
                strSQL = " ORDER BY CONSTRUCTIONSTATUSFLG ASC, CONSTRUCTIONCODE ASC";
250 256
                List<ConstructionBaseInfo> cbiList = new List<ConstructionBaseInfo>();
251
                if (!cbiDB.SelectAction(strSQL, ref cbiList)) return;
257
                if (!cbiDB.SelectAction(strSQL, ref cbiList)) return true;
252 258

  
253 259
                // 経過日数を取得する
254 260
                TimeSpan ts = DateTime.Now - StartDate;
......
260 266
                    StartDate = DateTime.Now.AddDays(-1);
261 267
                }
262 268

  
269
                bool procflg = true;
263 270
                // 経過日数分処理を行う
264 271
                for (int ix = 0; ix < diffDays; ix++)
265 272
                {
......
272 279
                        // 増減工事の子は処理しない
273 280
                        if (wrkRec.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Tying) continue;
274 281
                        // チェック
275
                        ConstructionStatusCheck(wrkRec, CriteriaDate, ref sErrorMessage, ref sBackColor, ref sForeColor);
282
                        if (!ConstructionStatusCheck(wrkRec, CriteriaDate, ref sErrorMessage, ref sBackColor, ref sForeColor))
283
                        {
284
                            procflg = false;
285
                            break;
286
                        }
276 287
                    }
288
                    if (!procflg) break;
277 289
                }
290
                return procflg;
278 291
            }
279 292
            catch (Exception ex)
280 293
            {
281 294
                logger.ErrorFormat("システムエラー:{0}", ex.Message);
295
                return false;
282 296
            }
283 297
            finally
284 298
            {
......
307 321
        {
308 322
            try
309 323
            {
310
                // 戻り値
311
                bool bCheckPass = true;
312

  
313 324
                // 初期化に失敗していたら処理しない
314 325
                if (!m_bExecuteFlg) return false;
315 326

  
......
318 329
                // 取得データの進捗状態がチェック判定テーブルにあるかの存在チェック
319 330
                bool exestFlg = false;
320 331
                int itblCnt = 0;
321
                for (int i = 0; i < m_arrayList.Count; i++)
332
                for (int i = 0; i < SystemOnceExecuteTermMstList.Count; i++)
322 333
                {
323
                    if (m_arrayList[i].TermMstTBL[0].ConstructionStatusFlg == checkRec.ConstructionStatusFlg)
334
                    // 判定対象データの状態がチェック判定テーブルにあれば処理をおこなう
335
                    if (SystemOnceExecuteTermMstList[i].TermMstTBL[0].ConstructionStatusFlg == checkRec.ConstructionStatusFlg)
324 336
                    {
325 337
                        exestFlg = true;
326 338
                        itblCnt = i;
......
328 340
                    }
329 341
                }
330 342
                // 取得データがチェック判定以外は処理しない
331
                if (!exestFlg) return bCheckPass;
343
                if (!exestFlg) return true;
332 344

  
333
                List<TermMaster> Termtbl = m_arrayList[itblCnt].TermMstTBL;
345
                // 戻り値
346
                bool bCheckNoError = true;
334 347

  
348
                List<TermMaster> Termtbl = SystemOnceExecuteTermMstList[itblCnt].TermMstTBL;
335 349
                // エラーチェック
336 350
                foreach (TermMaster wrkCheck in Termtbl)
337 351
                {
......
440 454
                        sBackColor = wrkCheck.BackColor;
441 455
                        sForeColor = wrkCheck.ForeColor;
442 456

  
443
                        // 戻り値にエラー
444
                        bCheckPass = false;
445 457

  
446 458
                        // 掲示板にメッセージを載せない場合があるのでフラグ制御
447 459
                        if (bCreateMessage)
......
452 464
                    }
453 465
                }
454 466

  
455
                return bCheckPass;
467

  
468
                return bCheckNoError;
456 469
            }
457 470
            catch (Exception ex)
458 471
            {
......
540 553

  
541 554
                // メッセージフラグを自動に設定する
542 555
                WriteData.MessageFlag = (int)CommonDefine.MessageFlg.Secretary;
543
                
556

  
544 557
                // 掲示板へメッセージを載せる
545 558
                ClsMessageBoradAccess.CreateMessage(WriteData, WriteDetail);
546 559

  
......
561 574
        /// <summary>
562 575
        /// 見積有効期限が経過したデータを非受注へ変更する
563 576
        /// </summary>
564
        private void ChangeNonOrdersData()
577
        private bool ChangeNonOrdersData()
565 578
        {
566 579
            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
567 580
            try
......
580 593
                if (!BaseDB.ExecuteReader(strSQL, ref arList))
581 594
                {
582 595
                    logger.ErrorFormat("工事基本情報更新エラー 非受注案件移行処理失敗:{0}:{1}", CommonMotions.GetMethodName(), strSQL);
583
                    return;
596
                    return false;
584 597
                }
585 598
                object[] wrkcount = (object[])arList[0];
586
                if (Common.CommonMotions.cnvInt(wrkcount[0]) == 0) return;
599
                if (Common.CommonMotions.cnvInt(wrkcount[0]) == 0) return true;
587 600

  
588 601
                // 対象データが存在すれば更新する
589 602
                strSQL = string.Format("UPDATE CONSTRUCTIONBASEINFO SET CONSTRUCTIONSTATUSFLG = {0}", iCode1);
......
596 609
                if (!BaseDB.ExecuteNonQuery(strSQL))
597 610
                {
598 611
                    logger.ErrorFormat("工事基本情報更新エラー 非受注案件移行処理失敗:{0}:{1}", CommonMotions.GetMethodName(), strSQL);
612
                    return false;
599 613
                }
614

  
615
                return true;
600 616
            }
601 617
            catch (Exception ex)
602 618
            {
603 619
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
620
                return false;
604 621
            }
605 622
            finally
606 623
            {
......
613 630
        /// <summary>
614 631
        /// 工事詳細台帳の給与を加算する
615 632
        /// </summary>
616
        private void CalculateDaysSalary()
633
        private bool CalculateDaysSalary()
617 634
        {
618 635
            IOConstructionLedger LedgerDB = new IOConstructionLedger();
619 636
            try
......
622 639
                string strSQL = " WHERE ComplateFlg <> 1 ORDER BY ConstructionStart ASC";
623 640
                List<ConstructionLedger> LedgerList = new List<ConstructionLedger>();
624 641
                // エラーもしくはデータが無い場合は処理しない
625
                if (!LedgerDB.SelectAction(strSQL, ref LedgerList) || LedgerList.Count == 0) return;
642
                if (!LedgerDB.SelectAction(strSQL, ref LedgerList) || LedgerList.Count == 0) return true;
626 643

  
627 644
                foreach (ConstructionLedger CurRec in LedgerList)
628 645
                {
......
632 649
                    // 給与を加算する
633 650
                    if (!ClsChangeLedgerData.CalculatePayment(CurRec.ConstructionCode, DateTime.Now, false)) break;
634 651
                }
652

  
653
                return true;
635 654
            }
636 655
            catch (Exception ex)
637 656
            {
638 657
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
658
                return false;
639 659
            }
640 660
            finally
641 661
            {
trunk/src/ProcessManagement/ProcessManagement/DB/Core/DBCommon.cs
61 61
        public void Initialize()
62 62
        {
63 63
            // DB接続情報作成
64
            m_dbconnectString = "User Id=" + CommonMotions.DFRModel.DBConnect.DBUser + ";";
65
            m_dbconnectString += "Password=" + CommonMotions.DFRModel.DBConnect.Password + ";";
66
            m_dbconnectString += "Data Source=" + CommonMotions.DFRModel.DBConnect.DBDataSource + ";";
64
            m_dbconnectString = string.Format("User Id={0};", CommonMotions.DFRModel.DBConnect.DBUser);
65
            m_dbconnectString += string.Format("Password={0};", CommonMotions.DFRModel.DBConnect.Password);
66
            m_dbconnectString += string.Format("Data Source={0};", CommonMotions.DFRModel.DBConnect.DBDataSource);
67
            //m_dbconnectString += "Pooling=false";
67 68
        }
68 69

  
69 70
        #endregion
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMPersonInCharge.cs
49 49
            Qualification,
50 50
            SealPrintName,
51 51
            EmployeeClassFlg,
52
            LedgerFlg,
52 53
            DeleteFlg,
53 54
            EntryDate,
54 55
            UpdateDate,
......
93 94
            strcmd += ", Qualification";
94 95
            strcmd += ", SealPrintName";
95 96
            strcmd += ", EmployeeClassFlg";
97
            strcmd += ", LedgerFlg";
96 98

  
97 99
            strcmd += ", DeleteFlg";
98 100
            strcmd += ", TO_CHAR(EntryDate, 'YYYY/MM/DD HH24:MI:ss')";
......
196 198
                {
197 199
                    strcmd = "INSERT INTO PersonInChargeMaster";
198 200

  
201
                    strcmd += " (PersonCode";
202
                    strcmd += ", DisplayOrder";
203
                    strcmd += ", PersonName";
204

  
205
                    strcmd += ", StartDate";
206
                    strcmd += ", EndDate";
207
                    strcmd += ", PassWord";
208
                    strcmd += ", SecurityManagement";
209
                    strcmd += ", MsgBackColor";
210
                    strcmd += ", DisplayString";
211
                    strcmd += ", DepartmentCode";
212
                    strcmd += ", MonthlySalary";
213
                    strcmd += ", YearSalary";
214
                    strcmd += ", Qualification";
215
                    strcmd += ", SealPrintName";
216
                    strcmd += ", EmployeeClassFlg";
217
                    strcmd += ", LedgerFlg";
218

  
219
                    strcmd += ", DeleteFlg";
220
                    strcmd += ", EntryDate";
221
                    strcmd += ", UpdateDate)";
222

  
199 223
                    strcmd += " VALUES (";
200 224

  
201 225
                    strcmd += string.Format("  {0}", work.PersonCode);
......
213 237
                    strcmd += string.Format(", '{0}'", work.Qualification);
214 238
                    strcmd += string.Format(", '{0}'", work.SealPrintName);
215 239
                    strcmd += string.Format(", {0}", work.EmployeeClassFlg);
240
                    strcmd += string.Format(", {0}", work.LedgerFlg);
216 241

  
217 242
                    strcmd += string.Format(", {0}", work.DeleteFlg.ToString());
218 243
                    strcmd += ", TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
......
263 288
                strcmd += string.Format(", Qualification = '{0}'", data.Qualification);
264 289
                strcmd += string.Format(", SealPrintName = '{0}'", data.SealPrintName);
265 290
                strcmd += string.Format(", EmployeeClassFlg = {0}", data.EmployeeClassFlg.ToString());
291
                strcmd += string.Format(", LedgerFlg = {0}", data.LedgerFlg);
266 292
                
267 293
                strcmd += string.Format(", DeleteFlg = {0}", data.DeleteFlg);
268 294
                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
......
333 359
                wrk.Qualification = objwrk[(int)NameColumn.Qualification].ToString();
334 360
                wrk.SealPrintName = objwrk[(int)NameColumn.SealPrintName].ToString();
335 361
                wrk.EmployeeClassFlg = int.Parse(objwrk[(int)NameColumn.EmployeeClassFlg].ToString());
362
                wrk.LedgerFlg = int.Parse(objwrk[(int)NameColumn.LedgerFlg].ToString());
336 363

  
337 364
                wrk.DeleteFlg = int.Parse(objwrk[(int)NameColumn.DeleteFlg].ToString());
338 365
                wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.EntryDate].ToString());
......
374 401
            wrk.SealPrintName = string.Empty;       // 印鑑表示名
375 402

  
376 403
            wrk.EmployeeClassFlg = 0;               // 社員区分
404
            wrk.LedgerFlg = 0;                      // 台帳計算対象フラグ
377 405

  
378 406
            wrk.DeleteFlg = 0;                      // 削除フラグ
379 407
            wrk.EntryDate = DateTime.MinValue;      // 登録日付
......
381 409
        }
382 410
        #endregion
383 411

  
384
        #region パブリックメソッド(特殊処理)
385

  
412
        #region MAX担当者番号取得
413
        /// <summary>
414
        /// MAX担当者番号取得
415
        /// </summary>
416
        /// <param name="AddSQLString"></param>
417
        /// <param name="bConnect"></param>
418
        /// <returns></returns>
386 419
        public int SelectMaxPersonCodeCount(string AddSQLString, bool bConnect = true)
387 420
        {
388 421
            //Oracle インターフェース
......
413 446

  
414 447
            return iRet;
415 448
        }
449
        #endregion
416 450

  
451
        #region MAX表示順番取得
452
        /// <summary>
453
        /// MAX表示順番取得
454
        /// </summary>
455
        /// <param name="AddSQLString"></param>
456
        /// <param name="bConnect"></param>
457
        /// <returns></returns>
417 458
        public int SelectMaxDisplayCount(string AddSQLString, bool bConnect = true)
418 459
        {
419 460
            //Oracle インターフェース
......
444 485

  
445 486
            return iRet;
446 487
        }
488
        #endregion
447 489

  
490
        #region 主キー検索の文字列を返す
448 491
        /// <summary>
449 492
        /// 主キー検索の文字列を返す
450 493
        /// </summary>
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOSystemExecute.cs
31 31
        /// <summary>
32 32
        /// システム起動確認データフィールド並び
33 33
        /// </summary>
34
        public enum DataColumn
34
        public enum TableColumn
35 35
        {
36 36
            PrimaryCode = 0,
37 37
            TargetDate,
......
52 52

  
53 53
        #endregion
54 54

  
55
        #region パブリックメソッド
55
        #region システム起動確認データ検索SQL作成
56 56
        /// <summary>
57
        /// システム起動確認データ検索
57
        /// システム起動確認データ検索SQL作成
58 58
        /// </summary>
59 59
        /// <param name="AddSQLString">検索条件SQL文字列</param>
60 60
        /// <param name="data">システム起動確認データデータ</param>
......
71 71

  
72 72
            return strcmd;
73 73
        }
74
        #endregion
75

  
76
        #region システム起動確認データ複数件検索
77
        /// <summary>
78
        /// システム起動確認データ複数件検索
79
        /// </summary>
80
        /// <param name="AddSQLString"></param>
81
        /// <param name="data"></param>
82
        /// <param name="bConnect"></param>
83
        /// <returns></returns>
74 84
        public bool SelectAction(string AddSQLString, ref List<SystemExecute> data, bool bConnect = true)
75 85
        {
76 86
            //Oracle インターフェース
......
102 112
                return false;
103 113
            }
104 114
        }
115
        #endregion
116

  
117
        #region システム起動確認データ1件検索
118
        /// <summary>
119
        /// システム起動確認データ1件検索
120
        /// </summary>
121
        /// <param name="AddSQLString"></param>
122
        /// <param name="data"></param>
123
        /// <param name="bConnect"></param>
124
        /// <returns></returns>
105 125
        public bool SelectAction(string AddSQLString, ref SystemExecute data, bool bConnect = true)
106 126
        {
107 127
            //Oracle インターフェース
......
134 154
                return false;
135 155
            }
136 156
        }
157
        #endregion
137 158

  
159
        #region システム起動確認データ追加SQL作成
138 160
        /// <summary>
139
        /// システム起動確認データ追加
161
        /// システム起動確認データ追加SQL作成
140 162
        /// </summary>
141 163
        /// <param name="data">システム起動確認データデータ</param>
142 164
        /// <returns>true:成功 false:失敗</returns>
......
144 166
        {
145 167
            string strcmd = "INSERT INTO SystemExecute";
146 168

  
169
            strcmd += "(PrimaryCode";
170
            strcmd += " ,TargetDate";
171
            strcmd += " ,EntryDate";
172
            strcmd += " ,UpdateDate)";
173

  
147 174
            strcmd += " VALUES (";
148 175
            strcmd += string.Format("{0}", work.PrimaryCode);
149 176
            strcmd += string.Format(", TO_DATE('{0}','YYYY/MM/DD')", work.TargetDate.ToShortDateString());
......
154 181

  
155 182
            return strcmd;
156 183
        }
184
        #endregion
185

  
186
        #region システム起動確認データ複数件追加
187
        /// <summary>
188
        /// システム起動確認データ複数件追加
189
        /// </summary>
190
        /// <param name="data"></param>
191
        /// <param name="bConnect"></param>
192
        /// <returns></returns>
157 193
        public bool InsertAction(List<SystemExecute> data, bool bConnect = true)
158 194
        {
159 195
            string strcmd = "";
......
173 209
                return false;
174 210
            }
175 211
        }
212
        #endregion
213

  
214
        #region システム起動確認データ1件追加
215
        /// <summary>
216
        /// システム起動確認データ1件追加
217
        /// </summary>
218
        /// <param name="data"></param>
219
        /// <param name="bConnect"></param>
220
        /// <returns></returns>
176 221
        public bool InsertAction(SystemExecute data, bool bConnect = true)
177 222
        {
178 223
            string strcmd = "";
......
189 234
                return false;
190 235
            }
191 236
        }
237
        #endregion
192 238

  
239
        #region システム起動確認データ更新
193 240
        /// <summary>
194 241
        /// システム起動確認データ更新
195 242
        /// </summary>
......
222 269
                return false;
223 270
            }
224 271
        }
272
        #endregion
225 273

  
226

  
274
        #region システム起動確認データ削除
227 275
        /// <summary>
228 276
        /// システム起動確認データ削除
229 277
        /// </summary>
......
248 296
                return false;
249 297
            }
250 298
        }
299
        #endregion
251 300

  
301
        #region 1項目更新処理
252 302
        /// <summary>
303
        /// 1項目の更新を行う
304
        /// </summary>
305
        /// <param name="PrimaryCode"></param>
306
        /// <param name="FeildNo"></param>
307
        /// <param name="value"></param>
308
        /// <param name="bConnect"></param>
309
        /// <returns></returns>
310
        public bool UpdateFeild(int PrimaryCode, int FeildNo, object value, bool bConnect = true)
311
        {
312
            string strcmd = "";
313
            try
314
            {
315
                strcmd = "UPDATE SystemExecute";
316

  
317
                strcmd += " SET";
318
                switch (FeildNo)
319
                {
320
                    case (int)TableColumn.PrimaryCode:
321
                        strcmd += string.Format(" PrimaryCode = {0}", ((int)value).ToString());
322
                        break;
323
                    case (int)TableColumn.TargetDate:
324
                        strcmd += string.Format(" TargetDate = TO_DATE('{0}','YYYY/MM/DD')", ((DateTime)value).ToShortDateString());
325
                        break;
326
                }
327

  
328
                strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')";
329
                strcmd += CreatePrimarykeyString(PrimaryCode);
330

  
331
                if (!ExecuteNonQuery(strcmd, bConnect)) return false;
332

  
333
                return true;
334
            }
335
            catch (Exception ex)
336
            {
337
                logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd);
338
                return false;
339
            }
340
        }
341
        #endregion
342

  
343
        #region OracleDataReaderより構造体へセットする
344
        /// <summary>
253 345
        /// OracleDataReaderより構造体へセットする
254 346
        /// </summary>
255 347
        /// <param name="reader">OracleDataReader</param>
......
259 351
            try
260 352
            {
261 353
                // データ取得
262
                wrk.PrimaryCode = int.Parse(objwrk[(int)DataColumn.PrimaryCode].ToString());
263
                wrk.TargetDate = DateTime.Parse(objwrk[(int)DataColumn.TargetDate].ToString());
354
                wrk.PrimaryCode = int.Parse(objwrk[(int)TableColumn.PrimaryCode].ToString());
355
                wrk.TargetDate = DateTime.Parse(objwrk[(int)TableColumn.TargetDate].ToString());
264 356

  
265
                wrk.EntryDate = DateTime.Parse(objwrk[(int)DataColumn.EntryDate].ToString());
266
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)DataColumn.UpdateDate].ToString());
357
                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
358
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
267 359
            }
268 360
            catch (OracleException oraex)
269 361
            {
......
277 369

  
278 370
        #endregion
279 371

  
280
        #region パブリックメソッド(特殊処理)
281

  
372
        #region 主キー検索の文字列を返す
282 373
        /// <summary>
283 374
        /// 主キー検索の文字列を返す
284 375
        /// </summary>
trunk/src/ProcessManagement/ProcessManagement/DataModel/ConstructionBaseInfo.cs
53 53
        private int         m_ConstructionStatusFlg = -1;	                    // 工事状態フラグ
54 54
        private int         m_ConstructionType = 0;                             // 工事種別区分名称コード
55 55
        private int         m_EstimateType = 1;                                 // 見積種別
56
        private DateTime    m_BillingStartDate=DateTime.MinValue;	            // 請求準備開始日
56
        private DateTime    m_BillingStartDate = DateTime.MinValue;	            // 請求準備開始日
57 57
        private DateTime    m_BillingDate = DateTime.MinValue;	                // 請求日
58 58
        private int         m_BillingSplitFlg = 1;                              // 請求回数フラグ
59 59
        private DateTime    m_BillingSendDate = DateTime.MinValue;              // 請求書郵送/手渡し日
trunk/src/ProcessManagement/ProcessManagement/DataModel/PersonInChargeMaster.cs
30 30
        private string      m_SealPrintName = string.Empty;     // 印鑑表示名
31 31

  
32 32
        private int         m_EmployeeClassFlg = 0;             // 社員区分
33
        
33
        private int         m_LedgerFlg = 1;                    // 台帳計算対象フラグ
34

  
34 35
        private int         m_DeleteFlg = 0;                    // 削除フラグ
35 36
        private DateTime    m_EntryDate = DateTime.MinValue;    // 登録日付
36 37
        private DateTime    m_UpdateDate = DateTime.MinValue;   // 更新日付
......
161 162
            set { m_EmployeeClassFlg = value; }
162 163
        }
163 164
        /// <summary>
165
        /// 台帳計算対象フラグ
166
        /// </summary>
167
        public int LedgerFlg
168
        {
169
            get { return m_LedgerFlg; }
170
            set { m_LedgerFlg = value; }
171
        }
172
        /// <summary>
164 173
        /// 削除フラグ
165 174
        /// </summary>
166 175
        public int DeleteFlg
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
1137 1137
        private bool SetcmbDepartment()
1138 1138
        {
1139 1139
            IOMDepartment depDB = new IOMDepartment();
1140
            List<DepartmentMaster> workList = new List<DepartmentMaster>();
1141 1140
            bool bSave = m_initDataLoad;
1142 1141
            m_initDataLoad = true;
1143 1142
            try
......
1148 1147
                cmbDepartment.Text = "";
1149 1148

  
1150 1149
                string strSQL = string.Empty;
1150
                // ?????}?X?^??????????
1151
                strSQL = "SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*)";
1152
                strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C";
1153
                strSQL += " WHERE A.DELETEFLG = 0";
1154

  
1151 1155
                // ?V?X?e????????????f?[?^?A?N?Z?X???????????
1152
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement
1153
                || CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key
1154
                || CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key
1155
                || CommonMotions.LoginUserData.DepartmentCode == CommonDefine.s_GeneralAffairsDevision)
1156
                if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key
1157
                    || CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
1156 1158
                {
1157
                    // ?V?X?e???????
1158
                    // ????@???????
1159
                    // ?????@???????
1160
                    // ?????????????S???????
1161
                    // ?????}?X?^??????????
1162
                    strSQL = " Where DeleteFlg = 0 Order By DisplayOrder ASC";
1163
                }
1164
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key)
1165
                {
1166 1159
                    // ??????
1167
                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By DisplayOrder ASC", CommonMotions.LoginUserData.DepartmentCode);
1168
                }
1169
                else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key)
1170
                {
1171 1160
                    // ???g?p??i???????A?N?Z?X??\?j
1172
                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By DisplayOrder ASC", CommonMotions.LoginUserData.DepartmentCode);
1161
                    strSQL += string.Format(" AND A.DEPARTMENTCODE = {0}", CommonMotions.LoginUserData.DepartmentCode);
1173 1162
                }
1163
                strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
1164
                strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
1165
                strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER";
1166
                strSQL += " ORDER BY A.DISPLAYORDER ASC";
1174 1167

  
1175 1168
                // ?????}?X?^???
1176
                if (!depDB.SelectAction(strSQL, ref workList)) return false;
1169
                ArrayList arList = new ArrayList();
1170
                if (!depDB.ExecuteReader(strSQL, ref arList)) return false;
1177 1171

  
1172

  
1178 1173
                List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>();
1179 1174
                ConstructionDataList.Add(new KeyValuePair<int, string>(0, ""));
1180 1175

  
1181
                foreach (DepartmentMaster work in workList)
1176
                foreach (object[] work in arList)
1182 1177
                {
1183
                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(work.DepartmentCode, work.DepartmentString);
1178
                    KeyValuePair<int, string> keyval = new KeyValuePair<int, string>(CommonMotions.cnvInt(work[0])
1179
                                                                                    , CommonMotions.cnvString(work[1]));
1184 1180

  
1185 1181
                    ConstructionDataList.Add(keyval);
1186 1182
                }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs
47 47

  
48 48
                string strSQL = "SELECT SUM(ORDERSDECISIONPRICE) FROM CONSTRUCTIONBASEINFO";
49 49
                strSQL += string.Format(" WHERE (TRUNC(CONSTRUCTIONCODE / 100) = {0})", (int)(m_ConstructionCode / 100));
50
                strSQL += string.Format(" AND CONSTRUCTIONSTATUSFLG != {0})", iCode1);
50
                strSQL += string.Format(" AND CONSTRUCTIONSTATUSFLG != {0}", iCode1);
51 51
                strSQL += " GROUP BY TRUNC(CONSTRUCTIONCODE / 100)";
52 52

  
53 53
                ArrayList Arlist = new ArrayList();
......
93 93
                ExecutionAmount = iInput;                                                     // ???s???z
94 94

  
95 95
                AmountConfigRate = (iInput / OrdersDecisionPrice) * 100.0;          // ???z?\????
96

  
96
                if (AmountConfigRate < -999.00 || 999.00 < AmountConfigRate) AmountConfigRate = 0;
97 97
            }
98 98
            catch (Exception ex)
99 99
            {
......
905 905
                                        IOMPersonInCharge PersonDB,
906 906
                                        IOConstructionLink cbLinkDB,
907 907
                                        int TotalOrdersPrice,
908
                                        bool TyingDataFlag)
908
                                        bool TyingDataFlag,
909
                                        ref bool LedgerReCalc,
910
                                        ref int ConstrCode)
909 911
        {
910
            FrmConstructionLedger frm = new FrmConstructionLedger();
912
            FrmConstructionLedger frm = new FrmConstructionLedger();                    // ?H??????????
911 913
            try
912 914
            {
913 915
                // ----- ???????????H??????i?[?G???A
......
992 994
                // ?H????????????
993 995
                ConstructionBaseInfo BaseRec = new ConstructionBaseInfo();
994 996
                string strBase = cbiDB.CreatePrimarykeyString(ProcConstrCode);
995
                if (!cbiDB.SelectAction(strBase, ref BaseRec)) return false;
997
                if (!cbiDB.SelectAction(strBase, ref BaseRec, false)) return false;
996 998
                // ?H????`?F?b?N
997 999
                DateTime StDate = BaseRec.ConstructionPeriodStart;
998 1000
                DateTime EdDate = BaseRec.ConstructionPeriodEnd;
......
1001 1003
                if (StDate != LedgerRec.ConstructionStart) bChangeCode = false;
1002 1004
                if (EdDate != LedgerRec.ConstructionEnd) bChangeCode = false;
1003 1005

  
1004
                // ???????????????????
1005
                if (!bChangeCode) return true;
1006
                // ????????????????
1007
                if (bChangeCode) LedgerReCalc = true;
1008
                ConstrCode = ProcConstrCode;
1006 1009

  
1007
                // ?H???R?[?h??Z?b?g
1008
                frm.ConstructionCode = ProcConstrCode;
1009

  
1010
                // ????????????o??
1011
                frm.Hide();
1012

  
1013
                // ??v?Z????
1014
                bool bret = frm.RecalculateLedger;
1015

  
1016
                // ????????
1017
                frm.Close();
1018

  
1019 1010
                return true;
1020 1011
            }
1021 1012
            catch (Exception ex)
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
645 645
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 77:?H?????S??????
646 646
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 78:?w????????
647 647
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 79:?H?????S????R?[?h
648
                        {false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},     // 80:?H???????????????
648 649
        };
649 650
        //?@0:???????|1:?????o?|2:????C?H???|3:?? ?? ???|4:??|5:???????p
650 651
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????????|11:???
......
743 744
                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},   // 78:?w????????
744 745
                        { true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false,  true,  true},   // 79:?H?????S????R?[?h
745 746

  
746
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},   // ?y??I?z+ 1:?????t???O
747
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},   // ?y??I?z+ 2:?????t???O ?????g?p
748
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},   // ?y??I?z+ 3:?c??o?????t???O
747
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 1:?????t???O
748
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 2:?????t???O ?????g?p
749
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 3:?c??o?????t???O
749 750
                        { true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false,  true,  true},    // ?y??I?z+ 4:?H?????t???O
750
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},   // ?y??I?z+ 5:??????
751
                        { true,  true,  false, true,  true,  true,  true,  false, false, false, true,  false, false, false, false, false, false, false}};  // ?y??I?z+ 6:??????
751
                        { true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false},    // ?y??I?z+ 5:??????
752
                        { true,  true,  false, true,  true,  true,  true,  false, false, false, true,  false, false, false, false, false, false, false},    // ?y??I?z+ 6:??????
753
                        { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false}};   // ?y??I?z+ 7:?H???????????????
752 754

  
753 755
        //  0:???????|1:?????o?|2:????C?H???|3:????|4:??|5:???????p
754 756
        //?|6:?{?H?????|7:?{?H?J?n?|8:?{?H?????|9:?????????|10:?????????|11:???
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
2474 2474
            IOConstructionLedger LedgerDB = new IOConstructionLedger();                 // ?H???????f?[?^
2475 2475
            IOConstructionLedgerDetail LedgerDDB = new IOConstructionLedgerDetail();    // ?H??????????f?[?^
2476 2476
            IOConstructionLedgerExcute LedgerEDB = new IOConstructionLedgerExcute();    // ?H???????x?????f?[?^
2477

  
2478
            FrmConstructionLedger frm = new FrmConstructionLedger();                    // ?H??????????
2477 2479
            try
2478 2480
            {
2479 2481
                //?f?[?^?`?F?b?N
......
2515 2517
                ConstructionBaseInfo BaseRec = new ConstructionBaseInfo();
2516 2518
                cbiDB.SelectAction(strTyCheck, ref BaseRec);
2517 2519
                if (BaseRec.TyingFlg != (int)CommonDefine.BaseInfoTyingFlg.Standard) TyingDataFlag = true;
2520
                if (rdbNotFluctuation.Checked) TyingDataFlag = false;
2518 2521
                //if ((pnlFluctuation.Visible == true && rdbExistsFluctuation.Checked == true) || (pnlFluctuation.Visible == false)) LastDateUpDate = true;
2519 2522

  
2520 2523
                // ?????H????e????????q??????????H???I??????????
......
2585 2588
                    return false;
2586 2589
                }
2587 2590

  
2591
                bool bLedgerReCalc = false;
2592
                int ProcConstrCode = 0;
2588 2593
                // ?H???????f?[?^?X?V
2589
                if (!LedgerDataChange(cbiDB, LedgerDB, LedgerDDB, LedgerEDB, PersonDB, cbLinkDB, TotalOrdersPrice, TyingDataFlag))
2594
                if (!LedgerDataChange(cbiDB, LedgerDB, LedgerDDB, LedgerEDB, PersonDB, cbLinkDB, TotalOrdersPrice, TyingDataFlag, ref bLedgerReCalc, ref ProcConstrCode))
2590 2595
                {
2591 2596
                    MessageBox.Show("?H???????f?[?^?X?V?G???[????B", "?X?V?G???[", MessageBoxButtons.OK, MessageBoxIcon.Error);
2592 2597
                    cbiDB.rollback();
......
2622 2627
                LedgerDDB.commit();
2623 2628
                LedgerEDB.commit();
2624 2629

  
2630
                if (bLedgerReCalc)
2631
                {
2632
                    // ?H???R?[?h??Z?b?g
2633
                    frm.ConstructionCode = ProcConstrCode;
2634

  
2635
                    // ????????????o??
2636
                    frm.Hide();
2637

  
2638
                    // ??v?Z????
2639
                    bool bret = frm.RecalculateLedger;
2640

  
2641
                    // ????????
2642
                    frm.Close();
2643
                }
2644
                
2625 2645
                // ?o?^?????????t???O?N???A
2626 2646
                m_bChengeAns = false;
2627 2647

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/ProcessControl.cs
209 209

  
210 210
                    // 画面クローズ
211 211
                    Handle.SubFormHandle.Close();
212
                    ClsExcute.SubFormHandleList[i].SubFormHandle = null;
212 213
                }
213 214
            }
214 215
            catch (System.Exception ex)
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs
659 659
        /// <param name="e"></param>
660 660
        private void FrmConstructionBudget_KeyDown(object sender, KeyEventArgs e)
661 661
        {
662
            //Alt??Ctrl?L?[?????????????????????
663
            if (e.Alt || e.Control) return;
664 662

  
665
            //Enter?L?[?????????????m?F
666
            if (e.KeyCode == Keys.Enter)
667
            {
668
                //????????Tab?L?[??????????????????B
669
                // Shift??????????????O??R???g???[????t?H?[?J?X?????
670
                this.ProcessTabKey(!e.Shift);
671

  
672
                e.Handled = true;
673
                //.NET Framework 2.0??~
674
                e.SuppressKeyPress = true;
675
            }
676
            // ?x?????N???A?????
677
            // if((int)DispGridColumn.SubContractorName)
678 663
        }
679 664
        #endregion
680 665

  
......
1123 1108
                    dTotal += CommonMotions.cnvDouble(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value);
1124 1109
                    if (CommonMotions.chkNumeric(dgv.Rows[c.RowIndex].Cells[c.ColumnIndex].Value)) NumericCnt++;
1125 1110
                }
1126
                if (DataCnt == 0 || dTotal == 0 || NumericCnt == 0) return;
1111
                if (DataCnt <= 1 || dTotal == 0 || NumericCnt == 0) return;
1127 1112
                string strTotal = CommonMotions.cnvTruncate(dTotal).ToString("#,#");
1128 1113
                if (dTotal - System.Math.Floor(dTotal) != 0) strTotal = dTotal.ToString("#,#.00");
1129 1114

  
......
1559 1544
        }
1560 1545
        #endregion
1561 1546

  
1562
        #region ?w???????^??????
1563
        /// <summary>
1564
        /// ?w???????^??????
1565
        /// </summary>
1566
        /// <param name="sender"></param>
1567
        /// <param name="e"></param>
1568
        private void Grp3radioButton_CheckedChanged(object sender, EventArgs e)
1569
        {
1570
            textBox3.Enabled = false;
1571
            textBox3.Text = "";
1572

  
1573
            // ?????w??????????????L
1574
            // ?S??????v?Z
1575
            if (radioButton7.Checked)
1576
            {
1577
                // ?w????????^?o???v?Z
1578
                if (!m_bInitFlg) CreateInstructorCosts(false);
1579
            }
1580
            else if (radioButton8.Checked)
1581
            {
1582
                // ?w????????^?o??N???A
1583
                if (!m_bInitFlg) ClearDetailLine((int)CostsRowLine.InstructorRowLine);
1584
            }
1585
            else if (radioButton9.Checked)
1586
            {
1587
                textBox3.Enabled = true;
1588
                textBox3.Focus();
1589
            }
1590

  
1591
            // ??X?t???OON
1592
            m_bChengeAns = true;
1593
        }
1594
        #endregion
1595

  
1596 1547
        #region ???S????U?????t????
1597 1548
        /// <summary>
1598 1549
        /// ???S????U?????t????
......
1643 1594
        {
1644 1595
            CalcExpenese();
1645 1596
        }
1597

  
1598
        private void button3_Click(object sender, EventArgs e)
1599
        {
1600
            CreateOhtherData();
1601
        }
1646 1602
        #endregion
1647 1603

  
1604

  
1648 1605
    }
1649 1606
}
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs
47 47
            this.panel1 = new System.Windows.Forms.Panel();
48 48
            this.lblLabel06 = new System.Windows.Forms.Label();
49 49
            this.label23 = new System.Windows.Forms.Label();
50
            this.pnlGroup3 = new System.Windows.Forms.Panel();
51
            this.label22 = new System.Windows.Forms.Label();
52
            this.radioButton7 = new System.Windows.Forms.RadioButton();
53
            this.textBox3 = new System.Windows.Forms.TextBox();
54
            this.radioButton8 = new System.Windows.Forms.RadioButton();
55
            this.radioButton9 = new System.Windows.Forms.RadioButton();
56 50
            this.pnlGroup2 = new System.Windows.Forms.Panel();
57 51
            this.label9 = new System.Windows.Forms.Label();
58 52
            this.radioButton4 = new System.Windows.Forms.RadioButton();
......
126 120
            this.btnOtherProc = new System.Windows.Forms.Button();
127 121
            this.button1 = new System.Windows.Forms.Button();
128 122
            this.button2 = new System.Windows.Forms.Button();
123
            this.button3 = new System.Windows.Forms.Button();
129 124
            this.panel1.SuspendLayout();
130
            this.pnlGroup3.SuspendLayout();
131 125
            this.pnlGroup2.SuspendLayout();
132 126
            this.pnlGroup1.SuspendLayout();
133 127
            this.pnlApproval.SuspendLayout();
......
199 193
            this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
200 194
            this.panel1.Controls.Add(this.lblLabel06);
201 195
            this.panel1.Controls.Add(this.label23);
202
            this.panel1.Controls.Add(this.pnlGroup3);
203 196
            this.panel1.Controls.Add(this.pnlGroup2);
204 197
            this.panel1.Controls.Add(this.label10);
205 198
            this.panel1.Controls.Add(this.label8);
......
252 245
            this.label23.Text = "発注者名称";
253 246
            this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
254 247
            // 
255
            // pnlGroup3
256
            // 
257
            this.pnlGroup3.BackColor = System.Drawing.Color.MistyRose;
258
            this.pnlGroup3.Controls.Add(this.label22);
259
            this.pnlGroup3.Controls.Add(this.radioButton7);
260
            this.pnlGroup3.Controls.Add(this.textBox3);
261
            this.pnlGroup3.Controls.Add(this.radioButton8);
262
            this.pnlGroup3.Controls.Add(this.radioButton9);
263
            this.pnlGroup3.Location = new System.Drawing.Point(959, 122);
264
            this.pnlGroup3.Name = "pnlGroup3";
265
            this.pnlGroup3.Size = new System.Drawing.Size(360, 30);
266
            this.pnlGroup3.TabIndex = 62;
267
            // 
268
            // label22
269
            // 
270
            this.label22.AutoSize = true;
271
            this.label22.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
272
            this.label22.Location = new System.Drawing.Point(328, 7);
273
            this.label22.Name = "label22";
274
            this.label22.Size = new System.Drawing.Size(25, 16);
275
            this.label22.TabIndex = 15;
276
            this.label22.Text = "日";
277
            // 
278
            // radioButton7
279
            // 
280
            this.radioButton7.AutoSize = true;
281
            this.radioButton7.Checked = true;
282
            this.radioButton7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
283
            this.radioButton7.Location = new System.Drawing.Point(7, 5);
284
            this.radioButton7.Name = "radioButton7";
285
            this.radioButton7.Size = new System.Drawing.Size(94, 20);
286
            this.radioButton7.TabIndex = 6;
287
            this.radioButton7.TabStop = true;
288
            this.radioButton7.Text = "全日振分";
289
            this.radioButton7.UseVisualStyleBackColor = true;
290
            this.radioButton7.CheckedChanged += new System.EventHandler(this.Grp3radioButton_CheckedChanged);
291
            // 
292
            // textBox3
293
            // 
294
            this.textBox3.BackColor = System.Drawing.Color.White;
295
            this.textBox3.Enabled = false;
296
            this.textBox3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
297
            this.textBox3.Location = new System.Drawing.Point(272, 4);
298
            this.textBox3.MaxLength = 6;
299
            this.textBox3.Name = "textBox3";
300
            this.textBox3.Size = new System.Drawing.Size(56, 23);
301
            this.textBox3.TabIndex = 13;
302
            this.textBox3.TabStop = false;
303
            this.textBox3.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
304
            this.textBox3.Validated += new System.EventHandler(this.textBox3_Validated);
305
            // 
306
            // radioButton8
307
            // 
308
            this.radioButton8.AutoSize = true;
309
            this.radioButton8.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
310
            this.radioButton8.Location = new System.Drawing.Point(101, 5);
311
            this.radioButton8.Name = "radioButton8";
312
            this.radioButton8.Size = new System.Drawing.Size(77, 20);
313
            this.radioButton8.TabIndex = 7;
314
            this.radioButton8.Text = "未振分";
315
            this.radioButton8.UseVisualStyleBackColor = true;
316
            this.radioButton8.CheckedChanged += new System.EventHandler(this.Grp3radioButton_CheckedChanged);
317
            // 
318
            // radioButton9
319
            // 
320
            this.radioButton9.AutoSize = true;
321
            this.radioButton9.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
322
            this.radioButton9.Location = new System.Drawing.Point(178, 5);
323
            this.radioButton9.Name = "radioButton9";
324
            this.radioButton9.Size = new System.Drawing.Size(94, 20);
325
            this.radioButton9.TabIndex = 14;
326
            this.radioButton9.Text = "日数指定";
327
            this.radioButton9.UseVisualStyleBackColor = true;
328
            this.radioButton9.CheckedChanged += new System.EventHandler(this.Grp3radioButton_CheckedChanged);
329
            // 
330 248
            // pnlGroup2
331 249
            // 
332 250
            this.pnlGroup2.BackColor = System.Drawing.Color.Beige;
......
1215 1133
            // button1
1216 1134
            // 
1217 1135
            this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1218
            this.button1.Location = new System.Drawing.Point(1300, 555);
1136
            this.button1.Location = new System.Drawing.Point(1300, 531);
1219 1137
            this.button1.Name = "button1";
1220 1138
            this.button1.Size = new System.Drawing.Size(37, 35);
1221 1139
            this.button1.TabIndex = 101;
......
1227 1145
            // button2
1228 1146
            // 
1229 1147
            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1230
            this.button2.Location = new System.Drawing.Point(1300, 591);
1148
            this.button2.Location = new System.Drawing.Point(1300, 566);
1231 1149
            this.button2.Name = "button2";
1232 1150
            this.button2.Size = new System.Drawing.Size(37, 35);
1233 1151
            this.button2.TabIndex = 101;
......
1236 1154
            this.button2.Visible = false;
1237 1155
            this.button2.Click += new System.EventHandler(this.button2_Click);
1238 1156
            // 
1157
            // button3
1158
            // 
1159
            this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
1160
            this.button3.Location = new System.Drawing.Point(1300, 601);
1161
            this.button3.Name = "button3";
1162
            this.button3.Size = new System.Drawing.Size(37, 35);
1163
            this.button3.TabIndex = 102;
1164
            this.button3.Text = "2";
1165
            this.button3.UseVisualStyleBackColor = true;
1166
            this.button3.Visible = false;
1167
            this.button3.Click += new System.EventHandler(this.button3_Click);
1168
            // 
1239 1169
            // FrmConstructionBudget
1240 1170
            // 
1241 1171
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
1242 1172
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
1243 1173
            this.BackColor = System.Drawing.Color.Black;
1244 1174
            this.ClientSize = new System.Drawing.Size(1344, 692);
1175
            this.Controls.Add(this.button3);
1245 1176
            this.Controls.Add(this.button2);
1246 1177
            this.Controls.Add(this.button1);
1247 1178
            this.Controls.Add(this.btnOtherProc);
......
1268 1199
            this.Load += new System.EventHandler(this.FrmConstructionBudget_Load);
1269 1200
            this.Shown += new System.EventHandler(this.FrmConstructionBudget_Shown);
1270 1201
            this.SizeChanged += new System.EventHandler(this.FrmConstructionBudget_SizeChanged);
1271
            this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.FrmConstructionBudget_KeyDown);
1272 1202
            this.panel1.ResumeLayout(false);
1273 1203
            this.panel1.PerformLayout();
1274
            this.pnlGroup3.ResumeLayout(false);
1275
            this.pnlGroup3.PerformLayout();
1276 1204
            this.pnlGroup2.ResumeLayout(false);
1277 1205
            this.pnlGroup2.PerformLayout();
1278 1206
            this.pnlGroup1.ResumeLayout(false);
......
1338 1266
        private System.Windows.Forms.RadioButton radioButton3;
1339 1267
        private System.Windows.Forms.RadioButton radioButton2;
1340 1268
        private System.Windows.Forms.RadioButton radioButton1;
1341
        private System.Windows.Forms.RadioButton radioButton8;
1342
        private System.Windows.Forms.RadioButton radioButton7;
1343 1269
        private System.Windows.Forms.RadioButton radioButton5;
1344 1270
        private System.Windows.Forms.RadioButton radioButton4;
1345 1271
        private System.Windows.Forms.DataGridViewTextBoxColumn Column1;
......
1361 1287
        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
1362 1288
        private System.Windows.Forms.DataGridViewTextBoxColumn Column16;
1363 1289
        private System.Windows.Forms.DataGridViewTextBoxColumn Column17;
1364
        private System.Windows.Forms.Label label22;
1365
        private System.Windows.Forms.TextBox textBox3;
1366
        private System.Windows.Forms.RadioButton radioButton9;
1367 1290
        private System.Windows.Forms.Label label9;
1368 1291
        private System.Windows.Forms.TextBox textBox2;
1369 1292
        private System.Windows.Forms.RadioButton radioButton6;
1370 1293
        private System.Windows.Forms.Panel pnlGroup1;
1371
        private System.Windows.Forms.Panel pnlGroup3;
1372 1294
        private System.Windows.Forms.Panel pnlGroup2;
1373 1295
        private System.Windows.Forms.Label lblLabel06;
1374 1296
        private System.Windows.Forms.Label label23;
1375 1297
        private System.Windows.Forms.Button button1;
1376 1298
        private System.Windows.Forms.Button button2;
1299
        private System.Windows.Forms.Button button3;
1377 1300
    }
1378 1301
}
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs
196 196
                PersonInChargeMaster picRec = new PersonInChargeMaster();
197 197
                if(!picDB.SelectAction(strPerson,ref picRec)) return false;
198 198

  
199
                m_ExpensesList.Clear();
199 200
                // 部署経費率マスタ取得
200 201
                string strSQL = "SELECT A.NAMESTRING, NVL(B.EXPENSESRATIO, 0), B.NAMECODE";
201 202
                strSQL += " FROM DIVISIONMASTER A";
......
255 256

  
256 257
            m_DspLabelCtrl[(int)DspLblCtrlName.SalaryDays] = textBox1;
257 258
            m_DspLabelCtrl[(int)DspLblCtrlName.A_SalaryDays] = textBox2;
258
            m_DspLabelCtrl[(int)DspLblCtrlName.I_SalaryDays] = textBox3;
259 259

  
260 260
            // データ行数
261 261
            int DispLineCnt = Enum.GetNames(typeof(CostsRowLine)).Length;
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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