プロジェクト

全般

プロフィール

リビジョン 482

堀内ほぼ5年前に追加

製品様に微修正

差分を表示:

trunk/src/DataCheckExcute/DataCheckExcute/Common/Process/ClsChangeLedgerData.cs
339 339
                                //bret = CalcSalaryDevisionNoting(LedgerExDB, CurRec, TargetDate.Date, ColPoint);
340 340
                                break;
341 341
                            case (int)CommonDefine.SalaryDevision.DaysInput:    // 日数入力
342
                                bret = CalcSalaryDevisionDaysInput(LedgerExDB, PersonDB, LedgerRec, CurRec);
342
                                //bret = CalcSalaryDevisionDaysInput(LedgerExDB, PersonDB, LedgerRec, CurRec);
343 343
                                break;
344 344
                            default:
345 345
                                break;
......
500 500
            IOProcessApproval AppDB = new IOProcessApproval();
501 501
            try
502 502
            {
503
                int OneDaySalary = 0;
503
                StringBuilder strSQL = new StringBuilder();
504 504

  
505

  
506

  
505 507
                // 月末日より月日数を取得する
506 508
                int MonthDayCnt = DateTimeUtil.EndOfMonth(LedgerRec.ConstructionStart).Day;
509
                int OneDaySalary = 0;
510
                int nSalaryDays = 0;
507 511
                // 支払給与計算
508 512
                switch (CurRec.GroupCount)
509 513
                {
510 514
                    case (int)FrmConstructionLedger.DataGroup.Instructor:       // 指導員給料
511 515
                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.InstructorMonthryCost / MonthDayCnt);
512
                        OneDaySalary *= CurRec.SalaryDays;
513 516
                        break;
514 517
                    case (int)FrmConstructionLedger.DataGroup.Assistant:        // 副担当者給料
515 518
                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.AssistantMonthryCost / MonthDayCnt);
......
522 525
                                                                        , LedgerRec.ConstructionStart
523 526
                                                                        , CurRec.CompanyCode
524 527
                                                                        , false);
525
                        OneDaySalary *= CurRec.SalaryDays;
526 528
                        break;
527 529
                }
528 530

  
531

  
532
                OneDaySalary *= nSalaryDays;
533

  
529 534
                // 工事予算が承認された月の位置に書く
530
                StringBuilder strSQL = new StringBuilder();
535
                strSQL.Clear();
531 536
                strSQL.Append(AppDB.CreatePrimarykeyString(CurRec.SourceCode,
532
                                                            3,                                      // 工事予算承認番号(ClExecuteが無いため)
537
                                                            3,                                      // 工事予算承認番号(ClsExecuteが無いため)
533 538
                                                            (int)CommonDefine.s_Default_OrderNo,
534 539
                                                            1));                                    // 先頭レコード
540
                strSQL.AppendFormat(" AND ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
535 541
                ProcessApproval AppRec = new ProcessApproval();
536 542
                if (!AppDB.SelectAction(strSQL.ToString(), ref AppRec)) return false;
537 543

  
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs
342 342
                                //bret = CalcSalaryDevisionNoting(LedgerExDB, CurRec, TargetDate.Date, ColPoint);
343 343
                                break;
344 344
                            case (int)CommonDefine.SalaryDevision.DaysInput:    // 日数入力
345
                                bret = CalcSalaryDevisionDaysInput(LedgerExDB, PersonDB, LedgerRec, CurRec);
345
                                //bret = CalcSalaryDevisionDaysInput(LedgerExDB, PersonDB, LedgerRec, CurRec);
346 346
                                break;
347 347
                            default:
348 348
                                break;
......
503 503
            IOProcessApproval AppDB = new IOProcessApproval();
504 504
            try
505 505
            {
506
                int OneDaySalary = 0;
506
                StringBuilder strSQL = new StringBuilder();
507 507

  
508

  
509

  
508 510
                // 月末日より月日数を取得する
509 511
                int MonthDayCnt = DateTimeUtil.EndOfMonth(LedgerRec.ConstructionStart).Day;
512
                int OneDaySalary = 0;
513
                int nSalaryDays = 0;
510 514
                // 支払給与計算
511 515
                switch (CurRec.GroupCount)
512 516
                {
513 517
                    case (int)FrmConstructionLedger.DataGroup.Instructor:       // 指導員給料
514 518
                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.InstructorMonthryCost / MonthDayCnt);
515
                        OneDaySalary *= CurRec.SalaryDays;
516 519
                        break;
517 520
                    case (int)FrmConstructionLedger.DataGroup.Assistant:        // 副担当者給料
518 521
                        OneDaySalary = CommonMotions.cnvRound((double)CommonDefine.AssistantMonthryCost / MonthDayCnt);
......
525 528
                                                                        , LedgerRec.ConstructionStart
526 529
                                                                        , CurRec.CompanyCode
527 530
                                                                        , false);
528
                        OneDaySalary *= CurRec.SalaryDays;
529 531
                        break;
530 532
                }
531 533

  
534

  
535
                OneDaySalary *= nSalaryDays;
536

  
532 537
                // 工事予算が承認された月の位置に書く
533
                StringBuilder strSQL = new StringBuilder();
538
                strSQL.Clear();
534 539
                strSQL.Append(AppDB.CreatePrimarykeyString(CurRec.SourceCode,
535
                                                            3,                                      // 工事予算承認番号(ClExecuteが無いため)
540
                                                            3,                                      // 工事予算承認番号(ClsExecuteが無いため)
536 541
                                                            (int)CommonDefine.s_Default_OrderNo,
537 542
                                                            1));                                    // 先頭レコード
543
                strSQL.AppendFormat(" AND ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
538 544
                ProcessApproval AppRec = new ProcessApproval();
539 545
                if (!AppDB.SelectAction(strSQL.ToString(), ref AppRec)) return false;
540 546

  
trunk/src/ProcessManagement/ProcessManagement/Common/ProductDefine.cs
151 151
            /// 1:VPSサーバー
152 152
            /// </summary>
153 153
            VPS,
154
            /// <summary>
155
            /// 2:スタンドアロン
156
            /// </summary>
157
            StandAlone,
154 158
        }
155 159
        #endregion
156 160

  
161
        #region バッチ処理起動タイプ
162
        /// <summary>
163
        /// バッチ処理起動タイプ
164
        /// </summary>
165
        public enum BatchProcessingDef
166
        {
167
            /// <summary>
168
            /// 0:サーバー起動
169
            /// </summary>
170
            Server = 0,
171
            /// <summary>
172
            /// 1:ローカル起動(起動時処理)
173
            /// </summary>
174
            Loacl,
175
        }
157 176
        #endregion
158 177

  
178
        #endregion
179

  
159 180
        #region メンバ変数
160 181

  
161 182
        #region 製品種別
......
169 190
        /// <summary>
170 191
        /// 更新機能実装
171 192
        /// </summary>
172
        private static int m_UpdateProcess = (int)UpdateProcessDef.Exists;
193
        private static int m_UpdateProcess = (int)UpdateProcessDef.None;
173 194
        #endregion
174 195

  
175 196
        #region Webサービス機能定義
......
186 207
        private static int m_StorageType = (int)StorageTypeDef.VPS;
187 208
        #endregion
188 209

  
210
        #region バッチ処理起動タイプ
211
        /// <summary>
212
        /// バッチ処理起動タイプ
213
        /// </summary>
214
        private static int m_BatchProcessing = (int)BatchProcessingDef.Server;
189 215
        #endregion
190 216

  
191
        #region コンストラクタ
192 217
        #endregion
193 218

  
194 219
        #region プロパティ
......
237 262
        }
238 263
        #endregion
239 264

  
265
        #region バッチ処理起動タイプ
266
        /// <summary>
267
        /// バッチ処理起動タイプ
268
        /// </summary>
269
        public static int BatchProcessing
270
        {
271
            set { m_BatchProcessing = value; }
272
            get { return m_BatchProcessing; }
273
        }
240 274
        #endregion
241 275

  
276
        #endregion
277

  
242 278
        #region メソッド
243 279

  
244 280
        #region システム構成名称取得
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOInvoiceData.cs
50 50
            Comment4,
51 51
            Comment5,
52 52
            CompleteFlg,
53
            DeleteFlg,
53 54
            ENTRYDATE,
54 55
            UPDATEDATE,
55 56
        }
......
206 207
                strcmd.AppendFormat(", '{0}'", data.Comment4.ToString());
207 208
                strcmd.AppendFormat(", '{0}'", data.Comment5.ToString());
208 209
                strcmd.AppendFormat(", {0}", data.CompleteFlg.ToString());
210
                strcmd.AppendFormat(", {0}", data.DeleteFlg.ToString());
209 211
                strcmd.Append(", NOW()");
210 212
                strcmd.Append(", NOW()");
211 213
                strcmd.Append(")");
......
254 256
                strcmd.AppendFormat(", Comment4 = '{0}'", data.Comment4.ToString());
255 257
                strcmd.AppendFormat(", Comment5 = '{0}'", data.Comment5.ToString());
256 258
                strcmd.AppendFormat(", CompleteFlg = {0}", data.CompleteFlg.ToString());
259
                strcmd.AppendFormat(", DeleteFlg = {0}", data.DeleteFlg.ToString());
257 260
                strcmd.Append(", UpdateDate = NOW()");
258 261

  
259 262
                strcmd.Append(AddSQLString);
......
330 333
                wrk.Comment5 = objwrk[(int)NameColumn.Comment5].ToString();
331 334

  
332 335
                wrk.CompleteFlg = int.Parse(objwrk[(int)NameColumn.CompleteFlg].ToString());
336
                wrk.DeleteFlg = int.Parse(objwrk[(int)NameColumn.DeleteFlg].ToString());
333 337

  
334 338
                wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.ENTRYDATE].ToString());
335 339
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)NameColumn.UPDATEDATE].ToString());
......
377 381
                wrk.Comment5 = string.Empty;
378 382

  
379 383
                wrk.CompleteFlg = 0;
384
                wrk.DeleteFlg = 0;
380 385

  
381 386
                wrk.EntryDate = DateTime.Now;
382 387
                wrk.UpdateDate = DateTime.Now;
......
457 462

  
458 463
            try
459 464
            {
460
                sql.AppendFormat("SELECT IFNULL(MAX(InvoiceNo),0) FROM InvoiceData WHERE RequestMonth = {0}", RequestMonth);
465
                //sql.AppendFormat("SELECT IFNULL(MAX(InvoiceNo),0) FROM InvoiceData WHERE RequestMonth = {0}", RequestMonth);
466
                sql.AppendFormat("SELECT IFNULL(MAX(InvoiceNo), {0}) + 1 As NewReqNo FROM RequestHead AS A", RequestMonth * 1000);
467
                sql.AppendFormat(" WHERE REQUESTMONTH = {0}", RequestMonth);
461 468

  
462 469
                // SQL実行
463 470
                if (!ExecuteReader(sql.ToString(), ref arData, bConnect)) return -1;
464 471

  
465 472
                // データセット
466
                foreach (object[] objwrk in arData)
467
                {
468
                    ret = int.Parse(objwrk[0].ToString());
469
                    break;
470
                }
473
                object[] objwrk = (object[])arData[0];
474
                ret = int.Parse(objwrk[0].ToString());
471 475

  
472
                if (ret > 0)
473
                {
474
                    ret++;
475
                }
476
                else
477
                {
478
                    ret = (RequestMonth * 1000) + 1;
479
                }
476
                //// データセット
477
                //foreach (object[] objwrk in arData)
478
                //{
479
                //    ret = int.Parse(objwrk[0].ToString());
480
                //    break;
481
                //}
480 482

  
483
                //if (ret > 0)
484
                //{
485
                //    ret++;
486
                //}
487
                //else
488
                //{
489
                //    ret = (RequestMonth * 1000) + 1;
490
                //}
491

  
481 492
            }
482 493
            catch (Exception ex)
483 494
            {
......
531 542
        private string CreateSelectSQL()
532 543
        {
533 544
            StringBuilder strcmd = new StringBuilder();
534
            strcmd.Append("SELECT");
535
            strcmd.Append(" InvoiceNo");
536
            strcmd.Append(", OrderersDivision");
537
            strcmd.Append(", OrderersCode");
538
            strcmd.Append(", RequestMonth");
539
            strcmd.Append(", SeqNo");
540
            strcmd.Append(", DATE_FORMAT(CretateDate, '%Y/%m/%d')");
541
            strcmd.Append(", DATE_FORMAT(RequestDate, '%Y/%m/%d')");
542
            strcmd.Append(", RequestName");
543
            strcmd.Append(", TotalAmount");
544
            strcmd.Append(", TaxAmount");
545
            strcmd.Append(", Comment1");
546
            strcmd.Append(", Comment2");
547
            strcmd.Append(", Comment3");
548
            strcmd.Append(", Comment4");
549
            strcmd.Append(", Comment5");
550
            strcmd.Append(", CompleteFlg");
551
            strcmd.Append(", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
552
            strcmd.Append(", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
545

  
546
            strcmd.Append("SELECT ");
547

  
548
            bool bColFirst = true;
549
            string strWork = string.Empty;
550
            foreach (var gender in Enum.GetValues(typeof(NameColumn)))
551
            {
552
                strWork = gender.ToString();
553
                if (!bColFirst) strcmd.Append(",");
554
                if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
555
                {
556
                    strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
557
                }
558
                else
559
                {
560
                    strcmd.AppendFormat(" {0}", strWork);
561
                }
562
                bColFirst = false;
563
            }
564

  
553 565
            strcmd.Append(" FROM InvoiceData");
554 566

  
555 567
            return strcmd.ToString();
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMSecurity.cs
41 41
            SecRange,
42 42
            GeneralAffairs,
43 43
            SelectBackColor,
44
            DeleteFlg,
44 45
            EntryDate,
45 46
            UpdateDate,
46 47
        }
......
66 67
        {
67 68
            // SQL作成(DateTime型が変換できないのでCharに変換しておく)
68 69
            StringBuilder strcmd = new StringBuilder();
69
            strcmd.Append("SELECT");
70
            strcmd.Append("  SecCode");
71
            strcmd.Append(", DisplayOrder");
72
            strcmd.Append(", SecName");
73
            strcmd.Append(", SecRank");
74
            strcmd.Append(", SecRange");
75
            strcmd.Append(", GeneralAffairs");
76
            strcmd.Append(", SelectBackColor");
77 70

  
78
            strcmd.Append(", DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
79
            strcmd.Append(", DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
71
            strcmd.Append("SELECT ");
72

  
73
            bool bColFirst = true;
74
            string strWork = string.Empty;
75
            foreach (var gender in Enum.GetValues(typeof(TableColumn)))
76
            {
77
                strWork = gender.ToString();
78
                if (!bColFirst) strcmd.Append(",");
79
                if (strWork.Equals("EntryDate") || strWork.Equals("UpdateDate"))
80
                {
81
                    strcmd.AppendFormat(" DATE_FORMAT({0}, '%Y/%m/%d %H:%i:%s')", strWork);
82
                }
83
                else
84
                {
85
                    strcmd.AppendFormat(" {0}", strWork);
86
                }
87
                bColFirst = false;
88
            }
89

  
80 90
            strcmd.Append(" FROM SecurityMaster");
81 91

  
82 92
            return strcmd.ToString();
......
194 204
                strcmd.AppendFormat(", {0}", work.SecRange);
195 205
                strcmd.AppendFormat(", {0}", work.GeneralAffairs);
196 206
                strcmd.AppendFormat(",'{0}'", work.SelectBackColor);
207
                strcmd.AppendFormat(", {0}", work.DeleteFlg);
197 208

  
198 209
                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
199 210
                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
......
246 257
                    strcmd.AppendFormat(", {0}", work.SecRange);
247 258
                    strcmd.AppendFormat(", {0}", work.GeneralAffairs);
248 259
                    strcmd.AppendFormat(",'{0}'", work.SelectBackColor);
260
                    strcmd.AppendFormat(", {0}", work.DeleteFlg);
249 261

  
250 262
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.EntryDate);
251 263
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d %H:%i:%s')", work.UpdateDate);
......
290 302
                strcmd.AppendFormat(",SecRange = {0}", data.SecRange);
291 303
                strcmd.AppendFormat(",GeneralAffairs = {0}", data.GeneralAffairs);
292 304
                strcmd.AppendFormat(",SelectBackColor = '{0}'", data.SelectBackColor);
305
                strcmd.AppendFormat(",DeleteFlg = {0}", data.DeleteFlg);
293 306

  
294 307
                strcmd.Append(", UpdateDate = NOW()");
295 308
                strcmd.Append(AddSQLString);
......
370 383
                    case (int)TableColumn.GeneralAffairs:
371 384
                        strcmd.AppendFormat(" GeneralAffairs = {0}", ((int)value).ToString());
372 385
                        break;
373

  
374 386
                    case (int)TableColumn.SelectBackColor:
375 387
                        strcmd.AppendFormat(" SelectBackColor = '{0}'", value.ToString());
376 388
                        break;
389
                    case (int)TableColumn.DeleteFlg:
390
                        strcmd.AppendFormat(" DeleteFlg = {0}", ((int)value).ToString());
391
                        break;
377 392
                }
378 393

  
379 394
                strcmd.Append(", UpdateDate = NOW()");
......
409 424
                wrk.SecRange = int.Parse(objwrk[(int)TableColumn.SecRange].ToString());
410 425
                wrk.GeneralAffairs = int.Parse(objwrk[(int)TableColumn.GeneralAffairs].ToString());
411 426
                wrk.SelectBackColor = objwrk[(int)TableColumn.SelectBackColor].ToString();
427
                wrk.DeleteFlg = int.Parse(objwrk[(int)TableColumn.DeleteFlg].ToString());
412 428

  
413 429
                wrk.EntryDate = DateTime.Parse(objwrk[(int)TableColumn.EntryDate].ToString());
414 430
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)TableColumn.UpdateDate].ToString());
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IORequestHead.cs
51 51
            InvoiceNo,
52 52
            BillingDate,
53 53
            BillConfirmDate,
54
            DeleteFlg,
54 55
            ENTRYDATE,
55 56
            UPDATEDATE,
56 57
        }
......
233 234
                strcmd.AppendFormat(", {0}", data.InvoiceNo.ToString());
234 235
                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.BillingDate.ToShortDateString());
235 236
                strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", data.BillConfirmDate.ToShortDateString());
237
                strcmd.AppendFormat(", {0}", data.DeleteFlg.ToString());
236 238

  
237 239
                strcmd.Append(", NOW()");
238 240
                strcmd.Append(", NOW()");
......
296 298
                    strcmd.AppendFormat(", {0}", work.AssignedFlg.ToString());
297 299
                    strcmd.AppendFormat(", {0}", work.InvoiceNo.ToString());
298 300
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.BillingDate.ToShortDateString());
301
                    strcmd.AppendFormat(", STR_TO_DATE('{0}','%Y/%m/%d')", work.BillConfirmDate.ToShortDateString());
302
                    strcmd.AppendFormat(", {0}", work.DeleteFlg.ToString());
299 303

  
300 304
                    strcmd.Append(", NOW()");
301 305
                    strcmd.Append(", NOW()");
......
354 358
                strcmd.AppendFormat(",InvoiceNo = {0}", data.InvoiceNo.ToString());
355 359
                strcmd.AppendFormat(",BillingDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.BillingDate.ToShortDateString());
356 360
                strcmd.AppendFormat(",BillConfirmDate = STR_TO_DATE('{0}','%Y/%m/%d')", data.BillConfirmDate.ToShortDateString());
361
                strcmd.AppendFormat(",DeleteFlg = {0}", data.DeleteFlg.ToString());
357 362

  
358 363
                strcmd.Append(", UpdateDate = NOW()");
359 364

  
......
462 467
                        strcmd.AppendFormat(" BillingDate = DATE('{0}')", ((DateTime)value).Date.ToString());
463 468
                        break;
464 469
                    case (int)NameColumn.BillConfirmDate:
465
                        strcmd.AppendFormat(" BillingDate = DATE('{0}')", ((DateTime)value).Date.ToString());
470
                        strcmd.AppendFormat(" BILLCONFIRMDATE = DATE('{0}')", ((DateTime)value).Date.ToString());
466 471
                        break;
472
                    case (int)NameColumn.DeleteFlg:
473
                        strcmd.AppendFormat(" DeleteFlg = {0}", (long)value);
474
                        break;
467 475
                }
468 476

  
469 477
                strcmd.Append(", UpdateDate = NOW()");
......
516 524
                wrk.BillingDate = DateTime.Parse(objwrk[(int)NameColumn.BillingDate].ToString());
517 525
                wrk.BillConfirmDate = DateTime.Parse(objwrk[(int)NameColumn.BillConfirmDate].ToString());
518 526

  
527
                wrk.DeleteFlg = int.Parse(objwrk[(int)NameColumn.DeleteFlg].ToString());
528

  
519 529
                wrk.EntryDate = DateTime.Parse(objwrk[(int)NameColumn.ENTRYDATE].ToString());
520 530
                wrk.UpdateDate = DateTime.Parse(objwrk[(int)NameColumn.UPDATEDATE].ToString());
521 531
            }
......
565 575
                wrk.BillingDate = DateTime.MinValue.Date;
566 576
                wrk.BillConfirmDate = DateTime.MinValue.Date;
567 577

  
578
                wrk.DeleteFlg = 0;
579

  
568 580
                wrk.EntryDate = DateTime.Now;
569 581
                wrk.UpdateDate = DateTime.Now;
570 582
            }
......
638 650

  
639 651
            try
640 652
            {
641
                sql.AppendFormat("SELECT IFNULL(MAX(RequestNo),0) FROM RequestHead WHERE RequestMonth = {0}", RequestMonth) ;
653
                sql.AppendFormat("SELECT IFNULL(MAX(requestno), {0}) + 1 As NewReqNo FROM RequestHead AS A", RequestMonth * 1000) ;
654
                sql.AppendFormat(" WHERE REQUESTMONTH = {0}", RequestMonth);
655
                //sql.AppendFormat("SELECT IFNULL(MAX(RequestNo),0) FROM RequestHead WHERE RequestMonth = {0}", RequestMonth) ;
642 656

  
643 657
                // SQL実行
644 658
                if (!ExecuteReader(sql.ToString(), ref arData, bConnect)) return -1;
......
647 661
                object[] objwrk = (object[])arData[0];
648 662
                ret = int.Parse(objwrk[0].ToString());
649 663

  
650
                int retB = 0;
651
                if (ret > 0)
652
                {
653
                    sql.Clear();
654
                    sql.AppendFormat("SELECT IFNULL(MAX(RequestNo),0) FROM RequestHead WHERE RequestNo > {0}", ret);
655
                    long lwork = (RequestMonth + 1) * 1000;
656
                    sql.AppendFormat(" And RequestNo < {0}", lwork);
657
                    // SQL実行
658
                    arData.Clear();
659
                    if (!ExecuteReader(sql.ToString(), ref arData, bConnect)) return -1;
660
                    object[] objwrk2 = (object[])arData[0];
661
                    retB = int.Parse(objwrk2[0].ToString());
664
                //int retB = 0;
665
                //if (ret > 0)
666
                //{
667
                //    sql.Clear();
668
                //    sql.AppendFormat("SELECT IFNULL(MAX(RequestNo),0) FROM RequestHead WHERE RequestNo > {0}", ret);
669
                //    long lwork = (RequestMonth + 1) * 1000;
670
                //    sql.AppendFormat(" And RequestNo < {0}", lwork);
671
                //    // SQL実行
672
                //    arData.Clear();
673
                //    if (!ExecuteReader(sql.ToString(), ref arData, bConnect)) return -1;
674
                //    object[] objwrk2 = (object[])arData[0];
675
                //    retB = int.Parse(objwrk2[0].ToString());
662 676

  
663
                    if (ret < retB) ret = retB;
664
                }
677
                //    if (ret < retB) ret = retB;
678
                //}
665 679

  
666
                if (ret > 0)
667
                {
668
                    ret++;
669
                }
670
                else
671
                {
672
                    ret = (RequestMonth * 1000) + 1;
673
                }
674

  
680
                //if (ret > 0)
681
                //{
682
                //    ret++;
683
                //}
684
                //else
685
                //{
686
                //    ret = (RequestMonth * 1000) + 1;
687
                //}
675 688
            }
676 689
            catch (Exception ex)
677 690
            {
trunk/src/ProcessManagement/ProcessManagement/DataModel/InvoiceData.cs
46 46
        private string      m_Comment4 = "";                    // コメント4
47 47
        private string      m_Comment5 = "";                    // コメント5
48 48
        private int         m_CompleteFlg = 0;                  // 出力完了フラグ
49
        private int         m_DeleteFlg = 0;                    // 削除フラグ
49 50
        private DateTime    m_EntryDate = DateTime.Now;         // 登録日付
50 51
        private DateTime    m_UpdateDate = DateTime.Now;        // 更新日付
51 52
        #endregion
......
197 198
            get { return m_CompleteFlg; }
198 199
            set { m_CompleteFlg = value; }
199 200
        }
201
        /// <summary>
202
        /// 削除フラグ
203
        /// </summary>
204
        public int DeleteFlg
205
        {
206
            set { m_DeleteFlg = value; }
207
            get { return m_DeleteFlg; }
208
        }
200 209

  
201 210
        /// <summary>
202 211
        /// 登録日付
trunk/src/ProcessManagement/ProcessManagement/DataModel/RemInvoiceDataDetail.cs
22 22
        private int         m_SeqNo = 0;
23 23
        /// <summary>
24 24
        /// 請求No
25
        /// </summary>
26
        private int         m_RequestNo = 0;
25
        /// </summary>
26
        private int         m_RequestNo = 0;
27 27
        /// <summary>
28 28
        /// 登録日付
29
        /// </summary>
29
        /// </summary>
30 30
        private DateTime    m_EntryDate = DateTime.Now;
31 31
        /// <summary>
32 32
        /// 更新日付
......
56 56
        }
57 57
        /// <summary>
58 58
        /// 請求No
59
        /// </summary>
59
        /// </summary>
60 60
        public int RequestNo
61 61
        {
62 62
            get { return m_RequestNo; }
63 63
            set { m_RequestNo = value; }
64
        }
64
        }
65 65

  
66 66
        /// <summary>
67 67
        /// 登録日付
trunk/src/ProcessManagement/ProcessManagement/DataModel/RequestHead.cs
29 29
        private int         m_InvoiceNo = 0;                            // 請求書No
30 30
        private DateTime    m_BillingDate = DateTime.MinValue;          // 請求日
31 31
        private DateTime    m_BillConfirmDate = DateTime.MinValue;      // 請求確認日
32
        private int         m_DeleteFlg = 0;                            // 削除フラグ
32 33

  
33 34
        private DateTime    m_EntryDate = DateTime.Now;                 // 登録日付
34 35
        private DateTime    m_UpdateDate = DateTime.Now;                // 更新日付
......
190 191
            get { return m_BillConfirmDate; }
191 192
            set { m_BillConfirmDate = value; }
192 193
        }
194
        /// <summary>
195
        /// 削除フラグ
196
        /// </summary>
197
        public int DeleteFlg
198
        {
199
            set { m_DeleteFlg = value; }
200
            get { return m_DeleteFlg; }
201
        }
193 202

  
194 203
        /// <summary>
195 204
        /// 登録日付
trunk/src/ProcessManagement/ProcessManagement/DataModel/SecurityMaster.cs
69 69
        /// 選択背景色
70 70
        /// </summary>
71 71
        private string      m_SelectBackColor = string.Empty;
72
        /// <summary>
73
        /// 削除フラグ
74
        /// </summary>
75
        private int m_DeleteFlg = 0;
72 76

  
73 77
        /// <summary>
74 78
        /// 登録年月日
......
138 142
            set { m_SelectBackColor = value; }
139 143
        }
140 144
        /// <summary>
145
        /// 削除フラグ
146
        /// </summary>
147
        public int DeleteFlg
148
        {
149
            set { m_DeleteFlg = value; }
150
            get { return m_DeleteFlg; }
151
        }
152
        /// <summary>
141 153
        /// 登録年月日
142 154
        /// </summary>
143 155
        public DateTime EntryDate
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs
65 65

  
66 66
                    case (int)ClsExcute.ApprovalListNo.OrderRequestApproval:
67 67
                        //  請求承認を承認時に工事詳細台帳請求金額セットする
68
                        //CaretaBillingLedgerData();
68
                        CaretaBillingLedgerData();
69 69
                        break;
70 70

  
71 71
                    case (int)ClsExcute.ApprovalListNo.SafetyPatrolApproval:
......
376 376
            IOConstructionLedgerDetail DetailDB = new IOConstructionLedgerDetail();
377 377
            IORequestHead ReqHDB = new IORequestHead();
378 378
            IOBeforeCreatingLedger BCLDB = new IOBeforeCreatingLedger();
379

  
380
            bool bRet = true;
381
            bool bTran = false;
379 382
            try
380 383
            {
381 384
                StringBuilder sql = new StringBuilder();
......
409 412
                ReqHDB.connect(); ReqHDB.beginTran();
410 413
                BCLDB.connect(); BCLDB.beginTran();
411 414

  
415
                bTran = true;
412 416
                object[] ObjRec = (object[])ReqData[0];
413 417
                long lAmountValue = CommonMotions.cnvLong(ObjRec[2]);
414 418

  
......
425 429
                                                , HeadRec.RequestMonth
426 430
                                                , lAmountValue))
427 431
                    {
428
                        BCLDB.rollback();
429
                        return false;
432
                        return (bRet = false);
430 433
                    }
431 434
                    return true;
432 435
                }
......
438 441
                                                            , (int)FrmConstructionLedger.DataGroup.BillingAmount));
439 442
                if (!DetailDB.SelectAction(sql.ToString(), ref lstDetail))
440 443
                {
441
                    BCLDB.rollback();
442
                    return false;
444
                    return (bRet = false);
443 445
                }
444 446

  
445 447
                // 当該月の請求金額のレコードがあるか取得してみる
......
452 454
                List<ConstructionLedgerExcute> lstExcute = new List<ConstructionLedgerExcute>();
453 455
                if (!ExcuteDB.SelectAction(sql.ToString(), ref lstExcute, false))
454 456
                {
455
                    BCLDB.rollback();
456
                    return false;
457
                    return (bRet = false);
457 458
                }
458 459

  
459 460
                // 請求月よりカラム番号を取得する
......
479 480

  
480 481
                    if (!ExcuteDB.UpdateAction(sql.ToString(), LdgExcute, false))
481 482
                    {
482
                        ExcuteDB.rollback();
483
                        BCLDB.rollback();
484
                        return false;
483
                        return (bRet = false);
485 484
                    }
486 485
                }
487 486
                else
......
490 489
                    // レコードを挿入
491 490
                    if (!ExcuteDB.InsertAction(LdgExcute, false))
492 491
                    {
493
                        ExcuteDB.rollback();
494
                        BCLDB.rollback();
495
                        return false;
492
                        return (bRet = false);
496 493
                    }
497 494
                }
498 495

  
......
503 500
                                        , (int)IORequestHead.NameColumn.BillConfirmDate
504 501
                                        , DateTime.Now, false))
505 502
                {
506
                    ExcuteDB.rollback();
507
                    BCLDB.rollback();
508
                    ReqHDB.rollback();
509
                    return false;
503
                    return (bRet = false);
510 504
                }
511 505

  
512
                ExcuteDB.commit();
513
                ReqHDB.commit();
514
                BCLDB.commit();
515

  
516 506
                return true;
517 507
            }
518 508
            catch (Exception ex)
......
522 512
            }
523 513
            finally
524 514
            {
515
                if (bTran)
516
                {
517
                    if (bRet)
518
                    {
519
                        ExcuteDB.commit();
520
                        ReqHDB.commit();
521
                        BCLDB.commit();
522
                    }
523
                    else
524
                    {
525
                        ExcuteDB.rollback();
526
                        ReqHDB.rollback();
527
                        BCLDB.rollback();
528
                    }
529
                }
530

  
525 531
                LedgerDB.close(); LedgerDB = null;
526 532
                ExcuteDB.close(); ExcuteDB = null;
527 533
                DetailDB.close(); DetailDB = null;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
1064 1064
                if (!DataEntryProcess(true)) return;
1065 1065

  
1066 1066
                CommonMotions.EntryEndMessage("?H?????f?[?^");
1067
                
1067 1068
                // ?I??
1068
                //this.Close();
1069
                this.Close();
1069 1070
            }
1070 1071
            catch (System.Exception ex)
1071 1072
            {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
834 834
        /// </summary>
835 835
        private void BillingDateDisplay()
836 836
        {
837
            IOPersonApproval ProAppDB = new IOPersonApproval();
837
            IOProcessApproval ProAppDB = new IOProcessApproval();
838 838
            try
839 839
            {
840 840
                // ?O???b?h???????
......
4006 4006
                int iStatusCount = GetStatusForCheckBox();
4007 4007
                DateTime wrkDate = DateTime.Now.Date;
4008 4008
                StringBuilder strSet = new StringBuilder();
4009
                StringBuilder strWhere = new StringBuilder();
4009 4010
                switch (iStatusCount)
4010 4011
                {
4011
                    case (int)CommonDefine.StatNumArray.Status0:        // 0, ??????
4012
                    case (int)CommonDefine.StatNumArray.Status0:                                    // 0, ??????
4012 4013
                        break;
4013
                    case (int)CommonDefine.StatNumArray.Status1:        // 1, ?????o
4014
                    case (int)CommonDefine.StatNumArray.Status1:                                    // 1, ?????o
4014 4015
                        break;
4015
                    case (int)CommonDefine.StatNumArray.Status2:        // 2, ????C?H??
4016
                    case (int)CommonDefine.StatNumArray.Status2:                                    // 2, ????C?H??
4016 4017
                        break;
4017
                    case (int)CommonDefine.StatNumArray.Status3:        // 3, ?? ?? ??
4018
                        strSet.AppendFormat(" ProvisionalOrderDate = DATE('{0}')", wrkDate);                // ?????????
4019
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4020
                        strSet.Append("       And DATE (ProvisionalOrderDate) = DATE ('0001/01/01')");
4018
                    case (int)CommonDefine.StatNumArray.Status3:                                    // 3, ?? ?? ??
4019
                        strSet.AppendFormat(" ProvisionalOrderDate = DATE('{0}')", wrkDate);        // ?????????
4020
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4021
                        //strWhere.Append("       And DATE (ProvisionalOrderDate) = DATE ('0001/01/01')");
4021 4022
                        break;
4022
                    case (int)CommonDefine.StatNumArray.Status4:        // 4, ??@?@??
4023
                        strSet.AppendFormat(" OrderDate = DATE('{0}')", wrkDate);                           // ???????
4024
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4025
                        strSet.Append("       And DATE (OrderDate) = DATE ('0001/01/01')");
4023
                    case (int)CommonDefine.StatNumArray.Status4:                                    // 4, ??@?@??
4024
                        strSet.AppendFormat(" OrderDate = DATE('{0}')", wrkDate);                   // ???????
4025
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4026
                        //strWhere.Append("       And DATE (OrderDate) = DATE ('0001/01/01')");
4026 4027
                        break;
4027
                    case (int)CommonDefine.StatNumArray.Status5:        // 5, ???????p
4028
                        strSet.AppendFormat(" TransferConstructionDate = DATE('{0}')", wrkDate);            // ???????p??????
4029
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4030
                        strSet.Append("       And DATE (TransferConstructionDate) = DATE ('0001/01/01')");
4028
                    case (int)CommonDefine.StatNumArray.Status5:                                    // 5, ???????p
4029
                        strSet.AppendFormat(" TransferConstructionDate = DATE('{0}')", wrkDate);    // ???????p??????
4030
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4031
                        //strWhere.Append("       And DATE (TransferConstructionDate) = DATE ('0001/01/01')");
4031 4032
                        break;
4032
                    case (int)CommonDefine.StatNumArray.Status6:        // 6, ?{?H????
4033
                        strSet.AppendFormat(" PreparationStartDate = DATE('{0}')", wrkDate);                // ?{?H?????J?n??????
4034
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4035
                        strSet.Append("       And DATE (PreparationStartDate) = DATE ('0001/01/01')");
4033
                    case (int)CommonDefine.StatNumArray.Status6:                                    // 6, ?{?H????
4034
                        strSet.AppendFormat(" PreparationStartDate = DATE('{0}')", wrkDate);        // ?{?H?????J?n??????
4035
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4036
                        //strWhere.Append("       And DATE (PreparationStartDate) = DATE ('0001/01/01')");
4036 4037
                        break;
4037
                    case (int)CommonDefine.StatNumArray.Status7:        // 7, ?{?H?J?n
4038
                        strSet.AppendFormat(" ConstructionStartingDate = DATE('{0}')", wrkDate);            // ?{?H?J?n??????
4039
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4040
                        strSet.Append("       And DATE (ConstructionStartingDate) = DATE ('0001/01/01')");
4038
                    case (int)CommonDefine.StatNumArray.Status7:                                    // 7, ?{?H?J?n
4039
                        strSet.AppendFormat(" ConstructionStartingDate = DATE('{0}')", wrkDate);    // ?{?H?J?n??????
4040
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4041
                        //strWhere.Append("       And DATE (ConstructionStartingDate) = DATE ('0001/01/01')");
4041 4042
                        break;
4042
                    case (int)CommonDefine.StatNumArray.Status8:        // 8, ?{?H????
4043
                        strSet.AppendFormat(" ConstructionCompletionDate = DATE('{0}')", wrkDate);          // ?{?H??????????
4044
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4045
                        strSet.Append("       And DATE (ConstructionCompletionDate) = DATE ('0001/01/01')");
4043
                    case (int)CommonDefine.StatNumArray.Status8:                                    // 8, ?{?H????
4044
                        strSet.AppendFormat(" ConstructionCompletionDate = DATE('{0}')", wrkDate);  // ?{?H??????????
4045
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4046
                        //strWhere.Append("       And DATE (ConstructionCompletionDate) = DATE ('0001/01/01')");
4046 4047
                        break;
4047
                    case (int)CommonDefine.StatNumArray.Status9:        // 9, ????????
4048
                        strSet.AppendFormat(" BillingStartDate = DATE('{0}')", wrkDate);                    // ?????????J?n??????
4049
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4050
                        strSet.Append("       And DATE (BillingStartDate) = DATE ('0001/01/01')");
4048
                    case (int)CommonDefine.StatNumArray.Status9:                                    // 9, ????????
4049
                        strSet.AppendFormat(" BillingStartDate = DATE('{0}')", wrkDate);            // ?????????J?n??????
4050
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4051
                        //strWhere.Append("       And DATE (BillingStartDate) = DATE ('0001/01/01')");
4051 4052
                        break;
4052
                    case (int)CommonDefine.StatNumArray.Status10:       // 10, ?????m?F
4053
                        strSet.AppendFormat(" BillingComplateDate = DATE('{0}')", wrkDate);                 // ?????m?F??????
4054
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4055
                        strSet.Append("       And DATE (BillingComplateDate) = DATE ('0001/01/01')");
4053
                    case (int)CommonDefine.StatNumArray.Status10:                                   // 10, ?????m?F
4054
                        strSet.AppendFormat(" BillingDate = DATE('{0}')", wrkDate);                 // ?????m?F??????
4055
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4056
                        //strWhere.Append("       And DATE (BillingDate) = DATE ('0001/01/01')");
4056 4057
                        break;
4057
                    case (int)CommonDefine.StatNumArray.Status11:       // 11, ?? ?? ??
4058
                        strSet.AppendFormat(" NonOrderDate = DATE('{0}')", wrkDate);                        // ????????
4059
                        strSet.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4060
                        strSet.Append("       And DATE (NonOrderDate) = DATE ('0001/01/01')");
4058
                    case (int)CommonDefine.StatNumArray.Status11:                                   // 11, ?? ?? ??
4059
                        strSet.AppendFormat(" NonOrderDate = DATE('{0}')", wrkDate);                // ????????
4060
                        strWhere.AppendFormat(" Where ConstructionCode = {0}", ConstrCode);
4061
                        //strWhere.Append("       And DATE (NonOrderDate) = DATE ('0001/01/01')");
4061 4062
                        break;
4062 4063
                }
4063 4064
                if (strSet.Length < 1) return true;
......
4065 4066
                StringBuilder strSQL = new StringBuilder();
4066 4067
                strSQL.Append("Update ConstructionBaseInfo Set");
4067 4068
                strSQL.Append(strSet.ToString());
4069
                strSQL.Append(strWhere.ToString());
4068 4070

  
4069 4071
                if (!cbiDB.ExecuteNonQuery(strSQL.ToString(), false)) return false;
4070 4072

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedger.cs
1068 1068
            // ???\???????????????????????s??
1069 1069
            if (!m_OnVisible) return;
1070 1070

  
1071
            await Task.Delay(500);
1071
            await Task.Delay(100);
1072 1072

  
1073 1073
            // ?t?H?[?????[?h???????
1074 1074
            InitFormLoad();
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
102 102
                    // 請求まとめからの参照呼び出し
103 103
                    InitReqSumDsp();
104 104
                }
105
                else
106
                {
107
                    // 工事詳細台帳通常の処理
108
                    GridLockProcess();
109
                }
105 110

  
106 111
                // 参照モード
107 112
                if (m_EditLock)
......
130 135
        }
131 136
        #endregion
132 137

  
138
        #region 登録ロック処理
139
        /// <summary>
140
        /// 登録ロック処理
141
        /// </summary>
142
        private void GridLockProcess()
143
        {
144
            try
145
            {
146
                // Administratorは処理しない
147
                if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode) return;
148

  
149
            }
150
            catch (Exception ex)
151
            {
152
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
153
            }
154
        }
155
        #endregion
156

  
133 157
        #region 初期設定
134 158
        /// <summary>
135 159
        /// 初期設定
......
7806 7830
        private bool SetAddData_AddWorkingRow(int BlockNo, int GroupNo, int DataNo, ConstructionBudget BudgetRec)
7807 7831
        {
7808 7832
            IOConstructionBudgetDetail DetailDB = new IOConstructionBudgetDetail();
7833
            IOConstructionLedgerExcute execDB = new IOConstructionLedgerExcute();
7809 7834
            try
7810 7835
            {
7811 7836
                // 工事予算書明細データを読み込む
7812 7837
                StringBuilder strSQL = new StringBuilder();
7813 7838
                strSQL.Append(DetailDB.CreatePrimarykeyString(m_AddingConstrCode));
7814
                strSQL.Append(string.Format(" AND GROUPCOUNT = {0}", GroupNo));
7839
                strSQL.AppendFormat(" AND GROUPCOUNT = {0}", GroupNo);
7840
                strSQL.Append("       And ExecutionAmount != 0");
7815 7841
                strSQL.Append(" ORDER BY LineCount ASC");
7816 7842

  
7817 7843
                ConstructionBudgetDetail DetailRec = new ConstructionBudgetDetail();
......
7826 7852
                    case (int)FrmConstructionBudget.DataGroup.InstructorCosts:
7827 7853
                        TargetLine = m_CostsRowCount[(int)CostsRowLine.InstructorRowLine];
7828 7854
                        GroupNo = (int)DataGroup.Instructor;
7829

  
7830
                        // 指導員行にコード・名前を入れる
7831
                        SetFirstStringName(GroupNo, ref DetailRec);
7832
                        // 一般ユーザーは指導員の給与を見えないようにする
7833
                        //if (!CheckLeaderOrUser()) DetailRec.SecondString = string.Empty;
7834 7855
                        break;
7835 7856

  
7836 7857
                    // 副担当者給与費用
7837 7858
                    case (int)FrmConstructionBudget.DataGroup.AssistantCosts:
7838 7859
                        TargetLine = m_CostsRowCount[(int)CostsRowLine.AssistantRowLine];
7839 7860
                        GroupNo = (int)DataGroup.Assistant;
7840

  
7841
                        // 副担当行にコード・名前を入れる
7842
                        SetFirstStringName(GroupNo, ref DetailRec);
7843
                        // 一般ユーザーは副担当者の給与を見えないようにする
7844
                        //if (!CheckLeaderOrUser()) DetailRec.SecondString = string.Empty;
7845 7861
                        break;
7846 7862

  
7847 7863
                    // 担当者給与費用
7848 7864
                    case (int)FrmConstructionBudget.DataGroup.PayrollExpenses:
7849 7865
                        TargetLine = m_CostsRowCount[(int)CostsRowLine.PayrollRowLine];
7850 7866
                        GroupNo = (int)DataGroup.Payroll;
7851

  
7852
                        // 担当者行にコード・名前を入れる
7853
                        SetFirstStringName(GroupNo, ref DetailRec);
7854
                        // 一般ユーザーは担当者の給与を見えないようにする
7855
                        //if (!CheckLeaderOrUser()) DetailRec.SecondString = string.Empty;
7856 7867
                        break;
7857 7868
                    default:
7858 7869
                        // その他の項目(ここには来ないが念のため)
7859 7870
                        GroupNo = 0;
7860 7871
                        break;
7861 7872
                }
7873
                // 行にコード・名前を入れる
7874
                if(GroupNo != 0) SetFirstStringName(GroupNo, ref DetailRec);
7862 7875

  
7863 7876
                // 担当者が同じならば金額を変更する、担当者がいなければ行を増やす
7864
                bool bExist = false;
7865 7877
                DataGridViewEX dgv = dgvAllDisplay;
7866
                for (int i = TargetLine; i < dgv.RowCount; i++, TargetLine++)
7867
                {
7868
                    DataGridViewRow wrkRow = dgv.Rows[i];
7869
                    // 対象グループ以外は抜ける
7870
                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) != GroupNo) break;
7871
                    // 同じ担当者がいれば抜ける
7872
                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.CompanyCode].Value) == DetailRec.CompanyCode)
7873
                    {
7874
                        bExist = true;
7875
                        break;
7876
                    }
7877
                }
7878
                int nExistsCnt = dgv.Rows.Cast<DataGridViewRow>().Where(x => CommonMotions.cnvInt(x.Cells[(int)GridColumn.GroupCount].Value)
7879
                                                                                                == GroupNo
7880
                                                                            
7881
                                                                            && CommonMotions.cnvInt(x.Cells[(int)GridColumn.CompanyCode].Value)
7882
                                                                                                == DetailRec.CompanyCode
7878 7883

  
7884
                                                                            && CommonMotions.cnvInt(x.Cells[(int)GridColumn.OperatingFlg].Value)
7885
                                                                                                == (int)ConstructionLedgerDetail.SalOpeKindDef.Oparateing)
7886
                                                                    .Count();
7887
                bool bExist = false;
7888
                if (nExistsCnt > 0) bExist = true;
7889

  
7890
                //for (int i = TargetLine; i < dgv.RowCount; i++, TargetLine++)
7891
                //{
7892
                //    DataGridViewRow wrkRow = dgv.Rows[i];
7893
                //    // 対象グループ以外は抜ける
7894
                //    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.GroupCount].Value) != GroupNo) break;
7895
                //    // 同じ担当者がいれば抜ける
7896
                //    if (CommonMotions.cnvInt(wrkRow.Cells[(int)GridColumn.CompanyCode].Value) == DetailRec.CompanyCode)
7897
                //    {
7898
                //        bExist = true;
7899
                //        break;
7900
                //    }
7901
                //}
7902

  
7879 7903
                // 給与区分情報取得
7880 7904
                int nSalaryFlg = (int)CommonDefine.SalaryDevision.All;
7881 7905
                int nSalaryDays = 0;
......
7903 7927

  
7904 7928
                // データ行現番号取得
7905 7929
                int FluctuationNo = (int)ConstructionLedgerDetail.FlucFlgDef.Fluctuates;
7930
                // 対象月より書込みカラム位置を取得する
7931
                int ColPoint = ClsChangeLedgerData.CalcTargetMonthToColumn(execDB, true, m_ConstructionCode, DateTime.Today);
7906 7932

  
7907 7933
                if (bExist)
7908 7934
                {
......
7913 7939
                    {
7914 7940
                        case (int)CommonDefine.SalaryDevision.All:
7915 7941
                            // 全日
7916
                            switch (nSalaryFlg)
7917
                            {
7918
                                case (int)CommonDefine.SalaryDevision.All:
7919
                                    break;
7920
                                case (int)CommonDefine.SalaryDevision.DaysInput:
7921
                                    break;
7922
                                case (int)CommonDefine.SalaryDevision.Noting:
7923
                                    break;
7924
                                default:
7925
                                    break;
7926
                            }
7927 7942
                            break;
7928 7943

  
7929 7944
                        case (int)CommonDefine.SalaryDevision.DaysInput:
......
7939 7954
                                case (int)CommonDefine.SalaryDevision.Noting:
7940 7955
                                    break;
7941 7956
                                default:
7942
                                    RowData.Cells[(int)GridColumn.SalaryDays].Value = "";
7943 7957
                                    break;
7944 7958
                            }
7945 7959
                            break;
......
7968 7982

  
7969 7983
                    RowData.Cells[(int)GridColumn.SourceCode].Value = m_AddingConstrCode;
7970 7984

  
7971
                    int EstimatePrice = CommonMotions.cnvInt(RowData.Cells[(int)GridColumn.EstimatePrice].Value) + (int)DetailRec.EstimatePrice;
7972
                    int ExecutionAmount = CommonMotions.cnvInt(RowData.Cells[(int)GridColumn.ExecPrice].Value) + (int)DetailRec.ExecutionAmount;
7973

  
7985
                    // 予算金額・実行金額のセット
7986
                    long EstimatePrice = CommonMotions.cnvLong(RowData.Cells[(int)GridColumn.EstimatePrice].Value) + (int)DetailRec.EstimatePrice;
7987
                    long ExecutionAmount = CommonMotions.cnvLong(RowData.Cells[(int)GridColumn.ExecPrice].Value) + (int)DetailRec.ExecutionAmount;
7974 7988
                    RowData.Cells[(int)GridColumn.EstimatePrice].Value = EstimatePrice.ToString("#,0");
7975 7989
                    RowData.Cells[(int)GridColumn.ExecPrice].Value = ExecutionAmount.ToString("#,0");
7990

  
7991
                    // 支払金額のセット
7992
                    ExecutionAmount = CommonMotions.cnvLong(RowData.Cells[ColPoint].Value) + (int)DetailRec.ExecutionAmount;
7993
                    RowData.Cells[ColPoint].Value = ExecutionAmount.ToString("#,0");
7976 7994
                }
7977 7995
                else
7978 7996
                {
......
8007 8025
                    RowData[(int)GridColumn.TotalFlg] = "0";
8008 8026
                    RowData[(int)GridColumn.BlankFlg] = "0";
8009 8027

  
8028
                    // 支払金額のセット
8029
                    RowData[ColPoint] = DetailRec.ExecutionAmount.ToString("#,0");
8030

  
8010 8031
                    dgv.Rows.Insert(TargetLine, RowData);
8011 8032
                }
8012 8033

  
......
8023 8044
            finally
8024 8045
            {
8025 8046
                DetailDB.close(); DetailDB = null;
8047
                execDB.close(); execDB = null;
8026 8048
            }
8027 8049
        }
8028 8050
        #endregion
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/ProcessControl.cs
99 99
                    // 製品によっての実装チェック
100 100
                    if (!ClsExcute.GetImplementationProcess(CurRec.Key)) continue;
101 101

  
102
                    // 起動チェック
103
                    int m_EditFlg = -1;
104
                    if (!ClsSecurityPermission.GetExecutePermission(CurRec.Key, ref m_EditFlg)) continue;
105

  
102 106
                    //イベントの登録
103 107
                    switch (CurRec.Key)
104 108
                    {
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.Designer.cs
73 73
            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
74 74
            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
75 75
            this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn();
76
            this.btnLineOrders = new System.Windows.Forms.Button();
76 77
            this.panel1.SuspendLayout();
77 78
            this.groupBox2.SuspendLayout();
78 79
            ((System.ComponentModel.ISupportInitialize)(this.dgvAllDisplay)).BeginInit();
......
557 558
            this.Column13.Name = "Column13";
558 559
            this.Column13.Visible = false;
559 560
            // 
561
            // btnLineOrders
562
            // 
563
            this.btnLineOrders.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
564
            this.btnLineOrders.BackColor = System.Drawing.Color.PaleGreen;
565
            this.btnLineOrders.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
566
            this.btnLineOrders.Location = new System.Drawing.Point(607, 656);
567
            this.btnLineOrders.Name = "btnLineOrders";
568
            this.btnLineOrders.Size = new System.Drawing.Size(130, 30);
569
            this.btnLineOrders.TabIndex = 117;
570
            this.btnLineOrders.Text = "発注先追加";
571
            this.btnLineOrders.UseVisualStyleBackColor = false;
572
            this.btnLineOrders.Click += new System.EventHandler(this.btnLineOrders_Click);
573
            // 
560 574
            // FrmOrderEntryList
561 575
            // 
562 576
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
563 577
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
564 578
            this.BackColor = System.Drawing.Color.Black;
565 579
            this.ClientSize = new System.Drawing.Size(1344, 692);
580
            this.Controls.Add(this.btnLineOrders);
566 581
            this.Controls.Add(this.btnHelp);
567 582
            this.Controls.Add(this.lblCellTotal);
568 583
            this.Controls.Add(this.btnAllSelect);
......
632 647
        private System.Windows.Forms.DataGridViewTextBoxColumn Column11;
633 648
        private System.Windows.Forms.DataGridViewTextBoxColumn Column12;
634 649
        private System.Windows.Forms.DataGridViewTextBoxColumn Column13;
650
        private System.Windows.Forms.Button btnLineOrders;
635 651
    }
636 652
}
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryList.cs
408 408
        }
409 409
        #endregion
410 410

  
411
        #region 発注先追加ボタン
412
        /// <summary>
413
        /// 発注先追加ボタン
414
        /// </summary>
415
        /// <param name="sender"></param>
416
        /// <param name="e"></param>
417
        private void btnLineOrders_Click(object sender, EventArgs e)
418
        {
419
            // 協力会社台帳選択処理
420
            GetLedgerInfoDiag();
421
        }
422
        #endregion
423

  
411 424
        #region 作成対象外セット押下
412 425
        /// <summary>
413 426
        /// 作成対象外セット押下
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/FrmOrderEntryListAuxiliary.cs
977 977
            }
978 978
        }
979 979
        #endregion
980

  
981
        #region 台帳選択処理
982
        /// <summary>
983
        /// 台帳選択処理
984
        /// </summary>
985
        private void GetLedgerInfoDiag()
986
        {
987
            try
988
            {
989
                DataGridViewRow CurRow = dgvAllDisplay.CurrentRow;
990

  
991
                // 承認済みは処理しない
992
                string strStat = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn.PurchaseExists].Value);
993
                if (strStat.Equals(DataStatusString[(int)DataStatusNo.Approvals]))
994
                {
995
                    MessageBox.Show("作成済データは設定できません", "追加不可", MessageBoxButtons.OK, MessageBoxIcon.Error);
996
                    return;
997
                }
998

  
999
                // 工事詳細台帳の行番号、列番号を設定
1000
                //int[] nLedgerInfo = new int[3];
1001
                //nLedgerInfo[0] = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerLineNo]);
1002
                //nLedgerInfo[1] = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerDetailNo]);
1003
                //nLedgerInfo[2] = CommonMotions.cnvInt(CurRow.Cells[(int)DispColumn.LedgerColNo]);
1004
                //if (nLedgerInfo[0] > 0 && nLedgerInfo[1] > 0 && nLedgerInfo[2] > 0)
1005
                //{
1006
                //    DialogResult drRet = MessageBox.Show("工事台帳と関連付けがされています\n変更しますか?"
1007
                //                    , "設定確認", MessageBoxButtons.OKCancel, MessageBoxIcon.Exclamation);
1008
                //    if (drRet == DialogResult.Cancel) return;
1009
                //}
1010

  
1011
                //// 台帳関連付け処理
1012
                //if (!GridLinkLedger()) return;
1013

  
1014
                //// 変更フラグ
1015
                //DataRowState nDataRowState = (DataRowState)CurRow.Cells[(int)DispColumn.RowState].Value;
1016
                //RowsTypeDef nRowType = (RowsTypeDef)CurRow.Cells[(int)DispColumn.RowType].Value;
1017
                //if (nRowType == RowsTypeDef.明細 && DataRowState.Unchanged == nDataRowState)
1018
                //    CurRow.Cells[(int)DispColumn.RowState].Value = DataRowState.Modified;
1019

  
1020
            }
1021
            catch (System.Exception ex)
1022
            {
1023
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1024
            }
1025
            finally
1026
            {
1027
                GC.Collect();
1028
            }
1029
        }
1030
        #endregion
1031

  
1032
        #region 台帳関連付け処理
1033
        /// <summary>
1034
        /// 台帳関連付け処理
1035
        /// </summary>
1036
        private bool GridLinkLedger()
1037
        {
1038
            FrmConstructionLedger frmLedger = new FrmConstructionLedger();
1039
            try
1040
            {
1041
                DataGridViewEX dgv = dgvAllDisplay;
1042
                DataGridViewRow CurRow = dgv.CurrentRow;
1043

  
1044
                int nCompanyCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.CompanyCode].Value);
1045
                int nConstrCode = m_ConstructionCode;
1046

  
1047
                // 台帳選択
1048
                int[] nRowCol = new int[2];
1049
                if (nConstrCode < 1 || nCompanyCode < 1) return false;
1050

  
1051
                // 業者・工事が設定済みは台帳より行を選択
1052
                if (!DispSelectLedger(nCompanyCode, nConstrCode, frmLedger, ref nRowCol))
1053
                {
1054
                    return false;
1055
                }
1056

  
1057
                return true;
1058
            }
1059
            catch (System.Exception ex)
1060
            {
1061
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1062
                return false;
1063
            }
1064
            finally
1065
            {
1066
                frmLedger.Dispose(); frmLedger = null;
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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