リビジョン 331
部署・担当者コンボボックス動作バグ修正
台帳一覧集計単位不具合修正
| branches/src/ProcessManagement/ProcessManagement/Common/CommonVersion.cs | ||
|---|---|---|
| 14 | 14 |
/// <summary> |
| 15 | 15 |
/// 本体バージョン |
| 16 | 16 |
/// </summary> |
| 17 |
public static int s_SystemVersion = 155;
|
|
| 17 |
public static int s_SystemVersion = 156;
|
|
| 18 | 18 |
|
| 19 | 19 |
/// <summary> |
| 20 | 20 |
/// コピー・環境バージョン |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs | ||
|---|---|---|
| 283 | 283 |
/// <summary> |
| 284 | 284 |
/// ?????R???{?{?b?N?X????????Z?b?g????
|
| 285 | 285 |
/// </summary> |
| 286 |
private bool SetcmbDepartment()
|
|
| 286 |
private void SetcmbDepartment()
|
|
| 287 | 287 |
{
|
| 288 | 288 |
IOMDepartment depDB = new IOMDepartment(); |
| 289 | 289 |
bool bSave = m_bInitFlg; |
| ... | ... | |
| 291 | 291 |
try |
| 292 | 292 |
{
|
| 293 | 293 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(this.cmbDepartment_SelectedIndexChanged); |
| 294 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 294 | 295 |
|
| 295 | 296 |
cmbDepartment.DataSource = null; |
| 296 | 297 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 303 | 304 |
|
| 304 | 305 |
// ?????}?X?^??? |
| 305 | 306 |
ArrayList arList = new ArrayList(); |
| 306 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
| 307 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 307 | 308 |
|
| 308 | 309 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 309 | 310 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "")); |
| ... | ... | |
| 319 | 320 |
// ?R???{?{?b?N?X?????\??
|
| 320 | 321 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 321 | 322 |
|
| 322 |
return true;
|
|
| 323 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 323 | 324 |
} |
| 324 | 325 |
catch (Exception ex) |
| 325 | 326 |
{
|
| 326 | 327 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 327 |
return false; |
|
| 328 | 328 |
} |
| 329 | 329 |
finally |
| 330 | 330 |
{
|
| ... | ... | |
| 388 | 388 |
/// <summary> |
| 389 | 389 |
/// ?S????R???{?{?b?N?X????????Z?b?g????
|
| 390 | 390 |
/// </summary> |
| 391 |
private bool SetcmbPersons()
|
|
| 391 |
private void SetcmbPersons()
|
|
| 392 | 392 |
{
|
| 393 | 393 |
IOMPersonInCharge picDB = new IOMPersonInCharge(); |
| 394 | 394 |
bool bSave = m_bInitFlg; |
| ... | ... | |
| 396 | 396 |
try |
| 397 | 397 |
{
|
| 398 | 398 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(this.cmbConstructionPerson_SelectedIndexChanged); |
| 399 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 399 | 400 |
|
| 400 | 401 |
cmbConstructionPerson.DataSource = null; |
| 401 | 402 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 408 | 409 |
|
| 409 | 410 |
// ?S????}?X?^??? |
| 410 | 411 |
ArrayList workList = new ArrayList(); |
| 411 |
if (!picDB.ExecuteReader(strSQL.ToString(), ref workList)) return false;
|
|
| 412 |
if (!picDB.ExecuteReader(strSQL.ToString(), ref workList)) return; |
|
| 412 | 413 |
|
| 413 | 414 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 414 | 415 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "")); |
| ... | ... | |
| 425 | 426 |
// ?R???{?{?b?N?X?????\??
|
| 426 | 427 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 427 | 428 |
|
| 428 |
return true;
|
|
| 429 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 429 | 430 |
} |
| 430 | 431 |
catch (Exception ex) |
| 431 | 432 |
{
|
| 432 | 433 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 433 |
return false; |
|
| 434 | 434 |
} |
| 435 | 435 |
finally |
| 436 | 436 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
|---|---|---|
| 349 | 349 |
bool bSelPerson = false; |
| 350 | 350 |
if (PersonCode != 0) bSelPerson = true; |
| 351 | 351 |
|
| 352 |
if (bSelPerson) |
|
| 352 |
if (bSelPerson && cmbDepartment.Visible)
|
|
| 353 | 353 |
{
|
| 354 | 354 |
if(radioButton1.Checked) |
| 355 | 355 |
{
|
| ... | ... | |
| 2093 | 2093 |
try |
| 2094 | 2094 |
{
|
| 2095 | 2095 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 2096 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 2096 | 2097 |
|
| 2097 | 2098 |
cmbDepartment.DataSource = null; |
| 2098 | 2099 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 2121 | 2122 |
// ?R???{?{?b?N?X?????\??
|
| 2122 | 2123 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 2123 | 2124 |
|
| 2125 |
cmbDepartment.SelectedValue = nBeforeCode; |
|
| 2124 | 2126 |
} |
| 2125 | 2127 |
catch (Exception ex) |
| 2126 | 2128 |
{
|
| ... | ... | |
| 2147 | 2149 |
try |
| 2148 | 2150 |
{
|
| 2149 | 2151 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 2152 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 2150 | 2153 |
|
| 2151 | 2154 |
cmbConstructionPerson.DataSource = null; |
| 2152 | 2155 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 2176 | 2179 |
// ?R???{?{?b?N?X?????\??
|
| 2177 | 2180 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 2178 | 2181 |
|
| 2179 |
return; |
|
| 2182 |
cmbConstructionPerson.SelectedValue= nBeforeCode; |
|
| 2183 |
|
|
| 2180 | 2184 |
} |
| 2181 | 2185 |
catch (Exception ex) |
| 2182 | 2186 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionJoin/FrmConstructionJoinAuxiliary.cs | ||
|---|---|---|
| 259 | 259 |
try |
| 260 | 260 |
{
|
| 261 | 261 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 262 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 262 | 263 |
|
| 263 | 264 |
cmbDepartment.DataSource = null; |
| 264 | 265 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 287 | 288 |
// コンボボックス初期表示 |
| 288 | 289 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 289 | 290 |
|
| 290 |
return;
|
|
| 291 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 291 | 292 |
} |
| 292 | 293 |
catch (Exception ex) |
| 293 | 294 |
{
|
| ... | ... | |
| 314 | 315 |
try |
| 315 | 316 |
{
|
| 316 | 317 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 318 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 317 | 319 |
|
| 318 | 320 |
cmbConstructionPerson.DataSource = null; |
| 319 | 321 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 343 | 345 |
// コンボボックス初期表示 |
| 344 | 346 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 345 | 347 |
|
| 346 |
return; |
|
| 348 |
cmbConstructionPerson.SelectedValue = nBeforeCode; |
|
| 349 |
|
|
| 347 | 350 |
} |
| 348 | 351 |
catch (Exception ex) |
| 349 | 352 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/CreateLedgerSQL.cs | ||
|---|---|---|
| 97 | 97 |
|
| 98 | 98 |
StringBuilder strSQL = new StringBuilder(); |
| 99 | 99 |
|
| 100 |
DateTime dtDefaultStart = DateTime.MinValue;
|
|
| 101 |
DateTime dtDefaultEnd = DateTime.MinValue;
|
|
| 102 |
CreateDefaultStartAndEndDate(BusinessPeriod, ref dtDefaultStart, ref dtDefaultEnd); |
|
| 100 |
DateTime dtDefaultStart = CommonMotions.GetOpeningEndDate(BusinessPeriod, true);
|
|
| 101 |
DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate(BusinessPeriod, false);
|
|
| 102 |
|
|
| 103 | 103 |
strSQL.Append("Select");
|
| 104 | 104 |
strSQL.Append(" Person.DepartmentCode");
|
| 105 | 105 |
strSQL.Append(", Person.PersonCode");
|
| ... | ... | |
| 112 | 112 |
strSQL.Append(", Person.EndDate");
|
| 113 | 113 |
strSQL.Append(" From");
|
| 114 | 114 |
strSQL.Append(" personinchargemaster As Person");
|
| 115 |
strSQL.Append(" Left Join (Select");
|
|
| 116 |
strSQL.Append(" Ledger.PersonCode AS PersonCode");
|
|
| 117 |
strSQL.Append(" , MIN(Ledger.Start0) As SDate");
|
|
| 118 |
strSQL.Append(" , MAX(Ledger.Comp0) AS EDate");
|
|
| 119 |
strSQL.Append(" From");
|
|
| 120 |
strSQL.Append(" (Select");
|
|
| 121 |
strSQL.Append(" LDetail.CompanyCode As PersonCode");
|
|
| 122 |
strSQL.Append(", Ledger.ConstructionStart As Start0");
|
|
| 123 |
strSQL.Append(", Ledger.ConstructionEnd As Comp0");
|
|
| 124 |
strSQL.Append(", LDetail.GROUPCOUNT");
|
|
| 125 |
strSQL.Append(", LDetail.ConstructionCode");
|
|
| 126 |
strSQL.Append(" From");
|
|
| 127 |
strSQL.Append(" constructionledgerdetail As LDetail");
|
|
| 128 |
strSQL.Append(" Inner Join constructionledger As Ledger On Ledger.ConstructionCode = LDetail.ConstructionCode");
|
|
| 129 |
strSQL.Append(", constructionbaseinfo As Base");
|
|
| 130 |
strSQL.Append(" Where");
|
|
| 131 |
strSQL.AppendFormat(" LDetail.GroupCount IN ({0}, {1}, {2})"
|
|
| 132 |
, (int)FrmConstructionLedger.DataGroup.Instructor |
|
| 133 |
, (int)FrmConstructionLedger.DataGroup.Assistant |
|
| 134 |
, (int)FrmConstructionLedger.DataGroup.Payroll); |
|
| 135 |
strSQL.Append(" And LDetail.CompanyCode <> 0");
|
|
| 136 |
strSQL.Append(" And Base.ConstructionCode = LDetail.ConstructionCode");
|
|
| 137 |
strSQL.AppendFormat(" And Base.ConstructionStatusFlg <> {0}", NotOrder);
|
|
| 138 |
strSQL.AppendFormat(" And Base.ConstructionPeriod = {0}) As Ledger", BusinessPeriod);
|
|
| 139 |
strSQL.Append(" Group By Ledger.PersonCode) As Detail");
|
|
| 115 |
|
|
| 116 |
strSQL.Append(" Left Join chgchargedep As DepHis");
|
|
| 117 |
strSQL.Append(" ON DepHis.PersonCode = Person.PersonCode");
|
|
| 118 |
strSQL.AppendFormat(" AND ((DATE(DepHis.STARTDATE) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
|
|
| 119 |
strSQL.AppendFormat(" AND (DATE('{0}') <= DATE(DepHis.CompDate)", dtDefaultStart.ToShortDateString());
|
|
| 120 |
strSQL.AppendFormat(" OR DATE('{0}') = DATE(DepHis.CompDate)))", DateTime.MinValue.ToShortDateString());
|
|
| 121 |
|
|
| 122 |
strSQL.Append(" Left Join (Select Ledger.PersonCode AS PersonCode");
|
|
| 123 |
strSQL.Append(" , MIN(Ledger.Start0) As SDate");
|
|
| 124 |
strSQL.Append(" , MAX(Ledger.Comp0) AS EDate");
|
|
| 125 |
strSQL.Append(" From");
|
|
| 126 |
strSQL.Append(" (Select LDetail.CompanyCode As PersonCode");
|
|
| 127 |
strSQL.Append(" , Ledger.ConstructionStart As Start0");
|
|
| 128 |
strSQL.Append(" , Ledger.ConstructionEnd As Comp0");
|
|
| 129 |
strSQL.Append(" , LDetail.GROUPCOUNT");
|
|
| 130 |
strSQL.Append(" , LDetail.ConstructionCode");
|
|
| 131 |
strSQL.Append(" From constructionledgerdetail As LDetail");
|
|
| 132 |
strSQL.Append(" Inner Join constructionledger As Ledger");
|
|
| 133 |
strSQL.Append(" On Ledger.ConstructionCode = LDetail.ConstructionCode");
|
|
| 134 |
strSQL.Append(" , constructionbaseinfo As Base");
|
|
| 135 |
strSQL.AppendFormat(" Where LDetail.GroupCount IN ({0}, {1}, {2})"
|
|
| 136 |
, (int)FrmConstructionLedger.DataGroup.Instructor |
|
| 137 |
, (int)FrmConstructionLedger.DataGroup.Assistant |
|
| 138 |
, (int)FrmConstructionLedger.DataGroup.Payroll); |
|
| 139 |
strSQL.Append(" And LDetail.CompanyCode <> 0");
|
|
| 140 |
strSQL.Append(" And Base.ConstructionCode = LDetail.ConstructionCode");
|
|
| 141 |
strSQL.AppendFormat(" And Base.ConstructionStatusFlg <> {0}", NotOrder);
|
|
| 142 |
strSQL.AppendFormat(" And Base.ConstructionPeriod = {0}) As Ledger", BusinessPeriod);
|
|
| 143 |
strSQL.Append(" Group By Ledger.PersonCode) As Detail");
|
|
| 144 |
|
|
| 140 | 145 |
strSQL.Append(" ON Detail.PersonCode = Person.PersonCode");
|
| 141 | 146 |
strSQL.AppendFormat(" Where Person.LEDGERFLG = {0}", (int)PersonInChargeMaster.LedgerDivNoDef.CalcTarget);
|
| 142 | 147 |
|
| ... | ... | |
| 162 | 167 |
else |
| 163 | 168 |
{
|
| 164 | 169 |
// 部署コード選択時は部署を検索条件へ入れる |
| 165 |
strSQL.AppendFormat(" AND Person.DEPARTMENTCODE = {0}", DepartmentCode);
|
|
| 170 |
strSQL.AppendFormat(" AND DepHis.DEPARTMENTCODE = {0}", DepartmentCode);
|
|
| 166 | 171 |
} |
| 167 | 172 |
if (PersonCode != 0) strSQL.AppendFormat(" AND Person.PERSONCODE = {0}", PersonCode);
|
| 168 | 173 |
|
| 169 |
strSQL.AppendFormat(" And ((DATE(Person.StartDate) <= DATE ('{0}') And DATE (Person.EndDate) = DATE ('{1}'))"
|
|
| 170 |
, dtDefaultStart.ToShortDateString()
|
|
| 171 |
, DateTime.MinValue.ToShortDateString());
|
|
| 174 |
strSQL.AppendFormat(" AND ((DATE(Person.STARTDATE) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
|
|
| 175 |
strSQL.AppendFormat(" AND (DATE('{0}') <= DATE(Person.ENDDATE)", dtDefaultStart.ToShortDateString());
|
|
| 176 |
strSQL.AppendFormat(" OR DATE('{0}') = DATE(Person.ENDDATE)))", DateTime.MinValue.ToShortDateString());
|
|
| 172 | 177 |
|
| 173 |
strSQL.AppendFormat(" Or (DATE('{0}') <= DATE(Person.StartDate) And DATE(Person.StartDate) <= DATE('{1}'))"
|
|
| 174 |
, dtDefaultStart.ToShortDateString() |
|
| 175 |
, dtDefaultEnd.ToShortDateString()); |
|
| 176 |
|
|
| 177 |
strSQL.AppendFormat(" Or (DATE('{0}') <= DATE(Person.EndDate) And DATE(Person.EndDate) <= DATE('{1}')))"
|
|
| 178 |
, dtDefaultStart.ToShortDateString() |
|
| 179 |
, dtDefaultEnd.ToShortDateString()); |
|
| 180 |
|
|
| 181 | 178 |
strSQL.AppendFormat(" ORDER BY Person.EmployeeClassFlg, Person.DISPLAYORDER");
|
| 182 | 179 |
|
| 183 | 180 |
if (!PersonDB.ExecuteReader(strSQL.ToString(), ref TargetList)) return 0; |
| ... | ... | |
| 196 | 193 |
} |
| 197 | 194 |
#endregion |
| 198 | 195 |
|
| 199 |
#region デフォルトの期首日・期末日を求める |
|
| 200 |
/// <summary> |
|
| 201 |
/// デフォルトの期首日・期末日を求める |
|
| 202 |
/// </summary> |
|
| 203 |
/// <param name="dtStart"></param> |
|
| 204 |
/// <param name="dtEnd"></param> |
|
| 205 |
public static void CreateDefaultStartAndEndDate(int BusinessPeriod, ref DateTime dtStart, ref DateTime dtEnd) |
|
| 206 |
{
|
|
| 207 |
IOMBizPeriodHistory BizHisDB = new IOMBizPeriodHistory(); |
|
| 208 |
try |
|
| 209 |
{
|
|
| 210 |
// 当期期首年月日を取得 |
|
| 211 |
int iYear = 0; |
|
| 212 |
int month = 0; |
|
| 213 |
int day = 0; |
|
| 214 |
bool bPeriod = false; |
|
| 215 |
if (CommonMotions.SystemMasterData.ConstructionNoBase == (int)SystemMaster.ConstrNoBaseDef.BusinessPeriod) |
|
| 216 |
{ // 営業期
|
|
| 217 |
iYear = CommonMotions.PeriodCountToYear(BusinessPeriod); |
|
| 218 |
bPeriod = true; |
|
| 219 |
} |
|
| 220 |
else |
|
| 221 |
{ // 工事年度
|
|
| 222 |
iYear = CommonMotions.SystemMasterData.ConstrYear; |
|
| 223 |
} |
|
| 224 |
CommonMotions.GetNowBeginMonthDay(bPeriod, ref month, ref day); |
|
| 225 |
dtStart = new DateTime(iYear, month, day); |
|
| 226 |
|
|
| 227 |
StringBuilder strSQL = new StringBuilder(); |
|
| 228 |
strSQL.AppendFormat(" Where DATE(BeginDate) = DATE('{0}')", dtStart.ToShortDateString());
|
|
| 229 |
strSQL.AppendFormat(" And PeriodFlag = {0}", CommonMotions.SystemMasterData.ConstructionNoBase);
|
|
| 230 |
strSQL.Append(" Order By PeriodFlag Asc, PeriodYear Asc");
|
|
| 231 |
|
|
| 232 |
List<BizPeriodHistory> BizList = new List<BizPeriodHistory>(); |
|
| 233 |
if (!BizHisDB.SelectAction(strSQL.ToString(), ref BizList)) return; |
|
| 234 |
|
|
| 235 |
// 終了年月日 |
|
| 236 |
dtEnd = BizList[0].CompleteDate; |
|
| 237 |
} |
|
| 238 |
catch (Exception ex) |
|
| 239 |
{
|
|
| 240 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
|
| 241 |
} |
|
| 242 |
finally |
|
| 243 |
{
|
|
| 244 |
BizHisDB.close(); BizHisDB = null; |
|
| 245 |
} |
|
| 246 |
} |
|
| 247 |
#endregion |
|
| 248 |
|
|
| 249 | 196 |
#region 計算開始・終了日のチェック入れ替え |
| 250 | 197 |
/// <summary> |
| 251 | 198 |
/// 計算開始・終了日のチェック入れ替え |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs | ||
|---|---|---|
| 1013 | 1013 |
prgber.Update(); |
| 1014 | 1014 |
|
| 1015 | 1015 |
// ?f?t?H???g?J?n?E?I?????????? |
| 1016 |
DateTime dtDefaultStart = DateTime.MinValue; |
|
| 1017 |
DateTime dtDefaultEnd = DateTime.MinValue; |
|
| 1018 |
CreateLedgerSQL.CreateDefaultStartAndEndDate((int)numUDConstPro.Value, ref dtDefaultStart, ref dtDefaultEnd); |
|
| 1016 |
DateTime dtDefaultStart = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value, true); |
|
| 1017 |
DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value, false); |
|
| 1019 | 1018 |
|
| 1020 | 1019 |
// ----- ?o????^?\???i?w?b?_?[??\???j |
| 1021 | 1020 |
SetPayrollData(TargetList, dtDefaultStart, dtDefaultEnd, SalaryDB, LedgerDB); |
| ... | ... | |
| 1526 | 1525 |
try |
| 1527 | 1526 |
{
|
| 1528 | 1527 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 1528 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 1529 | 1529 |
|
| 1530 | 1530 |
cmbDepartment.DataSource = null; |
| 1531 | 1531 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 1554 | 1554 |
// ?R???{?{?b?N?X?????\??
|
| 1555 | 1555 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 1556 | 1556 |
|
| 1557 |
return;
|
|
| 1557 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 1558 | 1558 |
} |
| 1559 | 1559 |
catch (Exception ex) |
| 1560 | 1560 |
{
|
| ... | ... | |
| 1581 | 1581 |
try |
| 1582 | 1582 |
{
|
| 1583 | 1583 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 1584 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 1584 | 1585 |
|
| 1585 | 1586 |
cmbConstructionPerson.DataSource = null; |
| 1586 | 1587 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 1610 | 1611 |
// ?R???{?{?b?N?X?????\??
|
| 1611 | 1612 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 1612 | 1613 |
|
| 1613 |
return;
|
|
| 1614 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 1614 | 1615 |
} |
| 1615 | 1616 |
catch (Exception ex) |
| 1616 | 1617 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionSplit/FrmConstructionSplitAuxiliary.cs | ||
|---|---|---|
| 190 | 190 |
try |
| 191 | 191 |
{
|
| 192 | 192 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 193 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 193 | 194 |
|
| 194 | 195 |
cmbDepartment.DataSource = null; |
| 195 | 196 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 218 | 219 |
// コンボボックス初期表示 |
| 219 | 220 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 220 | 221 |
|
| 221 |
return;
|
|
| 222 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 222 | 223 |
} |
| 223 | 224 |
catch (Exception ex) |
| 224 | 225 |
{
|
| ... | ... | |
| 245 | 246 |
try |
| 246 | 247 |
{
|
| 247 | 248 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 249 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 248 | 250 |
|
| 249 | 251 |
cmbConstructionPerson.DataSource = null; |
| 250 | 252 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 274 | 276 |
// コンボボックス初期表示 |
| 275 | 277 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 276 | 278 |
|
| 277 |
return;
|
|
| 279 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 278 | 280 |
} |
| 279 | 281 |
catch (Exception ex) |
| 280 | 282 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CopyTargetList/FrmCopyTargetListAuxiliary.cs | ||
|---|---|---|
| 648 | 648 |
/// <summary> |
| 649 | 649 |
/// ?????R???{?{?b?N?X????????Z?b?g????
|
| 650 | 650 |
/// </summary> |
| 651 |
private bool SetcmbDepartment()
|
|
| 651 |
private void SetcmbDepartment()
|
|
| 652 | 652 |
{
|
| 653 | 653 |
IOMDepartment depDB = new IOMDepartment(); |
| 654 | 654 |
bool bSave = m_initDataLoad; |
| ... | ... | |
| 656 | 656 |
try |
| 657 | 657 |
{
|
| 658 | 658 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 659 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 659 | 660 |
|
| 660 | 661 |
cmbDepartment.DataSource = null; |
| 661 | 662 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 668 | 669 |
|
| 669 | 670 |
// ?????}?X?^??? |
| 670 | 671 |
ArrayList arList = new ArrayList(); |
| 671 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
| 672 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 672 | 673 |
|
| 673 | 674 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 674 | 675 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "")); |
| ... | ... | |
| 684 | 685 |
// ?R???{?{?b?N?X?????\??
|
| 685 | 686 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 686 | 687 |
|
| 687 |
return true;
|
|
| 688 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 688 | 689 |
} |
| 689 | 690 |
catch (Exception ex) |
| 690 | 691 |
{
|
| 691 | 692 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 692 |
return false; |
|
| 693 | 693 |
} |
| 694 | 694 |
finally |
| 695 | 695 |
{
|
| ... | ... | |
| 704 | 704 |
/// <summary> |
| 705 | 705 |
/// ?S????R???{?{?b?N?X????????Z?b?g????
|
| 706 | 706 |
/// </summary> |
| 707 |
private bool SetcmbPersons()
|
|
| 707 |
private void SetcmbPersons()
|
|
| 708 | 708 |
{
|
| 709 | 709 |
IOMPersonInCharge picDB = new IOMPersonInCharge(); |
| 710 | 710 |
bool bSave = m_initDataLoad; |
| ... | ... | |
| 712 | 712 |
try |
| 713 | 713 |
{
|
| 714 | 714 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 715 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 715 | 716 |
|
| 716 | 717 |
cmbConstructionPerson.DataSource = null; |
| 717 | 718 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 724 | 725 |
|
| 725 | 726 |
// ?S????}?X?^??? |
| 726 | 727 |
ArrayList workList = new ArrayList(); |
| 727 |
if (!picDB.ExecuteReader(strSQL.ToString(), ref workList)) return false;
|
|
| 728 |
if (!picDB.ExecuteReader(strSQL.ToString(), ref workList)) return; |
|
| 728 | 729 |
|
| 729 | 730 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 730 | 731 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "")); |
| ... | ... | |
| 741 | 742 |
// ?R???{?{?b?N?X?????\??
|
| 742 | 743 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 743 | 744 |
|
| 744 |
return true;
|
|
| 745 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 745 | 746 |
} |
| 746 | 747 |
catch (Exception ex) |
| 747 | 748 |
{
|
| 748 | 749 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 749 |
return false; |
|
| 750 | 750 |
} |
| 751 | 751 |
finally |
| 752 | 752 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/CostomerRegist/FrmCostomerRegistListAuxiliary.cs | ||
|---|---|---|
| 619 | 619 |
try |
| 620 | 620 |
{
|
| 621 | 621 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 622 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 622 | 623 |
|
| 623 | 624 |
cmbDepartment.DataSource = null; |
| 624 | 625 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 647 | 648 |
// ?R???{?{?b?N?X?????\??
|
| 648 | 649 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 649 | 650 |
|
| 650 |
return;
|
|
| 651 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 651 | 652 |
} |
| 652 | 653 |
catch (Exception ex) |
| 653 | 654 |
{
|
| ... | ... | |
| 674 | 675 |
try |
| 675 | 676 |
{
|
| 676 | 677 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 678 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 677 | 679 |
|
| 678 | 680 |
cmbConstructionPerson.DataSource = null; |
| 679 | 681 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 703 | 705 |
// ?R???{?{?b?N?X?????\??
|
| 704 | 706 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 705 | 707 |
|
| 706 |
return;
|
|
| 708 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 707 | 709 |
} |
| 708 | 710 |
catch (Exception ex) |
| 709 | 711 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRList/FrmDRListAuxiliary.cs | ||
|---|---|---|
| 851 | 851 |
/// <summary> |
| 852 | 852 |
/// ?????R???{?{?b?N?X????????Z?b?g????
|
| 853 | 853 |
/// </summary> |
| 854 |
private bool SetcmbDepartment()
|
|
| 854 |
private void SetcmbDepartment()
|
|
| 855 | 855 |
{
|
| 856 | 856 |
IOMDepartment depDB = new IOMDepartment(); |
| 857 | 857 |
bool bSave = m_initDataLoad; |
| ... | ... | |
| 859 | 859 |
try |
| 860 | 860 |
{
|
| 861 | 861 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 862 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 862 | 863 |
|
| 863 | 864 |
cmbDepartment.DataSource = null; |
| 864 | 865 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 871 | 872 |
|
| 872 | 873 |
// ?????}?X?^??? |
| 873 | 874 |
ArrayList arList = new ArrayList(); |
| 874 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
| 875 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 875 | 876 |
|
| 876 | 877 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 877 | 878 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "")); |
| ... | ... | |
| 887 | 888 |
// ?R???{?{?b?N?X?????\??
|
| 888 | 889 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 889 | 890 |
|
| 890 |
return true;
|
|
| 891 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 891 | 892 |
} |
| 892 | 893 |
catch (Exception ex) |
| 893 | 894 |
{
|
| 894 | 895 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 895 |
return false; |
|
| 896 | 896 |
} |
| 897 | 897 |
finally |
| 898 | 898 |
{
|
| ... | ... | |
| 915 | 915 |
try |
| 916 | 916 |
{
|
| 917 | 917 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged); |
| 918 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 918 | 919 |
|
| 919 | 920 |
cmbConstructionPerson.DataSource = null; |
| 920 | 921 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 943 | 944 |
|
| 944 | 945 |
// ?R???{?{?b?N?X?????\??
|
| 945 | 946 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 947 |
|
|
| 948 |
cmbConstructionPerson.SelectedValue= nBeforeCode; |
|
| 946 | 949 |
} |
| 947 | 950 |
catch (Exception ex) |
| 948 | 951 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWork.cs | ||
|---|---|---|
| 290 | 290 |
SetcmbDepartment(); |
| 291 | 291 |
|
| 292 | 292 |
// 担当者のセット |
| 293 |
SetcombBoxPerson();
|
|
| 293 |
SetcmbPersons();
|
|
| 294 | 294 |
|
| 295 | 295 |
// コンボボックス初期表示 |
| 296 | 296 |
InitCombBox(); |
| ... | ... | |
| 520 | 520 |
} |
| 521 | 521 |
|
| 522 | 522 |
// 担当者コンボボックスをセットする |
| 523 |
SetcombBoxPerson();
|
|
| 523 |
SetcmbPersons();
|
|
| 524 | 524 |
|
| 525 | 525 |
// 変数を取り込む |
| 526 | 526 |
SetVariableValue(); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DRWork/FrmDRWorkAuxiliary.cs | ||
|---|---|---|
| 718 | 718 |
else |
| 719 | 719 |
{
|
| 720 | 720 |
cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode; |
| 721 |
SetcombBoxPerson();
|
|
| 721 |
SetcmbPersons();
|
|
| 722 | 722 |
cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode; |
| 723 | 723 |
} |
| 724 | 724 |
|
| ... | ... | |
| 1003 | 1003 |
try |
| 1004 | 1004 |
{
|
| 1005 | 1005 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 1006 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 1006 | 1007 |
|
| 1007 | 1008 |
cmbDepartment.DataSource = null; |
| 1008 | 1009 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 1033 | 1034 |
// コンボボックス初期表示 |
| 1034 | 1035 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 1035 | 1036 |
|
| 1037 |
cmbConstructionPerson.SelectedValue= nBeforeCode; |
|
| 1036 | 1038 |
} |
| 1037 | 1039 |
catch (Exception ex) |
| 1038 | 1040 |
{
|
| ... | ... | |
| 1051 | 1053 |
/// <summary> |
| 1052 | 1054 |
/// 担当者コンボボックスへ文字をセットする |
| 1053 | 1055 |
/// </summary> |
| 1054 |
private void SetcombBoxPerson()
|
|
| 1056 |
private void SetcmbPersons()
|
|
| 1055 | 1057 |
{
|
| 1056 | 1058 |
IOMPersonInCharge picDB = new IOMPersonInCharge(); |
| 1057 | 1059 |
bool bSave = m_bInitFlg; |
| 1058 | 1060 |
m_bInitFlg = true; |
| 1059 | 1061 |
try |
| 1060 | 1062 |
{
|
| 1063 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
|
| 1064 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 1065 |
|
|
| 1061 | 1066 |
cmbConstructionPerson.DataSource = null; |
| 1062 | 1067 |
cmbConstructionPerson.Items.Clear(); |
| 1063 | 1068 |
cmbConstructionPerson.Text = ""; |
| ... | ... | |
| 1087 | 1092 |
// コンボボックス初期表示 |
| 1088 | 1093 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 1089 | 1094 |
|
| 1090 |
return;
|
|
| 1095 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 1091 | 1096 |
} |
| 1092 | 1097 |
catch (Exception ex) |
| 1093 | 1098 |
{
|
| ... | ... | |
| 1097 | 1102 |
{
|
| 1098 | 1103 |
picDB.close(); picDB = null; |
| 1099 | 1104 |
m_bInitFlg = bSave; |
| 1105 |
|
|
| 1106 |
cmbConstructionPerson.SelectedIndexChanged += new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
|
| 1100 | 1107 |
} |
| 1101 | 1108 |
} |
| 1102 | 1109 |
#endregion |
| ... | ... | |
| 1129 | 1136 |
bool bSave = m_bInitFlg; |
| 1130 | 1137 |
m_bInitFlg = true; |
| 1131 | 1138 |
cmbDepartment.SelectedValue = PersonRec.DepartmentCode; |
| 1132 |
SetcombBoxPerson(); // 担当者コンボボックス変更
|
|
| 1139 |
SetcmbPersons(); // 担当者コンボボックス変更
|
|
| 1133 | 1140 |
cmbConstructionPerson.SelectedValue = PersonCode; |
| 1134 | 1141 |
m_bInitFlg = bSave; |
| 1135 | 1142 |
} |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/DepExpenssList/FrmDepExpenssListAuxiliary.cs | ||
|---|---|---|
| 466 | 466 |
/// <summary> |
| 467 | 467 |
/// ?????R???{?{?b?N?X????????Z?b?g????
|
| 468 | 468 |
/// </summary> |
| 469 |
private bool SetcmbDepartment()
|
|
| 469 |
private void SetcmbDepartment()
|
|
| 470 | 470 |
{
|
| 471 | 471 |
IOMDepartment depDB = new IOMDepartment(); |
| 472 | 472 |
try |
| 473 | 473 |
{
|
| 474 | 474 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 475 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 475 | 476 |
|
| 476 | 477 |
cmbDepartment.DataSource = null; |
| 477 | 478 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 484 | 485 |
|
| 485 | 486 |
// ?????}?X?^??? |
| 486 | 487 |
ArrayList arList = new ArrayList(); |
| 487 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
| 488 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 488 | 489 |
|
| 489 | 490 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 490 | 491 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "?@?S?@??@")); |
| ... | ... | |
| 500 | 501 |
// ?R???{?{?b?N?X?????\??
|
| 501 | 502 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 502 | 503 |
|
| 503 |
return true;
|
|
| 504 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 504 | 505 |
} |
| 505 | 506 |
catch (Exception ex) |
| 506 | 507 |
{
|
| 507 | 508 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 508 |
return false; |
|
| 509 | 509 |
} |
| 510 | 510 |
finally |
| 511 | 511 |
{
|
| ... | ... | |
| 516 | 516 |
} |
| 517 | 517 |
#endregion |
| 518 | 518 |
|
| 519 |
#region ?????R???{???S????R?[?h????????
|
|
| 519 |
#region ?????R???{??????R?[?h????????
|
|
| 520 | 520 |
/// <summary> |
| 521 |
/// ?????R???{???S????R?[?h????????
|
|
| 521 |
/// ?????R???{??????R?[?h????????
|
|
| 522 | 522 |
/// </summary> |
| 523 | 523 |
/// <returns></returns> |
| 524 | 524 |
private int GetDepartmentCode() |
| ... | ... | |
| 803 | 803 |
prgber.Update(); |
| 804 | 804 |
|
| 805 | 805 |
// ?f?t?H???g?J?n?E?I?????????? |
| 806 |
DateTime dtDefaultStart = DateTime.MinValue; |
|
| 807 |
DateTime dtDefaultEnd = DateTime.MinValue; |
|
| 808 |
CreateLedgerSQL.CreateDefaultStartAndEndDate((int)numUDConstPro.Value, ref dtDefaultStart, ref dtDefaultEnd); |
|
| 806 |
DateTime dtDefaultStart = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value, true); |
|
| 807 |
DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value, false); |
|
| 809 | 808 |
|
| 810 | 809 |
// ----- ?o????^?\???i?w?b?_?[??\???j |
| 811 | 810 |
SetPayrollData(TargetList, dtDefaultStart, dtDefaultEnd, SalaryDB, LedgerDB); |
| ... | ... | |
| 1025 | 1024 |
strSQL.Append(", SUM(A.GROSSPROFIT)");
|
| 1026 | 1025 |
strSQL.Append(", SUM(A.NETPROFIT)");
|
| 1027 | 1026 |
|
| 1028 |
strSQL.Append(" FROM PERSONINCHARGEMASTER C");
|
|
| 1029 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFO B");
|
|
| 1027 |
strSQL.Append(" FROM PERSONINCHARGEMASTER AS C");
|
|
| 1028 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFO AS B");
|
|
| 1030 | 1029 |
strSQL.Append(" ON B.CONSTRUCTIONPERSONCODE = C.PERSONCODE");
|
| 1031 | 1030 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
|
| 1032 | 1031 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
|
| ... | ... | |
| 1034 | 1033 |
strSQL.Append(" LEFT JOIN constructionbaseinfodetail AS E");
|
| 1035 | 1034 |
strSQL.Append(" On E.ConstructionCode = B.ConstructionCode");
|
| 1036 | 1035 |
strSQL.AppendFormat(" And E.DetailNo = {0}",(int)ConstructionBaseInfoDetail.DataNoDef.ConstrDepartmentName);
|
| 1037 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONLEDGER A ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
|
|
| 1036 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONLEDGER AS A");
|
|
| 1037 |
strSQL.Append(" ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
|
|
| 1038 | 1038 |
strSQL.Append(", DEPARTMENTMASTER D");
|
| 1039 | 1039 |
strSQL.Append(" WHERE D.DEPARTMENTCODE = B.ConstrDepCode");
|
| 1040 | 1040 |
|
| 1041 |
strSQL.Append(" GROUP BY C.DEPARTMENTCODE, E.DetailString, D.DISPLAYORDER");
|
|
| 1041 |
strSQL.Append(" GROUP BY B.ConstrDepCode, E.DetailString, D.DISPLAYORDER");
|
|
| 1042 | 1042 |
strSQL.Append(" ORDER BY DISPLAYORDER ASC");
|
| 1043 | 1043 |
} |
| 1044 | 1044 |
catch (Exception ex) |
| ... | ... | |
| 1070 | 1070 |
/// <summary> |
| 1071 | 1071 |
/// ???????????r?p?k???????? |
| 1072 | 1072 |
/// </summary> |
| 1073 |
private void CreateType2SQL(bool bDelFlg, ref StringBuilder strSQL)
|
|
| 1073 |
private void CreateType2SQL(bool bExistsFlg, ref StringBuilder strSQL)
|
|
| 1074 | 1074 |
{
|
| 1075 | 1075 |
try |
| 1076 | 1076 |
{
|
| 1077 | 1077 |
int NotOrder = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?? ?? ??")).Key;
|
| 1078 | 1078 |
int DepCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
| 1079 | 1079 |
|
| 1080 |
// ?????????E?????????????? |
|
| 1081 |
DateTime dtDefaultStart = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value, true); |
|
| 1082 |
DateTime dtDefaultEnd = CommonMotions.GetOpeningEndDate((int)numUDConstPro.Value, false); |
|
| 1083 |
|
|
| 1080 | 1084 |
// ----- ?r?p?k?? |
| 1081 | 1085 |
// ????????f?[?^???? |
| 1082 | 1086 |
strSQL.Append("SELECT");
|
| ... | ... | |
| 1093 | 1097 |
strSQL.Append(" ,SUM(A.NETPROFIT)");
|
| 1094 | 1098 |
strSQL.Append(" ,C.EMPLOYEECLASSFLG AS EMPLOYEECLASSFLG");
|
| 1095 | 1099 |
|
| 1096 |
strSQL.Append(" FROM PERSONINCHARGEMASTER C");
|
|
| 1097 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFO B");
|
|
| 1100 |
strSQL.Append(" FROM PERSONINCHARGEMASTER AS C");
|
|
| 1101 |
|
|
| 1102 |
strSQL.Append(" LEFT JOIN chgchargedep AS D");
|
|
| 1103 |
strSQL.Append(" ON D.PersonCode = C.PersonCode");
|
|
| 1104 |
strSQL.AppendFormat(" AND((DATE(D.STARTDATE) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
|
|
| 1105 |
strSQL.AppendFormat(" AND(DATE('{0}') <= DATE(D.CompDate)", dtDefaultStart.ToShortDateString());
|
|
| 1106 |
strSQL.AppendFormat(" OR DATE('{0}') = DATE(D.CompDate)))", DateTime.MinValue.ToShortDateString());
|
|
| 1107 |
|
|
| 1108 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONBASEINFO AS B");
|
|
| 1098 | 1109 |
strSQL.Append(" ON B.CONSTRUCTIONPERSONCODE = C.PERSONCODE");
|
| 1099 | 1110 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONPERIOD = {0}", numUDConstPro.Value);
|
| 1100 | 1111 |
strSQL.AppendFormat(" AND B.CONSTRUCTIONSTATUSFLG != {0}", NotOrder);
|
| 1101 | 1112 |
strSQL.AppendFormat(" AND B.TyingFlg != {0}", (int)ConstructionBaseInfo.TyingFlgDef.Tying);
|
| 1102 | 1113 |
strSQL.AppendFormat(" AND B.JoinFlg != {0}", (int)ConstructionBaseInfo.JoinFlgDef.JoinChildren);
|
| 1114 |
|
|
| 1103 | 1115 |
strSQL.Append(" LEFT JOIN constructionbaseinfodetail AS E");
|
| 1104 | 1116 |
strSQL.Append(" On E.ConstructionCode = B.ConstructionCode");
|
| 1105 | 1117 |
strSQL.AppendFormat(" And E.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DataNoDef.ConstrDepartmentName);
|
| 1106 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONLEDGER A");
|
|
| 1118 |
|
|
| 1119 |
strSQL.Append(" LEFT JOIN CONSTRUCTIONLEDGER AS A");
|
|
| 1107 | 1120 |
strSQL.Append(" ON A.CONSTRUCTIONCODE = B.CONSTRUCTIONCODE");
|
| 1108 |
strSQL.AppendFormat(" WHERE C.DepartmentCode = {0}", DepCode);
|
|
| 1109 |
|
|
| 1110 |
if (bDelFlg) |
|
| 1111 |
strSQL.Append(" AND C.DELETEFLG = 0");
|
|
| 1121 |
|
|
| 1122 |
strSQL.Append(" WHERE");
|
|
| 1123 |
strSQL.AppendFormat(" ((DATE(C.STARTDATE) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
|
|
| 1124 |
strSQL.AppendFormat(" AND(DATE('{0}') <= DATE(C.ENDDATE)", dtDefaultStart.ToShortDateString());
|
|
| 1125 |
strSQL.AppendFormat(" OR DATE('{0}') = DATE(C.ENDDATE)))", DateTime.MinValue.ToShortDateString());
|
|
| 1126 |
|
|
| 1127 |
strSQL.AppendFormat(" AND C.LedgerFlg = {0}", (int)PersonInChargeMaster.LedgerDivNoDef.CalcTarget);
|
|
| 1128 |
|
|
| 1129 |
strSQL.AppendFormat(" AND D.DepartmentCode = {0}", DepCode);
|
|
| 1130 |
|
|
| 1131 |
if (bExistsFlg) |
|
| 1132 |
{ // ????????????l
|
|
| 1133 |
strSQL.AppendFormat(" AND (DATE('{0}') < DATE(C.EndDate)", dtDefaultEnd.ToShortDateString());
|
|
| 1134 |
strSQL.AppendFormat(" OR DATE('{0}') = DATE(C.ENDDATE))", DateTime.MinValue.ToShortDateString());
|
|
| 1135 |
} |
|
| 1112 | 1136 |
else |
| 1113 |
strSQL.Append(" AND C.DELETEFLG != 0");
|
|
| 1137 |
{ // ???????????S????
|
|
| 1138 |
strSQL.AppendFormat(" AND(DATE('{0}') <= DATE(C.EndDate)", dtDefaultStart.ToShortDateString());
|
|
| 1139 |
strSQL.AppendFormat(" AND DATE(C.EndDate) <= DATE('{0}'))", dtDefaultEnd.ToShortDateString());
|
|
| 1140 |
} |
|
| 1114 | 1141 |
|
| 1115 | 1142 |
strSQL.Append(" GROUP BY C.DISPLAYORDER, C.PERSONCODE, C.PERSONNAME, C.EMPLOYEECLASSFLG");
|
| 1116 | 1143 |
strSQL.Append(" ORDER BY EMPLOYEECLASSFLG ASC, DISPLAYORDER ASC");
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Material/ConstrMATLList/FrmConstrMATLListAuxiliary.cs | ||
|---|---|---|
| 1046 | 1046 |
try |
| 1047 | 1047 |
{
|
| 1048 | 1048 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 1049 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 1049 | 1050 |
|
| 1050 | 1051 |
cmbDepartment.DataSource = null; |
| 1051 | 1052 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 1074 | 1075 |
// ?R???{?{?b?N?X?????\??
|
| 1075 | 1076 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 1076 | 1077 |
|
| 1077 |
return;
|
|
| 1078 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 1078 | 1079 |
} |
| 1079 | 1080 |
catch (Exception ex) |
| 1080 | 1081 |
{
|
| ... | ... | |
| 1102 | 1103 |
try |
| 1103 | 1104 |
{
|
| 1104 | 1105 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 1106 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 1105 | 1107 |
|
| 1106 | 1108 |
cmbConstructionPerson.DataSource = null; |
| 1107 | 1109 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 1131 | 1133 |
// ?R???{?{?b?N?X?????\??
|
| 1132 | 1134 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 1133 | 1135 |
|
| 1134 |
return;
|
|
| 1136 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 1135 | 1137 |
} |
| 1136 | 1138 |
catch (Exception ex) |
| 1137 | 1139 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PriceOfBudget/FrmPriceOfBudgetAuxiliary.cs | ||
|---|---|---|
| 611 | 611 |
/// <summary> |
| 612 | 612 |
/// ?????R???{?{?b?N?X????????Z?b?g????
|
| 613 | 613 |
/// </summary> |
| 614 |
private bool SetcmbDepartment()
|
|
| 614 |
private void SetcmbDepartment()
|
|
| 615 | 615 |
{
|
| 616 | 616 |
IOMDepartment depDB = new IOMDepartment(); |
| 617 | 617 |
bool bSave = m_initDataLoad; |
| ... | ... | |
| 619 | 619 |
try |
| 620 | 620 |
{
|
| 621 | 621 |
this.cmbDepartment.SelectedIndexChanged -= new System.EventHandler(this.cmbDepartment_SelectedIndexChanged); |
| 622 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 622 | 623 |
|
| 623 | 624 |
cmbDepartment.DataSource = null; |
| 624 | 625 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 631 | 632 |
|
| 632 | 633 |
// ?????}?X?^??? |
| 633 | 634 |
ArrayList arList = new ArrayList(); |
| 634 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
| 635 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 635 | 636 |
|
| 636 | 637 |
|
| 637 | 638 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| ... | ... | |
| 648 | 649 |
// ?R???{?{?b?N?X?????\??
|
| 649 | 650 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 650 | 651 |
|
| 651 |
return true;
|
|
| 652 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 652 | 653 |
} |
| 653 | 654 |
catch (Exception ex) |
| 654 | 655 |
{
|
| 655 | 656 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 656 |
return false; |
|
| 657 | 657 |
} |
| 658 | 658 |
finally |
| 659 | 659 |
{
|
| ... | ... | |
| 676 | 676 |
try |
| 677 | 677 |
{
|
| 678 | 678 |
this.cmbConstructionPerson.SelectedIndexChanged -= new System.EventHandler(this.cmbConstructionPerson_SelectedIndexChanged); |
| 679 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 679 | 680 |
|
| 680 | 681 |
cmbConstructionPerson.DataSource = null; |
| 681 | 682 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 705 | 706 |
// ?R???{?{?b?N?X?????\??
|
| 706 | 707 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 707 | 708 |
|
| 709 |
cmbConstructionPerson.SelectedValue= nBeforeCode; |
|
| 708 | 710 |
} |
| 709 | 711 |
catch (Exception ex) |
| 710 | 712 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Proceedings/FrmProceedingsAuxiliary.cs | ||
|---|---|---|
| 962 | 962 |
/// <summary> |
| 963 | 963 |
/// 部署コンボボックスへ文字をセットする |
| 964 | 964 |
/// </summary> |
| 965 |
private bool SetcmbDepartment()
|
|
| 965 |
private void SetcmbDepartment()
|
|
| 966 | 966 |
{
|
| 967 | 967 |
IOMDepartment depDB = new IOMDepartment(); |
| 968 | 968 |
bool bSave = m_bInitFlg; |
| ... | ... | |
| 970 | 970 |
try |
| 971 | 971 |
{
|
| 972 | 972 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(this.cmbDepartment_SelectedIndexChanged); |
| 973 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 973 | 974 |
|
| 974 | 975 |
cmbDepartment.DataSource = null; |
| 975 | 976 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 982 | 983 |
|
| 983 | 984 |
// 部署マスタ読込 |
| 984 | 985 |
ArrayList arList = new ArrayList(); |
| 985 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
| 986 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 986 | 987 |
|
| 987 | 988 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 988 | 989 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "")); |
| ... | ... | |
| 998 | 999 |
// コンボボックス初期表示 |
| 999 | 1000 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 1000 | 1001 |
|
| 1001 |
return true;
|
|
| 1002 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 1002 | 1003 |
} |
| 1003 | 1004 |
catch (Exception ex) |
| 1004 | 1005 |
{
|
| 1005 | 1006 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 1006 |
return false; |
|
| 1007 | 1007 |
} |
| 1008 | 1008 |
finally |
| 1009 | 1009 |
{
|
| ... | ... | |
| 1051 | 1051 |
try |
| 1052 | 1052 |
{
|
| 1053 | 1053 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(this.cmbConstructionPerson_SelectedIndexChanged); |
| 1054 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 1054 | 1055 |
|
| 1055 | 1056 |
cmbConstructionPerson.DataSource = null; |
| 1056 | 1057 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 1081 | 1082 |
// コンボボックス初期表示 |
| 1082 | 1083 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 1083 | 1084 |
|
| 1084 |
return;
|
|
| 1085 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 1085 | 1086 |
} |
| 1086 | 1087 |
catch (Exception ex) |
| 1087 | 1088 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/PurchaseOrderStatus/FrmPurchaseOrderStatusAuxiliary.cs | ||
|---|---|---|
| 243 | 243 |
bool bSelPerson = false; |
| 244 | 244 |
if (PersonCode != 0) bSelPerson = true; |
| 245 | 245 |
|
| 246 |
if (bSelPerson) |
|
| 246 |
if (bSelPerson && cmbDepartment.Visible)
|
|
| 247 | 247 |
{
|
| 248 | 248 |
if (radioButton1.Checked) |
| 249 | 249 |
{
|
| ... | ... | |
| 1019 | 1019 |
try |
| 1020 | 1020 |
{
|
| 1021 | 1021 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 1022 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 1022 | 1023 |
|
| 1023 | 1024 |
cmbDepartment.DataSource = null; |
| 1024 | 1025 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 1047 | 1048 |
// ?R???{?{?b?N?X?????\??
|
| 1048 | 1049 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 1049 | 1050 |
|
| 1050 |
return;
|
|
| 1051 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 1051 | 1052 |
} |
| 1052 | 1053 |
catch (Exception ex) |
| 1053 | 1054 |
{
|
| ... | ... | |
| 1074 | 1075 |
try |
| 1075 | 1076 |
{
|
| 1076 | 1077 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 1078 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 1077 | 1079 |
|
| 1078 | 1080 |
cmbConstructionPerson.DataSource = null; |
| 1079 | 1081 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 1103 | 1105 |
// ?R???{?{?b?N?X?????\??
|
| 1104 | 1106 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 1105 | 1107 |
|
| 1106 |
return;
|
|
| 1108 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 1107 | 1109 |
} |
| 1108 | 1110 |
catch (Exception ex) |
| 1109 | 1111 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ReqbillingStatus/FrmReqBillingStatusAuxiliary.cs | ||
|---|---|---|
| 231 | 231 |
bool bSelPerson = false; |
| 232 | 232 |
if (PersonCode != 0) bSelPerson = true; |
| 233 | 233 |
|
| 234 |
if (bSelPerson) |
|
| 234 |
if (bSelPerson && cmbDepartment.Visible)
|
|
| 235 | 235 |
{
|
| 236 | 236 |
if (radioButton1.Checked) |
| 237 | 237 |
{
|
| ... | ... | |
| 977 | 977 |
try |
| 978 | 978 |
{
|
| 979 | 979 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 980 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 980 | 981 |
|
| 981 | 982 |
cmbDepartment.DataSource = null; |
| 982 | 983 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 1005 | 1006 |
// ?R???{?{?b?N?X?????\??
|
| 1006 | 1007 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 1007 | 1008 |
|
| 1008 |
return;
|
|
| 1009 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 1009 | 1010 |
} |
| 1010 | 1011 |
catch (Exception ex) |
| 1011 | 1012 |
{
|
| ... | ... | |
| 1032 | 1033 |
try |
| 1033 | 1034 |
{
|
| 1034 | 1035 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 1036 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 1035 | 1037 |
|
| 1036 | 1038 |
cmbConstructionPerson.DataSource = null; |
| 1037 | 1039 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 1061 | 1063 |
// ?R???{?{?b?N?X?????\??
|
| 1062 | 1064 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 1063 | 1065 |
|
| 1064 |
return;
|
|
| 1066 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 1065 | 1067 |
} |
| 1066 | 1068 |
catch (Exception ex) |
| 1067 | 1069 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestInputList/FrmReqInputListAuxiliary.cs | ||
|---|---|---|
| 870 | 870 |
try |
| 871 | 871 |
{
|
| 872 | 872 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 873 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 873 | 874 |
|
| 874 | 875 |
cmbDepartment.DataSource = null; |
| 875 | 876 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 899 | 900 |
// ?R???{?{?b?N?X?????\??
|
| 900 | 901 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 901 | 902 |
|
| 902 |
return;
|
|
| 903 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 903 | 904 |
} |
| 904 | 905 |
catch (Exception ex) |
| 905 | 906 |
{
|
| ... | ... | |
| 926 | 927 |
try |
| 927 | 928 |
{
|
| 928 | 929 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 930 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 929 | 931 |
|
| 930 | 932 |
cmbConstructionPerson.DataSource = null; |
| 931 | 933 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 955 | 957 |
// ?R???{?{?b?N?X?????\??
|
| 956 | 958 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 957 | 959 |
|
| 958 |
return;
|
|
| 960 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 959 | 961 |
} |
| 960 | 962 |
catch (Exception ex) |
| 961 | 963 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
|---|---|---|
| 310 | 310 |
try |
| 311 | 311 |
{
|
| 312 | 312 |
cmbDepartment.SelectedIndexChanged -= new System.EventHandler(cmbDepartment_SelectedIndexChanged); |
| 313 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 313 | 314 |
|
| 314 | 315 |
cmbDepartment.DataSource = null; |
| 315 | 316 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 338 | 339 |
// ?R???{?{?b?N?X?????\??
|
| 339 | 340 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 340 | 341 |
|
| 341 |
return;
|
|
| 342 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 342 | 343 |
} |
| 343 | 344 |
catch (Exception ex) |
| 344 | 345 |
{
|
| ... | ... | |
| 386 | 387 |
try |
| 387 | 388 |
{
|
| 388 | 389 |
cmbPerson.SelectedIndexChanged -= new EventHandler(cmbPerson_SelectedIndexChanged); |
| 390 |
int nBeforeCode = CommonMotions.cnvInt(cmbPerson.SelectedValue); |
|
| 389 | 391 |
|
| 390 | 392 |
cmbPerson.DataSource = null; |
| 391 | 393 |
cmbPerson.Items.Clear(); |
| ... | ... | |
| 415 | 417 |
// ?R???{?{?b?N?X?????\??
|
| 416 | 418 |
ComboBoxAction.InitDataSetCombBox(cmbPerson, ConstructionDataList); |
| 417 | 419 |
|
| 418 |
return;
|
|
| 420 |
cmbPerson.SelectedValue = nBeforeCode;
|
|
| 419 | 421 |
} |
| 420 | 422 |
catch (Exception ex) |
| 421 | 423 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/SubConstrRegist/FrmSubConstrRegistListAuxiliary.cs | ||
|---|---|---|
| 691 | 691 |
try |
| 692 | 692 |
{
|
| 693 | 693 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 694 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 694 | 695 |
|
| 695 | 696 |
cmbDepartment.DataSource = null; |
| 696 | 697 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 719 | 720 |
// ?R???{?{?b?N?X?????\??
|
| 720 | 721 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 721 | 722 |
|
| 722 |
return;
|
|
| 723 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 723 | 724 |
} |
| 724 | 725 |
catch (Exception ex) |
| 725 | 726 |
{
|
| ... | ... | |
| 747 | 748 |
try |
| 748 | 749 |
{
|
| 749 | 750 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 751 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 750 | 752 |
|
| 751 | 753 |
cmbConstructionPerson.DataSource = null; |
| 752 | 754 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 776 | 778 |
// ?R???{?{?b?N?X?????\??
|
| 777 | 779 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 778 | 780 |
|
| 779 |
return;
|
|
| 781 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 780 | 782 |
} |
| 781 | 783 |
catch (Exception ex) |
| 782 | 784 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/TAndPCosts/FrmTAndPCostsAuxiliary.cs | ||
|---|---|---|
| 354 | 354 |
/// <summary> |
| 355 | 355 |
/// 部署コンボボックスへ文字をセットする |
| 356 | 356 |
/// </summary> |
| 357 |
private bool SetcmbDepartment()
|
|
| 357 |
private void SetcmbDepartment()
|
|
| 358 | 358 |
{
|
| 359 | 359 |
IOMDepartment depDB = new IOMDepartment(); |
| 360 | 360 |
bool bSave = m_bInitFlg; |
| ... | ... | |
| 362 | 362 |
try |
| 363 | 363 |
{
|
| 364 | 364 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 365 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 365 | 366 |
|
| 366 | 367 |
cmbDepartment.DataSource = null; |
| 367 | 368 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 374 | 375 |
|
| 375 | 376 |
// 部署マスタ読込 |
| 376 | 377 |
ArrayList arList = new ArrayList(); |
| 377 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return false;
|
|
| 378 |
if (!depDB.ExecuteReader(strSQL.ToString(), ref arList)) return; |
|
| 378 | 379 |
|
| 379 | 380 |
List<KeyValuePair<int, string>> ConstructionDataList = new List<KeyValuePair<int, string>>(); |
| 380 | 381 |
ConstructionDataList.Add(new KeyValuePair<int, string>(0, "")); |
| ... | ... | |
| 390 | 391 |
// コンボボックス初期表示 |
| 391 | 392 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 392 | 393 |
|
| 393 |
return true;
|
|
| 394 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 394 | 395 |
} |
| 395 | 396 |
catch (Exception ex) |
| 396 | 397 |
{
|
| 397 | 398 |
logger.ErrorFormat("システムエラー：{0}：{1}", CommonMotions.GetMethodName(), ex.Message);
|
| 398 |
return false; |
|
| 399 | 399 |
} |
| 400 | 400 |
finally |
| 401 | 401 |
{
|
| ... | ... | |
| 419 | 419 |
try |
| 420 | 420 |
{
|
| 421 | 421 |
cmbConstructionPerson.SelectedIndexChanged -= new EventHandler(cmbConstructionPerson_SelectedIndexChanged); |
| 422 |
int nBeforeCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
|
| 422 | 423 |
|
| 423 | 424 |
cmbConstructionPerson.DataSource = null; |
| 424 | 425 |
cmbConstructionPerson.Items.Clear(); |
| ... | ... | |
| 448 | 449 |
// コンボボックス初期表示 |
| 449 | 450 |
ComboBoxAction.InitDataSetCombBox(cmbConstructionPerson, ConstructionDataList); |
| 450 | 451 |
|
| 451 |
return;
|
|
| 452 |
cmbConstructionPerson.SelectedValue = nBeforeCode;
|
|
| 452 | 453 |
} |
| 453 | 454 |
catch (Exception ex) |
| 454 | 455 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Forms/ZMenu/FrmMenuAuxiliary.cs | ||
|---|---|---|
| 5905 | 5905 |
try |
| 5906 | 5906 |
{
|
| 5907 | 5907 |
cmbDepartment.SelectedIndexChanged -= new EventHandler(cmbDepartment_SelectedIndexChanged); |
| 5908 |
int nBeforeCode = CommonMotions.cnvInt(cmbDepartment.SelectedValue); |
|
| 5908 | 5909 |
|
| 5909 | 5910 |
cmbDepartment.DataSource = null; |
| 5910 | 5911 |
cmbDepartment.Items.Clear(); |
| ... | ... | |
| 5933 | 5934 |
// コンボボックス初期表示 |
| 5934 | 5935 |
ComboBoxAction.InitDataSetCombBox(cmbDepartment, ConstructionDataList); |
| 5935 | 5936 |
|
| 5936 |
return;
|
|
| 5937 |
cmbDepartment.SelectedValue = nBeforeCode;
|
|
| 5937 | 5938 |
} |
| 5938 | 5939 |
catch (Exception ex) |
| 5939 | 5940 |
{
|
| branches/src/ProcessManagement/ProcessManagement/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 32 | 32 |
// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を |
| 33 | 33 |
// 既定値にすることができます: |
| 34 | 34 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 35 |
[assembly: AssemblyVersion("1.0.1.155")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.155")]
|
|
| 35 |
[assembly: AssemblyVersion("1.0.1.156")]
|
|
| 36 |
[assembly: AssemblyFileVersion("1.0.1.156")]
|
|
| 37 | 37 |
// Log4netを使用する |
| 38 | 38 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = @"log4net.config", Watch = true)] |
他の形式にエクスポート: Unified diff