プロジェクト

全般

プロフィール

リビジョン 328

堀内ほぼ7年前に追加

売掛一覧・請求書状況確認の金額差異のバグ修正
精算予算書の申請時チェック追加
請求書作成処理修正中

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs
1632 1632

  
1633 1633
                int NowPoint = ClsExcute.GetNowProcessPoint();
1634 1634

  
1635
                // ????????\??
1636
                lblProcessTitil.Text = ClsExcute.ProcessExecuteName[m_ExecuteFlg].Replace("?|", "");
1637

  
1638 1635
                // ?O???b?h??s??0????
1639 1636
                dgv.Rows.Clear();
1640 1637

  
......
1692 1689
                // ?f?[?^???????{?^????\??
1693 1690
                btnDataEntry.Visible = m_DataAddtionButton;
1694 1691

  
1692
                // ????????\??
1693
                lblProcessTitil.Text = ClsExcute.ProcessExecuteName[m_ExecuteFlg].Replace("?|", "");
1694
                //label1.Text = CreateTitle();
1695

  
1695 1696
                switch (m_ExecuteFlg)
1696 1697
                {
1697 1698
                    case (int)ClsExcute.ProcessExecuteNo.ConstructionBaseInfo:              // ?H????{????
......
1701 1702
                        radioButton1.Checked = true;
1702 1703
                        break;
1703 1704
                    case (int)ClsExcute.ProcessExecuteNo.EstimateInput:                     // ??Z???????
1704
                    case (int)ClsExcute.ProcessExecuteNo.EstimateBudget:                    // ??Z???????
1705
                    case (int)ClsExcute.ProcessExecuteNo.EstimateBudget:                    // ??Z?\?Z????
1705 1706
                        // ??????????\??
1706 1707
                        OtherStatusVisible("???F");
1707 1708
                        // ???w?i?F??X                
......
1762 1763
        }
1763 1764
        #endregion
1764 1765

  
1766
        #region ???^?C?g????\??
1767
        /// <summary>
1768
        /// ???^?C?g????\??
1769
        /// </summary>
1770
        /// <returns></returns>
1771
        private string CreateTitle()
1772
        {
1773
            try
1774
            {
1775
                string work = ClsExcute.ProcessExecuteName[m_ExecuteFlg].Replace("?|", "");
1776

  
1777
                StringBuilder stRet = new StringBuilder();
1778
                for(int i = 0; i < work.Length; i++)
1779
                {
1780
                    if (0 < i) stRet.Append("?@");
1781
                    stRet.Append(work.Substring(i, 1));
1782
                }
1783
                stRet.Append("?@?? ??");
1784

  
1785
                return stRet.ToString();
1786
            }
1787
            catch (Exception ex)
1788
            {
1789
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1790
                return string.Empty;
1791
            }
1792
        }
1793
        #endregion
1794

  
1765 1795
        #region ??????????\??
1766 1796
        /// <summary>
1767 1797
        /// ??????????\??
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudget.cs
323 323
        private double m_ConstructionTimes = 0;
324 324

  
325 325
        /// <summary>
326
        /// ????f?[?^????G???A
327
        /// </summary>
328
        private List<EstimateBudgetDetail> m_DetailDataList = new List<EstimateBudgetDetail>();
329
        
330
        /// <summary>
331 326
        /// ?????Z?o???
332 327
        /// </summary>
333 328
        private FrmCostCalculation m_frmCostCalc = null;
......
1195 1190
        /// <param name="e"></param>
1196 1191
        private void btnPetition_Click(object sender, EventArgs e)
1197 1192
        {
1198
            IOEstimateBudget BudgetDB = new IOEstimateBudget();
1199 1193
            try
1200 1194
            {
1201
                // ??Z?\?Z?f?[?^??????????o?^????
1202
                string strSQL = BudgetDB.CreatePrimarykeyString(m_ConstructionCode);
1203
                EstimateBudget BudgetRec = new EstimateBudget();
1204
                if (!BudgetDB.SelectAction(strSQL, ref BudgetRec)) m_bChengeAns = true;
1195
                bool bDispMsg = true;
1196
                // ??Z?\?Z?f?[?^?????????????`?F?b?N
1197
                if (!CheckBudgetData())
1198
                {
1199
                    if (MessageBox.Show("?\?????e??o?^???????????A?X?V????????H", "?o?^?m?F"
1200
                                        , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return;
1201
                    m_bChengeAns = true;
1202
                    bDispMsg = false;
1203
                }
1205 1204

  
1206 1205
                // ?f?[?^??X?L????f?[?^?o?^
1207 1206
                if (m_bChengeAns)
1208 1207
                {
1209
                    if (!DataEntryProcess()) return;
1208
                    if (!DataEntryProcess(bDispMsg)) return;
1210 1209
                }
1211 1210

  
1212 1211
                // ?\??????????`?F?b?N
......
1237 1236
            {
1238 1237
                logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
1239 1238
            }
1240
            finally
1241
            {
1242
                BudgetDB.close(); BudgetDB = null;
1243
            }
1244 1239
        }
1245 1240
        #endregion
1246 1241

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/FrmEstimateBudgetAuxiliary.cs
892 892
                strSQL.AppendFormat(" WHERE CONSTRUCTIONCODE = {0}", m_ConstructionCode);
893 893
                strSQL.Append(" ORDER BY GROUPCOUNT, LINECOUNT");
894 894

  
895
                m_DetailDataList.Clear();
896
                if (!DetailDB.SelectAction(strSQL.ToString(), ref m_DetailDataList)) return false;
895
                // 明細データ保持エリア
896
                List<EstimateBudgetDetail> DetailDataList = new List<EstimateBudgetDetail>();
897
                if (!DetailDB.SelectAction(strSQL.ToString(), ref DetailDataList)) return false;
897 898
                // データ無は処理しない
898
                if (m_DetailDataList.Count == 0) return true;
899
                if (DetailDataList.Count == 0) return true;
899 900

  
900 901
                // 工期退避
901 902
                m_ConstructionTimes = CommonMotions.cnvDouble(m_dispLabelControl[(int)DispControl.ConstructionTime].Text);
902 903
                // 表示されている行にセットする
903
                RestoreDspData();
904
                RestoreDspData(DetailDataList);
904 905

  
905 906
                return true;
906 907
            }
......
2556 2557
        /// 登録ボタン押下後の登録処理
2557 2558
        /// </summary>
2558 2559
        /// <returns></returns>
2559
        private bool DataEntryProcess()
2560
        private bool DataEntryProcess(bool bDispMsg = true)
2560 2561
        {
2561 2562
            IOEstimateBudget ebMainDB = new IOEstimateBudget();
2562 2563
            IOEstimateBudgetDetail ebDetailDB = new IOEstimateBudgetDetail();
......
2566 2567
                //データチェック
2567 2568
                if (!DispFeildCheck()) return false;
2568 2569

  
2569
                if (MessageBox.Show("積算見積情報を更新します、よろしいですか?", "登録確認"
2570
                                    , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
2570
                if (bDispMsg)
2571
                {
2572
                    if (MessageBox.Show("積算予算データを登録します、よろしいですか?", "登録確認"
2573
                                        , MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) return false;
2574
                }
2571 2575

  
2572 2576
                // データ接続
2573 2577
                ebMainDB.connect(); ebMainDB.beginTran();
2574 2578
                ebDetailDB.connect(); ebDetailDB.beginTran();
2575 2579
                edDetailDB.connect(); edDetailDB.beginTran();
2576 2580

  
2577
                // 積算見積データ
2581
                // 積算予算データ
2578 2582
                if (!EstimateBudgetDataEntry(ebMainDB))
2579 2583
                {
2580 2584
                    ebMainDB.rollback();
2581 2585
                    return false;
2582 2586
                }
2583 2587

  
2584
                // 積算見積ページデータ
2588
                // 積算予算明細データ
2585 2589
                if (!EstimateBudgetDetailEntry(ebDetailDB))
2586 2590
                {
2587 2591
                    ebMainDB.rollback();
......
2969 2973
        }
2970 2974
        #endregion
2971 2975

  
2972
        #region 見積データ再引込時処理
2973
        /// <summary>
2974
        /// グリッドデータの退避
2975
        /// </summary>
2976
        private void SaveDspData()
2977
        {
2978
            try
2979
            {
2980
                m_DetailDataList.Clear();
2981
                // 工期退避
2982
                m_ConstructionTimes = CommonMotions.cnvDouble(m_dispLabelControl[(int)DispControl.ConstructionTime].Text);
2983

  
2984
                DataGridView dgv = dgvAllDisplay;
2985
                foreach (DataGridViewRow wrkRow in dgv.Rows)
2986
                {
2987
                    // 空白行は処理しない
2988
                    if (BlankLine(wrkRow.Index)) continue;
2989
                    // 明細チェック
2990
                    if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.TotalFlg].Value)) continue;
2991
                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.TotalFlg].Value) != 0) continue;
2992

  
2993
                    if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.TitleFlg].Value)) continue;
2994
                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.TitleFlg].Value) == 1) continue;
2995

  
2996
                    if (CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.BlankFlg].Value)) continue;
2997
                    if (CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.BlankFlg].Value) == 1) continue;
2998

  
2999
                    // データセット
3000
                    EstimateBudgetDetail work = new EstimateBudgetDetail();
3001
                    // グループ番号
3002
                    work.GroupCount = CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.GroupCount].Value);
3003

  
3004
                    // 構成キー
3005
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.ComponentCode].Value))
3006
                        work.ComponentCode = CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.ComponentCode].Value);
3007
                    // 工種キー
3008
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.ItemCode].Value))
3009
                        work.ItemCode = CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.ItemCode].Value);
3010
                    // 協力会社コード
3011
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.SubContractorCode].Value))
3012
                        work.CompanyCode = CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.SubContractorCode].Value);
3013
                    // 工種名称・協力会社名
3014
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.FirstString].Value))
3015
                        work.FirstString = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn.FirstString].Value).Trim();
3016
                    // 内容
3017
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.SecondString].Value))
3018
                        work.SecondString = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn.SecondString].Value).Trim();
3019
                    // 見積時金額
3020
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.EstimatePrice].Value))
3021
                        work.EstimatePrice = CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.EstimatePrice].Value);
3022
                    // 交渉時金額
3023
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.NegotiationPrice].Value))
3024
                        work.NegotiationPrice = CommonMotions.cnvInt(wrkRow.Cells[(int)DispGridColumn.NegotiationPrice].Value);
3025
                    // 注意事項
3026
                    if (!CommonMotions.chkObjectIsNull(wrkRow.Cells[(int)DispGridColumn.Notes].Value))
3027
                        work.Notes = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn.Notes].Value).Trim();
3028

  
3029
                    m_DetailDataList.Add(work);
3030
                }
3031
                // 合計計算
3032
                CalcBlockTotalLoop();
3033
            }
3034
            catch (System.Exception ex)
3035
            {
3036
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
3037
            }
3038
        }
3039
        #endregion
3040

  
3041 2976
        #region 退避エリアとグリッドデータのマッチングを行う
3042 2977
        /// <summary>
3043 2978
        /// 退避エリアとグリッドデータのマッチングを行う
3044 2979
        /// </summary>
3045
        private void RestoreDspData()
2980
        private void RestoreDspData(List<EstimateBudgetDetail> DetailDataList)
3046 2981
        {
3047 2982
            try
3048 2983
            {
......
3086 3021
                    strFirstString = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn.FirstString].Value);
3087 3022
                    strSecondString = CommonMotions.cnvString(wrkRow.Cells[(int)DispGridColumn.SecondString].Value);
3088 3023
                    GetData = -1;
3089
                    GetData = GetSaveDataToNegotiationPrice(nGroupCount,
3090
                                                                nComponentCode,
3091
                                                                nSubContractorCode,
3092
                                                                strFirstString,
3093
                                                                strSecondString,
3094
                                                                ref Notes);
3024
                    GetData = GetSaveDataToNegotiationPrice(DetailDataList,
3025
                                                            nGroupCount,
3026
                                                            nComponentCode,
3027
                                                            nSubContractorCode,
3028
                                                            strFirstString,
3029
                                                            strSecondString,
3030
                                                            ref Notes);
3095 3031
                    // 注意事項
3096 3032
                    wrkRow.Cells[(int)DispGridColumn.Notes].Value = Notes;
3097 3033

  
......
3118 3054
        /// <param name="para3">項目・協力会社</param>
3119 3055
        /// <param name="para4">内容</param>
3120 3056
        /// <returns></returns>
3121
        private int GetSaveDataToNegotiationPrice(int GroupNo, int para1, int para2, string para3, string para4, ref string Notes)
3057
        private int GetSaveDataToNegotiationPrice(List<EstimateBudgetDetail> DetailDataList,
3058
                                                    int GroupNo, int para1, int para2, string para3, string para4, ref string Notes)
3122 3059
        {
3123 3060
            try
3124 3061
            {
3125 3062
                int GetData = -1;
3126 3063
                bool bBreaksw = false;
3127 3064
                // テーブルより元のデータを探す
3128
                foreach (EstimateBudgetDetail wrkRec in m_DetailDataList)
3065
                foreach (EstimateBudgetDetail wrkRec in DetailDataList)
3129 3066
                {
3130 3067
                    // グループ番号が違えば処理しない
3131 3068
                    if (GroupNo != wrkRec.GroupCount) continue;
......
3360 3297
            }
3361 3298
        }
3362 3299
        #endregion
3300

  
3301
        #region 積算予算データの表示データと登録データが同じものかのチェック
3302
        /// <summary>
3303
        /// 積算予算データの表示データと登録データが同じものかのチェック
3304
        /// </summary>
3305
        /// <returns></returns>
3306
        private bool CheckBudgetData()
3307
        {
3308
            IOEstimateBudget BudgetDB = new IOEstimateBudget();
3309
            IOEstimateBudgetDetail ebDetailDB = new IOEstimateBudgetDetail();
3310
            try
3311
            {
3312
                // 積算予算データが無い場合は登録する
3313
                string strSQL = BudgetDB.CreatePrimarykeyString(m_ConstructionCode);
3314
                EstimateBudget BudgetRec = new EstimateBudget();
3315
                if (!BudgetDB.SelectAction(strSQL, ref BudgetRec)) return false;
3316

  
3317
                // 存在したら明細が同じかをチェックする
3318
                List<EstimateBudgetDetail> DetailRec = new List<EstimateBudgetDetail>();
3319
                if (!ebDetailDB.SelectAction(strSQL, ref DetailRec)) return false;
3320

  
3321
                // 明細データを同じものが画面上にあるかを検索する
3322
                DataGridView dgv = dgvAllDisplay;
3323
                bool MatchData = true;
3324
                foreach (EstimateBudgetDetail WrkRec in DetailRec)
3325
                {
3326
                    DataGridViewRow[] wrkRow = dgv.Rows.Cast<DataGridViewRow>().Where(x => 
3327
                                                                        WrkRec.GroupCount == CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.GroupCount].Value)        // グループ番号
3328
                                                                    && WrkRec.ComponentCode == CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.ComponentCode].Value)   // 構成キー
3329
                                                                    && WrkRec.ItemCode == CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.ItemCode].Value)             // 工種キー
3330
                                                                    && WrkRec.CompanyCode == CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.SubContractorCode].Value) // 協力会社コード
3331
                                                                    && WrkRec.FirstString == CommonMotions.cnvString(x.Cells[(int)DispGridColumn.FirstString].Value).Trim() // 工種名称・協力会社名
3332
                                                                    && WrkRec.SecondString == CommonMotions.cnvString(x.Cells[(int)DispGridColumn.SecondString].Value).Trim()   // 項目
3333
                                                                    && WrkRec.EstimatePrice == CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.EstimatePrice].Value)   // 見積時金額
3334
                                                                    && WrkRec.NegotiationPrice == CommonMotions.cnvInt(x.Cells[(int)DispGridColumn.NegotiationPrice].Value) // 交渉時金額
3335
                                                                    && WrkRec.Notes == CommonMotions.cnvString(x.Cells[(int)DispGridColumn.Notes].Value).Trim())        // 注意事項
3336
                                                                                .ToArray();
3337
                    if (wrkRow.Count() < 1)
3338
                    {
3339
                        MatchData = false;
3340
                        break;
3341
                    }
3342
                }
3343

  
3344
                return MatchData;
3345
            }
3346
            catch (Exception ex)
3347
            {
3348
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
3349
                return false;
3350
            }
3351
            finally
3352
            {
3353
                BudgetDB.close(); BudgetDB = null;
3354
                ebDetailDB.close(); ebDetailDB = null;
3355
            }
3356
        }
3357
        #endregion
3363 3358
    }
3364 3359
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs
274 274
            string strSubSQL = "";
275 275
            try
276 276
            {
277
                int nStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("????????")).Key;
277
                //int nStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("????????")).Key;
278 278
                int nNotStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
279 279
                // ?????????F???????????
280 280
                int ApprovalCode = ClsExcute.AppovalList.First(x => x.Value.Equals("???????F")).Key;
......
318 318
                strSQL.Append(" , constructionbaseinfo AS B");
319 319
                strSQL.Append(" LEFT JOIN personinchargemaster AS D ON D.PersonCode = B.ConstructionPersonCode");
320 320
                strSQL.Append(" LEFT JOIN departmentmaster AS E ON E.DepartmentCode = D.DepartmentCode");
321
                strSQL.Append(", orderersmaster AS C");
321
                strSQL.Append(" LEFT JOIN orderersmaster AS C");
322
                strSQL.Append(" On ( C.OrderCotegory = B.OrderersDivision");
323
                strSQL.Append(" AND C.OrderersCode = B.OrderersCode)");
322 324
                strSQL.Append(", constructionbaseinfodetail AS J");
323 325
                strSQL.Append(" WHERE");
324 326
                strSQL.Append(" (B.ConstructionCode = A.MAINCONSTRUCTIONCODE");
325 327
                strSQL.AppendFormat(" AND B.ConstructionPeriod = {0}", numUDConstPro.Value);
326 328
                if (m_BillingSplitFlg >= 0) strSQL.AppendFormat(" AND B.BillingSplitFlg = {0}", m_BillingSplitFlg);
327
                strSQL.AppendFormat(" AND (B.ConstructionStatusFlg >= {0}", nStatus);
328
                strSQL.AppendFormat(" AND B.ConstructionStatusFlg != {0}))", nNotStatus);
329
                strSQL.Append(" AND ( C.OrderCotegory = B.OrderersDivision");
330
                strSQL.Append(" AND C.OrderersCode = B.OrderersCode)");
329
                strSQL.AppendFormat(" AND (B.ConstructionStatusFlg != {0}))", nNotStatus);
331 330
                strSQL.Append(" AND (J.ConstructionCode = B.ConstructionCode");
332 331
                strSQL.AppendFormat(" AND J.DetailNo = {0})",(int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
333 332

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqList.cs
244 244
        {
245 245
            if (e.RowIndex < 0) return;
246 246
            // ?f?[?^??????????????
247
            if (dgvMaster.RowCount == 0) return;
248
            if (CommonMotions.chkCellBlank(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionName].Value)) return;
247
            if (dgvEntry.RowCount == 0) return;
248
            if (CommonMotions.chkCellBlank(dgvEntry.CurrentRow.Cells[(int)DispColumn.ConstructionName].Value)) return;
249 249

  
250 250
            // ?e?????N??
251
            int ConstrCode = CommonMotions.cnvIntFromStringCode(dgvMaster.CurrentRow.Cells[(int)DispColumn.ConstructionCode].Value.ToString(), "-");
252
            int OrderNo = CommonMotions.cnvInt(dgvMaster.CurrentRow.Cells[(int)DispColumn.OrderNo].Value);
251
            int ConstrCode = CommonMotions.cnvIntFromStringCode(dgvEntry.CurrentRow.Cells[(int)DispColumn.ConstructionCode].Value.ToString(), "-");
252
            int OrderNo = CommonMotions.cnvInt(dgvEntry.CurrentRow.Cells[(int)DispColumn.OrderNo].Value);
253 253
            SubProcessExecute(ConstrCode, OrderNo);
254 254
        }
255 255
        #endregion
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqList.designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = 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 44
            this.btnEnd = new System.Windows.Forms.Button();
45 45
            this.label1 = new System.Windows.Forms.Label();
46 46
            this.groupBox1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
......
56 56
            this.label2 = new System.Windows.Forms.Label();
57 57
            this.lblProcessTitil = new System.Windows.Forms.Label();
58 58
            this.btnDataUpDate = new System.Windows.Forms.Button();
59
            this.dgvMaster = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
59
            this.dgvEntry = new ProcessManagement.Forms.CustomControls.DataGridViewEX();
60 60
            this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
61 61
            this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn();
62 62
            this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
70 70
            this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
71 71
            this.groupBox1.SuspendLayout();
72 72
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit();
73
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).BeginInit();
73
            ((System.ComponentModel.ISupportInitialize)(this.dgvEntry)).BeginInit();
74 74
            this.SuspendLayout();
75 75
            // 
76 76
            // btnEnd
......
276 276
            this.btnDataUpDate.UseVisualStyleBackColor = false;
277 277
            this.btnDataUpDate.Click += new System.EventHandler(this.btnDataUpDate_Click);
278 278
            // 
279
            // dgvMaster
279
            // dgvEntry
280 280
            // 
281
            this.dgvMaster.AllowUserToAddRows = false;
282
            this.dgvMaster.AllowUserToDeleteRows = false;
283
            this.dgvMaster.AllowUserToResizeColumns = false;
284
            this.dgvMaster.AllowUserToResizeRows = false;
285
            dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
286
            this.dgvMaster.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
287
            this.dgvMaster.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
281
            this.dgvEntry.AllowUserToAddRows = false;
282
            this.dgvEntry.AllowUserToDeleteRows = false;
283
            this.dgvEntry.AllowUserToResizeColumns = false;
284
            this.dgvEntry.AllowUserToResizeRows = false;
285
            dataGridViewCellStyle14.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
286
            this.dgvEntry.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
287
            this.dgvEntry.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
288 288
            | System.Windows.Forms.AnchorStyles.Left) 
289 289
            | System.Windows.Forms.AnchorStyles.Right)));
290
            this.dgvMaster.BackgroundColor = System.Drawing.Color.White;
291
            this.dgvMaster.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
292
            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
293
            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
294
            dataGridViewCellStyle2.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
295
            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
296
            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
297
            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
298
            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
299
            this.dgvMaster.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
300
            this.dgvMaster.ColumnHeadersHeight = 24;
301
            this.dgvMaster.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
302
            this.dgvMaster.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
290
            this.dgvEntry.BackgroundColor = System.Drawing.Color.White;
291
            this.dgvEntry.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
292
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
293
            dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
294
            dataGridViewCellStyle15.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
295
            dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
296
            dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
297
            dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
298
            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
299
            this.dgvEntry.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
300
            this.dgvEntry.ColumnHeadersHeight = 24;
301
            this.dgvEntry.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
302
            this.dgvEntry.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
303 303
            this.Column1,
304 304
            this.Column9,
305 305
            this.Column5,
......
311 311
            this.Column2,
312 312
            this.Column11,
313 313
            this.Column8});
314
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
315
            dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window;
316
            dataGridViewCellStyle13.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
317
            dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText;
318
            dataGridViewCellStyle13.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
319
            dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
320
            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
321
            this.dgvMaster.DefaultCellStyle = dataGridViewCellStyle13;
322
            this.dgvMaster.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
323
            this.dgvMaster.EnableHeadersVisualStyles = false;
324
            this.dgvMaster.Location = new System.Drawing.Point(10, 103);
325
            this.dgvMaster.MultiSelect = false;
326
            this.dgvMaster.Name = "dgvMaster";
327
            this.dgvMaster.RowHeadersVisible = false;
328
            this.dgvMaster.RowHeadersWidth = 20;
329
            this.dgvMaster.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
330
            this.dgvMaster.RowTemplate.Height = 24;
331
            this.dgvMaster.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
332
            this.dgvMaster.Size = new System.Drawing.Size(1260, 508);
333
            this.dgvMaster.TabIndex = 5;
334
            this.dgvMaster.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
314
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
315
            dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window;
316
            dataGridViewCellStyle26.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
317
            dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText;
318
            dataGridViewCellStyle26.SelectionBackColor = System.Drawing.Color.LightSeaGreen;
319
            dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
320
            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
321
            this.dgvEntry.DefaultCellStyle = dataGridViewCellStyle26;
322
            this.dgvEntry.EditMode = System.Windows.Forms.DataGridViewEditMode.EditOnEnter;
323
            this.dgvEntry.EnableHeadersVisualStyles = false;
324
            this.dgvEntry.Location = new System.Drawing.Point(10, 103);
325
            this.dgvEntry.MultiSelect = false;
326
            this.dgvEntry.Name = "dgvEntry";
327
            this.dgvEntry.RowHeadersVisible = false;
328
            this.dgvEntry.RowHeadersWidth = 20;
329
            this.dgvEntry.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
330
            this.dgvEntry.RowTemplate.Height = 24;
331
            this.dgvEntry.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
332
            this.dgvEntry.Size = new System.Drawing.Size(1260, 508);
333
            this.dgvEntry.TabIndex = 5;
334
            this.dgvEntry.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvMaster_CellDoubleClick);
335 335
            // 
336 336
            // Column1
337 337
            // 
338
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
339
            this.Column1.DefaultCellStyle = dataGridViewCellStyle3;
338
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
339
            this.Column1.DefaultCellStyle = dataGridViewCellStyle16;
340 340
            this.Column1.HeaderText = "№";
341 341
            this.Column1.Name = "Column1";
342 342
            this.Column1.ReadOnly = true;
......
345 345
            // 
346 346
            // Column9
347 347
            // 
348
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
349
            this.Column9.DefaultCellStyle = dataGridViewCellStyle4;
348
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
349
            this.Column9.DefaultCellStyle = dataGridViewCellStyle17;
350 350
            this.Column9.HeaderText = "営業部署";
351 351
            this.Column9.Name = "Column9";
352 352
            this.Column9.ReadOnly = true;
......
354 354
            // 
355 355
            // Column5
356 356
            // 
357
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
358
            this.Column5.DefaultCellStyle = dataGridViewCellStyle5;
357
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
358
            this.Column5.DefaultCellStyle = dataGridViewCellStyle18;
359 359
            this.Column5.HeaderText = "営業担当者";
360 360
            this.Column5.Name = "Column5";
361 361
            this.Column5.ReadOnly = true;
......
364 364
            // 
365 365
            // Column10
366 366
            // 
367
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
368
            this.Column10.DefaultCellStyle = dataGridViewCellStyle6;
367
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
368
            this.Column10.DefaultCellStyle = dataGridViewCellStyle19;
369 369
            this.Column10.HeaderText = "工事部署";
370 370
            this.Column10.Name = "Column10";
371 371
            this.Column10.ReadOnly = true;
......
373 373
            // 
374 374
            // Column6
375 375
            // 
376
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
377
            this.Column6.DefaultCellStyle = dataGridViewCellStyle7;
376
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
377
            this.Column6.DefaultCellStyle = dataGridViewCellStyle20;
378 378
            this.Column6.HeaderText = "工事担当者";
379 379
            this.Column6.Name = "Column6";
380 380
            this.Column6.ReadOnly = true;
......
383 383
            // 
384 384
            // Column4
385 385
            // 
386
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
387
            this.Column4.DefaultCellStyle = dataGridViewCellStyle8;
386
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
387
            this.Column4.DefaultCellStyle = dataGridViewCellStyle21;
388 388
            this.Column4.HeaderText = "工 事 名 称";
389 389
            this.Column4.Name = "Column4";
390 390
            this.Column4.ReadOnly = true;
......
393 393
            // 
394 394
            // Column7
395 395
            // 
396
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
397
            this.Column7.DefaultCellStyle = dataGridViewCellStyle9;
396
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
397
            this.Column7.DefaultCellStyle = dataGridViewCellStyle22;
398 398
            this.Column7.HeaderText = "施工状態";
399 399
            this.Column7.Name = "Column7";
400 400
            this.Column7.ReadOnly = true;
......
403 403
            // 
404 404
            // Column3
405 405
            // 
406
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
407
            this.Column3.DefaultCellStyle = dataGridViewCellStyle10;
406
            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
407
            this.Column3.DefaultCellStyle = dataGridViewCellStyle23;
408 408
            this.Column3.HeaderText = "営業期";
409 409
            this.Column3.Name = "Column3";
410 410
            this.Column3.ReadOnly = true;
......
413 413
            // 
414 414
            // Column2
415 415
            // 
416
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
417
            this.Column2.DefaultCellStyle = dataGridViewCellStyle11;
416
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
417
            this.Column2.DefaultCellStyle = dataGridViewCellStyle24;
418 418
            this.Column2.HeaderText = "工事コード";
419 419
            this.Column2.Name = "Column2";
420 420
            this.Column2.ReadOnly = true;
......
431 431
            // 
432 432
            // Column8
433 433
            // 
434
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
435
            this.Column8.DefaultCellStyle = dataGridViewCellStyle12;
434
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
435
            this.Column8.DefaultCellStyle = dataGridViewCellStyle25;
436 436
            this.Column8.HeaderText = "作成";
437 437
            this.Column8.Name = "Column8";
438 438
            this.Column8.ReadOnly = true;
......
451 451
            this.Controls.Add(this.label1);
452 452
            this.Controls.Add(this.btnDataUpDate);
453 453
            this.Controls.Add(this.btnEnd);
454
            this.Controls.Add(this.dgvMaster);
454
            this.Controls.Add(this.dgvEntry);
455 455
            this.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
456 456
            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D;
457 457
            this.KeyPreview = true;
......
466 466
            this.groupBox1.ResumeLayout(false);
467 467
            this.groupBox1.PerformLayout();
468 468
            ((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).EndInit();
469
            ((System.ComponentModel.ISupportInitialize)(this.dgvMaster)).EndInit();
469
            ((System.ComponentModel.ISupportInitialize)(this.dgvEntry)).EndInit();
470 470
            this.ResumeLayout(false);
471 471

  
472 472
        }
......
478 478
        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBox1;
479 479
        private System.Windows.Forms.Label label2;
480 480
        private System.Windows.Forms.ComboBox cmbDepartment;
481
        private ProcessManagement.Forms.CustomControls.DataGridViewEX dgvMaster;
481
        private ProcessManagement.Forms.CustomControls.DataGridViewEX dgvEntry;
482 482
        private System.Windows.Forms.Label lblProcessTitil;
483 483
        private System.Windows.Forms.ComboBox cmbConstructionPerson;
484 484
        private System.Windows.Forms.Label label3;
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/ConstrReqList/FrmConstrReqListAuxiliary.cs
71 71
        {
72 72
            try
73 73
            {
74
                DataGridView dgv = dgvMaster;
74
                DataGridView dgv = dgvEntry;
75 75

  
76 76
                int NowPoint = ClsExcute.GetNowProcessPoint();
77 77
                // ??????l?N???A
......
258 258
            {
259 259
                int Status1 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("????????")).Key;
260 260
                int Status2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("??@?@??")).Key;
261
                int NotOrderStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
261
                int Status3 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
262 262

  
263 263
                strSQL.Append("SELECT * FROM (");
264 264
                for (int i = 0; i < 2; i++)
......
329 329
                    strSQL.Append(" AND A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
330 330
                    strSQL.AppendFormat(" AND B.DETAILNO = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstructionName);
331 331

  
332
                    strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG != {0}", Status3);
332 333
                    switch (i)
333 334
                    {
334 335
                        case 0:
......
336 337
                            {
337 338
                                case (int)ConstructionBaseInfo.BillingSplitFlgDef.AllOnBilling:
338 339
                                    // ??????????
339
                                    strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG >= {0}", Status1);
340
                                    strSQL.AppendFormat(" AND {0} <= A.CONSTRUCTIONSTATUSFLG", Status1);
340 341
                                    break;
341 342
                                case (int)ConstructionBaseInfo.BillingSplitFlgDef.SplitBilling:
342 343
                                    // ????????????
343
                                    strSQL.AppendFormat(" AND (A.CONSTRUCTIONSTATUSFLG >= {0}", Status2);
344
                                    strSQL.AppendFormat(" AND {0} <= A.CONSTRUCTIONSTATUSFLG", Status2);
344 345
                                    break;
345 346
                                default:
346 347
                                    break;
347 348
                            }
348
                            strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG != {0})", NotOrderStatus);
349 349
                            break;
350 350
                        case 1:
351 351
                            strSQL.Append(" AND E.MAINCONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
352
                            strSQL.AppendFormat(" AND A.CONSTRUCTIONSTATUSFLG != {0}", NotOrderStatus);
353 352
                            break;
354 353
                    }
355 354

  
......
387 386
            IOPurchaseOrder OrderDB = new IOPurchaseOrder();
388 387
            try
389 388
            {
390
                DataGridView dgv = dgvMaster;
389
                DataGridView dgv = dgvEntry;
391 390

  
392 391
                // ?f?[?^?\??
393 392
                int ino = 1;
......
534 533
            IOConstructionBaseInfo cbiDB = new IOConstructionBaseInfo();
535 534
            try
536 535
            {
537
                foreach (DataGridViewColumn wrkCol in dgvMaster.Columns) wrkCol.SortMode = DataGridViewColumnSortMode.NotSortable;
538
                dgvMaster.Rows.Clear();
536
                foreach (DataGridViewColumn wrkCol in dgvEntry.Columns) wrkCol.SortMode = DataGridViewColumnSortMode.NotSortable;
537
                dgvEntry.Rows.Clear();
539 538
                StringBuilder strSQL = new StringBuilder();
540 539
                // SQL??
541 540
                CreateInitSQL(ref strSQL);
......
550 549
                // ?f?[?^??????????\?[?g?????
551 550
                if (CommonDefine.s_MaxInitLineCount < arData.Count)
552 551
                {
553
                    foreach (DataGridViewColumn wrkCol in dgvMaster.Columns)
552
                    foreach (DataGridViewColumn wrkCol in dgvEntry.Columns)
554 553
                        wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
555 554
                }
556 555
                else
557 556
                {
558 557
                    // ?b???\?[?g??????
559
                    foreach (DataGridViewColumn wrkCol in dgvMaster.Columns)
558
                    foreach (DataGridViewColumn wrkCol in dgvEntry.Columns)
560 559
                        wrkCol.SortMode = DataGridViewColumnSortMode.Automatic;
561 560
                }
562 561
            }
......
567 566
            finally
568 567
            {
569 568
                cbiDB.close(); cbiDB = null;
570
                if (CommonDefine.s_MaxInitLineCount > dgvMaster.RowCount)
571
                    dgvMaster.RowCount += (CommonDefine.s_MaxInitLineCount - dgvMaster.RowCount);
569
                if (CommonDefine.s_MaxInitLineCount > dgvEntry.RowCount)
570
                    dgvEntry.RowCount += (CommonDefine.s_MaxInitLineCount - dgvEntry.RowCount);
572 571
            }
573 572
        }
574 573
        #endregion
......
581 580
        {
582 581
            try
583 582
            {
584
                DataGridView dgv = dgvMaster;
583
                DataGridView dgv = dgvEntry;
585 584

  
586 585
                int NowPoint = ClsExcute.GetNowProcessPoint();
587 586

  
......
596 595
                        break;
597 596
                }
598 597
                // ????????\??
599
                lblProcessTitil.Text = ClsExcute.ProcessExecuteName[m_ExecuteFlg].Replace("?|", "") + strSubTitle;
598
                lblProcessTitil.Text = string.Format("{0}{1}", ClsExcute.ProcessExecuteName[m_ExecuteFlg].Replace("?|", ""), strSubTitle);
600 599

  
601 600
                // ?O???b?h??s??0????
602 601
                dgv.Rows.Clear();
......
641 640
                // ?t?H?[???T?C?Y??
642 641
                m_FormWidthSize = this.Width;
643 642

  
644
                DataGridView dgv = dgvMaster;
643
                DataGridView dgv = dgvEntry;
645 644
                // ?O???b?h???????????
646 645
                m_GridWidthSize = dgv.Width;
647 646

  
......
668 667
        {
669 668
            try
670 669
            {
671
                DataGridView dgv = dgvMaster;
670
                DataGridView dgv = dgvEntry;
672 671
                int idifference = 0;
673 672
                // ??????
674 673
                if (!bNormal)
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.Designer.cs
28 28
        /// </summary>
29 29
        private void InitializeComponent()
30 30
        {
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
31
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
32
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
33
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
34
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
35
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
36
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
37
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
38
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
39
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
40
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
41
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
42
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
43
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
44
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
45
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
46
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
47
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
48
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
49
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
50
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
51
            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
52 52
            this.label3 = new System.Windows.Forms.Label();
53 53
            this.dgv1 = new System.Windows.Forms.DataGridView();
54 54
            this.col001 = new System.Windows.Forms.DataGridViewTextBoxColumn();
......
87 87
            this.groupBoxEx1 = new ProcessManagement.Forms.CustomControls.GroupBoxEx();
88 88
            this.label2 = new System.Windows.Forms.Label();
89 89
            this.label4 = new System.Windows.Forms.Label();
90
            this.pnlNormal = new System.Windows.Forms.Panel();
91
            this.btnApproval = new System.Windows.Forms.Button();
92 90
            this.cbReqMonth = new System.Windows.Forms.ComboBox();
93 91
            this.label5 = new System.Windows.Forms.Label();
94 92
            this.txtOrderer = new System.Windows.Forms.TextBox();
95 93
            this.lblReqOrder = new System.Windows.Forms.Label();
94
            this.pnlNormal = new System.Windows.Forms.Panel();
95
            this.button2 = new System.Windows.Forms.Button();
96
            this.btnApproval = new System.Windows.Forms.Button();
96 97
            this.pnlApproval = new System.Windows.Forms.Panel();
97 98
            this.btnDeny = new System.Windows.Forms.Button();
98 99
            this.btnPend = new System.Windows.Forms.Button();
99 100
            this.btnAgree = new System.Windows.Forms.Button();
101
            this.lblApprovalCount = new System.Windows.Forms.Label();
100 102
            ((System.ComponentModel.ISupportInitialize)(this.dgv1)).BeginInit();
101 103
            this.groupBoxEx1.SuspendLayout();
102 104
            this.pnlNormal.SuspendLayout();
......
107 109
            // 
108 110
            this.label3.BackColor = System.Drawing.Color.Gold;
109 111
            this.label3.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
110
            this.label3.Location = new System.Drawing.Point(464, 10);
112
            this.label3.Location = new System.Drawing.Point(465, 10);
111 113
            this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
112 114
            this.label3.Name = "label3";
113 115
            this.label3.Size = new System.Drawing.Size(400, 20);
......
150 152
            this.col098,
151 153
            this.col99});
152 154
            this.dgv1.EnableHeadersVisualStyles = false;
153
            this.dgv1.Location = new System.Drawing.Point(8, 98);
155
            this.dgv1.Location = new System.Drawing.Point(5, 98);
154 156
            this.dgv1.Name = "dgv1";
155 157
            this.dgv1.RowHeadersVisible = false;
156 158
            this.dgv1.RowHeadersWidth = 24;
157 159
            this.dgv1.RowTemplate.Height = 21;
158
            this.dgv1.Size = new System.Drawing.Size(1312, 477);
160
            this.dgv1.Size = new System.Drawing.Size(1320, 477);
159 161
            this.dgv1.TabIndex = 10;
160 162
            this.dgv1.CellBeginEdit += new System.Windows.Forms.DataGridViewCellCancelEventHandler(this.dgv1_CellBeginEdit);
161 163
            this.dgv1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgv1_CellEndEdit);
......
189 191
            // col004
190 192
            // 
191 193
            this.col004.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
192
            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
193
            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
194
            this.col004.DefaultCellStyle = dataGridViewCellStyle1;
194
            dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
195
            dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
196
            this.col004.DefaultCellStyle = dataGridViewCellStyle22;
195 197
            this.col004.Frozen = true;
196 198
            this.col004.HeaderText = "";
197 199
            this.col004.Name = "col004";
......
202 204
            // 
203 205
            // col005
204 206
            // 
205
            dataGridViewCellStyle2.BackColor = System.Drawing.Color.White;
206
            this.col005.DefaultCellStyle = dataGridViewCellStyle2;
207
            dataGridViewCellStyle23.BackColor = System.Drawing.Color.White;
208
            this.col005.DefaultCellStyle = dataGridViewCellStyle23;
207 209
            this.col005.Frozen = true;
208 210
            this.col005.HeaderText = "";
209 211
            this.col005.Name = "col005";
......
214 216
            // 
215 217
            // col006
216 218
            // 
217
            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
218
            dataGridViewCellStyle3.BackColor = System.Drawing.Color.White;
219
            this.col006.DefaultCellStyle = dataGridViewCellStyle3;
219
            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
220
            dataGridViewCellStyle24.BackColor = System.Drawing.Color.White;
221
            this.col006.DefaultCellStyle = dataGridViewCellStyle24;
220 222
            this.col006.Frozen = true;
221 223
            this.col006.HeaderText = "受注金額";
222 224
            this.col006.Name = "col006";
......
226 228
            // 
227 229
            // col007
228 230
            // 
229
            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
230
            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
231
            this.col007.DefaultCellStyle = dataGridViewCellStyle4;
231
            dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
232
            dataGridViewCellStyle25.BackColor = System.Drawing.SystemColors.Control;
233
            this.col007.DefaultCellStyle = dataGridViewCellStyle25;
232 234
            this.col007.Frozen = true;
233 235
            this.col007.HeaderText = "";
234 236
            this.col007.Name = "col007";
......
238 240
            // 
239 241
            // col008
240 242
            // 
241
            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
242
            this.col008.DefaultCellStyle = dataGridViewCellStyle5;
243
            dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
244
            this.col008.DefaultCellStyle = dataGridViewCellStyle26;
243 245
            this.col008.FillWeight = 120F;
244 246
            this.col008.Frozen = true;
245 247
            this.col008.HeaderText = "合計";
......
250 252
            // 
251 253
            // col009
252 254
            // 
253
            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
254
            this.col009.DefaultCellStyle = dataGridViewCellStyle6;
255
            dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
256
            this.col009.DefaultCellStyle = dataGridViewCellStyle27;
255 257
            this.col009.HeaderText = "1回目";
256 258
            this.col009.Name = "col009";
257 259
            this.col009.ReadOnly = true;
......
260 262
            // 
261 263
            // col010
262 264
            // 
263
            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
264
            this.col010.DefaultCellStyle = dataGridViewCellStyle7;
265
            dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
266
            this.col010.DefaultCellStyle = dataGridViewCellStyle28;
265 267
            this.col010.HeaderText = "2回目";
266 268
            this.col010.Name = "col010";
267 269
            this.col010.ReadOnly = true;
......
270 272
            // 
271 273
            // col011
272 274
            // 
273
            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
274
            this.col011.DefaultCellStyle = dataGridViewCellStyle8;
275
            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
276
            this.col011.DefaultCellStyle = dataGridViewCellStyle29;
275 277
            this.col011.HeaderText = "3回目";
276 278
            this.col011.Name = "col011";
277 279
            this.col011.ReadOnly = true;
......
280 282
            // 
281 283
            // col12
282 284
            // 
283
            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
284
            this.col12.DefaultCellStyle = dataGridViewCellStyle9;
285
            dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
286
            this.col12.DefaultCellStyle = dataGridViewCellStyle30;
285 287
            this.col12.HeaderText = "4回目";
286 288
            this.col12.Name = "col12";
287 289
            this.col12.ReadOnly = true;
......
291 293
            // 
292 294
            // col13
293 295
            // 
294
            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
295
            this.col13.DefaultCellStyle = dataGridViewCellStyle10;
296
            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
297
            this.col13.DefaultCellStyle = dataGridViewCellStyle31;
296 298
            this.col13.HeaderText = "5回目";
297 299
            this.col13.Name = "col13";
298 300
            this.col13.ReadOnly = true;
......
302 304
            // 
303 305
            // col14
304 306
            // 
305
            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
306
            this.col14.DefaultCellStyle = dataGridViewCellStyle11;
307
            dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
308
            this.col14.DefaultCellStyle = dataGridViewCellStyle32;
307 309
            this.col14.HeaderText = "6回目";
308 310
            this.col14.Name = "col14";
309 311
            this.col14.ReadOnly = true;
......
313 315
            // 
314 316
            // col15
315 317
            // 
316
            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
317
            this.col15.DefaultCellStyle = dataGridViewCellStyle12;
318
            dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
319
            this.col15.DefaultCellStyle = dataGridViewCellStyle33;
318 320
            this.col15.HeaderText = "7回目";
319 321
            this.col15.Name = "col15";
320 322
            this.col15.ReadOnly = true;
......
324 326
            // 
325 327
            // col16
326 328
            // 
327
            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
328
            this.col16.DefaultCellStyle = dataGridViewCellStyle13;
329
            dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
330
            this.col16.DefaultCellStyle = dataGridViewCellStyle34;
329 331
            this.col16.HeaderText = "8回目";
330 332
            this.col16.Name = "col16";
331 333
            this.col16.ReadOnly = true;
......
335 337
            // 
336 338
            // col17
337 339
            // 
338
            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
339
            this.col17.DefaultCellStyle = dataGridViewCellStyle14;
340
            dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
341
            this.col17.DefaultCellStyle = dataGridViewCellStyle35;
340 342
            this.col17.HeaderText = "9回目";
341 343
            this.col17.Name = "col17";
342 344
            this.col17.ReadOnly = true;
......
346 348
            // 
347 349
            // col18
348 350
            // 
349
            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
350
            this.col18.DefaultCellStyle = dataGridViewCellStyle15;
351
            dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
352
            this.col18.DefaultCellStyle = dataGridViewCellStyle36;
351 353
            this.col18.HeaderText = "10回目";
352 354
            this.col18.Name = "col18";
353 355
            this.col18.ReadOnly = true;
......
357 359
            // 
358 360
            // col19
359 361
            // 
360
            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
361
            this.col19.DefaultCellStyle = dataGridViewCellStyle16;
362
            dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
363
            this.col19.DefaultCellStyle = dataGridViewCellStyle37;
362 364
            this.col19.HeaderText = "11回目";
363 365
            this.col19.Name = "col19";
364 366
            this.col19.ReadOnly = true;
......
368 370
            // 
369 371
            // col20
370 372
            // 
371
            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
372
            this.col20.DefaultCellStyle = dataGridViewCellStyle17;
373
            dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
374
            this.col20.DefaultCellStyle = dataGridViewCellStyle38;
373 375
            this.col20.HeaderText = "12回目";
374 376
            this.col20.Name = "col20";
375 377
            this.col20.ReadOnly = true;
......
379 381
            // 
380 382
            // col21
381 383
            // 
382
            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
383
            this.col21.DefaultCellStyle = dataGridViewCellStyle18;
384
            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
385
            this.col21.DefaultCellStyle = dataGridViewCellStyle39;
384 386
            this.col21.HeaderText = "13回目";
385 387
            this.col21.Name = "col21";
386 388
            this.col21.ReadOnly = true;
......
390 392
            // 
391 393
            // col22
392 394
            // 
393
            dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
394
            this.col22.DefaultCellStyle = dataGridViewCellStyle19;
395
            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
396
            this.col22.DefaultCellStyle = dataGridViewCellStyle40;
395 397
            this.col22.HeaderText = "14回目";
396 398
            this.col22.Name = "col22";
397 399
            this.col22.ReadOnly = true;
......
401 403
            // 
402 404
            // col23
403 405
            // 
404
            dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
405
            this.col23.DefaultCellStyle = dataGridViewCellStyle20;
406
            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
407
            this.col23.DefaultCellStyle = dataGridViewCellStyle41;
406 408
            this.col23.HeaderText = "15回目";
407 409
            this.col23.Name = "col23";
408 410
            this.col23.ReadOnly = true;
......
412 414
            // 
413 415
            // col098
414 416
            // 
415
            dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
416
            this.col098.DefaultCellStyle = dataGridViewCellStyle21;
417
            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
418
            this.col098.DefaultCellStyle = dataGridViewCellStyle42;
417 419
            this.col098.HeaderText = "残り";
418 420
            this.col098.Name = "col098";
419 421
            this.col098.ReadOnly = true;
......
538 540
            this.groupBoxEx1.BorderColor = System.Drawing.Color.White;
539 541
            this.groupBoxEx1.Controls.Add(this.label2);
540 542
            this.groupBoxEx1.Controls.Add(this.label4);
541
            this.groupBoxEx1.Controls.Add(this.pnlNormal);
542 543
            this.groupBoxEx1.Controls.Add(this.cbReqMonth);
543 544
            this.groupBoxEx1.Controls.Add(this.label5);
544 545
            this.groupBoxEx1.Controls.Add(this.txtOrderer);
545 546
            this.groupBoxEx1.Controls.Add(this.lblReqOrder);
547
            this.groupBoxEx1.Controls.Add(this.pnlNormal);
546 548
            this.groupBoxEx1.Controls.Add(this.pnlApproval);
547
            this.groupBoxEx1.Location = new System.Drawing.Point(8, 52);
549
            this.groupBoxEx1.Location = new System.Drawing.Point(5, 52);
548 550
            this.groupBoxEx1.Name = "groupBoxEx1";
549
            this.groupBoxEx1.Size = new System.Drawing.Size(1312, 40);
551
            this.groupBoxEx1.Size = new System.Drawing.Size(1320, 40);
550 552
            this.groupBoxEx1.TabIndex = 18;
551 553
            this.groupBoxEx1.TabStop = false;
552 554
            // 
......
576 578
            this.label4.Text = "請求月";
577 579
            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
578 580
            // 
579
            // pnlNormal
580
            // 
581
            this.pnlNormal.Controls.Add(this.btnApproval);
582
            this.pnlNormal.Location = new System.Drawing.Point(1054, 1);
583
            this.pnlNormal.Name = "pnlNormal";
584
            this.pnlNormal.Size = new System.Drawing.Size(136, 36);
585
            this.pnlNormal.TabIndex = 8;
586
            // 
587
            // btnApproval
588
            // 
589
            this.btnApproval.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))));
590
            this.btnApproval.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
591
            this.btnApproval.Location = new System.Drawing.Point(2, 5);
592
            this.btnApproval.Name = "btnApproval";
593
            this.btnApproval.Size = new System.Drawing.Size(130, 27);
594
            this.btnApproval.TabIndex = 0;
595
            this.btnApproval.Text = "請求書申請";
596
            this.btnApproval.UseVisualStyleBackColor = false;
597
            this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click);
598
            // 
599 581
            // cbReqMonth
600 582
            // 
601 583
            this.cbReqMonth.BackColor = System.Drawing.Color.White;
......
641 623
            this.lblReqOrder.TabIndex = 7;
642 624
            this.lblReqOrder.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
643 625
            // 
626
            // pnlNormal
627
            // 
628
            this.pnlNormal.BackColor = System.Drawing.Color.White;
629
            this.pnlNormal.Controls.Add(this.lblApprovalCount);
630
            this.pnlNormal.Controls.Add(this.button2);
631
            this.pnlNormal.Controls.Add(this.btnApproval);
632
            this.pnlNormal.Location = new System.Drawing.Point(1053, 4);
633
            this.pnlNormal.Name = "pnlNormal";
634
            this.pnlNormal.Size = new System.Drawing.Size(262, 30);
635
            this.pnlNormal.TabIndex = 8;
636
            // 
637
            // button2
638
            // 
639
            this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
640
            this.button2.BackColor = System.Drawing.Color.White;
641
            this.button2.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
642
            this.button2.ForeColor = System.Drawing.Color.Red;
643
            this.button2.Location = new System.Drawing.Point(103, 3);
644
            this.button2.Name = "button2";
645
            this.button2.Size = new System.Drawing.Size(100, 24);
646
            this.button2.TabIndex = 13;
647
            this.button2.Text = "未承認";
648
            this.button2.UseVisualStyleBackColor = false;
649
            // 
650
            // btnApproval
651
            // 
652
            this.btnApproval.BackColor = System.Drawing.Color.White;
653
            this.btnApproval.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
654
            this.btnApproval.ForeColor = System.Drawing.Color.Red;
655
            this.btnApproval.Location = new System.Drawing.Point(3, 3);
656
            this.btnApproval.Name = "btnApproval";
657
            this.btnApproval.Size = new System.Drawing.Size(100, 24);
658
            this.btnApproval.TabIndex = 0;
659
            this.btnApproval.Text = "未申請";
660
            this.btnApproval.UseVisualStyleBackColor = false;
661
            this.btnApproval.Click += new System.EventHandler(this.btnApproval_Click);
662
            // 
644 663
            // pnlApproval
645 664
            // 
665
            this.pnlApproval.BackColor = System.Drawing.Color.White;
646 666
            this.pnlApproval.Controls.Add(this.btnDeny);
647 667
            this.pnlApproval.Controls.Add(this.btnPend);
648 668
            this.pnlApproval.Controls.Add(this.btnAgree);
649
            this.pnlApproval.Location = new System.Drawing.Point(1054, 1);
669
            this.pnlApproval.Location = new System.Drawing.Point(1053, 4);
650 670
            this.pnlApproval.Name = "pnlApproval";
651
            this.pnlApproval.Size = new System.Drawing.Size(254, 36);
671
            this.pnlApproval.Size = new System.Drawing.Size(262, 30);
652 672
            this.pnlApproval.TabIndex = 9;
653 673
            this.pnlApproval.Visible = false;
654 674
            // 
......
656 676
            // 
657 677
            this.btnDeny.BackColor = System.Drawing.Color.Red;
658 678
            this.btnDeny.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
659
            this.btnDeny.Location = new System.Drawing.Point(169, 5);
679
            this.btnDeny.Location = new System.Drawing.Point(171, 3);
660 680
            this.btnDeny.Name = "btnDeny";
661
            this.btnDeny.Size = new System.Drawing.Size(80, 27);
681
            this.btnDeny.Size = new System.Drawing.Size(84, 24);
662 682
            this.btnDeny.TabIndex = 2;
663 683
            this.btnDeny.Text = "不承認";
664 684
            this.btnDeny.UseVisualStyleBackColor = false;
......
668 688
            // 
669 689
            this.btnPend.BackColor = System.Drawing.Color.Yellow;
670 690
            this.btnPend.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
671
            this.btnPend.Location = new System.Drawing.Point(86, 5);
691
            this.btnPend.Location = new System.Drawing.Point(88, 3);
672 692
            this.btnPend.Name = "btnPend";
673
            this.btnPend.Size = new System.Drawing.Size(80, 27);
693
            this.btnPend.Size = new System.Drawing.Size(84, 24);
674 694
            this.btnPend.TabIndex = 1;
675 695
            this.btnPend.Text = "保留";
676 696
            this.btnPend.UseVisualStyleBackColor = false;
......
680 700
            // 
681 701
            this.btnAgree.BackColor = System.Drawing.Color.Lime;
682 702
            this.btnAgree.Font = new System.Drawing.Font("MS 明朝", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128)));
683
            this.btnAgree.Location = new System.Drawing.Point(3, 5);
703
            this.btnAgree.Location = new System.Drawing.Point(3, 3);
684 704
            this.btnAgree.Name = "btnAgree";
685
            this.btnAgree.Size = new System.Drawing.Size(80, 27);
705
            this.btnAgree.Size = new System.Drawing.Size(84, 24);
686 706
            this.btnAgree.TabIndex = 0;
687 707
            this.btnAgree.Text = "承認";
688 708
            this.btnAgree.UseVisualStyleBackColor = false;
689 709
            this.btnAgree.Click += new System.EventHandler(this.btnAgree_Click);
690 710
            // 
711
            // lblApprovalCount
712
            // 
713
            this.lblApprovalCount.BackColor = System.Drawing.Color.Black;
714
            this.lblApprovalCount.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
715
            this.lblApprovalCount.ForeColor = System.Drawing.Color.White;
716
            this.lblApprovalCount.Location = new System.Drawing.Point(205, 3);
717
            this.lblApprovalCount.Name = "lblApprovalCount";
718
            this.lblApprovalCount.Size = new System.Drawing.Size(50, 24);
719
            this.lblApprovalCount.TabIndex = 14;
720
            this.lblApprovalCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
721
            // 
691 722
            // FrmRequestInput
692 723
            // 
693 724
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
694 725
            this.BackColor = System.Drawing.Color.Black;
695
            this.ClientSize = new System.Drawing.Size(1328, 625);
726
            this.ClientSize = new System.Drawing.Size(1330, 625);
696 727
            this.Controls.Add(this.CombinedOrderLabel);
697 728
            this.Controls.Add(this.SeparateBillingLabel);
698 729
            this.Controls.Add(this.groupBoxEx1);
......
774 805
        private System.Windows.Forms.Label SeparateBillingLabel;
775 806
        private System.Windows.Forms.Label CombinedOrderLabel;
776 807
        private ProcessManagement.Forms.CustomControls.GroupBoxEx groupBoxEx1;
808
        private System.Windows.Forms.Button button2;
809
        private System.Windows.Forms.Label lblApprovalCount;
777 810
    }
778 811
}
779 812

  
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/FrmRequestInput.resx
192 192
  <metadata name="col99.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
193 193
    <value>True</value>
194 194
  </metadata>
195
  <metadata name="col001.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
196
    <value>True</value>
197
  </metadata>
198
  <metadata name="col002.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
199
    <value>True</value>
200
  </metadata>
201
  <metadata name="col003.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
202
    <value>True</value>
203
  </metadata>
204
  <metadata name="col004.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
205
    <value>True</value>
206
  </metadata>
207
  <metadata name="col005.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
208
    <value>True</value>
209
  </metadata>
210
  <metadata name="col006.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
211
    <value>True</value>
212
  </metadata>
213
  <metadata name="col007.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
214
    <value>True</value>
215
  </metadata>
216
  <metadata name="col008.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
217
    <value>True</value>
218
  </metadata>
219
  <metadata name="col009.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
220
    <value>True</value>
221
  </metadata>
222
  <metadata name="col010.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
223
    <value>True</value>
224
  </metadata>
225
  <metadata name="col011.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
226
    <value>True</value>
227
  </metadata>
228
  <metadata name="col12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
229
    <value>True</value>
230
  </metadata>
231
  <metadata name="col13.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
232
    <value>True</value>
233
  </metadata>
234
  <metadata name="col14.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
235
    <value>True</value>
236
  </metadata>
237
  <metadata name="col15.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
238
    <value>True</value>
239
  </metadata>
240
  <metadata name="col16.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
241
    <value>True</value>
242
  </metadata>
243
  <metadata name="col17.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
244
    <value>True</value>
245
  </metadata>
246
  <metadata name="col18.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
247
    <value>True</value>
248
  </metadata>
249
  <metadata name="col19.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
250
    <value>True</value>
251
  </metadata>
252
  <metadata name="col20.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
253
    <value>True</value>
254
  </metadata>
255
  <metadata name="col21.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
256
    <value>True</value>
257
  </metadata>
258
  <metadata name="col22.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
259
    <value>True</value>
260
  </metadata>
261
  <metadata name="col23.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
262
    <value>True</value>
263
  </metadata>
264
  <metadata name="col098.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
265
    <value>True</value>
266
  </metadata>
267
  <metadata name="col99.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
268
    <value>True</value>
269
  </metadata>
195 270
</root>
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/SalesConfirm/FrmSalesConfirmAuxiliary.cs
618 618
                int SelPerson = CommonMotions.cnvInt(comboBox3.SelectedValue);
619 619
                int SelDivision = CommonMotions.cnvInt(comboBox4.SelectedValue);
620 620
                int SelOrderer = CommonMotions.cnvInt(comboBox5.SelectedValue);
621
                int nNotStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
621 622

  
622 623
                sql.Append("select");
623 624

  
......
674 675
                sql.Append(" WHERE C1.ConstructionCode = A1.REQCONSTRUCTIONCODE");
675 676

  
676 677
                sql.AppendFormat(" AND C1.ConstructionPeriod = {0}", numericUpDown2.Value);
678
                sql.AppendFormat(" AND C1.ConstructionStatusFlg != {0}", nNotStatus);
677 679

  
678 680
                if (SelMonth != 0) sql.AppendFormat(" AND A1.REQUESTMONTH = {0}", SelMonth);
679 681
                if (SelDepartment != 0) sql.AppendFormat(" AND E1.DepartmentCode = {0}", SelDepartment);
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.1.151")]
36
[assembly: AssemblyFileVersion("1.0.1.151")]
35
[assembly: AssemblyVersion("1.0.1.153")]
36
[assembly: AssemblyFileVersion("1.0.1.153")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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