プロジェクト

全般

プロフィール

リビジョン 202

堀内7年以上前に追加

権限チェック不具合修正
部署まとめ・台帳まとめヘッダー表示不具合修正
資材履歴情報、StringBuilder化バグ修正

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/DB/IOAccess/IOMaterialRecordInfo.cs
73 73
            {
74 74
                // SQL作成(DateTime型が変換できないのでCharに変換しておく)
75 75
                strcmd.Append("SELECT");
76
                strcmd.Append("MaterialItemCode,DATE_FORMAT(ProcessDate, '%Y/%m/%d %H:%i:%s'),SeqNo,RecKind,ConstructionCode,PersonCode,MaterialCount,DATE_FORMAT(RepayPlanDate, '%Y/%m/%d %H:%i:%s'),CommentText");
76
                strcmd.Append(" MaterialItemCode,DATE_FORMAT(ProcessDate, '%Y/%m/%d %H:%i:%s'),SeqNo,RecKind,ConstructionCode,PersonCode,MaterialCount,DATE_FORMAT(RepayPlanDate, '%Y/%m/%d %H:%i:%s'),CommentText");
77 77
                strcmd.Append(",DATE_FORMAT(EntryDate, '%Y/%m/%d %H:%i:%s')");
78 78
                strcmd.Append(",DATE_FORMAT(UpdateDate, '%Y/%m/%d %H:%i:%s')");
79 79
                strcmd.Append("FROM MaterialRecordInfo");
......
115 115
                {
116 116
                    strcmd.Append("INSERT INTO MaterialRecordInfo");
117 117

  
118
                    strcmd.Append("VALUES (");
118
                    strcmd.Append(" VALUES (");
119 119

  
120 120
                    strcmd.AppendFormat("  {0}", work.MaterialItemCode.ToString());
121 121
                    strcmd.AppendFormat(", DATE_FORMAT('{0}','%Y/%m/%d')", work.ProcessDate.ToString());
......
155 155
            {
156 156

  
157 157
                strcmd.Append("UPDATE MaterialRecordInfo");
158
                strcmd.Append("SET");
159

  
158
                strcmd.Append(" SET");
159
                 
160 160
                strcmd.AppendFormat(" RecKind = {0}", data.RecKind.ToString());
161 161
                strcmd.AppendFormat(",ConstructionCode = {0}", data.ConstructionCode.ToString());
162 162
                strcmd.AppendFormat(",PersonCode = {0}", data.PersonCode.ToString());
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs
1733 1733
        {
1734 1734
            try
1735 1735
            {
1736
                // ???????B??w?b?_?[???N???A?????????
1737
                if (numUDConstPro.Value > CommonMotions.SystemMasterData.BusinessPeriod)
1738
                {
1739
                    SetUnreachedPeriod();
1740
                    return;
1741
                }
1742

  
1743 1736
                //Debug.WriteLine("---------------------");
1744 1737
                // ?????R?[?h??
1745 1738
                int DepartmentCode = GetDepartmentCode();
......
1754 1747
                DateTime DspSTDate = DateTime.MaxValue;
1755 1748
                DateTime DspEdDate = DateTime.MinValue;
1756 1749

  
1757
                // ???^???W?v????
1758
                for (int i = 0; i < PersonCDArray.Count; i++)
1750
                // ???????B??o????^??\???????
1751
                if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
1759 1752
                {
1760
                    // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1761
                    stDate = dtStartArray[i];
1762
                    edDate = dtMaxCompArray[i];
1763
                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1753
                    // ???^???W?v????
1754
                    for (int i = 0; i < PersonCDArray.Count; i++)
1755
                    {
1756
                        // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1757
                        stDate = dtStartArray[i];
1758
                        edDate = dtMaxCompArray[i];
1759
                        CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1764 1760

  
1765
                    // ???^????
1766
                    int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1767
                    // ??v???Z
1768
                    TotalSalary += workSalary;
1769
                    // ?\?????t??
1770
                    if (DspSTDate > stDate) DspSTDate = stDate;
1771
                    if (DspEdDate < edDate) DspEdDate = edDate;
1761
                        // ???^????
1762
                        int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1763
                        // ??v???Z
1764
                        TotalSalary += workSalary;
1765
                        // ?\?????t??
1766
                        if (DspSTDate > stDate) DspSTDate = stDate;
1767
                        if (DspEdDate < edDate) DspEdDate = edDate;
1768
                    }
1772 1769
                }
1773

  
1774 1770
                // ----- ?\??????
1775 1771
                // ?U?????^???z?E?????v???z?E?e???v???z??
1776 1772
                ProfitGeneral(ref OnSalary, ref  NetIncome, ref  NonSalary);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs
1688 1688
        {
1689 1689
            try
1690 1690
            {
1691
                // ???????B??w?b?_?[???N???A?????????
1692
                if (numUDConstPro.Value > CommonMotions.SystemMasterData.BusinessPeriod)
1693
                {
1694
                    SetUnreachedPeriod();
1695
                    return;
1696
                }
1697 1691

  
1698 1692
                //Debug.WriteLine("---------------------");
1699 1693
                // ?????R?[?h??
......
1709 1703
                DateTime DspSTDate = DateTime.MaxValue;
1710 1704
                DateTime DspEdDate = DateTime.MinValue;
1711 1705

  
1712
                // ???^???W?v????
1713
                for (int i = 0; i < PersonCDArray.Count; i++)
1706
                // ???????B??o????^??\???????
1707
                if (numUDConstPro.Value <= CommonMotions.SystemMasterData.BusinessPeriod)
1714 1708
                {
1715
                    // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1716
                    stDate = dtStartArray[i];
1717
                    edDate = dtMaxCompArray[i];
1718
                    CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1709
                    // ???^???W?v????
1710
                    for (int i = 0; i < PersonCDArray.Count; i++)
1711
                    {
1712
                        // ?J?n?E?I??????????????f?t?H???g?????E???????g?p????
1713
                        stDate = dtStartArray[i];
1714
                        edDate = dtMaxCompArray[i];
1715
                        CalcStartCompDate(dtDefaultStart, dtDefaultEnd, dtHireStDayArray[i], dtHireEdDayArray[i], ref stDate, ref edDate);
1719 1716

  
1720
                    // ???^????
1721
                    int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1722
                    // ??v???Z
1723
                    TotalSalary += workSalary;
1717
                        // ???^????
1718
                        int workSalary = CommonMotions.CalcElapsedSalary(SalaryDB, stDate, edDate, PersonCDArray[i]);
1719
                        // ??v???Z
1720
                        TotalSalary += workSalary;
1724 1721

  
1725
                    // ?\?????t??
1726
                    if (DspSTDate > stDate) DspSTDate = stDate;
1727
                    if (DspEdDate < edDate) DspEdDate = edDate;
1722
                        // ?\?????t??
1723
                        if (DspSTDate > stDate) DspSTDate = stDate;
1724
                        if (DspEdDate < edDate) DspEdDate = edDate;
1725
                    }
1728 1726
                }
1729

  
1730 1727
                // ----- ?\??????
1731 1728
                // ?U?????^???z?E?????v???z?E?e???v???z??
1732 1729
                ProfitGeneral(DepartmentCode, 0, ref OnSalary, ref  NetIncome, ref  NonSalary);
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs
166 166
                // 登録数を取得する
167 167
                int DataColCnt = (dgv.ColumnCount - ((int)GridColumn.SecName + 1)) / (int)GridColumn.SecName;
168 168

  
169
                StringBuilder strChkExists = new StringBuilder();
170
                ProcessExcute ExecRec = new ProcessExcute();
171

  
169 172
                // セキュリティ区分数だけ処理をおこなう
170 173
                for (int i = 0; i < DataColCnt; i++)
171 174
                {
......
214 217
                            exeDB.rollback();
215 218
                            return false;
216 219
                        }
220

  
221
                        // 以下の処理は一覧を起動許可にする
222
                        switch (iSecCode)
223
                        {
224
                            case (int)ClsExcute.ProcessExecuteNo.MaterialReserveEntry:      // 26:資材貸出
225
                            case (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry:       // 27:資材返却
226
                                strChkExists.Clear();
227
                                strChkExists.Append(exeDB.CreatePrimarykeyString((int)ClsExcute.ProcessExecuteNo.MaterialEntrylList));
228
                                if (!exeDB.SelectAction(strChkExists.ToString(), ref ExecRec, false))
229
                                {
230
                                    // 起動処理番号
231
                                    wrk.ExecCode = (int)ClsExcute.ProcessExecuteNo.MaterialEntrylList;
232
                                    // データ作成
233
                                    exeDB.InsertAction(wrk, false);
234
                                }
235
                                break;
236
                        }
217 237
                    }
218 238
                }
219 239

  
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenu.Designer.cs
43 43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
44 44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
45 45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
52
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
53
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
54
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
55
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
56
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
57
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
46 58
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
47 59
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
48 60
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
......
212 224
            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
213 225
            System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
214 226
            System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
215
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
216
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
217
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
218
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
219
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
220
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
221
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
222
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
223
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
224
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
225
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
226
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
227 227
            this.lblTitle = new System.Windows.Forms.Label();
228 228
            this.btnEnd = new System.Windows.Forms.Button();
229 229
            this.tabMenu = new System.Windows.Forms.TabControl();
......
260 260
            this.btnReLoadConstrApp = new System.Windows.Forms.Button();
261 261
            this.ProgressConstrApp = new System.Windows.Forms.ProgressBar();
262 262
            this.dgvApproval = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
263
            this.ApprovalColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
264
            this.ApprovalColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
265
            this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
266
            this.ApprovalColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
267
            this.ApprovalColumn03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
268
            this.ApprovalColumn04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
269
            this.ApprovalColumn05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
270
            this.ApprovalColumn06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
271
            this.ApprovalColumn07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
272
            this.ApprovalColumn08 = new System.Windows.Forms.DataGridViewTextBoxColumn();
273
            this.ApprovalColumn09 = new System.Windows.Forms.DataGridViewTextBoxColumn();
274
            this.ApprovalColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
275
            this.ApprovalColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
276
            this.Column47 = new System.Windows.Forms.DataGridViewTextBoxColumn();
263 277
            this.tabPage4 = new System.Windows.Forms.TabPage();
264 278
            this.label5 = new System.Windows.Forms.Label();
265 279
            this.label6 = new System.Windows.Forms.Label();
......
707 721
            this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
708 722
            this.timer_StaffAssign = new System.Windows.Forms.Timer(this.components);
709 723
            this.btnDataCopyE = new System.Windows.Forms.Button();
710
            this.ApprovalColumn02 = new System.Windows.Forms.DataGridViewTextBoxColumn();
711
            this.ApprovalColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn();
712
            this.Column32 = new System.Windows.Forms.DataGridViewTextBoxColumn();
713
            this.ApprovalColumn01 = new System.Windows.Forms.DataGridViewTextBoxColumn();
714
            this.ApprovalColumn03 = new System.Windows.Forms.DataGridViewTextBoxColumn();
715
            this.ApprovalColumn04 = new System.Windows.Forms.DataGridViewTextBoxColumn();
716
            this.ApprovalColumn05 = new System.Windows.Forms.DataGridViewTextBoxColumn();
717
            this.ApprovalColumn06 = new System.Windows.Forms.DataGridViewTextBoxColumn();
718
            this.ApprovalColumn07 = new System.Windows.Forms.DataGridViewTextBoxColumn();
719
            this.ApprovalColumn08 = new System.Windows.Forms.DataGridViewTextBoxColumn();
720
            this.ApprovalColumn09 = new System.Windows.Forms.DataGridViewTextBoxColumn();
721
            this.ApprovalColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn();
722
            this.ApprovalColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn();
723
            this.Column47 = new System.Windows.Forms.DataGridViewTextBoxColumn();
724 724
            this.tabMenu.SuspendLayout();
725 725
            this.tabPage1.SuspendLayout();
726 726
            ((System.ComponentModel.ISupportInitialize)(this.dgvBusinessMessage)).BeginInit();
......
1318 1318
            this.dgvApproval.TabIndex = 6;
1319 1319
            this.dgvApproval.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvApproval_CellDoubleClick);
1320 1320
            // 
1321
            // ApprovalColumn02
1322
            // 
1323
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1324
            dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
1325
            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
1326
            this.ApprovalColumn02.DefaultCellStyle = dataGridViewCellStyle15;
1327
            this.ApprovalColumn02.Frozen = true;
1328
            this.ApprovalColumn02.HeaderText = "工事コード";
1329
            this.ApprovalColumn02.Name = "ApprovalColumn02";
1330
            this.ApprovalColumn02.ReadOnly = true;
1331
            this.ApprovalColumn02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
1332
            this.ApprovalColumn02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1333
            this.ApprovalColumn02.Visible = false;
1334
            this.ApprovalColumn02.Width = 5;
1335
            // 
1336
            // ApprovalColumn12
1337
            // 
1338
            this.ApprovalColumn12.Frozen = true;
1339
            this.ApprovalColumn12.HeaderText = "承認機能番号";
1340
            this.ApprovalColumn12.Name = "ApprovalColumn12";
1341
            this.ApprovalColumn12.ReadOnly = true;
1342
            this.ApprovalColumn12.Visible = false;
1343
            this.ApprovalColumn12.Width = 5;
1344
            // 
1345
            // Column32
1346
            // 
1347
            this.Column32.Frozen = true;
1348
            this.Column32.HeaderText = "受付番号";
1349
            this.Column32.Name = "Column32";
1350
            this.Column32.ReadOnly = true;
1351
            this.Column32.Visible = false;
1352
            this.Column32.Width = 5;
1353
            // 
1354
            // ApprovalColumn01
1355
            // 
1356
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1357
            dataGridViewCellStyle16.BackColor = System.Drawing.Color.White;
1358
            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
1359
            this.ApprovalColumn01.DefaultCellStyle = dataGridViewCellStyle16;
1360
            this.ApprovalColumn01.Frozen = true;
1361
            this.ApprovalColumn01.HeaderText = "№";
1362
            this.ApprovalColumn01.Name = "ApprovalColumn01";
1363
            this.ApprovalColumn01.ReadOnly = true;
1364
            this.ApprovalColumn01.Resizable = System.Windows.Forms.DataGridViewTriState.False;
1365
            this.ApprovalColumn01.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1366
            this.ApprovalColumn01.Width = 40;
1367
            // 
1368
            // ApprovalColumn03
1369
            // 
1370
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
1371
            dataGridViewCellStyle17.BackColor = System.Drawing.Color.White;
1372
            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
1373
            this.ApprovalColumn03.DefaultCellStyle = dataGridViewCellStyle17;
1374
            this.ApprovalColumn03.Frozen = true;
1375
            this.ApprovalColumn03.HeaderText = "工 事 名 称";
1376
            this.ApprovalColumn03.Name = "ApprovalColumn03";
1377
            this.ApprovalColumn03.ReadOnly = true;
1378
            this.ApprovalColumn03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1379
            this.ApprovalColumn03.Width = 320;
1380
            // 
1381
            // ApprovalColumn04
1382
            // 
1383
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1384
            dataGridViewCellStyle18.BackColor = System.Drawing.Color.White;
1385
            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
1386
            this.ApprovalColumn04.DefaultCellStyle = dataGridViewCellStyle18;
1387
            this.ApprovalColumn04.Frozen = true;
1388
            this.ApprovalColumn04.HeaderText = "申請項目";
1389
            this.ApprovalColumn04.Name = "ApprovalColumn04";
1390
            this.ApprovalColumn04.ReadOnly = true;
1391
            this.ApprovalColumn04.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1392
            this.ApprovalColumn04.Width = 130;
1393
            // 
1394
            // ApprovalColumn05
1395
            // 
1396
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1397
            dataGridViewCellStyle19.BackColor = System.Drawing.Color.White;
1398
            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Black;
1399
            this.ApprovalColumn05.DefaultCellStyle = dataGridViewCellStyle19;
1400
            this.ApprovalColumn05.Frozen = true;
1401
            this.ApprovalColumn05.HeaderText = "申 請 者";
1402
            this.ApprovalColumn05.Name = "ApprovalColumn05";
1403
            this.ApprovalColumn05.ReadOnly = true;
1404
            this.ApprovalColumn05.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1405
            this.ApprovalColumn05.Width = 80;
1406
            // 
1407
            // ApprovalColumn06
1408
            // 
1409
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1410
            dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
1411
            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black;
1412
            this.ApprovalColumn06.DefaultCellStyle = dataGridViewCellStyle20;
1413
            this.ApprovalColumn06.Frozen = true;
1414
            this.ApprovalColumn06.HeaderText = "申 請 日";
1415
            this.ApprovalColumn06.Name = "ApprovalColumn06";
1416
            this.ApprovalColumn06.ReadOnly = true;
1417
            this.ApprovalColumn06.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1418
            // 
1419
            // ApprovalColumn07
1420
            // 
1421
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1422
            dataGridViewCellStyle21.BackColor = System.Drawing.Color.White;
1423
            dataGridViewCellStyle21.ForeColor = System.Drawing.Color.Black;
1424
            this.ApprovalColumn07.DefaultCellStyle = dataGridViewCellStyle21;
1425
            this.ApprovalColumn07.Frozen = true;
1426
            this.ApprovalColumn07.HeaderText = "承認希望日";
1427
            this.ApprovalColumn07.Name = "ApprovalColumn07";
1428
            this.ApprovalColumn07.ReadOnly = true;
1429
            this.ApprovalColumn07.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1430
            // 
1431
            // ApprovalColumn08
1432
            // 
1433
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1434
            dataGridViewCellStyle22.BackColor = System.Drawing.Color.White;
1435
            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
1436
            this.ApprovalColumn08.DefaultCellStyle = dataGridViewCellStyle22;
1437
            this.ApprovalColumn08.Frozen = true;
1438
            this.ApprovalColumn08.HeaderText = "承認者1";
1439
            this.ApprovalColumn08.Name = "ApprovalColumn08";
1440
            this.ApprovalColumn08.ReadOnly = true;
1441
            this.ApprovalColumn08.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1442
            this.ApprovalColumn08.Width = 80;
1443
            // 
1444
            // ApprovalColumn09
1445
            // 
1446
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1447
            dataGridViewCellStyle23.BackColor = System.Drawing.Color.White;
1448
            dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Black;
1449
            this.ApprovalColumn09.DefaultCellStyle = dataGridViewCellStyle23;
1450
            this.ApprovalColumn09.Frozen = true;
1451
            this.ApprovalColumn09.HeaderText = "承認者2";
1452
            this.ApprovalColumn09.Name = "ApprovalColumn09";
1453
            this.ApprovalColumn09.ReadOnly = true;
1454
            this.ApprovalColumn09.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1455
            this.ApprovalColumn09.Width = 80;
1456
            // 
1457
            // ApprovalColumn10
1458
            // 
1459
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1460
            dataGridViewCellStyle24.BackColor = System.Drawing.Color.White;
1461
            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.Black;
1462
            this.ApprovalColumn10.DefaultCellStyle = dataGridViewCellStyle24;
1463
            this.ApprovalColumn10.Frozen = true;
1464
            this.ApprovalColumn10.HeaderText = "承認者3";
1465
            this.ApprovalColumn10.Name = "ApprovalColumn10";
1466
            this.ApprovalColumn10.ReadOnly = true;
1467
            this.ApprovalColumn10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1468
            this.ApprovalColumn10.Width = 80;
1469
            // 
1470
            // ApprovalColumn11
1471
            // 
1472
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1473
            dataGridViewCellStyle25.BackColor = System.Drawing.Color.White;
1474
            dataGridViewCellStyle25.ForeColor = System.Drawing.Color.Black;
1475
            this.ApprovalColumn11.DefaultCellStyle = dataGridViewCellStyle25;
1476
            this.ApprovalColumn11.Frozen = true;
1477
            this.ApprovalColumn11.HeaderText = "承認者4";
1478
            this.ApprovalColumn11.Name = "ApprovalColumn11";
1479
            this.ApprovalColumn11.ReadOnly = true;
1480
            this.ApprovalColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1481
            this.ApprovalColumn11.Width = 80;
1482
            // 
1483
            // Column47
1484
            // 
1485
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1486
            dataGridViewCellStyle26.BackColor = System.Drawing.Color.White;
1487
            dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Black;
1488
            this.Column47.DefaultCellStyle = dataGridViewCellStyle26;
1489
            this.Column47.Frozen = true;
1490
            this.Column47.HeaderText = "承認者5";
1491
            this.Column47.Name = "Column47";
1492
            this.Column47.ReadOnly = true;
1493
            this.Column47.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1494
            this.Column47.Width = 80;
1495
            // 
1321 1496
            // tabPage4
1322 1497
            // 
1323 1498
            this.tabPage4.BackColor = System.Drawing.Color.Black;
......
2682 2857
            this.label23.Name = "label23";
2683 2858
            this.label23.Size = new System.Drawing.Size(120, 20);
2684 2859
            this.label23.TabIndex = 33;
2685
            this.label23.Text = "部署未定受注金額";
2860
            this.label23.Text = "担当未定受注金額";
2686 2861
            this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
2687 2862
            // 
2688 2863
            // ProgressConstructionProjects
......
4757 4932
            this.tblLayoutOrder.Controls.Add(this.label2, 0, 3);
4758 4933
            this.tblLayoutOrder.Controls.Add(this.lblArrpw1_02, 1, 2);
4759 4934
            this.tblLayoutOrder.Controls.Add(this.label3, 3, 2);
4760
            this.tblLayoutOrder.Location = new System.Drawing.Point(54, 16);
4935
            this.tblLayoutOrder.Location = new System.Drawing.Point(54, 12);
4761 4936
            this.tblLayoutOrder.Name = "tblLayoutOrder";
4762 4937
            this.tblLayoutOrder.RowCount = 11;
4763 4938
            this.tblLayoutOrder.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 44F));
......
7095 7270
            this.tableLayoutDocuments.Controls.Add(this.btnDocApp0500, 0, 10);
7096 7271
            this.tableLayoutDocuments.Controls.Add(this.btnDocApp0501, 2, 10);
7097 7272
            this.tableLayoutDocuments.Controls.Add(this.btnDocApp0502, 4, 10);
7098
            this.tableLayoutDocuments.Location = new System.Drawing.Point(56, 16);
7273
            this.tableLayoutDocuments.Location = new System.Drawing.Point(54, 12);
7099 7274
            this.tableLayoutDocuments.Name = "tableLayoutDocuments";
7100 7275
            this.tableLayoutDocuments.RowCount = 11;
7101 7276
            this.tableLayoutDocuments.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 44F));
......
7471 7646
            this.btnDataCopyE.Visible = false;
7472 7647
            this.btnDataCopyE.Click += new System.EventHandler(this.btnDataCopy_Click);
7473 7648
            // 
7474
            // ApprovalColumn02
7475
            // 
7476
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
7477
            dataGridViewCellStyle15.BackColor = System.Drawing.Color.White;
7478
            dataGridViewCellStyle15.ForeColor = System.Drawing.Color.Black;
7479
            this.ApprovalColumn02.DefaultCellStyle = dataGridViewCellStyle15;
7480
            this.ApprovalColumn02.Frozen = true;
7481
            this.ApprovalColumn02.HeaderText = "工事コード";
7482
            this.ApprovalColumn02.Name = "ApprovalColumn02";
7483
            this.ApprovalColumn02.ReadOnly = true;
7484
            this.ApprovalColumn02.Resizable = System.Windows.Forms.DataGridViewTriState.False;
7485
            this.ApprovalColumn02.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7486
            this.ApprovalColumn02.Visible = false;
7487
            this.ApprovalColumn02.Width = 5;
7488
            // 
7489
            // ApprovalColumn12
7490
            // 
7491
            this.ApprovalColumn12.Frozen = true;
7492
            this.ApprovalColumn12.HeaderText = "承認機能番号";
7493
            this.ApprovalColumn12.Name = "ApprovalColumn12";
7494
            this.ApprovalColumn12.ReadOnly = true;
7495
            this.ApprovalColumn12.Visible = false;
7496
            this.ApprovalColumn12.Width = 5;
7497
            // 
7498
            // Column32
7499
            // 
7500
            this.Column32.Frozen = true;
7501
            this.Column32.HeaderText = "受付番号";
7502
            this.Column32.Name = "Column32";
7503
            this.Column32.ReadOnly = true;
7504
            this.Column32.Visible = false;
7505
            this.Column32.Width = 5;
7506
            // 
7507
            // ApprovalColumn01
7508
            // 
7509
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7510
            dataGridViewCellStyle16.BackColor = System.Drawing.Color.White;
7511
            dataGridViewCellStyle16.ForeColor = System.Drawing.Color.Black;
7512
            this.ApprovalColumn01.DefaultCellStyle = dataGridViewCellStyle16;
7513
            this.ApprovalColumn01.Frozen = true;
7514
            this.ApprovalColumn01.HeaderText = "№";
7515
            this.ApprovalColumn01.Name = "ApprovalColumn01";
7516
            this.ApprovalColumn01.ReadOnly = true;
7517
            this.ApprovalColumn01.Resizable = System.Windows.Forms.DataGridViewTriState.False;
7518
            this.ApprovalColumn01.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7519
            this.ApprovalColumn01.Width = 40;
7520
            // 
7521
            // ApprovalColumn03
7522
            // 
7523
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
7524
            dataGridViewCellStyle17.BackColor = System.Drawing.Color.White;
7525
            dataGridViewCellStyle17.ForeColor = System.Drawing.Color.Black;
7526
            this.ApprovalColumn03.DefaultCellStyle = dataGridViewCellStyle17;
7527
            this.ApprovalColumn03.Frozen = true;
7528
            this.ApprovalColumn03.HeaderText = "工 事 名 称";
7529
            this.ApprovalColumn03.Name = "ApprovalColumn03";
7530
            this.ApprovalColumn03.ReadOnly = true;
7531
            this.ApprovalColumn03.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7532
            this.ApprovalColumn03.Width = 320;
7533
            // 
7534
            // ApprovalColumn04
7535
            // 
7536
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7537
            dataGridViewCellStyle18.BackColor = System.Drawing.Color.White;
7538
            dataGridViewCellStyle18.ForeColor = System.Drawing.Color.Black;
7539
            this.ApprovalColumn04.DefaultCellStyle = dataGridViewCellStyle18;
7540
            this.ApprovalColumn04.Frozen = true;
7541
            this.ApprovalColumn04.HeaderText = "申請項目";
7542
            this.ApprovalColumn04.Name = "ApprovalColumn04";
7543
            this.ApprovalColumn04.ReadOnly = true;
7544
            this.ApprovalColumn04.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7545
            this.ApprovalColumn04.Width = 130;
7546
            // 
7547
            // ApprovalColumn05
7548
            // 
7549
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7550
            dataGridViewCellStyle19.BackColor = System.Drawing.Color.White;
7551
            dataGridViewCellStyle19.ForeColor = System.Drawing.Color.Black;
7552
            this.ApprovalColumn05.DefaultCellStyle = dataGridViewCellStyle19;
7553
            this.ApprovalColumn05.Frozen = true;
7554
            this.ApprovalColumn05.HeaderText = "申 請 者";
7555
            this.ApprovalColumn05.Name = "ApprovalColumn05";
7556
            this.ApprovalColumn05.ReadOnly = true;
7557
            this.ApprovalColumn05.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7558
            this.ApprovalColumn05.Width = 80;
7559
            // 
7560
            // ApprovalColumn06
7561
            // 
7562
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7563
            dataGridViewCellStyle20.BackColor = System.Drawing.Color.White;
7564
            dataGridViewCellStyle20.ForeColor = System.Drawing.Color.Black;
7565
            this.ApprovalColumn06.DefaultCellStyle = dataGridViewCellStyle20;
7566
            this.ApprovalColumn06.Frozen = true;
7567
            this.ApprovalColumn06.HeaderText = "申 請 日";
7568
            this.ApprovalColumn06.Name = "ApprovalColumn06";
7569
            this.ApprovalColumn06.ReadOnly = true;
7570
            this.ApprovalColumn06.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7571
            // 
7572
            // ApprovalColumn07
7573
            // 
7574
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7575
            dataGridViewCellStyle21.BackColor = System.Drawing.Color.White;
7576
            dataGridViewCellStyle21.ForeColor = System.Drawing.Color.Black;
7577
            this.ApprovalColumn07.DefaultCellStyle = dataGridViewCellStyle21;
7578
            this.ApprovalColumn07.Frozen = true;
7579
            this.ApprovalColumn07.HeaderText = "承認希望日";
7580
            this.ApprovalColumn07.Name = "ApprovalColumn07";
7581
            this.ApprovalColumn07.ReadOnly = true;
7582
            this.ApprovalColumn07.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7583
            // 
7584
            // ApprovalColumn08
7585
            // 
7586
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7587
            dataGridViewCellStyle22.BackColor = System.Drawing.Color.White;
7588
            dataGridViewCellStyle22.ForeColor = System.Drawing.Color.Black;
7589
            this.ApprovalColumn08.DefaultCellStyle = dataGridViewCellStyle22;
7590
            this.ApprovalColumn08.Frozen = true;
7591
            this.ApprovalColumn08.HeaderText = "承認者1";
7592
            this.ApprovalColumn08.Name = "ApprovalColumn08";
7593
            this.ApprovalColumn08.ReadOnly = true;
7594
            this.ApprovalColumn08.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7595
            this.ApprovalColumn08.Width = 80;
7596
            // 
7597
            // ApprovalColumn09
7598
            // 
7599
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7600
            dataGridViewCellStyle23.BackColor = System.Drawing.Color.White;
7601
            dataGridViewCellStyle23.ForeColor = System.Drawing.Color.Black;
7602
            this.ApprovalColumn09.DefaultCellStyle = dataGridViewCellStyle23;
7603
            this.ApprovalColumn09.Frozen = true;
7604
            this.ApprovalColumn09.HeaderText = "承認者2";
7605
            this.ApprovalColumn09.Name = "ApprovalColumn09";
7606
            this.ApprovalColumn09.ReadOnly = true;
7607
            this.ApprovalColumn09.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7608
            this.ApprovalColumn09.Width = 80;
7609
            // 
7610
            // ApprovalColumn10
7611
            // 
7612
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7613
            dataGridViewCellStyle24.BackColor = System.Drawing.Color.White;
7614
            dataGridViewCellStyle24.ForeColor = System.Drawing.Color.Black;
7615
            this.ApprovalColumn10.DefaultCellStyle = dataGridViewCellStyle24;
7616
            this.ApprovalColumn10.Frozen = true;
7617
            this.ApprovalColumn10.HeaderText = "承認者3";
7618
            this.ApprovalColumn10.Name = "ApprovalColumn10";
7619
            this.ApprovalColumn10.ReadOnly = true;
7620
            this.ApprovalColumn10.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7621
            this.ApprovalColumn10.Width = 80;
7622
            // 
7623
            // ApprovalColumn11
7624
            // 
7625
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7626
            dataGridViewCellStyle25.BackColor = System.Drawing.Color.White;
7627
            dataGridViewCellStyle25.ForeColor = System.Drawing.Color.Black;
7628
            this.ApprovalColumn11.DefaultCellStyle = dataGridViewCellStyle25;
7629
            this.ApprovalColumn11.Frozen = true;
7630
            this.ApprovalColumn11.HeaderText = "承認者4";
7631
            this.ApprovalColumn11.Name = "ApprovalColumn11";
7632
            this.ApprovalColumn11.ReadOnly = true;
7633
            this.ApprovalColumn11.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7634
            this.ApprovalColumn11.Width = 80;
7635
            // 
7636
            // Column47
7637
            // 
7638
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
7639
            dataGridViewCellStyle26.BackColor = System.Drawing.Color.White;
7640
            dataGridViewCellStyle26.ForeColor = System.Drawing.Color.Black;
7641
            this.Column47.DefaultCellStyle = dataGridViewCellStyle26;
7642
            this.Column47.Frozen = true;
7643
            this.Column47.HeaderText = "承認者5";
7644
            this.Column47.Name = "Column47";
7645
            this.Column47.ReadOnly = true;
7646
            this.Column47.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
7647
            this.Column47.Width = 80;
7648
            // 
7649 7649
            // FrmMenu
7650 7650
            // 
7651 7651
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
4006 4006
                long lTotal01 = 0;
4007 4007
                long lTotal02 = 0;
4008 4008

  
4009
                string strSQL = "SELECT C.DEPARTMENTCODE, C.DEPARTMENTSTRING, C.DISPLAYORDER, SUM(A.ORDERSDECISIONPRICE), SUM(D.ORDERSDECISIONPRICE)";
4010
                strSQL += " FROM PERSONINCHARGEMASTER B";
4011
                strSQL += " LEFT JOIN CONSTRUCTIONBASEINFO A ON A.CONSTRUCTIONPERSONCODE = B.PERSONCODE";
4012
                strSQL += string.Format(" AND A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
4013
                strSQL += string.Format(" AND A.JOINFLG != {0}", (int)CommonDefine.BaseInfoJoinFlg.JoinChildren);
4014
                strSQL += " AND A.CONSTRUCTIONSTATUSFLG IN (";
4015
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("一般補修工事")).Key);       // 2
4016
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("仮 受 注")).Key);           // 3
4017
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("受  注")).Key);           // 4
4018
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("部署引継")).Key);           // 5
4019
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工準備")).Key);           // 6
4020
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工開始")).Key);           // 7
4021
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工完了")).Key);           // 8
4022
                strSQL += string.Format("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("空家補修工事")).Key);       // 16
4023
                strSQL += string.Format("{0})", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Hit'sV工事")).Key);         // 17
4024
                strSQL += " LEFT JOIN DEPARTMENTMASTER C ON C.DEPARTMENTCODE = B.DEPARTMENTCODE";
4025
                strSQL += " LEFT JOIN  CONSTRUCTIONLEDGER D ON D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE";
4009
                StringBuilder strSQL = new StringBuilder();
4010
                strSQL.Append("SELECT C.DEPARTMENTCODE, C.DEPARTMENTSTRING, C.DISPLAYORDER, SUM(A.ORDERSDECISIONPRICE), SUM(D.ORDERSDECISIONPRICE)");
4011
                strSQL.Append(" FROM CONSTRUCTIONBASEINFO AS A");
4026 4012

  
4027
                strSQL += " GROUP BY C.DEPARTMENTCODE, C.DEPARTMENTSTRING, C.DISPLAYORDER";
4028
                strSQL += " ORDER BY C.DISPLAYORDER";
4013
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER AS B ON B.PersonCode = A.CONSTRUCTIONPERSONCODE");
4014
                strSQL.Append(" LEFT JOIN DEPARTMENTMASTER AS C ON C.DEPARTMENTCODE = B.DEPARTMENTCODE");
4015
                strSQL.Append(" LEFT JOIN  CONSTRUCTIONLEDGER AS D ON D.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE");
4016

  
4017
                strSQL.AppendFormat(" WHERE A.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
4018
                strSQL.AppendFormat(" AND A.JOINFLG != {0}", (int)CommonDefine.BaseInfoJoinFlg.JoinChildren);
4019
                strSQL.Append(" AND A.CONSTRUCTIONSTATUSFLG IN (");
4020
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("一般補修工事")).Key);       // 2
4021
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("仮 受 注")).Key);           // 3
4022
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("受  注")).Key);           // 4
4023
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("部署引継")).Key);           // 5
4024
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工準備")).Key);           // 6
4025
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工開始")).Key);           // 7
4026
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("施工完了")).Key);           // 8
4027
                strSQL.AppendFormat("{0},", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("空家補修工事")).Key);       // 16
4028
                strSQL.AppendFormat("{0})", CommonDefine.ProjectsStatus.First(x => x.Value.Equals("Hit'sV工事")).Key);         // 17
4029

  
4030
                strSQL.Append(" GROUP BY C.DEPARTMENTCODE, C.DEPARTMENTSTRING, C.DISPLAYORDER");
4031
                strSQL.Append(" ORDER BY C.DISPLAYORDER");
4029 4032
                ArrayList arList = new ArrayList();
4030
                if (!BaseDB.ExecuteReader(strSQL, ref arList)) return;
4033
                if (!BaseDB.ExecuteReader(strSQL.ToString(), ref arList)) return;
4031 4034
                if (arList.Count == 0) return;
4032 4035

  
4033 4036
                int iRowcount = CommonMotions.cnvRoundUp((double)arList.Count / 4.0);
......
4059 4062
                            RowCnt = 0;
4060 4063
                            ColCnt = 0;
4061 4064
                            break;
4062
                        case 7:         // 7:会長室
4063
                            RowCnt = 0;
4064
                            ColCnt = 2;
4065
                            break;
4065
                        //case 7:         // 7:会長室
4066
                        //    RowCnt = 0;
4067
                        //    ColCnt = 2;
4068
                        //    break;
4066 4069
                        case 8:         // 8:社長室
4067 4070
                            RowCnt = 1;
4068 4071
                            ColCnt = 0;
......
4088 4091
                    lTotal02 += Price;
4089 4092
                    
4090 4093
                    // 会長室を表示しない
4091
                    if (DepCode == 7) continue;
4094
                    //if (DepCode == 7) continue;
4092 4095

  
4093 4096
                    dgv.Rows[RowCnt].Cells[ColCnt].Value = DepName;
4094 4097
                    dgv.Rows[RowCnt].Cells[ColCnt].Style.BackColor = Color.Aqua;
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.0.44")]
36
[assembly: AssemblyFileVersion("1.0.0.44")]
35
[assembly: AssemblyVersion("1.0.0.45")]
36
[assembly: AssemblyFileVersion("1.0.0.45")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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