プロジェクト

全般

プロフィール

リビジョン 354

堀内6年以上前に追加

請求処理修正中
出勤日報修正中
工事情報入力:引継時処理の部署セットにバグあり
積算見積書入力最大化修正

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/DataModel/EstimateDataDetail.cs
28 28
        private string  m_Note = string.Empty;	            // 備考
29 29
        private int     m_CompanyCode = 0;	                // 協力会社コード
30 30

  
31
        private int m_MyExpensesFlg = 0;                // 自社経費フラグ
32
        private int m_InputFlg = 0;                     // 入力フラグ
31
        private int     m_MyExpensesFlg = 0;                // 自社経費フラグ
32
        private int     m_InputFlg = 0;                     // 入力フラグ
33 33

  
34 34
        private DateTime m_EntryDate = DateTime.Now;        // 登録日付
35 35
        private DateTime m_UpdateDate = DateTime.Now;       // 更新日付
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmAppScrnAux.cs
44 44
                        CaretaLedgerData();
45 45
                        break;
46 46

  
47
                    case (int)ClsExcute.ApprovalListNo.OrderBillingApproval:
48
                        //  請求承認を承認時に請求データを作成する
49
                        // 請求データ作成
50
                        CaretaBillingData();
51
                        break;
52

  
47 53
                    case (int)ClsExcute.ApprovalListNo.SafetyPatrol:
48 54
                        // 安全パトロール承認後処理
49 55
                        // 行動予定追加、掲示板表示する。
......
241 247
        }
242 248
        #endregion
243 249

  
250
        #region 請求データ作成
251
        /// <summary>
252
        /// 請求データ作成
253
        /// </summary>
254
        /// <returns></returns>
255
        private bool CaretaBillingData()
256
        {
257
            try
258
            {
259
                // 実装中
260
                return true;
261
            }
262
            catch (Exception ex)
263
            {
264
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
265
                return false;
266
            }
267
        }
244 268
        #endregion
245 269

  
270
        #endregion
271

  
246 272
        #region ---------->> 申請後処理
247 273
        #region 申請データと注文書データのリンク情報を作成する
248 274
        /// <summary>
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/DataChange.cs
1011 1011
        {
1012 1012
            try
1013 1013
            {
1014
                if (ParentData.Count < 1) return true;
1015

  
1014 1016
                // ?e?R?[?h???????????????
1015 1017
                StringBuilder strLedger = new StringBuilder();
1016 1018
                strLedger.Append(LedgerDB.CreatePrimarykeyString(ProcConstrCode));
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
1402 1402
                // ?R???{?{?b?N?X?Z?b?g
1403 1403
                SetDepartmentCombbox();                     // ????
1404 1404
                SetcmbPersonInCharge();                     // ?S????
1405
                SetConstrManCombbox();                      // ?H???S????i???p????????????j
1405
                //SetConstrManCombbox();                      // ?H???S????i???p????????????j
1406 1406
                SetcmbConstructionYear();                   // ?H???N?x
1407 1407
                SetcmbConstructionPeriod();                 // ?c???
1408 1408
                SetcmbDivisionCombBox();                    // ???????
......
1444 1444
                CreateProcessContextMenu(m_SubForm);
1445 1445
                // *-----* ????????{?^????? *-----*
1446 1446

  
1447
                // ???????p????H???S??????Z?b?g????
1448
                int iCode1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("???????p")).Key;
1449
                int iStatus = GetStatusForCheckBox();
1450
                if (iStatus == iCode1)
1451
                {
1452
                    int TransferCode = CommonMotions.cnvInt(cmbTransferConstruction.SelectedValue);
1453
                    int nDepCode = CommonMotions.cnvInt(comboBoxEX2.SelectedValue);
1454
                    if (TransferCode < 99999 && nDepCode < 1) comboBoxEX2.SelectedValue = TransferCode;
1455
                }
1456

  
1447 1457
                // ?R???{?{?b?N?X?C?x???g?Z?b?g
1448 1458
                SetcmbConstYearEvent(true);
1449 1459
                SetCmbDepartmentEvent(true);
......
1586 1596
            }
1587 1597
            else
1588 1598
            {   // ?????????S????R???{?{?b?N?X???X?V????
1589
                SetConstrManCombbox(transferCode);
1599
                SetConstrManCombbox();
1590 1600
            }
1591 1601
            // ?????H?????p??????
1592 1602
            rdbStatus4.Checked = true;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.designer.cs
2718 2718
            this.cmbConstrPerson.Name = "cmbConstrPerson";
2719 2719
            this.cmbConstrPerson.Size = new System.Drawing.Size(255, 27);
2720 2720
            this.cmbConstrPerson.TabIndex = 1;
2721
            this.cmbConstrPerson.SelectedIndexChanged += new System.EventHandler(this.CmbConstrPerson_SelectedIndexChanged);
2722 2721
            this.cmbConstrPerson.TextChanged += new System.EventHandler(this.valueChange);
2723 2722
            // 
2724 2723
            // label113
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs
2271 2271
                                , cmbSalesSubPerson
2272 2272
                                , workList);
2273 2273
                SetcmbPersons(nTargetCount
2274
                                , GetPerson2DepartComb(cmbConstrPerson, true)
2275
                                , cmbConstrPerson
2276
                                , workList);
2277
                SetcmbPersons(nTargetCount
2274 2278
                                , GetPerson2DepartComb(cmbConstrSubPerson, true)
2275 2279
                                , cmbConstrSubPerson
2276 2280
                                , workList);
......
2333 2337
        /// <summary>
2334 2338
        /// ?H???S????R???{?{?b?N?X????????Z?b?g????
2335 2339
        /// </summary>
2336
        private void SetConstrManCombbox(int TransferCode = 0)
2340
        private void SetConstrManCombbox()
2337 2341
        {
2338 2342
            IOConstructionBaseInfo BaseDB = new IOConstructionBaseInfo();
2339 2343
            IOMPersonInCharge picDB = new IOMPersonInCharge();
......
2341 2345
            {
2342 2346
                int nBeforeCode = CommonMotions.cnvInt(cmbConstrPerson.SelectedValue);
2343 2347

  
2348
                int TransferCode = CommonMotions.cnvInt(cmbTransferConstruction.SelectedValue);
2349
                if (TransferCode < 1) return;
2350

  
2344 2351
                cmbConstrPerson.DataSource = null;
2345 2352
                cmbConstrPerson.Items.Clear();
2346 2353
                cmbConstrPerson.Text = "";
2347 2354

  
2348
                if (TransferCode == 0)
2349
                {
2350
                    // ???p???????????
2351
                    ConstructionBaseInfo BaseRec = new ConstructionBaseInfo();
2352
                    string strBase = BaseDB.CreatePrimarykeyString(m_ConstructionCode);
2353
                    BaseDB.SelectAction(strBase, ref BaseRec);
2354
                    TransferCode = BaseRec.TransferConstruction;
2355
                }
2356

  
2357 2355
                // ?S????}?X?^??????????
2358 2356
                int nTargetCount = GetTargetYear();
2359 2357
                StringBuilder strSQL = new StringBuilder();
......
2379 2377
                // ?R???{?{?b?N?X?????\??
2380 2378
                ComboBoxAction.InitDataSetCombBox(cmbConstrPerson, DataList2);
2381 2379

  
2382
                cmbConstrPerson.SelectedValue = nBeforeCode;
2380
                if (nBeforeCode > 0) cmbConstrPerson.SelectedValue = nBeforeCode;
2383 2381
            }
2384 2382
            catch (Exception ex)
2385 2383
            {
......
2917 2915
        /// ?S????R???{?{?b?N?X??X????
2918 2916
        /// </summary>
2919 2917
        /// <param name="sender"></param>
2920
        private void PersonCombBoxChange(object sender)
2918
        private void PersonCombBoxChange(object sender, EventArgs e)
2921 2919
        {
2922 2920
            ComboBox wrkCmbBox = (ComboBox)sender;
2923 2921
            IOMPersonInCharge PersonDB = new IOMPersonInCharge();
......
3027 3025
                {
3028 3026
                    cmbSalesPerson.SelectedIndexChanged += new EventHandler(cmbPerson_SelectedIndexChanged);
3029 3027
                    cmbSalesSubPerson.SelectedIndexChanged += new EventHandler(cmbPerson_SelectedIndexChanged);
3030
                    cmbConstrPerson.SelectedIndexChanged += new EventHandler(cmbPerson_SelectedIndexChanged);
3028
                    cmbConstrPerson.SelectedIndexChanged += new EventHandler(CmbConstrPerson_SelectedIndexChanged);
3031 3029
                    cmbConstrSubPerson.SelectedIndexChanged += new EventHandler(cmbPerson_SelectedIndexChanged);
3032 3030
                    cmbConstrInst.SelectedIndexChanged += new EventHandler(cmbPerson_SelectedIndexChanged);
3033 3031
                }
......
3035 3033
                {
3036 3034
                    cmbSalesPerson.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged);
3037 3035
                    cmbSalesSubPerson.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged);
3038
                    cmbConstrPerson.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged);
3036
                    cmbConstrPerson.SelectedIndexChanged -= new EventHandler(CmbConstrPerson_SelectedIndexChanged);
3039 3037
                    cmbConstrSubPerson.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged);
3040 3038
                    cmbConstrInst.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged);
3041 3039
                }
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/FrmConstructionLedgerAuxiliary.cs
1473 1473
                    DispDataFromConstructionBudget();
1474 1474
                }
1475 1475

  
1476
                // ----- 初期時再計算の為追加
1477
                // 請求金額計算
1478
                CalculateBillingAmount();
1479
                // 純利益計算
1480
                CalculateNetIncome();
1481
                // 合計計算
1482
                CreateAllTotal(false);
1483
                /// 現在利益計算
1484
                CalculateCurrentProfit();
1476 1485
            }
1477 1486
            catch (Exception ex)
1478 1487
            {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs
168 168
        /// <summary>
169 169
        /// 初期時データ取得
170 170
        /// </summary>
171
        /// <returns>true:データ表示処理実行 false:データ無新規時</returns>
172 171
        private void InitDataLoad()
173 172
        {
174 173
            try
......
264 263

  
265 264
                // 担当者を取得する
266 265
                int PersonCode = GetConstructionPersonCode();
267
                if (PersonCode == 0) return;
266
                //if (PersonCode == 0) return;
268 267

  
269 268
                m_HolidayCount = 0;
270 269
                // 月の最終日を求める
......
289 288
                string STime = string.Empty;
290 289
                string CTime = string.Empty;
291 290
                string TotalTime = string.Empty;
292
                int nWoringKind = 0;
291
                int nWorkKindFlg = 0;
293 292
                int AddRow = 0;
294 293

  
295 294
                // 日付の表示
......
301 300
                    strResultName = CommonMotions.cnvString(CurRec[3]);
302 301
                    strDispDay = string.Format("{0}日", DispDate.Day.ToString());
303 302
                    strWeek = DispDate.ToString("dddd");
304
                    nWoringKind = CommonMotions.cnvInt(CurRec[6]);
303
                    nWorkKindFlg = CommonMotions.cnvInt(CurRec[6]);
305 304

  
306 305
                    STime = string.Empty;
307 306
                    if (CommonMotions.cnvDate(CurRec[4]) != DateTime.MinValue) STime = CommonMotions.cnvDate(CurRec[4]).ToShortTimeString();
......
326 325
                                                strWeek,
327 326
                                                CommonMotions.cnvInt(CurRec[2]),
328 327
                                                strResultName,
328
                                                nWorkKindFlg,
329 329
                                                "",
330
                                                nWoringKind,
331 330
                                                STime,
332 331
                                                CTime,
333 332
                                                TotalTime,
......
338 337
                    if (strHoliday.Length != 0)
339 338
                    {
340 339
                        SetHolidayColor(true, AddRow);
341
                        nWoringKind = (int)AttendanceDailyData.WorkKindFlgDef.Holiday;
340
                        nWorkKindFlg = (int)AttendanceDailyData.WorkKindFlgDef.Holiday;
342 341
                        m_HolidayCount++;
343 342
                    }
344 343
                    
345 344
                    // 勤務区分のセット
346
                    SetWorkingKindProperty(AddRow, nWoringKind, false);
345
                    SetWorkingKindProperty(AddRow, nWorkKindFlg, false);
347 346
                    
348 347
                    // 残業以外は時間の入力ができない
349 348
                    LockOverTimeArea(AddRow);
......
420 419

  
421 420
                // 担当者を取得する
422 421
                int PersonCode = GetConstructionPersonCode();
423
                if (PersonCode == 0) return;
422
                //if (PersonCode == 0) return;
424 423

  
425 424
                //dgvTransport01.ReadOnly = false;
426 425
                //dgvTransport02.ReadOnly = false;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs
1010 1010
                strSQL.Append(" LEFT JOIN  COMPONENTMASTER C ON A.COMPONENTCODE = C.COMPONENTCODE");
1011 1011
                strSQL.Append(" LEFT JOIN  CONSTRUCTIONITEMMASTER D ON A.ITEMCODE = D.ITEMCODE");
1012 1012
                strSQL.AppendFormat(" WHERE A.CONSTRUCTIONCODE = {0}", m_ConstructionCode);                                     // 対象工事のみ
1013
                //strSQL.AppendFormat(" And A.COMPONENTCODE != {0}", ClsComCostsStatic.s_CommunityCompCode);                         // 共通仮設費以外を対象にする
1014
                strSQL.AppendFormat(" And A.COMPONENTCODE != {0}", m_CommonCosts.CommonTemporyPublic);                            // 共通仮設費以外を対象にする
1013
                strSQL.AppendFormat(" And A.COMPONENTCODE != {0}", m_CommonCosts.CommonTemporyPublic);                          // 共通仮設費以外を対象にする
1015 1014
                strSQL.Append(" And A.MYEXPENSESFLG = 0");                                                                      // 経費を除外する
1016
                //strSQL.Append(" And (A.COMPANYCODE != 0");
1017 1015
                strSQL.AppendFormat(" And A.COMPANYCODE != {0}",
1018 1016
                                                    CommonDefine.s_AmountMoney[(int)CommonDefine.AmountMoneyNo.MyCosts].Key);   // 自社施工・会社割当無を除外する
1019 1017
                strSQL.AppendFormat(" And ((A.DataType = {0} And  A.InputFlg = {1})",
......
1022 1020
                strSQL.AppendFormat(" Or (A.DataType = {0} And A.LineTotal != 0))",
1023 1021
                                                    (int)CommonDefine.TabCotegory.Spec);
1024 1022

  
1023
                strSQL.Append(" And((CHAR_LENGTH(A.ItemName) > 0 And A.Unitcount != 0 And A.LineTotal != 0)");
1024
                strSQL.Append(" Or (CHAR_LENGTH(A.SpecName) > 0 And A.Unitcount != 0 And A.LineTotal != 0))");
1025

  
1025 1026
                strSQL.Append(" GROUP BY B.COMPANYNAME, C.COMPONENTNAME, D.ITEMNAME, A.COMPANYCODE, A.COMPONENTCODE, D.ITEMCODE");
1026 1027
                strSQL.Append(" ORDER BY B.COMPANYNAME, C.COMPONENTNAME, D.ITEMNAME");
1027 1028
                ArrayList arList = new ArrayList();
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/FrmEstimateInputAuxiliary.cs
3946 3946
                int iMoveSize = idifference * 2;
3947 3947
                foreach (EstimateInputPage wrkPage in m_EntryPage)
3948 3948
                {
3949
                    if (bNormal)
3950
                        // 標準化の場合
3951
                        wrkPage.EntryDGV.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None;
3952
                    else
3953
                        // 最大化の場合
3954
                        wrkPage.EntryDGV.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
3949
                    //if (bNormal)
3950
                    //    // 標準化の場合
3951
                    //    wrkPage.EntryDGV.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.None;
3952
                    //else
3953
                    //    // 最大化の場合
3954
                    //    wrkPage.EntryDGV.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
3955 3955

  
3956 3956
                    // 頁カテゴリ取得
3957 3957
                    CommonDefine.TabCotegory pageCotegory = wrkPage.Cotegory;
3958 3958
                    // -------------- セルサイズ変更
3959 3959
                    if (pageCotegory == CommonDefine.TabCotegory.Total)
3960 3960
                    {   // 総計グリッド
3961
                        //for (int i = 0; i < wrkPage.EntryDGV.Columns.Count; i++)
3962
                        //{
3963
                        //    if (i != (int)GridItemColumn.ItemName &&
3964
                        //        i != (int)GridItemColumn.SpecName &&
3965
                        //        i != (int)GridItemColumn.Note) continue;
3961
                        for (int i = 0; i < wrkPage.EntryDGV.Columns.Count; i++)
3962
                        {
3963
                            if (i != (int)GridItemColumn.ItemName &&
3964
                                i != (int)GridItemColumn.SpecName &&
3965
                                i != (int)GridItemColumn.Note) continue;
3966 3966

  
3967
                        //    DataGridViewColumn wrkCol = wrkPage.EntryDGV.Columns[i];
3968
                        //    wrkCol.Width = s_PageType1CellSize[i];
3969
                        //    wrkCol.Width += idifference;
3970
                        //}
3967
                            DataGridViewColumn wrkCol = wrkPage.EntryDGV.Columns[i];
3968
                            wrkCol.Width = s_PageType1CellSize[i];
3969
                            wrkCol.Width += idifference;
3970
                        }
3971 3971
                    }
3972 3972
                    else if (pageCotegory == CommonDefine.TabCotegory.Component)
3973 3973
                    {   // 構成グリッド
3974
                        //for (int i = 0; i < wrkPage.EntryDGV.Columns.Count; i++)
3975
                        //{
3976
                        //    if (i != (int)GridItemColumn.ItemName &&
3977
                        //        i != (int)GridItemColumn.SpecName &&
3978
                        //        i != (int)GridItemColumn.Note &&
3979
                        //        i != (int)GridItemColumn.SubConstractorName) continue;
3974
                        for (int i = 0; i < wrkPage.EntryDGV.Columns.Count; i++)
3975
                        {
3976
                            if (i != (int)GridItemColumn.ItemName &&
3977
                                i != (int)GridItemColumn.SpecName &&
3978
                                i != (int)GridItemColumn.Note &&
3979
                                i != (int)GridItemColumn.SubConstractorName) continue;
3980 3980

  
3981
                        //    DataGridViewColumn wrkCol = wrkPage.EntryDGV.Columns[i];
3982
                        //    wrkCol.Width = s_PageType2CellSize[i];
3983
                        //    wrkCol.Width += idifference;
3984
                        //}
3981
                            DataGridViewColumn wrkCol = wrkPage.EntryDGV.Columns[i];
3982
                            wrkCol.Width = s_PageType2CellSize[i];
3983
                            wrkCol.Width += idifference;
3984
                        }
3985 3985
                        int lblYPoint = wrkPage.EntryLabel[(int)PageLabelCount.Label].Location.Y;
3986 3986
                        wrkPage.EntryLabel[(int)PageLabelCount.Label].Location = new Point((PageTotalLabelPoint[0] + iMoveSize), lblYPoint);
3987 3987
                        wrkPage.EntryLabel[(int)PageLabelCount.Total].Location = new Point((PageTotalLabelPoint[1] + iMoveSize), lblYPoint);
3988 3988
                    }
3989 3989
                    else if (pageCotegory == CommonDefine.TabCotegory.Item)
3990 3990
                    {   // 工種グリッド
3991
                        //for (int i = 0; i < wrkPage.EntryDGV.Columns.Count; i++)
3992
                        //{
3993
                        //    if (i != (int)GridItemColumn.ItemName &&
3994
                        //        i != (int)GridItemColumn.SpecName &&
3995
                        //        i != (int)GridItemColumn.Note &&
3996
                        //        i != (int)GridItemColumn.SubConstractorName) continue;
3991
                        for (int i = 0; i < wrkPage.EntryDGV.Columns.Count; i++)
3992
                        {
3993
                            if (i != (int)GridItemColumn.ItemName &&
3994
                                i != (int)GridItemColumn.SpecName &&
3995
                                i != (int)GridItemColumn.Note &&
3996
                                i != (int)GridItemColumn.SubConstractorName) continue;
3997 3997

  
3998
                        //    DataGridViewColumn wrkCol = wrkPage.EntryDGV.Columns[i];
3999
                        //    wrkCol.Width = s_PageType2CellSize[i];
4000
                        //    wrkCol.Width += idifference;
4001
                        //}
3998
                            DataGridViewColumn wrkCol = wrkPage.EntryDGV.Columns[i];
3999
                            wrkCol.Width = s_PageType2CellSize[i];
4000
                            wrkCol.Width += idifference;
4001
                        }
4002 4002
                        int lblYPoint = wrkPage.EntryLabel[(int)PageLabelCount.Label].Location.Y;
4003 4003
                        wrkPage.EntryLabel[(int)PageLabelCount.Label].Location = new Point((PageTotalLabelPoint[0] + iMoveSize), lblYPoint);
4004 4004
                        wrkPage.EntryLabel[(int)PageLabelCount.Total].Location = new Point((PageTotalLabelPoint[1] + iMoveSize), lblYPoint);
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestEntry/FrmEntryReqSelOrderer.cs
244 244
                return;
245 245
            }
246 246

  
247
            //FrmEntryReqSelRequest frmEntry = new FrmEntryReqSelRequest();
248
            FrmRequestPrintSel frmEntry = new FrmRequestPrintSel();
247
            FrmEntryReqSelRequest frmEntry = new FrmEntryReqSelRequest();
248
            //FrmRequestPrintSel frmEntry = new FrmRequestPrintSel();
249 249

  
250 250
            frmEntry.EditFlg = true;
251 251
            frmEntry.RequestMonth = CommonMotions.cnvInt(cbReqMonth.SelectedValue);
branches/src/ProcessManagement/ProcessManagement/Forms/Master/PersonInCharge/FrmPersonInCharge.designer.cs
30 30
        /// </summary>
31 31
        private void InitializeComponent()
32 32
        {
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
47 47
            this.btnDataEntry = new System.Windows.Forms.Button();
48 48
            this.btnEnd = new System.Windows.Forms.Button();
49 49
            this.label1 = new System.Windows.Forms.Label();
......
62 62
            this.label8 = new System.Windows.Forms.Label();
63 63
            this.txtInput2 = new System.Windows.Forms.TextBox();
64 64
            this.label9 = new System.Windows.Forms.Label();
65
            this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
66 65
            this.txtInput4 = new System.Windows.Forms.TextBox();
67 66
            this.label2 = new System.Windows.Forms.Label();
68 67
            this.label7 = new System.Windows.Forms.Label();
......
78 77
            this.label13 = new System.Windows.Forms.Label();
79 78
            this.label14 = new System.Windows.Forms.Label();
80 79
            this.label16 = new System.Windows.Forms.Label();
81
            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
82 80
            this.txtInput5 = new System.Windows.Forms.TextBox();
83 81
            this.txtInput8 = new System.Windows.Forms.TextBox();
84 82
            this.txtInput9 = new System.Windows.Forms.TextBox();
85
            this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
86 83
            this.label17 = new System.Windows.Forms.Label();
87
            this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
88 84
            this.label18 = new System.Windows.Forms.Label();
89 85
            this.lblSecRank = new System.Windows.Forms.Label();
90 86
            this.lblSecRange = new System.Windows.Forms.Label();
......
96 92
            this.label15 = new System.Windows.Forms.Label();
97 93
            this.txtInput12 = new System.Windows.Forms.TextBox();
98 94
            this.label23 = new System.Windows.Forms.Label();
99
            this.dgvSalary = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
100
            this.SalaryColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
101
            this.SalaryColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
102
            this.SalaryColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
103
            this.dgvRefDepartment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
104
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
105
            this.TextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
106
            this.cmbRefDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
107 95
            this.btnRefDepDel = new System.Windows.Forms.Button();
108 96
            this.btnRefDepAdd = new System.Windows.Forms.Button();
109
            this.dgvAssignment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
110
            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
111
            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
112
            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
113 97
            this.BtnDepartMentAdd = new System.Windows.Forms.Button();
114 98
            this.BtnDepartMentDel = new System.Windows.Forms.Button();
115 99
            this.txtInput13 = new System.Windows.Forms.TextBox();
......
123 107
            this.btnChrgToEmp = new System.Windows.Forms.Button();
124 108
            this.btnEmpToChrg = new System.Windows.Forms.Button();
125 109
            this.label20 = new System.Windows.Forms.Label();
110
            this.txtInput3 = new ProcessManagement.Forms.CustomControls.TextBoxEX();
111
            this.cmbDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
112
            this.cmbLedgerFlg = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
113
            this.cmbSecManage = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
114
            this.dgvSalary = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
115
            this.SalaryColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
116
            this.SalaryColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
117
            this.SalaryColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
118
            this.dgvRefDepartment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
119
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
120
            this.TextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
121
            this.cmbRefDepartment = new ProcessManagement.Forms.CustomControls.ComboBoxEX();
122
            this.dgvAssignment = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
123
            this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
124
            this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
125
            this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
126 126
            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
127 127
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
128 128
            this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
133 133
            this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
134 134
            this.panel1.SuspendLayout();
135 135
            this.tableLayoutPanel1.SuspendLayout();
136
            this.panel2.SuspendLayout();
137
            this.panel3.SuspendLayout();
136 138
            ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).BeginInit();
137 139
            ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).BeginInit();
138 140
            ((System.ComponentModel.ISupportInitialize)(this.dgvAssignment)).BeginInit();
139
            this.panel2.SuspendLayout();
140
            this.panel3.SuspendLayout();
141 141
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
142 142
            this.SuspendLayout();
143 143
            // 
......
444 444
            this.label9.Text = "終了年月日";
445 445
            this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
446 446
            // 
447
            // txtInput3
448
            // 
449
            this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left;
450
            this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable;
451
            this.txtInput3.Location = new System.Drawing.Point(148, 111);
452
            this.txtInput3.MaxLength = 11;
453
            this.txtInput3.Name = "txtInput3";
454
            this.txtInput3.Size = new System.Drawing.Size(139, 23);
455
            this.txtInput3.TabIndex = 3;
456
            this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
457
            this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated);
458
            // 
459 447
            // txtInput4
460 448
            // 
461 449
            this.txtInput4.Anchor = System.Windows.Forms.AnchorStyles.Left;
......
654 642
            this.label16.Text = "台帳計算対象";
655 643
            this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
656 644
            // 
657
            // cmbDepartment
658
            // 
659
            this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
660
            this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 3);
661
            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
662
            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
663
            this.cmbDepartment.FormattingEnabled = true;
664
            this.cmbDepartment.Location = new System.Drawing.Point(148, 362);
665
            this.cmbDepartment.Name = "cmbDepartment";
666
            this.cmbDepartment.Size = new System.Drawing.Size(429, 24);
667
            this.cmbDepartment.TabIndex = 8;
668
            this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange);
669
            // 
670 645
            // txtInput5
671 646
            // 
672 647
            this.txtInput5.Anchor = System.Windows.Forms.AnchorStyles.Left;
......
702 677
            this.txtInput9.TabIndex = 12;
703 678
            this.txtInput9.TextChanged += new System.EventHandler(this.valueChange);
704 679
            // 
705
            // cmbLedgerFlg
706
            // 
707
            this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left;
708
            this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
709
            this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
710
            this.cmbLedgerFlg.FormattingEnabled = true;
711
            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 647);
712
            this.cmbLedgerFlg.Name = "cmbLedgerFlg";
713
            this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24);
714
            this.cmbLedgerFlg.TabIndex = 13;
715
            this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange);
716
            // 
717 680
            // label17
718 681
            // 
719 682
            this.label17.Anchor = System.Windows.Forms.AnchorStyles.Left;
......
727 690
            this.label17.Text = "機密区分";
728 691
            this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
729 692
            // 
730
            // cmbSecManage
731
            // 
732
            this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left;
733
            this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2);
734
            this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
735
            this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
736
            this.cmbSecManage.FormattingEnabled = true;
737
            this.cmbSecManage.Location = new System.Drawing.Point(148, 682);
738
            this.cmbSecManage.Name = "cmbSecManage";
739
            this.cmbSecManage.Size = new System.Drawing.Size(284, 24);
740
            this.cmbSecManage.TabIndex = 14;
741
            this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged);
742
            this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange);
743
            // 
744 693
            // label18
745 694
            // 
746 695
            this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;
......
884 833
            this.label23.Text = "円(公認分)";
885 834
            this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
886 835
            // 
887
            // dgvSalary
888
            // 
889
            this.dgvSalary.AllowUserToAddRows = false;
890
            this.dgvSalary.AllowUserToDeleteRows = false;
891
            this.dgvSalary.AllowUserToResizeColumns = false;
892
            this.dgvSalary.AllowUserToResizeRows = false;
893
            this.dgvSalary.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
894
            | System.Windows.Forms.AnchorStyles.Left)));
895
            this.dgvSalary.BackgroundColor = System.Drawing.Color.White;
896
            this.dgvSalary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
897
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
898
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
899
            dataGridViewCellStyle1.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
900
            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
901
            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
902
            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
903
            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
904
            this.dgvSalary.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
905
            this.dgvSalary.ColumnHeadersHeight = 22;
906
            this.dgvSalary.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
907
            this.dgvSalary.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
908
            this.SalaryColumn1,
909
            this.SalaryColumn2,
910
            this.SalaryColumn3});
911
            this.tableLayoutPanel1.SetColumnSpan(this.dgvSalary, 3);
912
            this.dgvSalary.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
913
            this.dgvSalary.Location = new System.Drawing.Point(148, 248);
914
            this.dgvSalary.MultiSelect = false;
915
            this.dgvSalary.Name = "dgvSalary";
916
            this.dgvSalary.RowHeadersVisible = false;
917
            this.dgvSalary.RowHeadersWidth = 18;
918
            this.dgvSalary.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
919
            this.tableLayoutPanel1.SetRowSpan(this.dgvSalary, 3);
920
            this.dgvSalary.RowTemplate.Height = 20;
921
            this.dgvSalary.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
922
            this.dgvSalary.Size = new System.Drawing.Size(429, 104);
923
            this.dgvSalary.TabIndex = 21;
924
            this.dgvSalary.TabStop = false;
925
            // 
926
            // SalaryColumn1
927
            // 
928
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
929
            this.SalaryColumn1.DefaultCellStyle = dataGridViewCellStyle2;
930
            this.SalaryColumn1.Frozen = true;
931
            this.SalaryColumn1.HeaderText = "給与開始年月日";
932
            this.SalaryColumn1.Name = "SalaryColumn1";
933
            this.SalaryColumn1.ReadOnly = true;
934
            this.SalaryColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
935
            this.SalaryColumn1.Width = 129;
936
            // 
937
            // SalaryColumn2
938
            // 
939
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
940
            this.SalaryColumn2.DefaultCellStyle = dataGridViewCellStyle3;
941
            this.SalaryColumn2.Frozen = true;
942
            this.SalaryColumn2.HeaderText = "月給与額";
943
            this.SalaryColumn2.Name = "SalaryColumn2";
944
            this.SalaryColumn2.ReadOnly = true;
945
            this.SalaryColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
946
            this.SalaryColumn2.Width = 140;
947
            // 
948
            // SalaryColumn3
949
            // 
950
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
951
            this.SalaryColumn3.DefaultCellStyle = dataGridViewCellStyle4;
952
            this.SalaryColumn3.Frozen = true;
953
            this.SalaryColumn3.HeaderText = "年給与額";
954
            this.SalaryColumn3.Name = "SalaryColumn3";
955
            this.SalaryColumn3.ReadOnly = true;
956
            this.SalaryColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
957
            this.SalaryColumn3.Width = 140;
958
            // 
959
            // dgvRefDepartment
960
            // 
961
            this.dgvRefDepartment.AllowUserToAddRows = false;
962
            this.dgvRefDepartment.AllowUserToDeleteRows = false;
963
            this.dgvRefDepartment.AllowUserToResizeColumns = false;
964
            this.dgvRefDepartment.AllowUserToResizeRows = false;
965
            this.dgvRefDepartment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
966
            | System.Windows.Forms.AnchorStyles.Left)));
967
            this.dgvRefDepartment.BackgroundColor = System.Drawing.Color.White;
968
            this.dgvRefDepartment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
969
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
970
            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
971
            dataGridViewCellStyle5.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
972
            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
973
            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
974
            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
975
            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
976
            this.dgvRefDepartment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
977
            this.dgvRefDepartment.ColumnHeadersHeight = 24;
978
            this.dgvRefDepartment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
979
            this.dgvRefDepartment.ColumnHeadersVisible = false;
980
            this.dgvRefDepartment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
981
            this.Column8,
982
            this.TextBoxColumn1});
983
            this.tableLayoutPanel1.SetColumnSpan(this.dgvRefDepartment, 3);
984
            this.dgvRefDepartment.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
985
            this.dgvRefDepartment.Location = new System.Drawing.Point(148, 853);
986
            this.dgvRefDepartment.MultiSelect = false;
987
            this.dgvRefDepartment.Name = "dgvRefDepartment";
988
            this.dgvRefDepartment.RowHeadersVisible = false;
989
            this.dgvRefDepartment.RowHeadersWidth = 18;
990
            this.dgvRefDepartment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
991
            this.tableLayoutPanel1.SetRowSpan(this.dgvRefDepartment, 3);
992
            this.dgvRefDepartment.RowTemplate.Height = 20;
993
            this.dgvRefDepartment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
994
            this.dgvRefDepartment.Size = new System.Drawing.Size(429, 104);
995
            this.dgvRefDepartment.TabIndex = 18;
996
            this.dgvRefDepartment.TabStop = false;
997
            // 
998
            // Column8
999
            // 
1000
            this.Column8.Frozen = true;
1001
            this.Column8.HeaderText = "部署コード";
1002
            this.Column8.Name = "Column8";
1003
            this.Column8.ReadOnly = true;
1004
            this.Column8.Visible = false;
1005
            // 
1006
            // TextBoxColumn1
1007
            // 
1008
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
1009
            this.TextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle6;
1010
            this.TextBoxColumn1.Frozen = true;
1011
            this.TextBoxColumn1.HeaderText = "参 照 部 署 名 称";
1012
            this.TextBoxColumn1.Name = "TextBoxColumn1";
1013
            this.TextBoxColumn1.ReadOnly = true;
1014
            this.TextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
1015
            this.TextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1016
            this.TextBoxColumn1.Width = 409;
1017
            // 
1018
            // cmbRefDepartment
1019
            // 
1020
            this.cmbRefDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
1021
            this.tableLayoutPanel1.SetColumnSpan(this.cmbRefDepartment, 3);
1022
            this.cmbRefDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
1023
            this.cmbRefDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
1024
            this.cmbRefDepartment.FormattingEnabled = true;
1025
            this.cmbRefDepartment.Location = new System.Drawing.Point(148, 967);
1026
            this.cmbRefDepartment.Name = "cmbRefDepartment";
1027
            this.cmbRefDepartment.Size = new System.Drawing.Size(429, 24);
1028
            this.cmbRefDepartment.TabIndex = 19;
1029
            this.cmbRefDepartment.TextChanged += new System.EventHandler(this.valueChange);
1030
            // 
1031 836
            // btnRefDepDel
1032 837
            // 
1033 838
            this.btnRefDepDel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
......
1062 867
            this.btnRefDepAdd.UseVisualStyleBackColor = false;
1063 868
            this.btnRefDepAdd.Click += new System.EventHandler(this.btnRefDepAdd_Click);
1064 869
            // 
1065
            // dgvAssignment
1066
            // 
1067
            this.dgvAssignment.AllowUserToAddRows = false;
1068
            this.dgvAssignment.AllowUserToDeleteRows = false;
1069
            this.dgvAssignment.AllowUserToResizeColumns = false;
1070
            this.dgvAssignment.AllowUserToResizeRows = false;
1071
            this.dgvAssignment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
1072
            | System.Windows.Forms.AnchorStyles.Left)));
1073
            this.dgvAssignment.BackgroundColor = System.Drawing.Color.White;
1074
            this.dgvAssignment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1075
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1076
            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
1077
            dataGridViewCellStyle7.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1078
            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
1079
            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1080
            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1081
            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1082
            this.dgvAssignment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
1083
            this.dgvAssignment.ColumnHeadersHeight = 22;
1084
            this.dgvAssignment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1085
            this.dgvAssignment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
1086
            this.dataGridViewTextBoxColumn1,
1087
            this.dataGridViewTextBoxColumn2,
1088
            this.dataGridViewTextBoxColumn3});
1089
            this.tableLayoutPanel1.SetColumnSpan(this.dgvAssignment, 3);
1090
            this.dgvAssignment.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
1091
            this.dgvAssignment.Location = new System.Drawing.Point(148, 428);
1092
            this.dgvAssignment.MultiSelect = false;
1093
            this.dgvAssignment.Name = "dgvAssignment";
1094
            this.dgvAssignment.RowHeadersVisible = false;
1095
            this.dgvAssignment.RowHeadersWidth = 18;
1096
            this.dgvAssignment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
1097
            this.tableLayoutPanel1.SetRowSpan(this.dgvAssignment, 3);
1098
            this.dgvAssignment.RowTemplate.Height = 20;
1099
            this.dgvAssignment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
1100
            this.dgvAssignment.Size = new System.Drawing.Size(429, 104);
1101
            this.dgvAssignment.TabIndex = 21;
1102
            this.dgvAssignment.TabStop = false;
1103
            // 
1104
            // dataGridViewTextBoxColumn1
1105
            // 
1106
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1107
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle8;
1108
            this.dataGridViewTextBoxColumn1.Frozen = true;
1109
            this.dataGridViewTextBoxColumn1.HeaderText = "配属年月日";
1110
            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
1111
            this.dataGridViewTextBoxColumn1.ReadOnly = true;
1112
            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1113
            this.dataGridViewTextBoxColumn1.Width = 129;
1114
            // 
1115
            // dataGridViewTextBoxColumn2
1116
            // 
1117
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
1118
            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle9;
1119
            this.dataGridViewTextBoxColumn2.Frozen = true;
1120
            this.dataGridViewTextBoxColumn2.HeaderText = "配属部署名";
1121
            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
1122
            this.dataGridViewTextBoxColumn2.ReadOnly = true;
1123
            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1124
            this.dataGridViewTextBoxColumn2.Width = 280;
1125
            // 
1126
            // dataGridViewTextBoxColumn3
1127
            // 
1128
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1129
            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle10;
1130
            this.dataGridViewTextBoxColumn3.Frozen = true;
1131
            this.dataGridViewTextBoxColumn3.HeaderText = "部署コード";
1132
            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
1133
            this.dataGridViewTextBoxColumn3.ReadOnly = true;
1134
            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1135
            this.dataGridViewTextBoxColumn3.Visible = false;
1136
            this.dataGridViewTextBoxColumn3.Width = 5;
1137
            // 
1138 870
            // BtnDepartMentAdd
1139 871
            // 
1140 872
            this.BtnDepartMentAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
......
1299 1031
            this.label20.Text = "データ変更";
1300 1032
            this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
1301 1033
            // 
1034
            // txtInput3
1035
            // 
1036
            this.txtInput3.Anchor = System.Windows.Forms.AnchorStyles.Left;
1037
            this.txtInput3.ImeMode = System.Windows.Forms.ImeMode.Disable;
1038
            this.txtInput3.Location = new System.Drawing.Point(148, 111);
1039
            this.txtInput3.MaxLength = 11;
1040
            this.txtInput3.Name = "txtInput3";
1041
            this.txtInput3.Size = new System.Drawing.Size(139, 23);
1042
            this.txtInput3.TabIndex = 3;
1043
            this.txtInput3.TextChanged += new System.EventHandler(this.txtInput_TextChanged);
1044
            this.txtInput3.Validated += new System.EventHandler(this.txtInput_Validated);
1045
            // 
1046
            // cmbDepartment
1047
            // 
1048
            this.cmbDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
1049
            this.tableLayoutPanel1.SetColumnSpan(this.cmbDepartment, 3);
1050
            this.cmbDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
1051
            this.cmbDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
1052
            this.cmbDepartment.FormattingEnabled = true;
1053
            this.cmbDepartment.Location = new System.Drawing.Point(148, 360);
1054
            this.cmbDepartment.Name = "cmbDepartment";
1055
            this.cmbDepartment.Size = new System.Drawing.Size(429, 24);
1056
            this.cmbDepartment.TabIndex = 8;
1057
            this.cmbDepartment.TextChanged += new System.EventHandler(this.valueChange);
1058
            // 
1059
            // cmbLedgerFlg
1060
            // 
1061
            this.cmbLedgerFlg.Anchor = System.Windows.Forms.AnchorStyles.Left;
1062
            this.cmbLedgerFlg.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
1063
            this.cmbLedgerFlg.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
1064
            this.cmbLedgerFlg.FormattingEnabled = true;
1065
            this.cmbLedgerFlg.Location = new System.Drawing.Point(148, 645);
1066
            this.cmbLedgerFlg.Name = "cmbLedgerFlg";
1067
            this.cmbLedgerFlg.Size = new System.Drawing.Size(139, 24);
1068
            this.cmbLedgerFlg.TabIndex = 13;
1069
            this.cmbLedgerFlg.TextChanged += new System.EventHandler(this.valueChange);
1070
            // 
1071
            // cmbSecManage
1072
            // 
1073
            this.cmbSecManage.Anchor = System.Windows.Forms.AnchorStyles.Left;
1074
            this.tableLayoutPanel1.SetColumnSpan(this.cmbSecManage, 2);
1075
            this.cmbSecManage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
1076
            this.cmbSecManage.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
1077
            this.cmbSecManage.FormattingEnabled = true;
1078
            this.cmbSecManage.Location = new System.Drawing.Point(148, 680);
1079
            this.cmbSecManage.Name = "cmbSecManage";
1080
            this.cmbSecManage.Size = new System.Drawing.Size(284, 24);
1081
            this.cmbSecManage.TabIndex = 14;
1082
            this.cmbSecManage.SelectedValueChanged += new System.EventHandler(this.cmbSecManage_SelectedValueChanged);
1083
            this.cmbSecManage.TextChanged += new System.EventHandler(this.valueChange);
1084
            // 
1085
            // dgvSalary
1086
            // 
1087
            this.dgvSalary.AllowUserToAddRows = false;
1088
            this.dgvSalary.AllowUserToDeleteRows = false;
1089
            this.dgvSalary.AllowUserToResizeColumns = false;
1090
            this.dgvSalary.AllowUserToResizeRows = false;
1091
            this.dgvSalary.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
1092
            | System.Windows.Forms.AnchorStyles.Left)));
1093
            this.dgvSalary.BackgroundColor = System.Drawing.Color.White;
1094
            this.dgvSalary.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1095
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1096
            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
1097
            dataGridViewCellStyle15.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1098
            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
1099
            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1100
            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1101
            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1102
            this.dgvSalary.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
1103
            this.dgvSalary.ColumnHeadersHeight = 22;
1104
            this.dgvSalary.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1105
            this.dgvSalary.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
1106
            this.SalaryColumn1,
1107
            this.SalaryColumn2,
1108
            this.SalaryColumn3});
1109
            this.tableLayoutPanel1.SetColumnSpan(this.dgvSalary, 3);
1110
            this.dgvSalary.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
1111
            this.dgvSalary.Location = new System.Drawing.Point(148, 248);
1112
            this.dgvSalary.MultiSelect = false;
1113
            this.dgvSalary.Name = "dgvSalary";
1114
            this.dgvSalary.RowHeadersVisible = false;
1115
            this.dgvSalary.RowHeadersWidth = 18;
1116
            this.dgvSalary.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
1117
            this.tableLayoutPanel1.SetRowSpan(this.dgvSalary, 3);
1118
            this.dgvSalary.RowTemplate.Height = 20;
1119
            this.dgvSalary.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
1120
            this.dgvSalary.Size = new System.Drawing.Size(429, 104);
1121
            this.dgvSalary.TabIndex = 21;
1122
            this.dgvSalary.TabStop = false;
1123
            // 
1124
            // SalaryColumn1
1125
            // 
1126
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1127
            this.SalaryColumn1.DefaultCellStyle = dataGridViewCellStyle16;
1128
            this.SalaryColumn1.Frozen = true;
1129
            this.SalaryColumn1.HeaderText = "給与開始年月日";
1130
            this.SalaryColumn1.Name = "SalaryColumn1";
1131
            this.SalaryColumn1.ReadOnly = true;
1132
            this.SalaryColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1133
            this.SalaryColumn1.Width = 129;
1134
            // 
1135
            // SalaryColumn2
1136
            // 
1137
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1138
            this.SalaryColumn2.DefaultCellStyle = dataGridViewCellStyle17;
1139
            this.SalaryColumn2.Frozen = true;
1140
            this.SalaryColumn2.HeaderText = "月給与額";
1141
            this.SalaryColumn2.Name = "SalaryColumn2";
1142
            this.SalaryColumn2.ReadOnly = true;
1143
            this.SalaryColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1144
            this.SalaryColumn2.Width = 140;
1145
            // 
1146
            // SalaryColumn3
1147
            // 
1148
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1149
            this.SalaryColumn3.DefaultCellStyle = dataGridViewCellStyle18;
1150
            this.SalaryColumn3.Frozen = true;
1151
            this.SalaryColumn3.HeaderText = "年給与額";
1152
            this.SalaryColumn3.Name = "SalaryColumn3";
1153
            this.SalaryColumn3.ReadOnly = true;
1154
            this.SalaryColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1155
            this.SalaryColumn3.Width = 140;
1156
            // 
1157
            // dgvRefDepartment
1158
            // 
1159
            this.dgvRefDepartment.AllowUserToAddRows = false;
1160
            this.dgvRefDepartment.AllowUserToDeleteRows = false;
1161
            this.dgvRefDepartment.AllowUserToResizeColumns = false;
1162
            this.dgvRefDepartment.AllowUserToResizeRows = false;
1163
            this.dgvRefDepartment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
1164
            | System.Windows.Forms.AnchorStyles.Left)));
1165
            this.dgvRefDepartment.BackgroundColor = System.Drawing.Color.White;
1166
            this.dgvRefDepartment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1167
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1168
            dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control;
1169
            dataGridViewCellStyle19.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1170
            dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText;
1171
            dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1172
            dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1173
            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1174
            this.dgvRefDepartment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle19;
1175
            this.dgvRefDepartment.ColumnHeadersHeight = 24;
1176
            this.dgvRefDepartment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1177
            this.dgvRefDepartment.ColumnHeadersVisible = false;
1178
            this.dgvRefDepartment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
1179
            this.Column8,
1180
            this.TextBoxColumn1});
1181
            this.tableLayoutPanel1.SetColumnSpan(this.dgvRefDepartment, 3);
1182
            this.dgvRefDepartment.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
1183
            this.dgvRefDepartment.Location = new System.Drawing.Point(148, 853);
1184
            this.dgvRefDepartment.MultiSelect = false;
1185
            this.dgvRefDepartment.Name = "dgvRefDepartment";
1186
            this.dgvRefDepartment.RowHeadersVisible = false;
1187
            this.dgvRefDepartment.RowHeadersWidth = 18;
1188
            this.dgvRefDepartment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
1189
            this.tableLayoutPanel1.SetRowSpan(this.dgvRefDepartment, 3);
1190
            this.dgvRefDepartment.RowTemplate.Height = 20;
1191
            this.dgvRefDepartment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
1192
            this.dgvRefDepartment.Size = new System.Drawing.Size(429, 104);
1193
            this.dgvRefDepartment.TabIndex = 18;
1194
            this.dgvRefDepartment.TabStop = false;
1195
            // 
1196
            // Column8
1197
            // 
1198
            this.Column8.Frozen = true;
1199
            this.Column8.HeaderText = "部署コード";
1200
            this.Column8.Name = "Column8";
1201
            this.Column8.ReadOnly = true;
1202
            this.Column8.Visible = false;
1203
            // 
1204
            // TextBoxColumn1
1205
            // 
1206
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
1207
            this.TextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle20;
1208
            this.TextBoxColumn1.Frozen = true;
1209
            this.TextBoxColumn1.HeaderText = "参 照 部 署 名 称";
1210
            this.TextBoxColumn1.Name = "TextBoxColumn1";
1211
            this.TextBoxColumn1.ReadOnly = true;
1212
            this.TextBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.False;
1213
            this.TextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1214
            this.TextBoxColumn1.Width = 409;
1215
            // 
1216
            // cmbRefDepartment
1217
            // 
1218
            this.cmbRefDepartment.Anchor = System.Windows.Forms.AnchorStyles.Left;
1219
            this.tableLayoutPanel1.SetColumnSpan(this.cmbRefDepartment, 3);
1220
            this.cmbRefDepartment.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
1221
            this.cmbRefDepartment.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
1222
            this.cmbRefDepartment.FormattingEnabled = true;
1223
            this.cmbRefDepartment.Location = new System.Drawing.Point(148, 965);
1224
            this.cmbRefDepartment.Name = "cmbRefDepartment";
1225
            this.cmbRefDepartment.Size = new System.Drawing.Size(429, 24);
1226
            this.cmbRefDepartment.TabIndex = 19;
1227
            this.cmbRefDepartment.TextChanged += new System.EventHandler(this.valueChange);
1228
            // 
1229
            // dgvAssignment
1230
            // 
1231
            this.dgvAssignment.AllowUserToAddRows = false;
1232
            this.dgvAssignment.AllowUserToDeleteRows = false;
1233
            this.dgvAssignment.AllowUserToResizeColumns = false;
1234
            this.dgvAssignment.AllowUserToResizeRows = false;
1235
            this.dgvAssignment.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
1236
            | System.Windows.Forms.AnchorStyles.Left)));
1237
            this.dgvAssignment.BackgroundColor = System.Drawing.Color.White;
1238
            this.dgvAssignment.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1239
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1240
            dataGridViewCellStyle21.BackColor = System.Drawing.SystemColors.Control;
1241
            dataGridViewCellStyle21.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1242
            dataGridViewCellStyle21.ForeColor = System.Drawing.SystemColors.WindowText;
1243
            dataGridViewCellStyle21.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1244
            dataGridViewCellStyle21.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1245
            dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1246
            this.dgvAssignment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle21;
1247
            this.dgvAssignment.ColumnHeadersHeight = 22;
1248
            this.dgvAssignment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1249
            this.dgvAssignment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
1250
            this.dataGridViewTextBoxColumn1,
1251
            this.dataGridViewTextBoxColumn2,
1252
            this.dataGridViewTextBoxColumn3});
1253
            this.tableLayoutPanel1.SetColumnSpan(this.dgvAssignment, 3);
1254
            this.dgvAssignment.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
1255
            this.dgvAssignment.Location = new System.Drawing.Point(148, 428);
1256
            this.dgvAssignment.MultiSelect = false;
1257
            this.dgvAssignment.Name = "dgvAssignment";
1258
            this.dgvAssignment.RowHeadersVisible = false;
1259
            this.dgvAssignment.RowHeadersWidth = 18;
1260
            this.dgvAssignment.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
1261
            this.tableLayoutPanel1.SetRowSpan(this.dgvAssignment, 3);
1262
            this.dgvAssignment.RowTemplate.Height = 20;
1263
            this.dgvAssignment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
1264
            this.dgvAssignment.Size = new System.Drawing.Size(429, 104);
1265
            this.dgvAssignment.TabIndex = 21;
1266
            this.dgvAssignment.TabStop = false;
1267
            // 
1268
            // dataGridViewTextBoxColumn1
1269
            // 
1270
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1271
            this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle22;
1272
            this.dataGridViewTextBoxColumn1.Frozen = true;
1273
            this.dataGridViewTextBoxColumn1.HeaderText = "配属年月日";
1274
            this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
1275
            this.dataGridViewTextBoxColumn1.ReadOnly = true;
1276
            this.dataGridViewTextBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1277
            this.dataGridViewTextBoxColumn1.Width = 129;
1278
            // 
1279
            // dataGridViewTextBoxColumn2
1280
            // 
1281
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
1282
            this.dataGridViewTextBoxColumn2.DefaultCellStyle = dataGridViewCellStyle23;
1283
            this.dataGridViewTextBoxColumn2.Frozen = true;
1284
            this.dataGridViewTextBoxColumn2.HeaderText = "配属部署名";
1285
            this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
1286
            this.dataGridViewTextBoxColumn2.ReadOnly = true;
1287
            this.dataGridViewTextBoxColumn2.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1288
            this.dataGridViewTextBoxColumn2.Width = 280;
1289
            // 
1290
            // dataGridViewTextBoxColumn3
1291
            // 
1292
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1293
            this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle24;
1294
            this.dataGridViewTextBoxColumn3.Frozen = true;
1295
            this.dataGridViewTextBoxColumn3.HeaderText = "部署コード";
1296
            this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
1297
            this.dataGridViewTextBoxColumn3.ReadOnly = true;
1298
            this.dataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
1299
            this.dataGridViewTextBoxColumn3.Visible = false;
1300
            this.dataGridViewTextBoxColumn3.Width = 5;
1301
            // 
1302 1302
            // dgvMaster
1303 1303
            // 
1304 1304
            this.dgvMaster.AllowUserToAddRows = false;
......
1307 1307
            this.dgvMaster.AllowUserToResizeRows = false;
1308 1308
            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
1309 1309
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
1310
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1311
            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
1312
            dataGridViewCellStyle11.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1313
            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
1314
            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1315
            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1316
            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1317
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
1310
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
1311
            dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control;
1312
            dataGridViewCellStyle25.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1313
            dataGridViewCellStyle25.ForeColor = System.Drawing.SystemColors.WindowText;
1314
            dataGridViewCellStyle25.SelectionBackColor = System.Drawing.SystemColors.Highlight;
1315
            dataGridViewCellStyle25.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
1316
            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
1317
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle25;
1318 1318
            this.dgvMaster.ColumnHeadersHeight = 24;
1319 1319
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
1320 1320
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
......
1339 1339
            // 
1340 1340
            // Column1
1341 1341
            // 
1342
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1343
            dataGridViewCellStyle12.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1344
            this.Column1.DefaultCellStyle = dataGridViewCellStyle12;
1342
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
1343
            dataGridViewCellStyle26.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1344
            this.Column1.DefaultCellStyle = dataGridViewCellStyle26;
1345 1345
            this.Column1.Frozen = true;
1346 1346
            this.Column1.HeaderText = "№";
1347 1347
            this.Column1.Name = "Column1";
......
1351 1351
            // 
1352 1352
            // Column2
1353 1353
            // 
1354
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1355
            this.Column2.DefaultCellStyle = dataGridViewCellStyle13;
1354
            dataGridViewCellStyle27.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1355
            this.Column2.DefaultCellStyle = dataGridViewCellStyle27;
1356 1356
            this.Column2.Frozen = true;
1357 1357
            this.Column2.HeaderText = "担当者コード";
1358 1358
            this.Column2.Name = "Column2";
......
1362 1362
            // 
1363 1363
            // Column3
1364 1364
            // 
1365
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
1366
            dataGridViewCellStyle14.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1367
            this.Column3.DefaultCellStyle = dataGridViewCellStyle14;
1365
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
1366
            dataGridViewCellStyle28.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
1367
            this.Column3.DefaultCellStyle = dataGridViewCellStyle28;
1368 1368
            this.Column3.HeaderText = "担 当 者 名";
1369 1369
            this.Column3.Name = "Column3";
1370 1370
            this.Column3.ReadOnly = true;
......
1432 1432
            this.panel1.ResumeLayout(false);
1433 1433
            this.tableLayoutPanel1.ResumeLayout(false);
1434 1434
            this.tableLayoutPanel1.PerformLayout();
1435
            this.panel2.ResumeLayout(false);
1436
            this.panel2.PerformLayout();
1437
            this.panel3.ResumeLayout(false);
1435 1438
            ((System.ComponentModel.ISupportInitialize)(this.dgvSalary)).EndInit();
1436 1439
            ((System.ComponentModel.ISupportInitialize)(this.dgvRefDepartment)).EndInit();
1437 1440
            ((System.ComponentModel.ISupportInitialize)(this.dgvAssignment)).EndInit();
1438
            this.panel2.ResumeLayout(false);
1439
            this.panel2.PerformLayout();
1440
            this.panel3.ResumeLayout(false);
1441 1441
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
1442 1442
            this.ResumeLayout(false);
1443 1443

  
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurity.cs
556 556
                    {
557 557
                        //チェックボックス列以外は処理しない
558 558
                        if (!dgv.Columns[e.ColumnIndex].GetType().Equals(typeof(DataGridViewCheckBoxColumn))) return;
559
                        // 変更不可行以外は処理しない
559
                        // 変更不可行は処理しない
560 560
                        if (!dgv.Rows[e.RowIndex].ReadOnly) return;
561 561
                        
562 562
                        dgv.Rows[e.RowIndex].Cells[e.ColumnIndex].Style.BackColor = s_TitleRowColor;
branches/src/ProcessManagement/ProcessManagement/Forms/Master/Security/FrmSecurityAuxiliary.cs
83 83

  
84 84
                }
85 85

  
86
                // 特別権限は起動できたら編集できる
87
                int SAccKey = (int)CommonDefine.SecurityRankPos.SpecialAuthority;   // 経営者アクセス
88
                if (SecRank == CommonDefine.SecurityRankList[SAccKey].Key)
89
                    dgv.Columns[dgv.ColumnCount - 1].ReadOnly = true;
86
                // 特別権限は起動できたら編集できる・・・?
87
                //int SAccKey = (int)CommonDefine.SecurityRankPos.SpecialAuthority;   // 経営者アクセス
88
                //if (SecRank == CommonDefine.SecurityRankList[SAccKey].Key)
89
                //    dgv.Columns[dgv.ColumnCount - 1].ReadOnly = true;
90 90

  
91 91
                return AddRowCnt;
92 92
            }
......
1291 1291

  
1292 1292
                m_WindowState = this.WindowState;
1293 1293

  
1294
                //Debug.WriteLine(string.Format("m_FormSize  W:{0}-H{1}", m_FormSize.Width, m_FormSize.Height));
1295
                //Debug.WriteLine(string.Format("m_GridSize  W:{0}-H{1}", m_GridSize.Width, m_GridSize.Height));
1296
                //Debug.WriteLine(string.Format("m_Title     X:{0}-Y{1}", m_Title.X, m_Title.Y));
1297
                //Debug.WriteLine(string.Format("m_Button[0] X:{0}-Y{1}", m_Button[0].X, m_Button[0].Y));
1298
                //Debug.WriteLine(string.Format("m_Button[1] X:{0}-Y{1}", m_Button[1].X, m_Button[1].Y));
1299
                //Debug.WriteLine(string.Format("m_Panel[0]  X:{0}-Y{1}", m_Panel[0].X, m_Panel[0].Y));
1300
                //Debug.WriteLine(string.Format("m_Panel[1]  X:{0}-Y{1}", m_Panel[1].X, m_Panel[1].Y));
1301 1294
            }
1302 1295
            catch (Exception ex)
1303 1296
            {
......
1314 1307
        {
1315 1308
            try
1316 1309
            {
1317
                label1.Location = new Point(m_Title.X, m_Title.Y);
1310
                // カラムサイズ変更
1311
                foreach (DataGridViewColumn CurCol in dgvProcess.Columns)
1312
                {
1313
                    switch (CurCol.Index)
1314
                    {
1315
                        case (int)GridColumn.No:
1316
                            CurCol.Width = 60;
1317
                            break;
1318 1318

  
1319
                dgvProcess.Width = m_GridSize.Width;
1320
                dgvProcess.Height = m_GridSize.Height;
1319
                        case (int)GridColumn.SecName:
1320
                            CurCol.Width = 360;
1321
                            break;
1321 1322

  
1322
                groupBox1.Location = new Point(m_Panel[0].X, m_Panel[0].Y);
1323
                groupBox2.Location = new Point(m_Panel[1].X, m_Panel[1].Y);
1324

  
1325
                btnDataEntry.Location = new Point(m_Button[0].X, m_Button[0].Y);
1326
                btnEnd.Location = new Point(m_Button[1].X, m_Button[1].Y);
1327

  
1328
                this.Size = new Size(m_FormSize.Width, m_FormSize.Height);
1329

  
1330
                this.WindowState = FormWindowState.Normal;
1331

  
1332
                //Debug.WriteLine(string.Format("FormSize  W:{0}-H{1}", this.Width, this.Height));
1333
                //Debug.WriteLine(string.Format("GridSize  W:{0}-H{1}", dgvProcess.Width, dgvProcess.Height));
1334
                //Debug.WriteLine(string.Format("Title     X:{0}-Y{1}", m_Title.X, m_Title.Y));
1335
                //Debug.WriteLine(string.Format("Button1   X:{0}-Y{1}", btnDataEntry.Location.X, btnDataEntry.Location.Y));
1336
                //Debug.WriteLine(string.Format("Button2   X:{0}-Y{1}", btnEnd.Location.X, btnEnd.Location.Y));
1337
                //Debug.WriteLine(string.Format("Panel1    X:{0}-Y{1}", groupBox1.Location.X, groupBox1.Location.Y));
1338
                //Debug.WriteLine(string.Format("Panel2    X:{0}-Y{1}", groupBox2.Location.X, groupBox2.Location.Y));
1323
                        default:
1324
                            CurCol.Width = s_CheckCellWidth;
1325
                            break;
1326
                    }
1327
                }
1339 1328
            }
1340 1329
            catch (Exception ex)
1341 1330
            {
branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs
3250 3250
            try
3251 3251
            {
3252 3252
                // 完了工事以外の申請中と承認後7日間のデータを対象とする
3253
                string strSQL = "SELECT";
3254
                strSQL += " A.APPROVALCODE,";
3255
                strSQL += " A.ORDERDATE,";
3256
                strSQL += " A.ORDERNO,";
3257
                strSQL += " A.PERSONCODE,";
3258
                strSQL += " C.PERSONNAME,";
3259
                strSQL += " A.PETITIONAPPROVALDATE,";
3260
                strSQL += " A.ENTRYDATE,";
3261
                strSQL += " A.APPROVALLIMITDATES,";
3262
                strSQL += " A.PERSONCODEAPPROVAL,";
3263
                strSQL += " D.PERSONNAME,";
3264
                strSQL += " C.DEPARTMENTCODE,";
3265
                strSQL += " B.DEPARTMENTSTRING,";
3266
                strSQL += " E.APPROVALPERSON,";
3267
                strSQL += " E.DISPLAYORDER,";
3268
                strSQL += " F.PERSONNAME,";
3269
                strSQL += string.Format(" IFNULL(G.APPROVALSTATUS, {0}),", (int)CommonDefine.ApprovalStatus.Undecided);
3253
                StringBuilder strSQL = new StringBuilder();
3254
                strSQL.Append("SELECT");
3255
                strSQL.Append(" A.APPROVALCODE,");
3256
                strSQL.Append(" A.ORDERDATE,");
3257
                strSQL.Append(" A.ORDERNO,");
3258
                strSQL.Append(" A.PERSONCODE,");
3259
                strSQL.Append(" C.PERSONNAME,");
3260
                strSQL.Append(" A.PETITIONAPPROVALDATE,");
3261
                strSQL.Append(" A.ENTRYDATE,");
3262
                strSQL.Append(" A.APPROVALLIMITDATES,");
3263
                strSQL.Append(" A.PERSONCODEAPPROVAL,");
3264
                strSQL.Append(" D.PERSONNAME,");
3265
                strSQL.Append(" C.DEPARTMENTCODE,");
3266
                strSQL.Append(" B.DEPARTMENTSTRING,");
3267
                strSQL.Append(" E.APPROVALPERSON,");
3268
                strSQL.Append(" E.DISPLAYORDER,");
3269
                strSQL.Append(" F.PERSONNAME,");
3270
                strSQL.AppendFormat(" IFNULL(G.APPROVALSTATUS, {0}),", (int)CommonDefine.ApprovalStatus.Undecided);
3270 3271

  
3271
                strSQL += " J.ATTENDANCEMONTH,";
3272
                strSQL.Append(" J.ATTENDANCEMONTH,");
3272 3273

  
3273
                strSQL += " H.DATAMODE,";
3274
                strSQL += " H.CREATEDATE,";
3275
                strSQL += " H.SEQNO,";
3274
                strSQL.Append(" H.DATAMODE,");
3275
                strSQL.Append(" H.CREATEDATE,");
3276
                strSQL.Append(" H.SEQNO,");
3276 3277

  
3277
                strSQL += " I.DATAMODE,";
3278
                strSQL += " I.CREATEDATE,";
3279
                strSQL += " I.SEQNO";
3278
                strSQL.Append(" I.DATAMODE,");
3279
                strSQL.Append(" I.CREATEDATE,");
3280
                strSQL.Append(" I.SEQNO");
3280 3281

  
3281
                strSQL += " FROM PERSONAPPROVAL A";
3282
                strSQL += " LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.PERSONCODE";
3283
                strSQL += " LEFT JOIN PERSONINCHARGEMASTER D ON D.PERSONCODE = A.PERSONCODEAPPROVAL";
3284
                strSQL += " LEFT JOIN DEPARTMENTMASTER B ON B.DEPARTMENTCODE = D.DEPARTMENTCODE";
3282
                strSQL.Append(" FROM PERSONAPPROVAL A");
3283
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER C ON C.PERSONCODE = A.PERSONCODE");
3284
                strSQL.Append(" LEFT JOIN PERSONINCHARGEMASTER D ON D.PERSONCODE = A.PERSONCODEAPPROVAL");
3285
                strSQL.Append(" LEFT JOIN DEPARTMENTMASTER B ON B.DEPARTMENTCODE = D.DEPARTMENTCODE");
3285 3286

  
3286
                strSQL += " LEFT JOIN APPROVALMASTER E ON E.APPROVALCODE = A.APPROVALCODE AND E.DEPARTMENTCODE = C.DEPARTMENTCODE";
3287
                strSQL.Append(" LEFT JOIN APPROVALMASTER E ON E.APPROVALCODE = A.APPROVALCODE AND E.DEPARTMENTCODE = C.DEPARTMENTCODE");
3287 3288

  
3288
                strSQL += " LEFT JOIN PERSONAPPROVAL G";
3289
                strSQL += " ON G.PERSONCODE = A.PERSONCODE";
3290
                strSQL += " AND G.APPROVALCODE = A.APPROVALCODE";
3291
                strSQL += " AND G.ORDERNO = A.ORDERNO";
3292
                strSQL += " AND G.PERSONCODEAPPROVAL = E.APPROVALPERSON";
3293
                strSQL += " AND G.SEQNO != 1";
3289
                strSQL.Append(" LEFT JOIN PERSONAPPROVAL G");
3290
                strSQL.Append(" ON G.PERSONCODE = A.PERSONCODE");
3291
                strSQL.Append(" AND G.APPROVALCODE = A.APPROVALCODE");
3292
                strSQL.Append(" AND G.ORDERNO = A.ORDERNO");
3293
                strSQL.Append(" AND G.PERSONCODEAPPROVAL = E.APPROVALPERSON");
3294
                strSQL.Append(" AND G.SEQNO != 1");
3294 3295

  
3295
                strSQL += " LEFT JOIN AttendanceData J ON J.PERSONCODE = A.PERSONCODE AND J.ORDERDATE = A.ORDERDATE AND J.ORDERNO = A.ORDERNO";
3296
                strSQL += " LEFT JOIN COSTOMERREGIST H ON H.PERSONCODE = A.PERSONCODE AND H.ORDERDATE = A.ORDERDATE AND H.ORDERNO = A.ORDERNO";
3297
                strSQL += " LEFT JOIN SUBCONSTRREGIST I ON I.PERSONCODE = A.PERSONCODE AND I.ORDERDATE = A.ORDERDATE AND I.ORDERNO = A.ORDERNO";
3296
                strSQL.Append(" LEFT JOIN AttendanceData J ON J.PERSONCODE = A.PERSONCODE AND J.ORDERDATE = A.ORDERDATE AND J.ORDERNO = A.ORDERNO");
3297
                strSQL.Append(" LEFT JOIN COSTOMERREGIST H ON H.CREATEPERSONCODE = A.PERSONCODE AND H.ORDERDATE = A.ORDERDATE AND H.ORDERNO = A.ORDERNO");
3298
                strSQL.Append(" LEFT JOIN SUBCONSTRREGIST I ON I.PERSONCODE = A.PERSONCODE AND I.ORDERDATE = A.ORDERDATE AND I.ORDERNO = A.ORDERNO");
3298 3299

  
3299
                strSQL += ", PERSONINCHARGEMASTER F";
3300
                strSQL.Append(", PERSONINCHARGEMASTER F");
3300 3301

  
3301
                strSQL += string.Format(" WHERE ((A.SEQNO = 1 AND A.ApprovalStatus != {0})", (int)CommonDefine.ApprovalStatus.Approval);
3302
                strSQL += string.Format(" OR (A.SEQNO = 1 AND A.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
3303
                strSQL += " AND DATE(A.UPDATEDATE) >= DATE(DATE_SUB(NOW(), INTERVAL 7 DAY))))";
3302
                strSQL.AppendFormat(" WHERE ((A.SEQNO = 1 AND A.ApprovalStatus != {0})", (int)CommonDefine.ApprovalStatus.Approval);
3303
                strSQL.AppendFormat(" OR (A.SEQNO = 1 AND A.ApprovalStatus = {0}", (int)CommonDefine.ApprovalStatus.Approval);
3304
                strSQL.Append(" AND DATE(A.UPDATEDATE) >= DATE(DATE_SUB(NOW(), INTERVAL 7 DAY))))");
3304 3305

  
3305
                strSQL += " AND F.PERSONCODE = E.APPROVALPERSON";
3306
                strSQL.Append(" AND F.PERSONCODE = E.APPROVALPERSON");
3306 3307

  
3307
                strSQL += " ORDER BY A.APPROVALCODE DESC, A.PETITIONAPPROVALDATE DESC, A.PERSONCODE ASC, A.ORDERNO DESC, E.DISPLAYORDER DESC";
3308
                if (!AppDB.ExecuteReader(strSQL, ref arData)) return false;
3308
                strSQL.Append(" ORDER BY A.APPROVALCODE DESC, A.PETITIONAPPROVALDATE DESC, A.PERSONCODE ASC, A.ORDERNO DESC, E.DISPLAYORDER DESC");
3309
                if (!AppDB.ExecuteReader(strSQL.ToString(), ref arData)) return false;
3309 3310

  
3310 3311
                return true;
3311 3312
            }
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.1.205")]
36
[assembly: AssemblyFileVersion("1.0.1.205")]
35
[assembly: AssemblyVersion("1.0.1.206")]
36
[assembly: AssemblyFileVersion("1.0.1.206")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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