プロジェクト

全般

プロフィール

リビジョン 363

堀内6年以上前に追加

他プロセス起動処理バグ修正

差分を表示:

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

  
19 19
        /// <summary>
20 20
        /// コピー・環境バージョン
branches/src/ProcessManagement/ProcessManagement/Common/Process/ClsOtherProc.cs
94 94

  
95 95
                // フォームをずらす
96 96
                frm.Location = CommonMotions.SetFormPosion(ParentsForm.Location);
97
                frm.Activate();
97 98
            }
98 99
            catch (Exception ex)
99 100
            {
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs
1729 1729
                // ??????o????J?E???g
1730 1730
                if (CommonMotions.chkNumeric(txtbox.Text))
1731 1731
                {   // ??????????
1732
                    if (txtbox.Text.ToString().Length <= 4)
1732
                    if (txtbox.Text.Length < 1) { }
1733
                    else if (txtbox.Text.ToString().Length <= 4)
1733 1734
                    {
1734 1735
                        txtbox.Text = dtToday.Year.ToString()
1735 1736
                                        + "/" + CommonMotions.cnvInt(txtbox.Text.Substring(0, 2)).ToString("00")
......
1738 1739
                }
1739 1740
                else
1740 1741
                {   // 99/99?????
1741
                    if (txtbox.Text.ToString().Length <= 5)
1742
                    if (txtbox.Text.Length < 1) { }
1743
                    else if (txtbox.Text.ToString().Length <= 5)
1742 1744
                    {
1743 1745
                        txtbox.Text = dtToday.Year.ToString()
1744 1746
                                        + "/" + CommonMotions.cnvInt(txtbox.Text.Substring(0, txtbox.Text.IndexOf("/"))).ToString("00")
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/ProcessControl.cs
816 816
                // 資材返却入力起動
817 817
                frm = new FrmMaterialReturnEntry();
818 818
                // クロースドハンドラをこちらで定義する
819
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
819
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
820 820

  
821 821
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
822 822
                                                    , m_ConstructionCode
......
1129 1129
            try
1130 1130
            {
1131 1131
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1132
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1132
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1133 1133
                bool ThisEnd = frm.ParentEnd;
1134 1134

  
1135 1135
                // フォームのクリア
......
1337 1337
        }
1338 1338
        #endregion
1339 1339

  
1340
        #region 資材返却入力のクローズを取得する
1341
        /// <summary>
1342
        /// 資材返却入力のクローズを取得する
1343
        /// </summary>
1344
        /// <param name="sender"></param>
1345
        /// <param name="e"></param>
1346
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1347
        {
1348
            try
1349
            {
1350
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1351
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1352
                bool ThisEnd = frm.ParentEnd;
1353

  
1354
                // フォームのクリア
1355
                ClsOtherProc.ProcFormClose(ProcessNo);
1356

  
1357
                if (ThisEnd)
1358
                {
1359
                    // 終了処理OFF
1360
                    m_CloseingProcessOn = false;
1361
                    this.Close();
1362
                }
1363
                else
1364
                {
1365
                    UpDateProcessContextMenu();
1366
                    this.Activate();
1367
                }
1368
            }
1369
            catch (Exception ex)
1370
            {
1371
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1372
            }
1373
        }
1374
        #endregion
1375

  
1340 1376
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1341 1377
    }
1342 1378
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1121 1121
            try
1122 1122
            {
1123 1123
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1124
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1125 1125
                bool ThisEnd = frm.ParentEnd;
1126 1126

  
1127 1127
                // フォームのクリア
......
1329 1329
        }
1330 1330
        #endregion
1331 1331

  
1332
        #region 資材返却入力のクローズを取得する
1333
        /// <summary>
1334
        /// 資材返却入力のクローズを取得する
1335
        /// </summary>
1336
        /// <param name="sender"></param>
1337
        /// <param name="e"></param>
1338
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1339
        {
1340
            try
1341
            {
1342
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1343
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1344
                bool ThisEnd = frm.ParentEnd;
1345

  
1346
                // フォームのクリア
1347
                ClsOtherProc.ProcFormClose(ProcessNo);
1348

  
1349
                if (ThisEnd)
1350
                {
1351
                    // 終了処理OFF
1352
                    m_CloseingProcessOn = false;
1353
                    this.Close();
1354
                }
1355
                else
1356
                {
1357
                    UpDateProcessContextMenu();
1358
                    this.Activate();
1359
                }
1360
            }
1361
            catch (Exception ex)
1362
            {
1363
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1364
            }
1365
        }
1366
        #endregion
1367

  
1332 1368
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1333 1369
    }
1334 1370
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1121 1121
            try
1122 1122
            {
1123 1123
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1124
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1125 1125
                bool ThisEnd = frm.ParentEnd;
1126 1126

  
1127 1127
                // フォームのクリア
......
1329 1329
        }
1330 1330
        #endregion
1331 1331

  
1332
        #region 資材返却入力のクローズを取得する
1333
        /// <summary>
1334
        /// 資材返却入力のクローズを取得する
1335
        /// </summary>
1336
        /// <param name="sender"></param>
1337
        /// <param name="e"></param>
1338
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1339
        {
1340
            try
1341
            {
1342
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1343
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1344
                bool ThisEnd = frm.ParentEnd;
1345

  
1346
                // フォームのクリア
1347
                ClsOtherProc.ProcFormClose(ProcessNo);
1348

  
1349
                if (ThisEnd)
1350
                {
1351
                    // 終了処理OFF
1352
                    m_CloseingProcessOn = false;
1353
                    this.Close();
1354
                }
1355
                else
1356
                {
1357
                    UpDateProcessContextMenu();
1358
                    this.Activate();
1359
                }
1360
            }
1361
            catch (Exception ex)
1362
            {
1363
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1364
            }
1365
        }
1366
        #endregion
1367

  
1332 1368
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1333 1369
    }
1334 1370
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/ProcessControl.cs
767 767
                // 資材返却入力起動
768 768
                frm = new FrmMaterialReturnEntry();
769 769
                // クロースドハンドラをこちらで定義する
770
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
770
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
771 771

  
772 772
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
773 773
                                                    , m_ConstructionCode
......
1067 1067
            try
1068 1068
            {
1069 1069
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1070
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1070
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1071 1071
                bool ThisEnd = frm.ParentEnd;
1072 1072

  
1073 1073
                // フォームのクリア
......
1275 1275
        }
1276 1276
        #endregion
1277 1277

  
1278
        #region 資材返却入力のクローズを取得する
1279
        /// <summary>
1280
        /// 資材返却入力のクローズを取得する
1281
        /// </summary>
1282
        /// <param name="sender"></param>
1283
        /// <param name="e"></param>
1284
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1285
        {
1286
            try
1287
            {
1288
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1289
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1290
                bool ThisEnd = frm.ParentEnd;
1291

  
1292
                // フォームのクリア
1293
                ClsOtherProc.ProcFormClose(ProcessNo);
1294

  
1295
                if (ThisEnd)
1296
                {
1297
                    // 終了処理OFF
1298
                    m_CloseingProcessOn = false;
1299
                    this.Close();
1300
                }
1301
                else
1302
                {
1303
                    UpDateProcessContextMenu();
1304
                    this.Activate();
1305
                }
1306
            }
1307
            catch (Exception ex)
1308
            {
1309
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1310
            }
1311
        }
1312
        #endregion
1313

  
1278 1314
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1279 1315
    }
1280 1316
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRConstruction/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepartmentCost/FrmDepartmentCostAux.cs
1811 1811
                // ??????o????J?E???g
1812 1812
                if (CommonMotions.chkNumeric(strCurCell))
1813 1813
                {   // ??????????
1814
                    if (strCurCell.Length <= 4)
1814
                    if (strCurCell.Length < 1) { }
1815
                    else if (strCurCell.Length <= 4)
1815 1816
                    {
1816 1817
                        CurCell.Value = dtToday.Year.ToString()
1817 1818
                                        + "/" + CommonMotions.cnvInt(strCurCell.Substring(0, 2)).ToString("00")
......
1819 1820
                    }
1820 1821
                }
1821 1822
                else
1822
                {   // 99/99?????
1823
                    if (strCurCell.ToString().Length <= 5)
1824
                    {
1823
                {
1824
                    if (strCurCell.Length < 1) { }
1825
                    else if (strCurCell.ToString().Length <= 5)
1826
                    {   // 99/99?????
1825 1827
                        CurCell.Value = dtToday.Year.ToString()
1826 1828
                                        + "/" + CommonMotions.cnvInt(strCurCell.Substring(0, strCurCell.IndexOf("/"))).ToString("00")
1827 1829
                                        + "/" + CommonMotions.cnvInt(strCurCell.Substring(strCurCell.IndexOf("/") + 1)).ToString("00");
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateBudget/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimateInput/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/EstimatePrint/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReserveEntry/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/MaterialReturnEntry/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderEntry/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderPrint/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1120 1120
            try
1121 1121
            {
1122 1122
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1123
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1124 1124
                bool ThisEnd = frm.ParentEnd;
1125 1125

  
1126 1126
                // フォームのクリア
......
1328 1328
        }
1329 1329
        #endregion
1330 1330

  
1331
        #region 資材返却入力のクローズを取得する
1332
        /// <summary>
1333
        /// 資材返却入力のクローズを取得する
1334
        /// </summary>
1335
        /// <param name="sender"></param>
1336
        /// <param name="e"></param>
1337
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1338
        {
1339
            try
1340
            {
1341
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1342
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1343
                bool ThisEnd = frm.ParentEnd;
1344

  
1345
                // フォームのクリア
1346
                ClsOtherProc.ProcFormClose(ProcessNo);
1347

  
1348
                if (ThisEnd)
1349
                {
1350
                    // 終了処理OFF
1351
                    m_CloseingProcessOn = false;
1352
                    this.Close();
1353
                }
1354
                else
1355
                {
1356
                    UpDateProcessContextMenu();
1357
                    this.Activate();
1358
                }
1359
            }
1360
            catch (Exception ex)
1361
            {
1362
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1363
            }
1364
        }
1365
        #endregion
1366

  
1331 1367
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1332 1368
    }
1333 1369
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInput/ProcessControl.cs
814 814
                // 資材返却入力起動
815 815
                frm = new FrmMaterialReturnEntry();
816 816
                // クロースドハンドラをこちらで定義する
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
817
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
818 818

  
819 819
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
820 820
                                                    , m_ConstructionCode
......
1119 1119
            try
1120 1120
            {
1121 1121
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1122
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1122
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1123 1123
                bool ThisEnd = frm.ParentEnd;
1124 1124

  
1125 1125
                // フォームのクリア
......
1327 1327
        }
1328 1328
        #endregion
1329 1329

  
1330
        #region 資材返却入力のクローズを取得する
1331
        /// <summary>
1332
        /// 資材返却入力のクローズを取得する
1333
        /// </summary>
1334
        /// <param name="sender"></param>
1335
        /// <param name="e"></param>
1336
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1337
        {
1338
            try
1339
            {
1340
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1341
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1342
                bool ThisEnd = frm.ParentEnd;
1343

  
1344
                // フォームのクリア
1345
                ClsOtherProc.ProcFormClose(ProcessNo);
1346

  
1347
                if (ThisEnd)
1348
                {
1349
                    // 終了処理OFF
1350
                    m_CloseingProcessOn = false;
1351
                    this.Close();
1352
                }
1353
                else
1354
                {
1355
                    UpDateProcessContextMenu();
1356
                    this.Activate();
1357
                }
1358
            }
1359
            catch (Exception ex)
1360
            {
1361
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1362
            }
1363
        }
1364
        #endregion
1365

  
1330 1366
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1331 1367
    }
1332 1368
}
branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/ProcessControl.cs
828 828
                // 資材返却入力起動
829 829
                frm = new FrmMaterialReturnEntry();
830 830
                // クロースドハンドラをこちらで定義する
831
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReserveClosed);
831
                frm.FormClosed += new FormClosedEventHandler(FrmMaterialReturnClosed);
832 832

  
833 833
                ClsOtherProc.ProcExec_MaterialReturn(ref frm
834 834
                                                    , m_ConstructionCode
......
1134 1134
            try
1135 1135
            {
1136 1136
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.PurchaseOrderPrint;
1137
                FrmPurchaseOrderEntry frm = (FrmPurchaseOrderEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1137
                FrmPurchaseOrderPrint frm = (FrmPurchaseOrderPrint)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1138 1138
                bool ThisEnd = frm.ParentEnd;
1139 1139

  
1140 1140
                // フォームのクリア
......
1342 1342
        }
1343 1343
        #endregion
1344 1344

  
1345
        #region 資材返却入力のクローズを取得する
1346
        /// <summary>
1347
        /// 資材返却入力のクローズを取得する
1348
        /// </summary>
1349
        /// <param name="sender"></param>
1350
        /// <param name="e"></param>
1351
        private void FrmMaterialReturnClosed(object sender, FormClosedEventArgs e)
1352
        {
1353
            try
1354
            {
1355
                int ProcessNo = (int)ClsExcute.ProcessExecuteNo.MaterialReturnEntry;
1356
                FrmMaterialReturnEntry frm = (FrmMaterialReturnEntry)ClsExcute.SubFormHandleList[ProcessNo].SubFormHandle;
1357
                bool ThisEnd = frm.ParentEnd;
1358

  
1359
                // フォームのクリア
1360
                ClsOtherProc.ProcFormClose(ProcessNo);
1361

  
1362
                if (ThisEnd)
1363
                {
1364
                    // 終了処理OFF
1365
                    m_CloseingProcessOn = false;
1366
                    this.Close();
1367
                }
1368
                else
1369
                {
1370
                    UpDateProcessContextMenu();
1371
                    this.Activate();
1372
                }
1373
            }
1374
            catch (Exception ex)
1375
            {
1376
                logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message);
1377
            }
1378
        }
1379
        #endregion
1380

  
1345 1381
        #endregion // ---------- 他プロセス終了ハンドラ群 END
1346 1382

  
1347 1383
        #region // ---------- 請求まとめ入力固有処理
branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs
32 32
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を 
33 33
// 既定値にすることができます:
34 34
// [assembly: AssemblyVersion("1.0.*")]
35
[assembly: AssemblyVersion("1.0.1.215")]
36
[assembly: AssemblyFileVersion("1.0.1.215")]
35
[assembly: AssemblyVersion("1.0.1.216")]
36
[assembly: AssemblyFileVersion("1.0.1.216")]
37 37
// Log4netを使用する
38 38
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)]

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