プロジェクト

全般

プロフィール

リビジョン 142

堀内7年以上前に追加

2017年5月13日移行時ソース

差分を表示:

trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalList.cs
194 194
        /// <param name="e"></param>
195 195
        private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
196 196
        {
197
            SetInitnumUDConstPro();
197 198
            // ?R???{?{?b?N?X?Z?b?g
198 199
            SetcmbDepartment();
199 200
            SetcmbPersons();
......
263 264
        private void numUDConstPro_ValueChanged(object sender, EventArgs e)
264 265
        {
265 266
            if (m_bInitFlg) return;
267

  
268
            // ?R???{?{?b?N?X?Z?b?g
269
            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
270
            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
271
            SetcmbDepartment();
272
            SetcmbPersons();
273
            cmbDepartment.SelectedValue = DepCode;
274
            cmbConstructionPerson.SelectedValue = PerCode;
275

  
266 276
            // ?f?[?^?\??
267 277
            DataDisplay();
268 278
        }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs
483 483
                cmbConstructionPerson.Items.Clear();
484 484
                cmbConstructionPerson.Text = "";
485 485

  
486
                int DepartmentCode = GetDepartmentCode();
486 487
                string strSQL = string.Empty;
487
                int DepartmentCode = GetDepartmentCode();
488
                // ????????
489
                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
490
                strSQL += " AND (DEPARTMENTCODE";
491
                string strSubSQL = string.Empty;
488 492
                if (DepartmentCode == 0)
489 493
                {
490
                    strSQL = " WHERE DeleteFlg = 0";
491
                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
492 494
                    // ?Q??????}?X?^????????
493
                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
494
                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
495
                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
495
                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
496
                                            , CommonMotions.LoginUserData.PersonCode);
496 497
                }
497 498
                else
498 499
                {
499
                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
500
                    strSubSQL += string.Format(" = {0}", DepartmentCode);
500 501
                }
502
                strSQL += strSubSQL + ")";
501 503

  
504
                // ??????????E??????????
505
                DateTime dtDefaultStart = DateTime.MinValue;
506
                DateTime dtDefaultEnd = DateTime.MinValue;
507
                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
508

  
509
                strSQL += string.Format(" AND (STARTDATE <= TO_DATE('{0}','YYYY/MM/DD')", dtDefaultEnd.ToShortDateString());
510
                strSQL += string.Format(" AND (TO_DATE('{0}','YYYY/MM/DD') <= ENDDATE", dtDefaultStart.ToShortDateString());
511
                strSQL += string.Format(" OR TO_DATE('{0}','YYYY/MM/DD') = ENDDATE))", DateTime.MinValue.ToShortDateString());
512

  
513
                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
502 514
                // ?S????}?X?^???
503 515
                if (!picDB.SelectAction(strSQL, ref workList)) return false;
504 516

  
......
541 553
        }
542 554
        #endregion
543 555

  
556
        #region ?f?t?H???g???????E?????????????
557
        /// <summary>
558
        /// ?f?t?H???g???????E?????????????
559
        /// </summary>
560
        /// <param name="dtStart"></param>
561
        /// <param name="dtEnd"></param>
562
        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
563
        {
564
            try
565
            {
566
                // ????????N????????
567
                int iYear = 0;
568
                int month = 0;
569
                int day = 0;
570
                bool bPeriod = true;
571
                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
572
                {   // ?c???
573
                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
574
                    bPeriod = true;
575
                }
576
                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
577
                dtStart = new DateTime(iYear, month, day);
578
                dtEnd = dtStart.AddYears(1).AddDays(-1);     // ?I????{1?N?|1??
579
            }
580
            catch (Exception ex)
581
            {
582
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
583
            }
584
        }
585
        #endregion
586

  
544 587
        #region ?f?[?^?\??????
545 588
        /// <summary>
546 589
        /// ???f?[?^?\??????
......
1245 1288
        }
1246 1289
        #endregion
1247 1290

  
1291
        #region ???N?x?????Z?b?g
1292
        /// <summary>
1293
        /// ???N?x?????Z?b?g
1294
        /// </summary>
1295
        private void SetInitnumUDConstPro()
1296
        {
1297
            try
1298
            {
1299
                // ?????N?x?Z?b?g
1300
                // ?f?[?^?????????????????Z?b?g
1301
                int minval = 0;
1302
                int maxval = 0;
1303
                CommonMotions.GetPeriodYear(ref minval, ref maxval);
1304
                numUDConstPro.Minimum = minval;
1305
                numUDConstPro.Maximum = maxval;
1306
                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
1307

  
1308
            }
1309
            catch (Exception ex)
1310
            {
1311
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1312
            }
1313
        }
1314
        #endregion
1315

  
1248 1316
        #region ??????????O?C???S??????Z?b?g????
1249 1317
        /// <summary>
1250 1318
        /// ??????????O?C???S??????Z?b?g????
......
1279 1347
                else
1280 1348
                {
1281 1349
                    // ?I?????????????Z?b?g?????
1282
                    if (cmbDepartment.Items.Count > 1) return;
1350
                    if (cmbDepartment.Items.Count > 2) return;
1283 1351
                    cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
1284 1352
                    SetcmbPersons();
1285 1353
                    cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionList.cs
203 203
        /// <param name="e"></param>
204 204
        private void FrmConstructionBaseInfoList_Load(object sender, EventArgs e)
205 205
        {
206
            SetInitnumUDConstPro();
206 207
            // ?R???{?{?b?N?X?Z?b?g
207 208
            SetcmbDepartment();
208 209
            SetcmbPersons();
......
295 296
        private void numUDConstPro_ValueChanged(object sender, EventArgs e)
296 297
        {
297 298
            if (m_initDataLoad) return;
299

  
300
            // ?R???{?{?b?N?X?Z?b?g
301
            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
302
            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
303
            SetcmbDepartment();
304
            SetcmbPersons();
305
            cmbDepartment.SelectedValue = DepCode;
306
            cmbConstructionPerson.SelectedValue = PerCode;
307

  
298 308
            // ?f?[?^?\??
299 309
            DataDisplay();
300 310
        }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
974 974
        }
975 975
        #endregion
976 976

  
977
        #region ???N?x?????Z?b?g
978
        /// <summary>
979
        /// ???N?x?????Z?b?g
980
        /// </summary>
981
        private void SetInitnumUDConstPro()
982
        {
983
            try
984
            {
985
                // ?????N?x?Z?b?g
986
                // ?f?[?^?????????????????Z?b?g
987
                int minval = 0;
988
                int maxval = 0;
989
                CommonMotions.GetPeriodYear(ref minval, ref maxval);
990
                numUDConstPro.Minimum = minval;
991
                numUDConstPro.Maximum = maxval;
992
                numUDConstPro.Value = CommonMotions.SystemMasterData.BusinessPeriod;
993

  
994
            }
995
            catch (Exception ex)
996
            {
997
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
998
            }
999
        }
1000
        #endregion
1001

  
977 1002
        #region ??????????O?C???S??????Z?b?g????
978 1003
        /// <summary>
979 1004
        /// ??????????O?C???S??????Z?b?g????
......
1011 1036
                else
1012 1037
                {
1013 1038
                    // ?I?????????????Z?b?g?????
1014
                    if (cmbDepartment.Items.Count > 1) return;
1039
                    if (cmbDepartment.Items.Count > 2) return;
1015 1040
                    cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode;
1016 1041
                    SetcmbPersons();
1017 1042
                    cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode;
......
1515 1540
        private void SetcmbPersons()
1516 1541
        {
1517 1542
            IOMPersonInCharge picDB = new IOMPersonInCharge();
1543
            List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
1518 1544
            bool bSave = m_initDataLoad;
1519 1545
            m_initDataLoad = true;
1520 1546
            try
......
1523 1549
                cmbConstructionPerson.Items.Clear();
1524 1550
                cmbConstructionPerson.Text = "";
1525 1551

  
1526
                List<PersonInChargeMaster> workList = new List<PersonInChargeMaster>();
1552
                int DepartmentCode = GetDepartmentCode();
1527 1553
                string strSQL = string.Empty;
1528
                int DepartmentCode = GetDepartmentCode();
1554
                // ????????
1555
                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
1556
                strSQL += " AND (DEPARTMENTCODE";
1557
                string strSubSQL = string.Empty;
1529 1558
                if (DepartmentCode == 0)
1530 1559
                {
1531
                    strSQL = " WHERE DeleteFlg = 0";
1532
                    strSQL += string.Format(" AND EmployeeClassFlg = {0}", (int)CommonDefine.EmployeeClassFlg.Regular);
1533 1560
                    // ?Q??????}?X?^????????
1534
                    strSQL += " AND DEPARTMENTCODE IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA";
1535
                    strSQL += string.Format(" WHERE AA.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
1536
                    strSQL += " Order By EmployeeClassFlg ASC, DisplayOrder ASC";
1561
                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
1562
                                            , CommonMotions.LoginUserData.PersonCode);
1537 1563
                }
1538 1564
                else
1539 1565
                {
1540
                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DeleteFlg = 0 Order By EmployeeClassFlg ASC, DisplayOrder ASC", DepartmentCode);
1566
                    strSubSQL += string.Format(" = {0}", DepartmentCode);
1541 1567
                }
1568
                strSQL += strSubSQL + ")";
1542 1569

  
1570
                // ??????????E??????????
1571
                DateTime dtDefaultStart = DateTime.MinValue;
1572
                DateTime dtDefaultEnd = DateTime.MinValue;
1573
                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
1574

  
1575
                strSQL += string.Format(" AND (STARTDATE <= TO_DATE('{0}','YYYY/MM/DD')", dtDefaultEnd.ToShortDateString());
1576
                strSQL += string.Format(" AND (TO_DATE('{0}','YYYY/MM/DD') <= ENDDATE", dtDefaultStart.ToShortDateString());
1577
                strSQL += string.Format(" OR TO_DATE('{0}','YYYY/MM/DD') = ENDDATE))", DateTime.MinValue.ToShortDateString());
1578

  
1579
                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
1543 1580
                // ?S????}?X?^???
1544 1581
                if (!picDB.SelectAction(strSQL, ref workList)) return;
1545 1582

  
......
1570 1607
        }
1571 1608
        #endregion
1572 1609

  
1610
        #region ?f?t?H???g???????E?????????????
1611
        /// <summary>
1612
        /// ?f?t?H???g???????E?????????????
1613
        /// </summary>
1614
        /// <param name="dtStart"></param>
1615
        /// <param name="dtEnd"></param>
1616
        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
1617
        {
1618
            try
1619
            {
1620
                // ????????N????????
1621
                int iYear = 0;
1622
                int month = 0;
1623
                int day = 0;
1624
                bool bPeriod = true;
1625
                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
1626
                {   // ?c???
1627
                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
1628
                    bPeriod = true;
1629
                }
1630
                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
1631
                dtStart = new DateTime(iYear, month, day);
1632
                dtEnd = dtStart.AddYears(1).AddDays(-1);     // ?I????{1?N?|1??
1633
            }
1634
            catch (Exception ex)
1635
            {
1636
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1637
            }
1638
        }
1639
        #endregion
1640

  
1573 1641
        #region ?S????R???{?{?b?N?X?Z?b?g?????????Z?b?g????
1574 1642
        /// <summary>
1575 1643
        /// ?S????R???{?{?b?N?X?Z?b?g?????????Z?b?g????
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoin.cs
313 313
        private void numUDConstPro_ValueChanged(object sender, EventArgs e)
314 314
        {
315 315
            if (m_bInitFlag) return;
316

  
317
            // コンボボックスセット
318
            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
319
            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
320
            SetcmbDepartment();
321
            SetcmbPersons();
322
            cmbDepartment.SelectedValue = DepCode;
323
            cmbConstructionPerson.SelectedValue = PerCode;
324

  
316 325
            // データ表示
317 326
            InitDataLoad();
318 327
        }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs
355 355
                cmbConstructionPerson.Items.Clear();
356 356
                cmbConstructionPerson.Text = "";
357 357

  
358
                int DepartmentCode = GetDepartmentCode();
358 359
                string strSQL = string.Empty;
359
                int DepartmentCode = GetDepartmentCode();
360
                // 検索条件
361
                strSQL = string.Format(" WHERE LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
362
                strSQL += " AND (DEPARTMENTCODE";
363
                string strSubSQL = string.Empty;
360 364
                if (DepartmentCode == 0)
361
                    strSQL = " WHERE DELETEFLG = 0 ORDER BY EMPLOYEECLASSFLG ASC, DISPLAYORDER ASC";
365
                {
366
                    // 参照部署マスタより取得する
367
                    strSubSQL += string.Format(" IN (SELECT AA.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER AA WHERE AA.PERSONCODE = {0})"
368
                                            , CommonMotions.LoginUserData.PersonCode);
369
                }
362 370
                else
363
                    strSQL = string.Format(" WHERE DEPARTMENTCODE = {0} AND DELETEFLG = 0 ORDER BY EMPLOYEECLASSFLG ASC, DISPLAYORDER ASC", DepartmentCode);
371
                {
372
                    strSubSQL += string.Format(" = {0}", DepartmentCode);
373
                }
374
                strSQL += strSubSQL + ")";
364 375

  
376
                // 当期期首日・期末日を取得
377
                DateTime dtDefaultStart = DateTime.MinValue;
378
                DateTime dtDefaultEnd = DateTime.MinValue;
379
                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
380

  
381
                strSQL += string.Format(" AND (STARTDATE <= TO_DATE('{0}','YYYY/MM/DD')", dtDefaultEnd.ToShortDateString());
382
                strSQL += string.Format(" AND (TO_DATE('{0}','YYYY/MM/DD') <= ENDDATE", dtDefaultStart.ToShortDateString());
383
                strSQL += string.Format(" OR TO_DATE('{0}','YYYY/MM/DD') = ENDDATE))", DateTime.MinValue.ToShortDateString());
384

  
385
                strSQL += " Order By DeleteFlg ASC, EmployeeClassFlg ASC, DisplayOrder ASC";
365 386
                // 担当者マスタ読込
366 387
                if (!picDB.SelectAction(strSQL, ref workList)) return;
367 388

  
......
402 423
        }
403 424
        #endregion
404 425

  
426
        #region デフォルトの期首日・期末日を求める
427
        /// <summary>
428
        /// デフォルトの期首日・期末日を求める
429
        /// </summary>
430
        /// <param name="dtStart"></param>
431
        /// <param name="dtEnd"></param>
432
        private void CreateDefaultStartAndEndDate(ref DateTime dtStart, ref DateTime dtEnd)
433
        {
434
            try
435
            {
436
                // 当期期首年月日を取得
437
                int iYear = 0;
438
                int month = 0;
439
                int day = 0;
440
                bool bPeriod = true;
441
                if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)CommonDefine.SystemConstructionNoBase.BusinessPeriod)
442
                {   // 営業期
443
                    iYear = CommonMotions.PeriodCountToYear(CommonMotions.cnvInt(numUDConstPro.Value));
444
                    bPeriod = true;
445
                }
446
                CommonMotions.GetBeginningMonthDay(bPeriod, ref month, ref day);
447
                dtStart = new DateTime(iYear, month, day);
448
                dtEnd = dtStart.AddYears(1).AddDays(-1);     // 終了は+1年-1日
449
            }
450
            catch (Exception ex)
451
            {
452
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
453
            }
454
        }
455
        #endregion
456

  
405 457
        #region 担当者コンボボックスセット時部署をセットする
406 458
        /// <summary>
407 459
        /// 担当者コンボボックスセット時部署をセットする
......
813 865
                    frm.NameList.Add(CommonMotions.cnvString(CurRow.Cells[(int)DispGridColumn.ConstructionName].Value));
814 866
                }
815 867

  
816
                frm.OrderersDivision = m_OrderersDivision;  // 発注者区分
817
                frm.OrdererCode = m_OrdererCode;            // 発注者番号
868
                frm.ExcuteFlg = (int)FrmJoinSelect.ExcuteType.Join;    // 動作タイプ
869
                frm.OrderersDivision = m_OrderersDivision;              // 発注者区分
870
                frm.OrdererCode = m_OrdererCode;                        // 発注者番号
818 871
                frm.ShowDialog();
819 872
                if (frm.Result == DialogResult.Cancel) return;
820 873

  
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmJoinSelect.cs
24 24
        #endregion
25 25

  
26 26
        #region 定数
27

  
27
        /// <summary>
28
        /// 画面動作タイプ
29
        /// </summary>
30
        public enum ExcuteType
31
        {
32
            /// <summary>
33
            /// 無し
34
            /// </summary>
35
            None=0,
36
            /// <summary>
37
            /// 結合処理
38
            /// </summary>
39
            Join,
40
            /// <summary>
41
            /// 分割処理
42
            /// </summary>
43
            Split,
44
        }
28 45
        #endregion
29 46

  
30 47
        #region 変数
......
49 66
        private string m_ConstructionName = string.Empty;
50 67

  
51 68
        /// <summary>
69
        /// 動作区分
70
        /// </summary>
71
        private int m_ExcuteFlg = 0;
72

  
73
        /// <summary>
52 74
        /// 終了ボタン
53 75
        /// </summary>
54 76
        private DialogResult m_Result = DialogResult.Cancel;
......
61 83

  
62 84
        #region プロパティ
63 85

  
86

  
64 87
        /// <summary>
65 88
        /// 工事名称一覧
66 89
        /// </summary>
......
94 117
        }
95 118

  
96 119
        /// <summary>
120
        /// 動作区分
121
        /// </summary>
122
        public int ExcuteFlg
123
        {
124
            get { return m_ExcuteFlg; }
125
            set { m_ExcuteFlg = value; }
126
        }
127

  
128
        /// <summary>
97 129
        /// 終了ボタン
98 130
        /// </summary>
99 131
        public DialogResult Result
......
121 153
        /// <param name="e"></param>
122 154
        private void FrmJoinSelect_Load(object sender, EventArgs e)
123 155
        {
156
            switch (m_ExcuteFlg)
157
            {
158
                case (int)ExcuteType.Join:
159
                    this.Text = "新規結合作成処理";
160
                    label3.Text = "結合後に使用する工事名称を入力してください。";
161
                    break;
162
                case (int)ExcuteType.Split:
163
                    this.Text = "新規分割作成処理";
164
                    label3.Text = "分割後に使用する工事名称を入力してください。";
165
                    break;
166
            }
167

  
124 168
            InitDataDisp();
125 169
        }
126 170
        #endregion
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs
167 167
        /// <summary>
168 168
        /// ?O???b?h????s?^?C?g??
169 169
        /// </summary>
170
        private static string[] s_GroupTitle = new string[] {"???S????U??",
171
                                                            "?w ?? ?? ?U ??",
172
                                                            "?S??????^???z"};
170
        private static string[] s_GroupTitle = new string[] {" ???S??????v ",
171
                                                             "  ?w???????v  ",
172
                                                             "?S??????^???z"};
173 173
        #endregion
174 174

  
175 175
        #region ???v???Z?X????
......
455 455
        /// <param name="e"></param>
456 456
        private void FrmLedgerStatus_Load(object sender, EventArgs e)
457 457
        {
458

  
458
            SetInitnumUDConstPro();
459 459
            // ?R???{?{?b?N?X?Z?b?g
460 460
            SetcmbDepartment();
461 461
            SetcmbPersons();
......
554 554
        private void numUDConstPro_ValueChanged(object sender, EventArgs e)
555 555
        {
556 556
            if (m_initDataLoad) return;
557

  
558
            // ?R???{?{?b?N?X?Z?b?g
559
            int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue);
560
            int PerCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue);
561
            SetcmbDepartment();
562
            SetcmbPersons();
563
            cmbDepartment.SelectedValue = DepCode;
564
            cmbConstructionPerson.SelectedValue = PerCode;
565

  
557 566
            // ?f?[?^?\??
558 567
            DataDisplay();
559 568
        }
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
49 49
            this.btnEnd = new System.Windows.Forms.Button();
50 50
            this.label1 = new System.Windows.Forms.Label();
51 51
            this.groupBox1 = new System.Windows.Forms.GroupBox();
......
105 105
            this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
106 106
            this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
107 107
            this.btnLedgerStatus = new System.Windows.Forms.Button();
108
            this.label18 = new System.Windows.Forms.Label();
108 109
            this.groupBox1.SuspendLayout();
109 110
            this.pnlPayroll.SuspendLayout();
110 111
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
......
162 163
            // 
163 164
            this.pnlPayroll.BackColor = System.Drawing.Color.PaleGoldenrod;
164 165
            this.pnlPayroll.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
166
            this.pnlPayroll.Controls.Add(this.label18);
165 167
            this.pnlPayroll.Controls.Add(this.lblEndDate);
166 168
            this.pnlPayroll.Controls.Add(this.lblStartDate);
167 169
            this.pnlPayroll.Controls.Add(this.label8);
......
259 261
            // 
260 262
            // label23
261 263
            // 
262
            this.label23.BackColor = System.Drawing.Color.LightSalmon;
264
            this.label23.BackColor = System.Drawing.Color.Orange;
263 265
            this.label23.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
264 266
            this.label23.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
265 267
            this.label23.ForeColor = System.Drawing.Color.White;
......
267 269
            this.label23.Name = "label23";
268 270
            this.label23.Size = new System.Drawing.Size(110, 25);
269 271
            this.label23.TabIndex = 51;
270
            this.label23.Text = "当期純利益";
272
            this.label23.Text = "担当外収益";
271 273
            this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
272 274
            // 
273 275
            // label11
......
297 299
            // 
298 300
            // label19
299 301
            // 
300
            this.label19.BackColor = System.Drawing.Color.LightSalmon;
302
            this.label19.BackColor = System.Drawing.Color.Orange;
301 303
            this.label19.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
302 304
            this.label19.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
303 305
            this.label19.ForeColor = System.Drawing.Color.White;
......
305 307
            this.label19.Name = "label19";
306 308
            this.label19.Size = new System.Drawing.Size(110, 25);
307 309
            this.label19.TabIndex = 49;
308
            this.label19.Text = "当期純利益";
310
            this.label19.Text = "担当外収益";
309 311
            this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
310 312
            // 
311 313
            // lblPlusorMinus2
......
382 384
            this.label22.Name = "label22";
383 385
            this.label22.Size = new System.Drawing.Size(110, 25);
384 386
            this.label22.TabIndex = 32;
385
            this.label22.Text = "当期暫定純利益";
387
            this.label22.Text = "当期人件費";
386 388
            this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
387 389
            // 
388 390
            // lblTotalValue2
......
403 405
            this.label14.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
404 406
            this.label14.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
405 407
            this.label14.ForeColor = System.Drawing.Color.DarkRed;
406
            this.label14.Location = new System.Drawing.Point(379, 28);
408
            this.label14.Location = new System.Drawing.Point(72, 53);
407 409
            this.label14.Name = "label14";
408 410
            this.label14.Size = new System.Drawing.Size(110, 25);
409 411
            this.label14.TabIndex = 32;
......
424 426
            // 
425 427
            // label20
426 428
            // 
427
            this.label20.BackColor = System.Drawing.Color.DarkOrange;
429
            this.label20.BackColor = System.Drawing.Color.LightGoldenrodYellow;
428 430
            this.label20.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
429 431
            this.label20.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
430
            this.label20.ForeColor = System.Drawing.Color.White;
432
            this.label20.ForeColor = System.Drawing.Color.Black;
431 433
            this.label20.Location = new System.Drawing.Point(72, 28);
432 434
            this.label20.Name = "label20";
433 435
            this.label20.Size = new System.Drawing.Size(110, 25);
434 436
            this.label20.TabIndex = 11;
435
            this.label20.Text = "振分済純利益";
437
            this.label20.Text = "副担当収益";
436 438
            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
437 439
            // 
438 440
            // label13
......
474 476
            // 
475 477
            // label17
476 478
            // 
477
            this.label17.BackColor = System.Drawing.Color.Green;
479
            this.label17.BackColor = System.Drawing.Color.OldLace;
478 480
            this.label17.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
479 481
            this.label17.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
480
            this.label17.ForeColor = System.Drawing.Color.White;
481
            this.label17.Location = new System.Drawing.Point(72, 53);
482
            this.label17.ForeColor = System.Drawing.Color.Black;
483
            this.label17.Location = new System.Drawing.Point(379, 28);
482 484
            this.label17.Name = "label17";
483 485
            this.label17.Size = new System.Drawing.Size(110, 25);
484 486
            this.label17.TabIndex = 6;
485
            this.label17.Text = "未振分純利益";
487
            this.label17.Text = "指導員収益";
486 488
            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
487 489
            // 
488 490
            // label9
......
674 676
            this.dgvMaster.AllowUserToDeleteRows = false;
675 677
            this.dgvMaster.AllowUserToResizeColumns = false;
676 678
            this.dgvMaster.AllowUserToResizeRows = false;
677
            dataGridViewCellStyle37.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
678
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle37;
679
            dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
680
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
679 681
            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
680 682
            | System.Windows.Forms.AnchorStyles.Left) 
681 683
            | System.Windows.Forms.AnchorStyles.Right)));
682 684
            this.dgvMaster.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
683 685
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
684
            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
685
            dataGridViewCellStyle38.BackColor = System.Drawing.SystemColors.Control;
686
            dataGridViewCellStyle38.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
687
            dataGridViewCellStyle38.ForeColor = System.Drawing.SystemColors.WindowText;
688
            dataGridViewCellStyle38.SelectionBackColor = System.Drawing.SystemColors.Highlight;
689
            dataGridViewCellStyle38.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
690
            dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
691
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle38;
686
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
687
            dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control;
688
            dataGridViewCellStyle20.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
689
            dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText;
690
            dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
691
            dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
692
            dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
693
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
692 694
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
693 695
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
694 696
            this.Column1,
......
706 708
            this.Column10,
707 709
            this.Column11,
708 710
            this.Column12});
709
            dataGridViewCellStyle54.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
710
            dataGridViewCellStyle54.BackColor = System.Drawing.SystemColors.Window;
711
            dataGridViewCellStyle54.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
712
            dataGridViewCellStyle54.ForeColor = System.Drawing.SystemColors.ControlText;
713
            dataGridViewCellStyle54.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
714
            dataGridViewCellStyle54.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
715
            dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
716
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle54;
711
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
712
            dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Window;
713
            dataGridViewCellStyle36.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
714
            dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.ControlText;
715
            dataGridViewCellStyle36.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
716
            dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
717
            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
718
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle36;
717 719
            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
718 720
            this.dgvMaster.Location = new System.Drawing.Point(5, 168);
719 721
            this.dgvMaster.Name = "dgvMaster";
......
731 733
            // 
732 734
            // Column1
733 735
            // 
734
            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
735
            this.Column1.DefaultCellStyle = dataGridViewCellStyle39;
736
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
737
            this.Column1.DefaultCellStyle = dataGridViewCellStyle21;
736 738
            this.Column1.Frozen = true;
737 739
            this.Column1.HeaderText = "№";
738 740
            this.Column1.Name = "Column1";
......
743 745
            // 
744 746
            // Column13
745 747
            // 
746
            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
747
            this.Column13.DefaultCellStyle = dataGridViewCellStyle40;
748
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
749
            this.Column13.DefaultCellStyle = dataGridViewCellStyle22;
748 750
            this.Column13.Frozen = true;
749 751
            this.Column13.HeaderText = "済";
750 752
            this.Column13.Name = "Column13";
......
754 756
            // 
755 757
            // Column14
756 758
            // 
757
            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
758
            this.Column14.DefaultCellStyle = dataGridViewCellStyle41;
759
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
760
            this.Column14.DefaultCellStyle = dataGridViewCellStyle23;
759 761
            this.Column14.Frozen = true;
760 762
            this.Column14.HeaderText = "部署";
761 763
            this.Column14.Name = "Column14";
......
763 765
            // 
764 766
            // Column2
765 767
            // 
766
            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
767
            this.Column2.DefaultCellStyle = dataGridViewCellStyle42;
768
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
769
            this.Column2.DefaultCellStyle = dataGridViewCellStyle24;
768 770
            this.Column2.Frozen = true;
769 771
            this.Column2.HeaderText = "担当者名";
770 772
            this.Column2.Name = "Column2";
......
774 776
            // 
775 777
            // Column3
776 778
            // 
777
            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
778
            this.Column3.DefaultCellStyle = dataGridViewCellStyle43;
779
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
780
            this.Column3.DefaultCellStyle = dataGridViewCellStyle25;
779 781
            this.Column3.Frozen = true;
780 782
            this.Column3.HeaderText = "工事コード";
781 783
            this.Column3.Name = "Column3";
......
787 789
            // 
788 790
            // Column4
789 791
            // 
790
            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
791
            this.Column4.DefaultCellStyle = dataGridViewCellStyle44;
792
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
793
            this.Column4.DefaultCellStyle = dataGridViewCellStyle26;
792 794
            this.Column4.Frozen = true;
793 795
            this.Column4.HeaderText = "工 事 名 称";
794 796
            this.Column4.Name = "Column4";
......
799 801
            // 
800 802
            // Column15
801 803
            // 
802
            dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
803
            dataGridViewCellStyle45.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
804
            this.Column15.DefaultCellStyle = dataGridViewCellStyle45;
804
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
805
            dataGridViewCellStyle27.Font = new System.Drawing.Font("MS 明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
806
            this.Column15.DefaultCellStyle = dataGridViewCellStyle27;
805 807
            this.Column15.Frozen = true;
806 808
            this.Column15.HeaderText = "状 態";
807 809
            this.Column15.Name = "Column15";
......
810 812
            // 
811 813
            // Column5
812 814
            // 
813
            dataGridViewCellStyle46.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
814
            dataGridViewCellStyle46.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
815
            this.Column5.DefaultCellStyle = dataGridViewCellStyle46;
815
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
816
            dataGridViewCellStyle28.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
817
            this.Column5.DefaultCellStyle = dataGridViewCellStyle28;
816 818
            this.Column5.Frozen = true;
817 819
            this.Column5.HeaderText = "受注金額";
818 820
            this.Column5.Name = "Column5";
......
823 825
            // 
824 826
            // Column6
825 827
            // 
826
            dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
827
            dataGridViewCellStyle47.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
828
            this.Column6.DefaultCellStyle = dataGridViewCellStyle47;
828
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
829
            dataGridViewCellStyle29.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
830
            this.Column6.DefaultCellStyle = dataGridViewCellStyle29;
829 831
            this.Column6.HeaderText = "会社経費";
830 832
            this.Column6.Name = "Column6";
831 833
            this.Column6.ReadOnly = true;
......
834 836
            // 
835 837
            // Column7
836 838
            // 
837
            dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
838
            dataGridViewCellStyle48.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
839
            this.Column7.DefaultCellStyle = dataGridViewCellStyle48;
839
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
840
            dataGridViewCellStyle30.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
841
            this.Column7.DefaultCellStyle = dataGridViewCellStyle30;
840 842
            this.Column7.HeaderText = "部署経費";
841 843
            this.Column7.Name = "Column7";
842 844
            this.Column7.ReadOnly = true;
......
845 847
            // 
846 848
            // Column8
847 849
            // 
848
            dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
849
            dataGridViewCellStyle49.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
850
            this.Column8.DefaultCellStyle = dataGridViewCellStyle49;
850
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
851
            dataGridViewCellStyle31.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
852
            this.Column8.DefaultCellStyle = dataGridViewCellStyle31;
851 853
            this.Column8.HeaderText = "営業経費";
852 854
            this.Column8.Name = "Column8";
853 855
            this.Column8.ReadOnly = true;
......
856 858
            // 
857 859
            // Column9
858 860
            // 
859
            dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
860
            dataGridViewCellStyle50.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
861
            this.Column9.DefaultCellStyle = dataGridViewCellStyle50;
861
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
862
            dataGridViewCellStyle32.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
863
            this.Column9.DefaultCellStyle = dataGridViewCellStyle32;
862 864
            this.Column9.HeaderText = "総支払額";
863 865
            this.Column9.Name = "Column9";
864 866
            this.Column9.ReadOnly = true;
......
867 869
            // 
868 870
            // Column10
869 871
            // 
870
            dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
871
            dataGridViewCellStyle51.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
872
            this.Column10.DefaultCellStyle = dataGridViewCellStyle51;
872
            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
873
            dataGridViewCellStyle33.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
874
            this.Column10.DefaultCellStyle = dataGridViewCellStyle33;
873 875
            this.Column10.HeaderText = "粗 利";
874 876
            this.Column10.Name = "Column10";
875 877
            this.Column10.ReadOnly = true;
......
878 880
            // 
879 881
            // Column11
880 882
            // 
881
            dataGridViewCellStyle52.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
882
            dataGridViewCellStyle52.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
883
            this.Column11.DefaultCellStyle = dataGridViewCellStyle52;
883
            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
884
            dataGridViewCellStyle34.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
885
            this.Column11.DefaultCellStyle = dataGridViewCellStyle34;
884 886
            this.Column11.HeaderText = "給 与";
885 887
            this.Column11.Name = "Column11";
886 888
            this.Column11.ReadOnly = true;
......
891 893
            // 
892 894
            // Column12
893 895
            // 
894
            dataGridViewCellStyle53.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
895
            dataGridViewCellStyle53.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
896
            this.Column12.DefaultCellStyle = dataGridViewCellStyle53;
896
            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
897
            dataGridViewCellStyle35.Font = new System.Drawing.Font("MS P明朝", 9F, System.Drawing.FontStyle.Bold);
898
            this.Column12.DefaultCellStyle = dataGridViewCellStyle35;
897 899
            this.Column12.HeaderText = "純利益";
898 900
            this.Column12.Name = "Column12";
899 901
            this.Column12.ReadOnly = true;
......
914 916
            this.btnLedgerStatus.UseVisualStyleBackColor = false;
915 917
            this.btnLedgerStatus.Click += new System.EventHandler(this.btnLedgerStatus_Click);
916 918
            // 
919
            // label18
920
            // 
921
            this.label18.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
922
            this.label18.AutoSize = true;
923
            this.label18.Font = new System.Drawing.Font("MS 明朝", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
924
            this.label18.ForeColor = System.Drawing.Color.Red;
925
            this.label18.Location = new System.Drawing.Point(944, 59);
926
            this.label18.Name = "label18";
927
            this.label18.Size = new System.Drawing.Size(282, 19);
928
            this.label18.TabIndex = 55;
929
            this.label18.Text = "※当期人件費のみの計算です";
930
            // 
917 931
            // FrmLedgerStatus
918 932
            // 
919 933
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
1010 1024
        private System.Windows.Forms.Label lblCalcValue1;
1011 1025
        private System.Windows.Forms.Label label10;
1012 1026
        private System.Windows.Forms.Button btnLedgerStatus;
1027
        private System.Windows.Forms.Label label18;
1013 1028
    }
1014 1029
}
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
686 686
        /// <param name="dtStartArray"></param>
687 687
        /// <param name="dtCompArray"></param>
688 688
        /// <returns></returns>
689
        private int SetOtherCost(List<int> PersonCDArray, List<DateTime> dtStartArray, List<DateTime> dtCompArray)
689
        private int SetOtherCost(List<int> PersonCDArray, List<DateTime> dtStartArray, List<DateTime> dtCompArray,  List<DateTime> dtHireStDayArray)
690 690
        {
691 691
            try
692 692
            {
......
704 704
                for (int ii = 0; ii < PersonCDArray.Count; ii++)
705 705
                {
706 706
                    // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
707
                    if (dtStartArray[ii] == DateTime.MinValue || dtStartArray[ii] == DateTime.MaxValue) dtStartArray[ii] = dtDefaultStart;
708
                    if (dtCompArray[ii] == DateTime.MinValue || dtCompArray[ii] == DateTime.MaxValue) dtCompArray[ii] = dtDefaultEnd;
707
                    //if (dtStartArray[ii] == DateTime.MinValue || dtStartArray[ii] == DateTime.MaxValue) dtStartArray[ii] = dtDefaultStart;
708
                    //if (dtCompArray[ii] == DateTime.MinValue || dtCompArray[ii] == DateTime.MaxValue) dtCompArray[ii] = dtDefaultEnd;
709
                    // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
709 710

  
711
                    DateTime stDate = dtStartArray[ii];
712
                    DateTime edDate = dtCompArray[ii];
713
                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[ii], dtCompArray[ii], ref stDate, ref edDate);
714

  
715

  
710 716
                    // ?o???
711
                    GetPersonExpensesCostValue(PersonCDArray[ii], dtStartArray[ii], dtCompArray[ii], ref CostValue);
717
                    //GetPersonExpensesCostValue(PersonCDArray[ii], dtStartArray[ii], dtCompArray[ii], ref CostValue);
718
                    GetPersonExpensesCostValue(PersonCDArray[ii], stDate, edDate, ref CostValue);
712 719
                }
713 720

  
714 721
                // ----- ?o???W?v
......
722 729
                    dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionName].Value = CommonDefine.CostDataNoString[i];
723 730
                    // ???z?Z?b?g
724 731
                    dgv.Rows[RowCnt].Cells[(int)DispColumn.TotalPayment].Value = CostValue[i].ToString("#,0");
732
                    dgv.Rows[RowCnt].Cells[(int)DispColumn.NetProfit].Value = (CostValue[i] * -1).ToString("#,0");
725 733
                    SumData += CostValue[i];
726 734
                }
727 735

  
......
733 741
                dgv.Rows[ExpensesCnt].Cells[(int)DispColumn.SelectionName].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
734 742
                // ???z?Z?b?g
735 743
                dgv.Rows[ExpensesCnt].Cells[(int)DispColumn.TotalPayment].Value = SumData.ToString("#,0");
744
                dgv.Rows[ExpensesCnt].Cells[(int)DispColumn.NetProfit].Value = (SumData * -1).ToString("#,0");
736 745
                // ?s??F??????
737 746
                SetRowColor(dgv.Rows[ExpensesCnt], s_RowTotalBackColor, s_RowTotalForeColor);
738 747

  
......
778 787
                    // ?o????
779 788
                    dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionName].Value = s_GroupTitle[i];
780 789
                    // ???z?Z?b?g
781
                    dgv.Rows[RowCnt].Cells[(int)DispColumn.GrossProfit].Value = CostValue[i].ToString("#,0");
790
                    dgv.Rows[RowCnt].Cells[(int)DispColumn.NetProfit].Value = CostValue[i].ToString("#,0");
782 791
                    SumData += CostValue[i];
783 792
                }
784 793

  
......
789 798
                // ?o????
790 799
                dgv.Rows[RowCnt].Cells[(int)DispColumn.SelectionName].Value = s_GroupTitle[2];
791 800
                // ???z?Z?b?g
792
                dgv.Rows[RowCnt].Cells[(int)DispColumn.GrossProfit].Value = ConstrCost.ToString("#,0");
801
                dgv.Rows[RowCnt].Cells[(int)DispColumn.NetProfit].Value = ConstrCost.ToString("#,0");
793 802
                SumData += ConstrCost;
794 803

  
795 804
                // ----- ???U????v??\??????
......
799 808
                dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.SelectionName].Value = s_TotalTitleArray[(int)RowTitleNum.Auxiliary];
800 809
                dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.SelectionName].Style.Alignment = DataGridViewContentAlignment.MiddleCenter;
801 810
                // ???z?Z?b?g
802
                dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.GrossProfit].Value = SumData.ToString("#,0");
811
                dgv.Rows[AuxiliaryCnt].Cells[(int)DispColumn.NetProfit].Value = SumData.ToString("#,0");
803 812
                // ?s??F??????
804 813
                SetRowColor(dgv.Rows[AuxiliaryCnt], s_RowTotalBackColor, s_RowTotalForeColor);
805 814

  
......
981 990
                strSQL += string.Format(" AND E.CONSTRUCTIONSTATUSFLG <> {0}", NotOrder);
982 991
                strSQL += string.Format(" AND E.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
983 992

  
984
                strSQL += " WHERE P.DELETEFLG = 0";
985
                strSQL += string.Format(" AND P.LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
993
                strSQL += string.Format(" WHERE P.LEDGERFLG = {0}", (int)CommonDefine.PersonLedgerDivNo.CalcTarget);
986 994

  
995
                // ??????????E??????????
996
                DateTime dtDefaultStart = DateTime.MinValue;
997
                DateTime dtDefaultEnd = DateTime.MinValue;
998
                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
999
                strSQL += string.Format(" AND (P.STARTDATE <= TO_DATE('{0}','YYYY/MM/DD')", dtDefaultEnd.ToShortDateString());
1000
                strSQL += string.Format(" AND (TO_DATE('{0}','YYYY/MM/DD') <= P.ENDDATE", dtDefaultStart.ToShortDateString());
1001
                strSQL += string.Format(" OR TO_DATE('{0}','YYYY/MM/DD') = P.ENDDATE))", DateTime.MinValue.ToShortDateString());
1002

  
987 1003
                // ?H?????f?[?^??????????????
988
                strSQL += " AND P.DEPARTMENTCODE IN";
989
                strSQL += " (SELECT DEPARTMENTCODE FROM (SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*) CNT";
990
                strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C , CONSTRUCTIONLEDGERDETAIL D";
991
                strSQL += " WHERE A.DELETEFLG = 0";
992
                strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
993
                strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
994
                strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
1004
                if (DepartmentCode == 0)
1005
                {
1006
                    strSQL += " AND P.DEPARTMENTCODE IN";
1007
                    strSQL += " (SELECT TMP.DEPARTMENTCODE FROM (SELECT A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER, COUNT(*) CNT";
1008
                    strSQL += " FROM DEPARTMENTMASTER A, PERSONINCHARGEMASTER B, CONSTRUCTIONBASEINFO C , CONSTRUCTIONLEDGERDETAIL D";
1009
                    strSQL += " WHERE A.DELETEFLG = 0";
1010
                    strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE";
1011
                    strSQL += " AND B.PERSONCODE = C.CONSTRUCTIONPERSONCODE";
1012
                    strSQL += " AND D.CONSTRUCTIONCODE = C.CONSTRUCTIONCODE";
995 1013

  
996
                strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER))";
997

  
998
                // ?????R?[?h?I?????????????????????????
999
                if (DepartmentCode != 0) strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
1014
                    strSQL += " GROUP BY A.DEPARTMENTCODE, A.DEPARTMENTSTRING, A.DISPLAYORDER) TMP)";
1015
                }
1016
                else
1017
                {
1018
                    // ?????R?[?h?I?????????????????????????
1019
                    strSQL += string.Format(" AND P.DEPARTMENTCODE = {0}", DepartmentCode);
1020
                }
1000 1021
                if (PersonCode != 0) strSQL += string.Format(" AND P.PERSONCODE = {0}", PersonCode);
1001 1022

  
1002 1023
                strSQL += " GROUP BY P.PERSONCODE, P.PERSONNAME, P.DISPLAYORDER, P.MonthlySalary, P.STARTDATE, P.ENDDATE";
......
1005 1026
                ArrayList arList = new ArrayList();
1006 1027
                if (!PersonDB.ExecuteReader(strSQL, ref arList)) return 0;
1007 1028

  
1008
                // ??????????E??????????
1009
                DateTime dtDefaultStart = DateTime.MinValue;
1010
                DateTime dtDefaultEnd = DateTime.MinValue;
1011
                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
1012

  
1013 1029
                DateTime stDate = DateTime.MaxValue;
1014 1030
                DateTime edDate = DateTime.MinValue;
1015 1031
                DateTime maxDate = DateTime.MinValue;
......
1132 1148
                int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
1133 1149

  
1134 1150
                // ?H???????f?[?^?????U??????????
1135
                //string strSQL = "SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(P.EXECUTIONAMOUNT)";
1136 1151
                string strSQL = "SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(B.PAYMENTAMOUNT)";
1137
                //strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P, CONSTRUCTIONBASEINFO A";
1138 1152
                strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P LEFT JOIN CONSTRUCTIONLEDGEREXCUTE B";
1139 1153
                strSQL += " ON B.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND B.GROUPCOUNT = P.GROUPCOUNT AND B.LINECOUNT = P.LINECOUNT";
1140 1154
                strSQL += " , CONSTRUCTIONBASEINFO A";
......
1152 1166
                strSQL += " GROUP BY A.CONSTRUCTIONPERIOD, P.GROUPCOUNT";
1153 1167

  
1154 1168
                strSQL += " UNION";
1155
                //strSQL += " SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(P.EXECUTIONAMOUNT)";
1156 1169
                strSQL += " SELECT A.CONSTRUCTIONPERIOD, P.GROUPCOUNT, SUM(B.PAYMENTAMOUNT)";
1157
                //strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P, CONSTRUCTIONBASEINFO A";
1158 1170
                strSQL += " FROM CONSTRUCTIONLEDGERDETAIL P LEFT JOIN CONSTRUCTIONLEDGEREXCUTE B";
1159 1171
                strSQL += " ON B.CONSTRUCTIONCODE = P.CONSTRUCTIONCODE AND B.GROUPCOUNT = P.GROUPCOUNT AND B.LINECOUNT = P.LINECOUNT";
1160 1172
                strSQL += " , CONSTRUCTIONBASEINFO A";
......
1298 1310
        }
1299 1311
        #endregion
1300 1312

  
1301
        #region ?w?b?_?[????v????o???????
1302
        /// <summary>
1303
        /// ?w?b?_?[????v????o???????
1304
        /// </summary>
1305
        private void ReCalcHeader(int Expenses)
1306
        {
1307
            try
1308
            {
1309
                // ?U?????^???z
1310
                int OnSalary = CommonMotions.cnvInt(lblCalcValue1.Text);
1311

  
1312
                // ?????v???z
1313
                int NetIncome = CommonMotions.cnvInt(lblCalcValue2.Text);
1314

  
1315
                // ?e???v???z??
1316
                int NonSalary = CommonMotions.cnvInt(lblCalcValue3.Text);
1317

  
1318
                // ???^???\??
1319
                int TotalSalary = CommonMotions.cnvInt(lblPayroll.Text);
1320

  
1321

  
1322
                // ?U?????^???z?\??
1323
                lblCalcValue1.Text = OnSalary.ToString("#,0");
1324

  
1325
                // ???^???\??
1326
                lblPayroll.Text = TotalSalary.ToString("#,0");
1327

  
1328
                // ???^???z?v?Z?E?\??
1329
                int TotalValue = OnSalary - TotalSalary;
1330
                lblTotalValue.Text = TotalValue.ToString("#,0");
1331
                lblTotalValue2.Text = TotalValue.ToString("#,0");
1332

  
1333
                // ?????v???z?\??
1334
                lblCalcValue2.Text = NetIncome.ToString("#,0");
1335

  
1336
                // ?????????v?v?Z
1337
                int CalcTotal1 = NetIncome + TotalValue;
1338
                lblTotalCalcValue1.Text = CalcTotal1.ToString("#,0");
1339
                lblTotalCalcValue2.Text = CalcTotal1.ToString("#,0");
1340

  
1341
                // ?e???v???z??
1342
                lblCalcValue3.Text = NonSalary.ToString("#,0");
1343

  
1344
                // ?????????v?v?Z
1345
                int CalcTotal = NonSalary + CalcTotal1 - Expenses;
1346
                lblTotalCalcValue.Text = CalcTotal.ToString("#,0");
1347
            }
1348
            catch (Exception ex)
1349
            {
1350
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1351
            }
1352
        }
1353
        #endregion
1354

  
1355 1313
        #region ???f?[?^?\??????
1356 1314
        /// <summary>
1357 1315
        /// ???f?[?^?\??????
......
1524 1482
                DateTime dtDefaultEnd = DateTime.MinValue;
1525 1483
                CreateDefaultStartAndEndDate(ref dtDefaultStart, ref dtDefaultEnd);
1526 1484

  
1485
                // ?I???????????????????????????????????
1486
                if (numUDConstPro.Value > CommonMotions.SystemMasterData.BusinessPeriod) return;
1487

  
1527 1488
                // ----- ?o????^?\???i?w?b?_?[??\???j
1528 1489
                SetPayrollData(PersonCDArray, dtDefaultStart, dtDefaultEnd,
1529 1490
                                dtStartArray, dtCompArray,
......
1531 1492
                                dtHireStDays, dtHireEdDays);
1532 1493

  
1533 1494
                // ----- ?o???\??????
1534
                int Expenses = SetOtherCost(PersonCDArray, dtStartArray, dtCompArray);
1495
                int Expenses = SetOtherCost(PersonCDArray, dtStartArray, dtCompArray, dtHireStDays);
1535 1496

  
1536 1497
                // ProgressBar??l???X????
1537 1498
                prgber.Value++;
......
1545 1506
                prgber.Value++;
1546 1507
                prgber.Update();
1547 1508

  
1548
                // ?o??^???U?????x???z???????A???v??????
1509
                // ?x?????z
1549 1510
                TotalArea[(int)DispColumn.TotalPayment] += Expenses;                // ?x?????z+?o??
1511

  
1512
                // ?e??
1550 1513
                TotalArea[(int)DispColumn.GrossProfit] -= Expenses;                 // ?e??-?o??
1551
                TotalArea[(int)DispColumn.GrossProfit] += Auxiliary;                // ?e??+???l????
1514
                
1515
                // ?????v
1552 1516
                TotalArea[(int)DispColumn.NetProfit] -= Expenses;                   // ?????v-?o??
1553 1517
                TotalArea[(int)DispColumn.NetProfit] += Auxiliary;                  // ?????v+???l????
1554 1518

  
......
1732 1696
        }
1733 1697
        #endregion
1734 1698

  
1735
        #region ???^?G???A?N???A
1736
        /// <summary>
1737
        /// ???^?G???A?N???A
1738
        /// </summary>
1739
        private void ClearSalary()
1740
        {
1741
            lblPayroll.Text = "";
1742
            lblCalcValue1.Text = "";
1743
            lblTotalValue.Text = "";
1744
            lblCalcValue3.Text = "";
1745
            lblCalcValue2.Text = "";
1746
        }
1747
        #endregion
1748

  
1749 1699
        #region ?S???????w?????H???J?n??????????
1750 1700
        /// <summary>
1751 1701
        /// ?S???????w?????H???J?n??????????
......
1788 1738
        }
1789 1739
        #endregion
1790 1740

  
1791
        #region ???^?f?[?^?\??????
1741
        #region ?v?Z?J?n?E?I??????`?F?b?N??????
1792 1742
        /// <summary>
1793
        /// ???^?f?[?^?\??????
1743
        /// ?v?Z?J?n?E?I??????`?F?b?N??????
1794 1744
        /// </summary>
1795
        /// <returns></returns>
1796
        private bool SalaryDisplay()
1745
        private void CalcStartCompDate(DateTime dtDefaultStart, DateTime dtDefaultEnd,
1746
                                        DateTime HireStartDate, DateTime HireCompDate,
1747
                                        ref DateTime StartDate, ref DateTime CompDate)
1797 1748
        {
1798
            IOMPersonInCharge personDB = new IOMPersonInCharge();
1799 1749
            try
1800 1750
            {
1801
                bool bRet = false;
1802

  
1803
                // ????f?[?^??\??
1804
                pnlPayroll.Visible = false;
1805

  
1806
                // ?R???{?{?b?N?X???I??S???????????
1807
                int PersonCode = GetConstructionPersonCode();
1808
                if (!cmbConstructionPerson.Visible) PersonCode = CommonMotions.LoginUserData.PersonCode;
1809

  
1810
                // ?V?Z?L?????e?B?f?[?^??????????m?F????
1811
                if (CommonMotions.LoginUserData.SecCode == 0)
1751
                if (StartDate == DateTime.MinValue)
1812 1752
                {
1813
                    // ?Z?L?????e?B???x????
1814
                    int SecLevel1 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key;
1815
                    int SecLevel2 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SupervisorAuthority].Key;
1816
                    int SecLevel3 = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key;
1817
                    // ?V?X?e????????????f?[?^?A?N?Z?X???????????
1818
                    if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement)
1819
                    {
1820
                        // ?V?X?e???????i???????j
1821
                        bRet = true;
1822
                    }
1823
                    else if (CommonMotions.LoginUserData.SecurityManagement == SecLevel1)
1824
                    {
1825
                        // ????@???????i???????j
1826
                        bRet = true;
1827
                    }
1828
                    else if (CommonMotions.LoginUserData.SecurityManagement == SecLevel2)
1829
                    {
1830
                        // ?????@???????i?@?\?????j
1831
                        bRet = true;
1832
                    }
1833
                    else if (CommonMotions.LoginUserData.SecurityManagement == SecLevel3)
1834
                    {
1835
                        // ??????
1836
                        bRet = true;
1837
                    }
1838
                    else
1839
                    {
1840
                        // ?????[?U?[?????????^????????
1841
                        if (CommonMotions.LoginUserData.PersonCode == PersonCode)
1842
                            bRet = true;
1843
                        else
1844
                            bRet = false;
1845
                    }
1753
                    StartDate = dtDefaultStart;
1846 1754
                }
1847
                else
1755
                else if (dtDefaultStart <= HireStartDate && HireStartDate <= dtDefaultEnd)
1848 1756
                {
1849
                    int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority;
1850
                    int FRank = (int)CommonDefine.SecurityRankPos.FreeAuthority;
1851
                    int LRank = (int)CommonDefine.SecurityRankPos.LimitedAuthority;
1852

  
1853
                    // ?V?X?e????????????f?[?^?A?N?Z?X???????????
1854
                    if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode)
1855
                    {
1856
                        // ?V?X?e???????i???????j
1857
                        bRet = true;
1858
                    }
1859
                    else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key)
1860
                    {
1861
                        // ?o?c??i???????j
1862
                        bRet = true;
1863
                    }
1864
                    else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[FRank].Key)
1865
                    {
1866
                        // ?????????i?@?\?????j
1867
                        bRet = true;
1868
                    }
1869
                    else if (CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[LRank].Key)
1870
                    {
1871
                        // ??????
1872
                        bRet = true;
1873
                    }
1874
                    else
1875
                    {
1876
                        // ?????[?U?[?????????^????????
1877
                        if (CommonMotions.LoginUserData.PersonCode == PersonCode)
1878
                            bRet = true;
1879
                        else
1880
                            bRet = false;
1881
                    }
1757
                    StartDate = HireStartDate;
1882 1758
                }
1883
                // ?f?[?^?\??
1884
                pnlPayroll.Visible = bRet;
1759
                else if (dtDefaultStart < StartDate)
1760
                {
1761
                    StartDate = dtDefaultStart;
1762
                }
1885 1763

  
1886
                // ???N???A
1887
                ClearSalary();
1764
                // ?????????????????????O??????????
1765
                if (CompDate.Date > DateTime.Today.Date) return;
1888 1766

  
1889
                return bRet;
1767
                if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
1768
                {   // ?O????O?????
1769
                    CompDate = dtDefaultEnd;
1770
                }
1771
                else if (HireCompDate != DateTime.MinValue
1772
                        && (dtDefaultStart < HireCompDate && HireCompDate < dtDefaultEnd))
1773
                {   // ??????????????I????????????
1774
                    CompDate = HireCompDate;
1775
                }
1776
                else
1777
                {   // ??O?????
1778
                    CompDate = DateTime.Today.Date;
1779
                }
1890 1780
            }
1891 1781
            catch (Exception ex)
1892 1782
            {
1893
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1894
                return false;
1783
                logger.ErrorFormat("?V?X?e???G???[?F{0}", ex.Message);
1895 1784
            }
1896
            finally
1897
            {
1898
                personDB.close(); personDB = null;
1899
            }
1900 1785
        }
1901 1786
        #endregion
1902 1787

  
......
1919 1804
                // ?????R?[?h??
1920 1805
                int DepartmentCode = GetDepartmentCode();
1921 1806

  
1922
                // ??????????E??????????
1923
                DateTime dtCurDefaultStart = dtDefaultStart;
1924
                DateTime dtCurDefaultEnd = dtDefaultEnd;
1925

  
1926 1807
                int TotalSalary = 0;        // ???^????
1927 1808
                int OnSalary = 0;           // ?U?????^???z??
1928 1809
                int NetIncome = 0;          // ?????v???z??
1929 1810
                int NonSalary = 0;          // ?e???v???z??
1930 1811

  
1931
                DateTime dtStart = DateTime.MinValue;
1932
                DateTime dtEnd = DateTime.MinValue;
1933
                DateTime dtMax = DateTime.MaxValue;
1934
                DateTime dtDispStart = DateTime.MaxValue;
1935
                DateTime dtDispComplate = DateTime.MinValue;
1812
                DateTime stDate = DateTime.Today;
1813
                DateTime edDate = DateTime.Today;
1814

  
1815
                DateTime dtCurDefaultStart = dtDefaultStart;
1816
                DateTime dtCurDefaultEnd = DateTime.Today;
1936 1817
                // ???^???W?v????
1937 1818
                for (int i = 0; i < PersonCDArray.Count; i++)
1938 1819
                {
1939
                    // ??????????E??????????
1940
                    dtCurDefaultStart = dtDefaultStart;
1941
                    dtCurDefaultEnd = dtDefaultEnd;
1820
                    // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1821
                    stDate = dtStartArray[i];
1822
                    edDate = dtMaxCompArray[i];
1823
                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1942 1824

  
1943
                    // ???????????????J?n???????????
1944
                    if (dtDefaultStart < dtHireStDayArray[i] && dtHireStDayArray[i] < dtDefaultEnd)
1945
                    {
1946
                        dtCurDefaultStart = dtHireStDayArray[i];
1947
                    }
1948
                    // ??????????????I????????????
1949
                    if (dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
1950
                    {
1951
                        dtCurDefaultEnd = dtHireEdDayArray[i];
1952
                    }
1953

  
1954
                    // ?J?n????
1955
                    dtStart = dtStartArray[i];
1956
                    // ?f?[?^?????????????????Z?b?g????
1957
                    if (dtStart == DateTime.MaxValue)
1958
                    {
1959
                        dtStart = dtCurDefaultStart;
1960
                    }
1961
                    else if (dtCurDefaultStart < dtStart)
1962
                    {   // ?J?n?????????????????????Z?b?g????
1963
                        dtStart = dtCurDefaultStart;
1964
                    }
1965

  
1966
                    // ??????
1967
                    dtMax = dtMaxCompArray[i];
1968
                    if (dtMax == DateTime.MinValue) dtMax = dtCurDefaultEnd;
1969
                    // ???????????????????
1970
                    if (dtMax < DateTime.Today.Date)
1971
                    {
1972
                        if (numUDConstPro.Value < CommonMotions.SystemMasterData.BusinessPeriod)
1973
                        {   // ?O????O?????
1974
                            dtMax = dtCurDefaultEnd;
1975
                        }
1976
                        else if (dtHireEdDayArray[i] != DateTime.MinValue && dtDefaultStart < dtHireEdDayArray[i] && dtHireEdDayArray[i] < dtDefaultEnd)
1977
                        {   // ??????????????I????????????
1978
                            dtMax = dtCurDefaultEnd;
1979
                        }
1980
                        else
1981
                        {   // ??O?????
1982
                            dtMax = DateTime.Today.Date;
1983
                        }
1984
                    }
1985

  
1986 1825
                    // ???^????
1987
                    int workSalary = CalcElapsedSalary(dtStart, dtMax, PersonCDArray[i], SalaryArray[i]);
1826
                    int workSalary = CalcElapsedSalary(stDate, edDate, PersonCDArray[i], SalaryArray[i]);
1988 1827
                    // ??v???Z
1989
                    if (workSalary > 0) TotalSalary += workSalary;
1990
                    //Debug.WriteLine(string.Format("Code={0} Val={1} Start={2} End={3}", PersonCDArray[i], workSalary.ToString("0,0"), dtStart, dtMax));
1828
                    TotalSalary += workSalary;
1991 1829

  
1992
                    // ?v?Z?J?n?I????????????
1993
                    if (dtStart < dtDispStart) dtDispStart = dtStart;
1994
                    if (dtDispComplate < dtMax) dtDispComplate = dtMax;
1830
                    if (stDate < dtCurDefaultStart) dtCurDefaultStart = stDate;
1831
                    if (dtCurDefaultEnd < edDate) dtCurDefaultEnd = edDate;
1995 1832
                }
1833
                if (PersonCDArray.Count == 1)
1834
                {
1835
                    if (dtHireStDayArray[0] != DateTime.MinValue)
1836
                        if (dtDefaultStart < dtHireStDayArray[0]) dtCurDefaultStart = dtHireStDayArray[0];
1996 1837

  
1838
                    if (dtHireEdDayArray[0] != DateTime.MinValue)
1839
                        if (dtHireEdDayArray[0] < dtDefaultEnd) dtCurDefaultEnd = dtHireEdDayArray[0];
1840
                }
1841

  
1997 1842
                // ----- ?\??????
1998 1843
                // ?U?????^???z?E?????v???z?E?e???v???z??
1999 1844
                ProfitGeneral(ref OnSalary, ref  NetIncome, ref  NonSalary);
......
2007 1852
                // ???^???z?v?Z?E?\??
2008 1853
                int TotalValue = OnSalary - TotalSalary;
... 差分の行数が表示可能な上限を超えました。超過分は表示しません。

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