リビジョン 35
セキュリティ区分変更バグ修正
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsChangeLedgerData.cs | ||
---|---|---|
81 | 81 |
// 対象をまず削除する(対象月で削除する) |
82 | 82 |
string strDelSQL = "DELETE CONSTRUCTIONLEDGEREXCUTE"; |
83 | 83 |
strDelSQL += " WHERE CONSTRUCTIONCODE IN"; |
84 |
strDelSQL += " (SELECT CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO";
|
|
85 |
strDelSQL += string.Format(" WHERE (SALESPERSONCODE = {0} OR CONSTRUCTIONPERSONCODE = {0} OR CONSTRSUBPERSONCODE = {0} OR CONSTRUCTIONINSTRUCTOR = {0}))", PersonCode);
|
|
84 |
strDelSQL += " (SELECT A1.CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO A1";
|
|
85 |
strDelSQL += string.Format(" WHERE (A1.SALESPERSONCODE = {0} OR A1.CONSTRUCTIONPERSONCODE = {0} OR A1.CONSTRSUBPERSONCODE = {0} OR A1.CONSTRUCTIONINSTRUCTOR = {0}))", PersonCode);
|
|
86 | 86 |
strDelSQL += string.Format(" AND GROUPCOUNT IN ({0}, {1}, {2}, {3}, {4})" |
87 | 87 |
, GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Transport) |
88 | 88 |
, GetConstructionLedgerGroupNo((int)CommonDefine.CostDataNo.Purchase) |
... | ... | |
97 | 97 |
string strSQL = "SELECT CONSTRUCTIONCODE, DATATYPE, TO_CHAR(ACTIONDATE,'YYYY/MM'), SUM(ENTRYPRICE) FROM COSTDATAOFPERSON"; |
98 | 98 |
strSQL += String.Format(" WHERE TO_CHAR(ACTIONDATE,'YYYY/MM') = '{0}'", TargetMonth); |
99 | 99 |
strSQL += String.Format(" AND DATATYPE = {0}", i); |
100 |
strSQL += " AND CONSTRUCTIONCODE IN (SELECT CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO";
|
|
101 |
strSQL += string.Format(" WHERE (SALESPERSONCODE = {0} OR CONSTRUCTIONPERSONCODE = {0} OR CONSTRSUBPERSONCODE = {0} OR CONSTRUCTIONINSTRUCTOR = {0}))", PersonCode);
|
|
100 |
strSQL += " AND CONSTRUCTIONCODE IN (SELECT A1.CONSTRUCTIONCODE FROM CONSTRUCTIONBASEINFO A1";
|
|
101 |
strSQL += string.Format(" WHERE (A1.SALESPERSONCODE = {0} OR A1.CONSTRUCTIONPERSONCODE = {0} OR A1.CONSTRSUBPERSONCODE = {0} OR A1.CONSTRUCTIONINSTRUCTOR = {0}))", PersonCode);
|
|
102 | 102 |
strSQL += " GROUP BY CONSTRUCTIONCODE, DATATYPE, TO_CHAR(ACTIONDATE,'YYYY/MM')"; |
103 | 103 |
strSQL += " ORDER BY CONSTRUCTIONCODE, DATATYPE"; |
104 | 104 |
ArrayList arList = new ArrayList(); |
... | ... | |
495 | 495 |
/// <param name="TargetDate">対象日</param> |
496 | 496 |
/// <param name="bSetFlag">月一括セットフラグ</param> |
497 | 497 |
/// <returns></returns> |
498 |
public static bool CalculatePayment(ConstructionLedger LedgerRec, DateTime TargetDate, DateTime lasrDate)
|
|
498 |
public static bool CalculatePayment(ConstructionLedger LedgerRec, DateTime TargetDate, DateTime lastDate)
|
|
499 | 499 |
{ |
500 | 500 |
IOConstructionLedgerDetail LedgerDeDB = new IOConstructionLedgerDetail(); |
501 | 501 |
IOConstructionLedgerExcute LedgerExDB = new IOConstructionLedgerExcute(); |
... | ... | |
518 | 518 |
// 対象月より書込みカラム位置を取得する |
519 | 519 |
int ColPoint = CalcTargetMonthToColumn(LedgerRec.ConstructionStart, TargetDate); |
520 | 520 |
// 経過日数を取得する |
521 |
TimeSpan ts = TargetDate - lasrDate;
|
|
521 |
TimeSpan ts = TargetDate - lastDate;
|
|
522 | 522 |
int WorkingDay = ts.Days; |
523 | 523 |
|
524 | 524 |
LedgerExDB.connect(); LedgerExDB.beginTran(); |
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsExcute.cs | ||
---|---|---|
1078 | 1078 |
public static void ProcessExecuteNo_ConstructionLedgerList(ProcessParameter CurrentPara) |
1079 | 1079 |
{ |
1080 | 1080 |
// 工事詳細台帳一覧 |
1081 |
FrmConstructionLedgerList frm = new FrmConstructionLedgerList();
|
|
1081 |
FrmLedgerStatus frm = new FrmLedgerStatus();
|
|
1082 | 1082 |
try |
1083 | 1083 |
{ |
1084 | 1084 |
int ProcessNo = (int)ProcessExecuteNo.ConstructionLedgerList; |
... | ... | |
1439 | 1439 |
public static void ProcessExecuteNo_ConstrLedgerPersonList(ProcessParameter CurrentPara) |
1440 | 1440 |
{ |
1441 | 1441 |
// 工事詳細台帳一覧 |
1442 |
FrmConstructionLedgerList frm = new FrmConstructionLedgerList();
|
|
1442 |
FrmLedgerStatus frm = new FrmLedgerStatus();
|
|
1443 | 1443 |
try |
1444 | 1444 |
{ |
1445 | 1445 |
int ProcessNo = (int)ProcessExecuteNo.ConstructionLedgerList; |
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsMessageBoradAccess.cs | ||
---|---|---|
382 | 382 |
|
383 | 383 |
// 部署の最高アクセス権限を取得する |
384 | 384 |
CurRecRank = CommonMotions.cnvInt(objSecRec[0]); |
385 |
if (CurRecRank == 0) CurRecRank = 9; |
|
385 | 386 |
} |
386 | 387 |
else |
387 | 388 |
{ // ----- 以外は担当者コード |
... | ... | |
396 | 397 |
|
397 | 398 |
// アクセスランクを取得する |
398 | 399 |
CurRecRank = CommonMotions.cnvInt(objRec[TergetCnt + (int)GetTarget.SecRank]); |
400 |
if (CurRecRank == 0) CurRecRank = 9; |
|
399 | 401 |
} |
400 | 402 |
// 部署コードが無い場合はチェックしない |
401 | 403 |
if (DepCode == 0) continue; |
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSecurityPermission.cs | ||
---|---|---|
455 | 455 |
IOMSecurity SecDB = new IOMSecurity(); |
456 | 456 |
|
457 | 457 |
// 初期値として一般ユーザーをセットする |
458 |
int Rank = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.NormalAuthority].Key; |
|
458 |
int Rank = 0; |
|
459 |
// 初期値として参照無をセットする |
|
460 |
Range = 0; |
|
459 | 461 |
try |
460 | 462 |
{ |
463 |
if (CommonMotions.LoginUserData.SecCode == 0) return Rank; |
|
464 |
|
|
465 |
// 初期値として一般ユーザーをセットする |
|
466 |
Rank = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.NormalAuthority].Key; |
|
461 | 467 |
// 初期値として参照無をセットする |
462 | 468 |
Range = CommonDefine.SecurityRangeList[(int)CommonDefine.SecurityRangePos.None].Key; |
463 |
|
|
469 |
|
|
464 | 470 |
// 担当者マスタより保護区分マスタを取得する |
465 | 471 |
string strSQL = "SELECT A.PERSONCODE, A.PERSONNAME, B.SECNAME, B.SECRANK, B.SECRANGE"; |
466 | 472 |
strSQL += " FROM PERSONINCHARGEMASTER A, SECURITYMASTER B"; |
trunk/src/ProcessManagement/ProcessManagement/Common/Process/ClsSystemOnceExecute.cs | ||
---|---|---|
261 | 261 |
try |
262 | 262 |
{ |
263 | 263 |
// 工事基本情報を期限テーブルに設定している状態分取得する |
264 |
string strSQL = " WHERE CONSTRUCTIONSTATUSFLG IN (SELECT DISTINCT CONSTRUCTIONSTATUSFLG FROM TERMMASTER)";
|
|
264 |
string strSQL = " WHERE CONSTRUCTIONSTATUSFLG IN (SELECT DISTINCT A1.CONSTRUCTIONSTATUSFLG FROM TERMMASTER A1)";
|
|
265 | 265 |
strSQL = " ORDER BY CONSTRUCTIONSTATUSFLG ASC, CONSTRUCTIONCODE ASC"; |
266 | 266 |
List<ConstructionBaseInfo> cbiList = new List<ConstructionBaseInfo>(); |
267 | 267 |
if (!cbiDB.SelectAction(strSQL, ref cbiList)) return true; |
trunk/src/ProcessManagement/ProcessManagement/DB/IOAccess/IODailyDataDetail.cs | ||
---|---|---|
205 | 205 |
try |
206 | 206 |
{ |
207 | 207 |
strcmd = "INSERT INTO DailyDataDetail"; |
208 |
strcmd += " (PersonCode"; // 担当者コード |
|
209 |
strcmd += " ,DailyDataDate"; // 日報作成日 |
|
210 |
strcmd += " ,ConstructionCode"; // 工事番号 |
|
211 |
strcmd += " ,SeqNo"; // 明細行番号 |
|
212 |
strcmd += " ,JobCategoryCode"; // 職種キー |
|
213 |
strcmd += " ,CompanyCode"; // 協力会社コード |
|
214 |
strcmd += " ,TodayHeadCount"; // 当日人員数 |
|
215 |
strcmd += " ,TotalHeadCount"; // 累計人員数 |
|
216 |
strcmd += " ,TodayWork"; // 当日作業内容 |
|
217 |
strcmd += " ,NextdayWork"; // 翌日作業内容 |
|
218 |
strcmd += " ,NextdayHeadCount"; // 翌日人員数 |
|
219 |
strcmd += " ,EntryDate"; // 登録年月日 |
|
220 |
strcmd += " ,UpdateDate)"; // 更新年月日 |
|
208 | 221 |
|
209 | 222 |
strcmd += " VALUES ("; |
210 | 223 |
|
... | ... | |
330 | 343 |
} |
331 | 344 |
#endregion |
332 | 345 |
|
346 |
#region 1項目更新処理 |
|
347 |
/// <summary> |
|
348 |
/// 1項目の更新を行う |
|
349 |
/// </summary> |
|
350 |
/// <param name="ConstructionCode"></param> |
|
351 |
/// <param name="FeildNo"></param> |
|
352 |
/// <param name="value"></param> |
|
353 |
/// <param name="bConnect"></param> |
|
354 |
/// <returns></returns> |
|
355 |
public bool UpdateFeild(int PersonCode, DateTime DailyDataDate, int ConstructionCode, int SeqNo, int FeildNo, object value, bool bConnect = true) |
|
356 |
{ |
|
357 |
string strcmd = ""; |
|
358 |
try |
|
359 |
{ |
|
360 |
strcmd = "UPDATE DailyDataDetail"; |
|
361 |
|
|
362 |
strcmd += " SET"; |
|
363 |
switch (FeildNo) |
|
364 |
{ |
|
365 |
case (int)DataColumn.PersonCode: |
|
366 |
strcmd += string.Format(" PersonCode = {0}", (int)value); |
|
367 |
break; |
|
368 |
case (int)DataColumn.DailyDataDate: |
|
369 |
strcmd += string.Format(" DailyDataDate = TO_DATE('{0}','YYYY/MM/DD')", ((DateTime)value).ToShortDateString()); |
|
370 |
break; |
|
371 |
case (int)DataColumn.ConstructionCode: |
|
372 |
strcmd += string.Format(" ConstructionCode = {0}", (int)value); |
|
373 |
break; |
|
374 |
case (int)DataColumn.SeqNo: |
|
375 |
strcmd += string.Format(" SeqNo = {0}", (int)value); |
|
376 |
break; |
|
377 |
case (int)DataColumn.JobCategoryCode: |
|
378 |
strcmd += string.Format(" JobCategoryCode = {0}", (int)value); |
|
379 |
break; |
|
380 |
case (int)DataColumn.CompanyCode: |
|
381 |
strcmd += string.Format(" CompanyCode = {0}", (int)value); |
|
382 |
break; |
|
383 |
case (int)DataColumn.TodayHeadCount: |
|
384 |
strcmd += string.Format(" TodayHeadCount = {0}", (double)value); |
|
385 |
break; |
|
386 |
case (int)DataColumn.TotalHeadCount: |
|
387 |
strcmd += string.Format(" TotalHeadCount = {0}", (double)value); |
|
388 |
break; |
|
389 |
case (int)DataColumn.TodayWork: |
|
390 |
strcmd += string.Format(" TodayWork = '{0}'", CommonMotions.cnvString(value)); |
|
391 |
break; |
|
392 |
case (int)DataColumn.NextdayWork: |
|
393 |
strcmd += string.Format(" NextdayWork = '{0}'", CommonMotions.cnvString(value)); |
|
394 |
break; |
|
395 |
case (int)DataColumn.NextdayHeadCount: |
|
396 |
strcmd += string.Format(" NextdayHeadCount = {0}", (double)value); |
|
397 |
break; |
|
398 |
} |
|
399 |
|
|
400 |
strcmd += ", UpdateDate = TO_DATE(TO_CHAR(sysdate,'YYYY/MM/DD HH24:MI:SS'),'YYYY/MM/DD HH24:MI:SS')"; |
|
401 |
strcmd += CreatePrimarykeyString(PersonCode, DailyDataDate, ConstructionCode, SeqNo); |
|
402 |
|
|
403 |
if (!ExecuteNonQuery(strcmd, bConnect)) return false; |
|
404 |
|
|
405 |
return true; |
|
406 |
} |
|
407 |
catch (Exception ex) |
|
408 |
{ |
|
409 |
logger.ErrorFormat("システムエラー:{0}:{1}:{2}", CommonMotions.GetMethodName(2), ex.Message, strcmd); |
|
410 |
return false; |
|
411 |
} |
|
412 |
} |
|
413 |
#endregion |
|
414 |
|
|
333 | 415 |
#region データセット処理 |
334 | 416 |
/// <summary> |
335 | 417 |
/// OracleDataReaderより構造体へセットする |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalList/FrmApprovalListAuxiliary.cs | ||
---|---|---|
370 | 370 |
else |
371 | 371 |
{ |
372 | 372 |
// ?Q??????}?X?^???????? |
373 |
strSQL += " AND A.DEPARTMENTCODE IN (SELECT DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER";
|
|
374 |
strSQL += string.Format(" WHERE PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode); |
|
373 |
strSQL += " AND A.DEPARTMENTCODE IN (SELECT A1.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1";
|
|
374 |
strSQL += string.Format(" WHERE A1.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
375 | 375 |
} |
376 | 376 |
} |
377 | 377 |
strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE"; |
... | ... | |
768 | 768 |
else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key) |
769 | 769 |
{ |
770 | 770 |
// ?@???????i?????????j |
771 |
strSecurity += string.Format(" And (B.SalesPersonCode IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0})", CommonMotions.LoginUserData.DepartmentCode);
|
|
772 |
strSecurity += string.Format(" And (B.CONSTRUCTIONPERSONCODE IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0}))", CommonMotions.LoginUserData.DepartmentCode);
|
|
773 |
strSecurity += string.Format(" And (B.CONSTRSUBPERSONCODE IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0}))", CommonMotions.LoginUserData.DepartmentCode);
|
|
774 |
strSecurity += string.Format(" And (B.CONSTRUCTIONINSTRUCTOR IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0}))", CommonMotions.LoginUserData.DepartmentCode);
|
|
771 |
strSecurity += string.Format(" And (B.SalesPersonCode IN (Select B1.PersonCode From PersonInChargeMaster B1 Where B1.DepartmentCode = {0})", CommonMotions.LoginUserData.DepartmentCode);
|
|
772 |
strSecurity += string.Format(" Or B.CONSTRUCTIONPERSONCODE IN (Select B2.PersonCode From PersonInChargeMaster B2 Where B2.DepartmentCode = {0})", CommonMotions.LoginUserData.DepartmentCode);
|
|
773 |
strSecurity += string.Format(" Or B.CONSTRSUBPERSONCODE IN (Select B3.PersonCode From PersonInChargeMaster B3 Where B3.DepartmentCode = {0})", CommonMotions.LoginUserData.DepartmentCode);
|
|
774 |
strSecurity += string.Format(" Or B.CONSTRUCTIONINSTRUCTOR IN (Select B4.PersonCode From PersonInChargeMaster B4 Where B4.DepartmentCode = {0}))", CommonMotions.LoginUserData.DepartmentCode);
|
|
775 | 775 |
} |
776 | 776 |
else if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key) |
777 | 777 |
{ |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreen.cs | ||
---|---|---|
459 | 459 |
{ |
460 | 460 |
try |
461 | 461 |
{ |
462 |
// ?????H????H???\?Z???\??????{??????????`?F?b?N???? |
|
463 |
if (!CheckLedgerApproval()) |
|
464 |
{ |
|
465 |
MessageBox.Show("?{???H?????????????????????B", "?\???G???[", MessageBoxButtons.OK, MessageBoxIcon.Error); |
|
466 |
return; |
|
467 |
} |
|
468 |
|
|
462 | 469 |
if (!DispFeildCheck()) return; |
463 | 470 |
if (MessageBox.Show("???????F??\????????A???????????H?B", "???F?\???m?F" |
464 | 471 |
, MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.No) return; |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalScreen/FrmApprovalScreenAuxiliary.cs | ||
---|---|---|
134 | 134 |
} |
135 | 135 |
#endregion |
136 | 136 |
|
137 |
#region 増減工事の工事予算書申請時に本体があるかをチェックする |
|
138 |
/// <summary> |
|
139 |
/// 増減工事の工事予算書申請時に本体があるかをチェックする |
|
140 |
/// </summary> |
|
141 |
/// <param name="Rec"></param> |
|
142 |
/// <returns></returns> |
|
143 |
private bool CheckLedgerApproval() |
|
144 |
{ |
|
145 |
IOConstructionLink LinkDB = new IOConstructionLink(); |
|
146 |
try |
|
147 |
{ |
|
148 |
// 工事予算申請時だけのチェック |
|
149 |
int iCode = ClsExcute.AppovalList.First(x => x.Value.Equals("工事予算書承認")).Key; |
|
150 |
if (m_ApprovalCode != iCode) return true; |
|
151 |
|
|
152 |
// 増減なしの工事・本体工事はチェック無 |
|
153 |
if (m_ConstructionBaseInfo.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Standard |
|
154 |
|| m_ConstructionBaseInfo.TyingFlg == (int)CommonDefine.BaseInfoTyingFlg.Pearent) return true; |
|
155 |
|
|
156 |
// 増減工事の子データのみ表示 |
|
157 |
string strSQL = " SELECT * FROM CONSTRUCTIONLINK A, CONSTRUCTIONLEDGER B"; |
|
158 |
strSQL += string.Format(" WHERE A.FLUCTUATIONCODE = {0}", m_ConstructionCode); |
|
159 |
strSQL += " AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"; |
|
160 |
ArrayList arList = new ArrayList(); |
|
161 |
if (!LinkDB.ExecuteReader(strSQL, ref arList)) return false; |
|
162 |
if (arList.Count == 0) return false; |
|
163 |
|
|
164 |
return true; |
|
165 |
} |
|
166 |
catch (Exception ex) |
|
167 |
{ |
|
168 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
169 |
return false; |
|
170 |
} |
|
171 |
finally |
|
172 |
{ |
|
173 |
LinkDB.close(); LinkDB = null; |
|
174 |
} |
|
175 |
} |
|
176 |
#endregion |
|
177 |
|
|
137 | 178 |
#region 承認時データ更新処理 |
138 | 179 |
/// <summary> |
139 | 180 |
/// 承認時にデータを更新する |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstractionList/FrmConstructionListAuxiliary.cs | ||
---|---|---|
291 | 291 |
// ?@???????i?????????j |
292 | 292 |
int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?????o")).Key; |
293 | 293 |
int iStatus2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("???????p")).Key; |
294 |
strSQL += string.Format(" And (A.SalesPersonCode IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0})", CommonMotions.LoginUserData.DepartmentCode);
|
|
295 |
strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0} And (A.ConstructionPersonCode IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {1})",
|
|
294 |
strSQL += string.Format(" And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1 Where A1.DepartmentCode = {0})", CommonMotions.LoginUserData.DepartmentCode);
|
|
295 |
strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0} And (A.ConstructionPersonCode IN (Select A2.PersonCode From PersonInChargeMaster A2 Where A2.DepartmentCode = {1})",
|
|
296 | 296 |
iStatus, CommonMotions.LoginUserData.DepartmentCode); |
297 |
strSQL += string.Format(" Or A.ConstructionInstructor IN (Select PersonCode From PersonInChargeMaster Where DepartmentCode = {0})))", CommonMotions.LoginUserData.DepartmentCode);
|
|
297 |
strSQL += string.Format(" Or A.ConstructionInstructor IN (Select A3.PersonCode From PersonInChargeMaster A3 Where A3.DepartmentCode = {0})))", CommonMotions.LoginUserData.DepartmentCode);
|
|
298 | 298 |
strSQL += string.Format(" Or (A.ConstructionStatusFlg >= {0} And A.ConstructionPersonCode = 0)", iStatus); // ????????????o???H???S??????????????????\?? |
299 | 299 |
strSQL += string.Format(" Or (A.ConstructionStatusFlg = {0} And A.TransferConstruction = {1}))", |
300 | 300 |
iStatus2, CommonMotions.LoginUserData.DepartmentCode); // ???????p |
... | ... | |
655 | 655 |
strSQL += string.Format(" And ({0} <= A.ConstructionStatusFlg", ProgressStart); |
656 | 656 |
strSQL += string.Format(" And A.ConstructionStatusFlg <= {0})", ProgressComplete); |
657 | 657 |
strSQL += " AND A.ConstructionPersonCode != 0"; |
658 |
strSQL += " AND A.ConstructionCode IN (SELECT CONSTRUCTIONCODE FROM CONSTRUCTIONBUDGETDETAIL WHERE (COMPANYCODE != 0 AND COMPANYCODE != -1)";
|
|
659 |
strSQL += " GROUP BY CONSTRUCTIONCODE, COMPANYCODE HAVING SUM(ExecutionAmount) >= 300000)";
|
|
658 |
strSQL += " AND A.ConstructionCode IN (SELECT AA1.CONSTRUCTIONCODE FROM CONSTRUCTIONBUDGETDETAIL AA1 WHERE (AA1.COMPANYCODE != 0 AND AA1.COMPANYCODE != -1)";
|
|
659 |
strSQL += " GROUP BY AA1.CONSTRUCTIONCODE, AA1.COMPANYCODE HAVING SUM(AA1.ExecutionAmount) >= 300000)";
|
|
660 | 660 |
strSQL += " AND A.CONSTRUCTIONCODE = A1.CONSTRUCTIONCODE"; |
661 | 661 |
strSQL += string.Format(" AND A1.APPROVALCODE = {0} AND A1.SEQNO = 1", (int)ClsExcute.ApprovalListNo.ConstructionBudgetApproval); |
662 | 662 |
strSQL += string.Format(" AND A1.APPROVALSTATUS = {0}", (int)CommonDefine.ApprovalStatus.Approval); |
... | ... | |
1403 | 1403 |
else |
1404 | 1404 |
{ |
1405 | 1405 |
// ?Q??????}?X?^???????? |
1406 |
strSQL += " AND A.DEPARTMENTCODE IN (SELECT DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER";
|
|
1407 |
strSQL += string.Format(" WHERE PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode); |
|
1406 |
strSQL += " AND A.DEPARTMENTCODE IN (SELECT A1.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A1";
|
|
1407 |
strSQL += string.Format(" WHERE A1.PERSONCODE = {0})", CommonMotions.LoginUserData.PersonCode);
|
|
1408 | 1408 |
} |
1409 | 1409 |
} |
1410 | 1410 |
strSQL += " AND A.DEPARTMENTCODE = B.DEPARTMENTCODE"; |
... | ... | |
1433 | 1433 |
// ?V?Z?L?????e?B?f?[?^??????????m?F???? |
1434 | 1434 |
if (CommonMotions.LoginUserData.SecCode == 0) |
1435 | 1435 |
{ |
1436 |
// ?????? |
|
1437 |
// ???g?p??i???????A?N?Z?X??\?j |
|
1438 |
if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.SuperiorAuthority].Key || |
|
1439 |
CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key) |
|
1440 |
{ |
|
1441 |
// ?????????????O |
|
1442 |
if (CommonMotions.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision) |
|
1443 |
cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode; |
|
1444 |
} |
|
1436 |
// ?????????????O |
|
1437 |
if (CommonMotions.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision) |
|
1438 |
cmbDepartment.SelectedValue = CommonMotions.LoginUserData.DepartmentCode; |
|
1445 | 1439 |
} |
1446 | 1440 |
else |
1447 | 1441 |
{ |
... | ... | |
1514 | 1508 |
if (CommonMotions.LoginUserData.SecCode == 0) |
1515 | 1509 |
{ |
1516 | 1510 |
// ?????[?U?[????????????????????A???O?C?????R?[?h???Z?b?g???? |
1517 |
if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.UserAuthority].Key && |
|
1518 |
CommonMotions.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision) |
|
1511 |
if (CommonMotions.LoginUserData.DepartmentCode != CommonDefine.s_GeneralAffairsDevision) |
|
1519 | 1512 |
{ |
1520 | 1513 |
cmbConstructionPerson.SelectedValue = CommonMotions.LoginUserData.PersonCode; |
1521 | 1514 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfo.cs | ||
---|---|---|
1181 | 1181 |
TerminatingProcess(); |
1182 | 1182 |
|
1183 | 1183 |
// ???F??????\???????????N???[?Y???? |
1184 |
if (m_frmAppList != null) m_frmAppList.Close();
|
|
1184 |
if (m_frmAppList != null) m_frmAppList.Dispose();
|
|
1185 | 1185 |
|
1186 | 1186 |
// ?I???{?^????ON????O?v???Z?X???? |
1187 | 1187 |
if (m_CloseingProcessOn) ClsExcute.BackProcess(); |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/FrmConstructionBaseInfoAuxiliary.cs | ||
---|---|---|
3659 | 3659 |
{ |
3660 | 3660 |
// ???F????\?? |
3661 | 3661 |
m_frmAppList = new FrmApprovalStatusList(); |
3662 |
m_frmAppList.ConstructionCode = m_ConstructionCode; |
|
3663 |
m_frmAppList.EditLock = m_EditLock; |
|
3664 |
m_frmAppList.LocationPoint = new Point(this.Right, this.Top); |
|
3665 |
//m_frmAppList.ShowInTaskbar = false; |
|
3666 |
// ?N???[?X?h?n???h????????????`???? |
|
3667 |
m_frmAppList.FormClosed += new FormClosedEventHandler(FrmAppList_FormClosed); |
|
3668 |
m_frmAppList.Show(); |
|
3669 |
|
|
3662 |
try |
|
3663 |
{ |
|
3664 |
m_frmAppList.ConstructionCode = m_ConstructionCode; |
|
3665 |
m_frmAppList.EditLock = m_EditLock; |
|
3666 |
m_frmAppList.LocationPoint = new Point(this.Right, this.Top); |
|
3667 |
//m_frmAppList.ShowInTaskbar = false; |
|
3668 |
// ?N???[?X?h?n???h????????????`???? |
|
3669 |
m_frmAppList.FormClosed += new FormClosedEventHandler(FrmAppList_FormClosed); |
|
3670 |
m_frmAppList.Show(); |
|
3671 |
} |
|
3672 |
catch (Exception ex) |
|
3673 |
{ |
|
3674 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
3675 |
} |
|
3670 | 3676 |
} |
3671 | 3677 |
#endregion |
3672 | 3678 |
|
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBaseInfo/ProcessControl.cs | ||
---|---|---|
204 | 204 |
if (Handle.SubFormHandle == null) continue; |
205 | 205 |
|
206 | 206 |
// 画面クローズ |
207 |
Handle.SubFormHandle.Close();
|
|
207 |
Handle.SubFormHandle.Dispose();
|
|
208 | 208 |
ClsExcute.SubFormHandleList[i].SubFormHandle = null; |
209 | 209 |
} |
210 | 210 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.cs | ||
---|---|---|
735 | 735 |
// ?\???E???F?\?????? |
736 | 736 |
InitApprovalDisplay(); |
737 | 737 |
|
738 |
// ?Q??????X?????? |
|
739 |
if (m_EditLock) |
|
740 |
{ |
|
741 |
BudgetInputReadOnly(); |
|
742 |
btnApproval.Enabled = false; |
|
743 |
btnPetition.Enabled = false; |
|
744 |
} |
|
745 |
|
|
746 |
|
|
747 | 738 |
// *-----* ????????{?^????? *-----* |
748 | 739 |
CreateProcessContextMenu(m_SubForm); |
749 | 740 |
// *-----* ????????{?^????? *-----* |
... | ... | |
1327 | 1318 |
} |
1328 | 1319 |
#endregion |
1329 | 1320 |
|
1321 |
#region ?o????X?{?^?? |
|
1322 |
/// <summary> |
|
1323 |
/// ?o????X?{?^?? |
|
1324 |
/// </summary> |
|
1325 |
/// <param name="sender"></param> |
|
1326 |
/// <param name="e"></param> |
|
1327 |
private void btnChangeExpenses_Click(object sender, EventArgs e) |
|
1328 |
{ |
|
1329 |
|
|
1330 |
// ?o???X???? |
|
1331 |
DspChangeExpens(); |
|
1332 |
|
|
1333 |
} |
|
1334 |
#endregion |
|
1335 |
|
|
1330 | 1336 |
#region ???F?p?l???ipnlApproval?j???F?{?^?? |
1331 | 1337 |
/// <summary> |
1332 | 1338 |
/// ???F?p?l???ipnlApproval?j???F?{?^?? |
... | ... | |
1476 | 1482 |
/// <param name="e"></param> |
1477 | 1483 |
private void Grp1radioButton_CheckedChanged(object sender, EventArgs e) |
1478 | 1484 |
{ |
1479 |
textBox1.Enabled = false; |
|
1480 |
textBox1.Text = ""; |
|
1485 |
try |
|
1486 |
{ |
|
1487 |
textBox1.Enabled = false; |
|
1488 |
textBox1.Text = ""; |
|
1481 | 1489 |
|
1482 |
// ?????w??????????????L |
|
1483 |
// ?S??????v?Z |
|
1484 |
if (radioButton1.Checked) |
|
1485 |
{ |
|
1486 |
// ???^?o???v?Z |
|
1487 |
if (!m_bInitFlg) |
|
1490 |
// ?????w??????????????L |
|
1491 |
// ?S??????v?Z |
|
1492 |
if (radioButton1.Checked) |
|
1488 | 1493 |
{ |
1489 |
CreatePayrollCosts(false); |
|
1494 |
// ???^?o???v?Z |
|
1495 |
if (!m_bInitFlg) |
|
1496 |
{ |
|
1497 |
CreatePayrollCosts(false); |
|
1490 | 1498 |
|
1491 |
// ?e???v?s?v?Z |
|
1492 |
CreateGrossProfit(false); |
|
1499 |
// ?e???v?s?v?Z
|
|
1500 |
CreateGrossProfit(false);
|
|
1493 | 1501 |
|
1494 |
// ?????v?v?Z |
|
1495 |
CreateNetIncome(false); |
|
1502 |
// ?????v?v?Z
|
|
1503 |
CreateNetIncome(false);
|
|
1496 | 1504 |
|
1497 |
// ???v???z |
|
1498 |
CreateAllTotal(false); |
|
1505 |
// ???v???z |
|
1506 |
CreateAllTotal(false); |
|
1507 |
} |
|
1499 | 1508 |
} |
1509 |
else if (radioButton2.Checked) |
|
1510 |
{ |
|
1511 |
// ???^?o??N???A |
|
1512 |
if (!m_bInitFlg) ClearDetailLine((int)CostsRowLine.ConstructorRowLine); |
|
1513 |
} |
|
1514 |
else if (radioButton3.Checked) |
|
1515 |
{ |
|
1516 |
textBox1.Enabled = true; |
|
1517 |
textBox1.Focus(); |
|
1518 |
} |
|
1519 |
|
|
1520 |
// ??X?t???OON |
|
1521 |
m_bChengeAns = true; |
|
1500 | 1522 |
} |
1501 |
else if (radioButton2.Checked)
|
|
1523 |
catch (Exception ex)
|
|
1502 | 1524 |
{ |
1503 |
// ???^?o??N???A |
|
1504 |
if (!m_bInitFlg) ClearDetailLine((int)CostsRowLine.ConstructorRowLine); |
|
1525 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1505 | 1526 |
} |
1506 |
else if (radioButton3.Checked) |
|
1507 |
{ |
|
1508 |
textBox1.Enabled = true; |
|
1509 |
textBox1.Focus(); |
|
1510 |
} |
|
1511 |
|
|
1512 |
// ??X?t???OON |
|
1513 |
m_bChengeAns = true; |
|
1514 | 1527 |
} |
1515 | 1528 |
#endregion |
1516 | 1529 |
|
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudget.designer.cs | ||
---|---|---|
95 | 95 |
this.btnLineAdd = new System.Windows.Forms.Button(); |
96 | 96 |
this.panel2 = new System.Windows.Forms.Panel(); |
97 | 97 |
this.lblCellTotal = new System.Windows.Forms.Label(); |
98 |
this.btnDispDown = new System.Windows.Forms.Button(); |
|
99 |
this.btnDispUp = new System.Windows.Forms.Button(); |
|
100 |
this.btnOtherProc = new System.Windows.Forms.Button(); |
|
101 |
this.button1 = new System.Windows.Forms.Button(); |
|
102 |
this.button2 = new System.Windows.Forms.Button(); |
|
103 |
this.button3 = new System.Windows.Forms.Button(); |
|
104 |
this.btnChangeExpenses = new System.Windows.Forms.Button(); |
|
105 |
this.button4 = new System.Windows.Forms.Button(); |
|
106 | 98 |
this.dgvAllDisplay = new ProcessManagement.Forms.CustomControls.DataGridViewEX(); |
107 | 99 |
this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
108 | 100 |
this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
... | ... | |
123 | 115 |
this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
124 | 116 |
this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
125 | 117 |
this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
118 |
this.btnDispDown = new System.Windows.Forms.Button(); |
|
119 |
this.btnDispUp = new System.Windows.Forms.Button(); |
|
120 |
this.btnOtherProc = new System.Windows.Forms.Button(); |
|
121 |
this.button1 = new System.Windows.Forms.Button(); |
|
122 |
this.button2 = new System.Windows.Forms.Button(); |
|
123 |
this.button3 = new System.Windows.Forms.Button(); |
|
124 |
this.btnChangeExpenses = new System.Windows.Forms.Button(); |
|
125 |
this.button4 = new System.Windows.Forms.Button(); |
|
126 | 126 |
this.panel1.SuspendLayout(); |
127 | 127 |
this.pnlGroup2.SuspendLayout(); |
128 | 128 |
this.pnlGroup1.SuspendLayout(); |
... | ... | |
831 | 831 |
this.lblCellTotal.Size = new System.Drawing.Size(0, 13); |
832 | 832 |
this.lblCellTotal.TabIndex = 36; |
833 | 833 |
// |
834 |
// btnDispDown |
|
835 |
// |
|
836 |
this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
837 |
this.btnDispDown.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
838 |
this.btnDispDown.Location = new System.Drawing.Point(1300, 418); |
|
839 |
this.btnDispDown.Name = "btnDispDown"; |
|
840 |
this.btnDispDown.Size = new System.Drawing.Size(40, 40); |
|
841 |
this.btnDispDown.TabIndex = 42; |
|
842 |
this.btnDispDown.TabStop = false; |
|
843 |
this.btnDispDown.Text = "▼"; |
|
844 |
this.btnDispDown.UseVisualStyleBackColor = true; |
|
845 |
this.btnDispDown.Visible = false; |
|
846 |
this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click); |
|
847 |
// |
|
848 |
// btnDispUp |
|
849 |
// |
|
850 |
this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
851 |
this.btnDispUp.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
852 |
this.btnDispUp.Location = new System.Drawing.Point(1300, 354); |
|
853 |
this.btnDispUp.Name = "btnDispUp"; |
|
854 |
this.btnDispUp.Size = new System.Drawing.Size(40, 40); |
|
855 |
this.btnDispUp.TabIndex = 41; |
|
856 |
this.btnDispUp.TabStop = false; |
|
857 |
this.btnDispUp.Text = "▲"; |
|
858 |
this.btnDispUp.UseVisualStyleBackColor = true; |
|
859 |
this.btnDispUp.Visible = false; |
|
860 |
this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click); |
|
861 |
// |
|
862 |
// btnOtherProc |
|
863 |
// |
|
864 |
this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
865 |
this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen; |
|
866 |
this.btnOtherProc.Location = new System.Drawing.Point(7, 656); |
|
867 |
this.btnOtherProc.Name = "btnOtherProc"; |
|
868 |
this.btnOtherProc.Size = new System.Drawing.Size(200, 30); |
|
869 |
this.btnOtherProc.TabIndex = 95; |
|
870 |
this.btnOtherProc.TabStop = false; |
|
871 |
this.btnOtherProc.Text = "他の画面へ"; |
|
872 |
this.btnOtherProc.UseVisualStyleBackColor = false; |
|
873 |
this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click); |
|
874 |
// |
|
875 |
// button1 |
|
876 |
// |
|
877 |
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
878 |
this.button1.Location = new System.Drawing.Point(1300, 506); |
|
879 |
this.button1.Name = "button1"; |
|
880 |
this.button1.Size = new System.Drawing.Size(37, 35); |
|
881 |
this.button1.TabIndex = 101; |
|
882 |
this.button1.Text = "○"; |
|
883 |
this.button1.UseVisualStyleBackColor = true; |
|
884 |
this.button1.Visible = false; |
|
885 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
|
886 |
// |
|
887 |
// button2 |
|
888 |
// |
|
889 |
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
890 |
this.button2.Location = new System.Drawing.Point(1300, 541); |
|
891 |
this.button2.Name = "button2"; |
|
892 |
this.button2.Size = new System.Drawing.Size(37, 35); |
|
893 |
this.button2.TabIndex = 101; |
|
894 |
this.button2.Text = "1"; |
|
895 |
this.button2.UseVisualStyleBackColor = true; |
|
896 |
this.button2.Visible = false; |
|
897 |
this.button2.Click += new System.EventHandler(this.button2_Click); |
|
898 |
// |
|
899 |
// button3 |
|
900 |
// |
|
901 |
this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
902 |
this.button3.Location = new System.Drawing.Point(1300, 576); |
|
903 |
this.button3.Name = "button3"; |
|
904 |
this.button3.Size = new System.Drawing.Size(37, 35); |
|
905 |
this.button3.TabIndex = 102; |
|
906 |
this.button3.Text = "2"; |
|
907 |
this.button3.UseVisualStyleBackColor = true; |
|
908 |
this.button3.Visible = false; |
|
909 |
this.button3.Click += new System.EventHandler(this.button3_Click); |
|
910 |
// |
|
911 |
// btnChangeExpenses |
|
912 |
// |
|
913 |
this.btnChangeExpenses.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
914 |
this.btnChangeExpenses.BackColor = System.Drawing.Color.Gold; |
|
915 |
this.btnChangeExpenses.Font = new System.Drawing.Font("MS 明朝", 9.75F, System.Drawing.FontStyle.Bold); |
|
916 |
this.btnChangeExpenses.Location = new System.Drawing.Point(223, 656); |
|
917 |
this.btnChangeExpenses.Name = "btnChangeExpenses"; |
|
918 |
this.btnChangeExpenses.Size = new System.Drawing.Size(130, 30); |
|
919 |
this.btnChangeExpenses.TabIndex = 103; |
|
920 |
this.btnChangeExpenses.Text = "経費変更"; |
|
921 |
this.btnChangeExpenses.UseVisualStyleBackColor = false; |
|
922 |
this.btnChangeExpenses.Visible = false; |
|
923 |
// |
|
924 |
// button4 |
|
925 |
// |
|
926 |
this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
927 |
this.button4.Location = new System.Drawing.Point(1300, 611); |
|
928 |
this.button4.Name = "button4"; |
|
929 |
this.button4.Size = new System.Drawing.Size(37, 35); |
|
930 |
this.button4.TabIndex = 104; |
|
931 |
this.button4.Text = "3"; |
|
932 |
this.button4.UseVisualStyleBackColor = true; |
|
933 |
this.button4.Visible = false; |
|
934 |
this.button4.Click += new System.EventHandler(this.button4_Click); |
|
935 |
// |
|
936 | 834 |
// dgvAllDisplay |
937 | 835 |
// |
938 | 836 |
this.dgvAllDisplay.AllowUserToAddRows = false; |
... | ... | |
1193 | 1091 |
this.Column17.Visible = false; |
1194 | 1092 |
this.Column17.Width = 5; |
1195 | 1093 |
// |
1094 |
// btnDispDown |
|
1095 |
// |
|
1096 |
this.btnDispDown.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
1097 |
this.btnDispDown.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1098 |
this.btnDispDown.Location = new System.Drawing.Point(1300, 418); |
|
1099 |
this.btnDispDown.Name = "btnDispDown"; |
|
1100 |
this.btnDispDown.Size = new System.Drawing.Size(40, 40); |
|
1101 |
this.btnDispDown.TabIndex = 42; |
|
1102 |
this.btnDispDown.TabStop = false; |
|
1103 |
this.btnDispDown.Text = "▼"; |
|
1104 |
this.btnDispDown.UseVisualStyleBackColor = true; |
|
1105 |
this.btnDispDown.Visible = false; |
|
1106 |
this.btnDispDown.Click += new System.EventHandler(this.btnDispDown_Click); |
|
1107 |
// |
|
1108 |
// btnDispUp |
|
1109 |
// |
|
1110 |
this.btnDispUp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
1111 |
this.btnDispUp.Font = new System.Drawing.Font("MS 明朝", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
1112 |
this.btnDispUp.Location = new System.Drawing.Point(1300, 354); |
|
1113 |
this.btnDispUp.Name = "btnDispUp"; |
|
1114 |
this.btnDispUp.Size = new System.Drawing.Size(40, 40); |
|
1115 |
this.btnDispUp.TabIndex = 41; |
|
1116 |
this.btnDispUp.TabStop = false; |
|
1117 |
this.btnDispUp.Text = "▲"; |
|
1118 |
this.btnDispUp.UseVisualStyleBackColor = true; |
|
1119 |
this.btnDispUp.Visible = false; |
|
1120 |
this.btnDispUp.Click += new System.EventHandler(this.btnDispUp_Click); |
|
1121 |
// |
|
1122 |
// btnOtherProc |
|
1123 |
// |
|
1124 |
this.btnOtherProc.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
1125 |
this.btnOtherProc.BackColor = System.Drawing.Color.SpringGreen; |
|
1126 |
this.btnOtherProc.Location = new System.Drawing.Point(7, 656); |
|
1127 |
this.btnOtherProc.Name = "btnOtherProc"; |
|
1128 |
this.btnOtherProc.Size = new System.Drawing.Size(200, 30); |
|
1129 |
this.btnOtherProc.TabIndex = 95; |
|
1130 |
this.btnOtherProc.TabStop = false; |
|
1131 |
this.btnOtherProc.Text = "他の画面へ"; |
|
1132 |
this.btnOtherProc.UseVisualStyleBackColor = false; |
|
1133 |
this.btnOtherProc.Click += new System.EventHandler(this.btnOtherProc_Click); |
|
1134 |
// |
|
1135 |
// button1 |
|
1136 |
// |
|
1137 |
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
1138 |
this.button1.Location = new System.Drawing.Point(1300, 506); |
|
1139 |
this.button1.Name = "button1"; |
|
1140 |
this.button1.Size = new System.Drawing.Size(37, 35); |
|
1141 |
this.button1.TabIndex = 101; |
|
1142 |
this.button1.Text = "○"; |
|
1143 |
this.button1.UseVisualStyleBackColor = true; |
|
1144 |
this.button1.Visible = false; |
|
1145 |
this.button1.Click += new System.EventHandler(this.button1_Click); |
|
1146 |
// |
|
1147 |
// button2 |
|
1148 |
// |
|
1149 |
this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
1150 |
this.button2.Location = new System.Drawing.Point(1300, 541); |
|
1151 |
this.button2.Name = "button2"; |
|
1152 |
this.button2.Size = new System.Drawing.Size(37, 35); |
|
1153 |
this.button2.TabIndex = 101; |
|
1154 |
this.button2.Text = "1"; |
|
1155 |
this.button2.UseVisualStyleBackColor = true; |
|
1156 |
this.button2.Visible = false; |
|
1157 |
this.button2.Click += new System.EventHandler(this.button2_Click); |
|
1158 |
// |
|
1159 |
// button3 |
|
1160 |
// |
|
1161 |
this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
1162 |
this.button3.Location = new System.Drawing.Point(1300, 576); |
|
1163 |
this.button3.Name = "button3"; |
|
1164 |
this.button3.Size = new System.Drawing.Size(37, 35); |
|
1165 |
this.button3.TabIndex = 102; |
|
1166 |
this.button3.Text = "2"; |
|
1167 |
this.button3.UseVisualStyleBackColor = true; |
|
1168 |
this.button3.Visible = false; |
|
1169 |
this.button3.Click += new System.EventHandler(this.button3_Click); |
|
1170 |
// |
|
1171 |
// btnChangeExpenses |
|
1172 |
// |
|
1173 |
this.btnChangeExpenses.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); |
|
1174 |
this.btnChangeExpenses.BackColor = System.Drawing.Color.Gold; |
|
1175 |
this.btnChangeExpenses.Font = new System.Drawing.Font("MS 明朝", 9.75F, System.Drawing.FontStyle.Bold); |
|
1176 |
this.btnChangeExpenses.Location = new System.Drawing.Point(223, 656); |
|
1177 |
this.btnChangeExpenses.Name = "btnChangeExpenses"; |
|
1178 |
this.btnChangeExpenses.Size = new System.Drawing.Size(130, 30); |
|
1179 |
this.btnChangeExpenses.TabIndex = 103; |
|
1180 |
this.btnChangeExpenses.Text = "経費変更"; |
|
1181 |
this.btnChangeExpenses.UseVisualStyleBackColor = false; |
|
1182 |
this.btnChangeExpenses.Visible = false; |
|
1183 |
this.btnChangeExpenses.Click += new System.EventHandler(this.btnChangeExpenses_Click); |
|
1184 |
// |
|
1185 |
// button4 |
|
1186 |
// |
|
1187 |
this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); |
|
1188 |
this.button4.Location = new System.Drawing.Point(1300, 611); |
|
1189 |
this.button4.Name = "button4"; |
|
1190 |
this.button4.Size = new System.Drawing.Size(37, 35); |
|
1191 |
this.button4.TabIndex = 104; |
|
1192 |
this.button4.Text = "3"; |
|
1193 |
this.button4.UseVisualStyleBackColor = true; |
|
1194 |
this.button4.Visible = false; |
|
1195 |
this.button4.Click += new System.EventHandler(this.button4_Click); |
|
1196 |
// |
|
1196 | 1197 |
// FrmConstructionBudget |
1197 | 1198 |
// |
1198 | 1199 |
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/FrmConstructionBudgetAuxiliary.cs | ||
---|---|---|
40 | 40 |
{ |
41 | 41 |
m_CellSize[wrkCell.Index] = wrkCell.Width; |
42 | 42 |
} |
43 |
|
|
44 |
// 経営者は経費の変更ができる |
|
45 |
// 新セキュリティデータ対応済みかを確認する |
|
46 |
if (CommonMotions.LoginUserData.SecCode == 0) |
|
47 |
{ |
|
48 |
if (CommonMotions.LoginUserData.SecurityManagement == CommonDefine.AdminSecurityManagement) |
|
49 |
{ |
|
50 |
btnChangeExpenses.Visible = true; |
|
51 |
} |
|
52 |
} |
|
53 |
else |
|
54 |
{ |
|
55 |
int SRank = (int)CommonDefine.SecurityRankPos.SpecialAuthority; // 経営者アクセス |
|
56 |
if (CommonMotions.LoginUserData.PersonCode == CommonDefine.AdminCode |
|
57 |
|| CommonMotions.LoginUserSecurity.SecRank == CommonDefine.SecurityRankList[SRank].Key) |
|
58 |
{ |
|
59 |
btnChangeExpenses.Visible = true; |
|
60 |
} |
|
61 |
} |
|
43 | 62 |
} |
44 | 63 |
catch (Exception ex) |
45 | 64 |
{ |
... | ... | |
1313 | 1332 |
// データ編集に関するボタンを非表示にする |
1314 | 1333 |
btnDataEntry.Visible = false; // 登録ボタン |
1315 | 1334 |
btnDataDelete.Visible = false; // 削除ボタン |
1335 |
|
|
1336 |
btnChangeExpenses.Visible = false; // 経費変更ボタン |
|
1316 | 1337 |
} |
1317 | 1338 |
catch (Exception ex) |
1318 | 1339 |
{ |
... | ... | |
1321 | 1342 |
} |
1322 | 1343 |
#endregion |
1323 | 1344 |
|
1345 |
#region 参照モード |
|
1346 |
/// <summary> |
|
1347 |
/// 参照モードにして各コントロールへロックをかける |
|
1348 |
/// </summary> |
|
1349 |
private void SeeModeLock() |
|
1350 |
{ |
|
1351 |
try |
|
1352 |
{ |
|
1353 |
dgvAllDisplay.ReadOnly = true; |
|
1354 |
|
|
1355 |
// 各グループボックスを使用禁止にする |
|
1356 |
pnlGroup1.Enabled = false; |
|
1357 |
pnlGroup2.Enabled = false; |
|
1358 |
|
|
1359 |
pnlApproval.Visible = false; |
|
1360 |
pnlApprovalButton.Visible = false; |
|
1361 |
|
|
1362 |
// 最後にボタンの処理を行う |
|
1363 |
btnApprovalList.Visible = false; |
|
1364 |
btnDataEntry.Visible = false; |
|
1365 |
btnDataDelete.Visible = false; |
|
1366 |
btnLineAdd.Visible = false; |
|
1367 |
btnLineDel.Visible = false; |
|
1368 |
btnChangeExpenses.Visible = false; |
|
1369 |
|
|
1370 |
} |
|
1371 |
catch (Exception ex) |
|
1372 |
{ |
|
1373 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
1374 |
} |
|
1375 |
} |
|
1376 |
#endregion |
|
1377 |
|
|
1324 | 1378 |
#region 承認者画面表示 |
1325 | 1379 |
/// <summary> |
1326 | 1380 |
/// 承認画面を表示する |
... | ... | |
1523 | 1577 |
} |
1524 | 1578 |
RowData[(int)GridColumn.FixFlg] = "*"; |
1525 | 1579 |
RowData[(int)GridColumn.GroupCount] = DetailRec.GroupCount; |
1580 |
RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode; |
|
1581 |
RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode; |
|
1526 | 1582 |
RowData[(int)GridColumn.ItemName] = DetailRec.FirstString; |
1527 | 1583 |
RowData[(int)GridColumn.TextName] = DetailRec.SecondString; |
1528 | 1584 |
RowData[(int)GridColumn.CompanyType] = DetailRec.CompanyType; |
... | ... | |
1699 | 1755 |
RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.CommonTempCosts, icnt); |
1700 | 1756 |
RowData[(int)GridColumn.FixFlg] = "*"; |
1701 | 1757 |
RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.CommonTempCosts; |
1758 |
RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode; |
|
1759 |
RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode; |
|
1702 | 1760 |
RowData[(int)GridColumn.ItemName] = DetailRec.FirstString; |
1703 | 1761 |
RowData[(int)GridColumn.TextName] = DetailRec.SecondString; |
1704 | 1762 |
RowData[(int)GridColumn.EstimatePrice] = DetailRec.EstimatePrice.ToString("#,0"); |
... | ... | |
1759 | 1817 |
RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.CommonTempCosts, icnt); |
1760 | 1818 |
RowData[(int)GridColumn.FixFlg] = "*"; |
1761 | 1819 |
RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.CommonTempCosts; |
1820 |
RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode; |
|
1821 |
RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode; |
|
1762 | 1822 |
RowData[(int)GridColumn.ItemName] = DetailRec.ItemName; |
1763 | 1823 |
RowData[(int)GridColumn.CompanyType] = "0"; |
1764 | 1824 |
RowData[(int)GridColumn.CompanyCode] = "0"; |
... | ... | |
1822 | 1882 |
RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.OutSourceCosts, icnt); |
1823 | 1883 |
RowData[(int)GridColumn.FixFlg] = "*"; |
1824 | 1884 |
RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.OutSourceCosts; |
1885 |
RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode; |
|
1886 |
RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode; |
|
1825 | 1887 |
RowData[(int)GridColumn.ItemName] = DetailRec.SecondString; |
1826 | 1888 |
RowData[(int)GridColumn.CompanyType] = 0; |
1827 | 1889 |
RowData[(int)GridColumn.CompanyCode] = DetailRec.CompanyCode; |
... | ... | |
2050 | 2112 |
RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.MyConstruction, icnt); |
2051 | 2113 |
RowData[(int)GridColumn.FixFlg] = "*"; |
2052 | 2114 |
RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.MyConstruction; |
2115 |
RowData[(int)GridColumn.ComponentCode] = DetailRec.ComponentCode; |
|
2116 |
RowData[(int)GridColumn.ItemCode] = DetailRec.ItemCode; |
|
2053 | 2117 |
RowData[(int)GridColumn.ItemName] = DetailRec.FirstString; |
2054 | 2118 |
RowData[(int)GridColumn.TextName] = DetailRec.SecondString; |
2055 | 2119 |
RowData[(int)GridColumn.EstimatePrice] = DetailRec.EstimatePrice.ToString("#,0"); |
... | ... | |
2119 | 2183 |
RowData[(int)GridColumn.FixFlg] = "*"; |
2120 | 2184 |
RowData[(int)GridColumn.No] = string.Format("{0}-{1}", (int)FrmConstructionBudget.DataGroup.MyConstruction, icnt); |
2121 | 2185 |
RowData[(int)GridColumn.GroupCount] = (int)FrmConstructionBudget.DataGroup.MyConstruction; |
2186 |
RowData[(int)GridColumn.ComponentCode] = CommonMotions.cnvInt(wrkrec[3]); |
|
2187 |
RowData[(int)GridColumn.ItemCode] = CommonMotions.cnvInt(wrkrec[4]); |
|
2122 | 2188 |
RowData[(int)GridColumn.ItemName] = CommonMotions.cnvString(wrkrec[1]).Trim(); |
2123 | 2189 |
RowData[(int)GridColumn.TextName] = CommonMotions.cnvString(wrkrec[5]).Trim(); |
2124 | 2190 |
RowData[(int)GridColumn.CompanyType] = "0"; |
... | ... | |
2810 | 2876 |
// 承認済みは処理しない |
2811 | 2877 |
if (ApprovalCheck()) return true; |
2812 | 2878 |
|
2813 |
// 割合がセットされていなければ処理しない |
|
2814 |
if (DetailRec.AmountConfigRate == 0) return false; |
|
2879 |
//// 割合がセットされていなければ処理しない
|
|
2880 |
//if (DetailRec.AmountConfigRate == 0) return false;
|
|
2815 | 2881 |
|
2882 |
// 名前がセットされていなければ処理しない |
|
2883 |
if (DetailRec.FirstString.Length == 0) return false; |
|
2884 |
|
|
2816 | 2885 |
// 受注金額取得 |
2817 | 2886 |
double dBase = CommonMotions.cnvDouble(m_DspLabelCtrl[(int)DspLblCtrlName.OrdersPrice].Text); |
2818 | 2887 |
// 経費率計算 |
... | ... | |
2920 | 2989 |
// 期間が同じ場合は処理しない |
2921 | 2990 |
if (StDate == m_ConstructionBaseInfo.ConstructionPeriodStart && EdDate == m_ConstructionBaseInfo.ConstructionPeriodEnd) |
2922 | 2991 |
{ |
2923 |
radioButton2.Checked = true; |
|
2992 |
//radioButton2.Checked = true;
|
|
2924 | 2993 |
} |
2925 | 2994 |
else |
2926 | 2995 |
{ |
... | ... | |
2929 | 2998 |
m_ConstructionBaseInfo.ConstructionPeriodStart, |
2930 | 2999 |
m_ConstructionBaseInfo.ConstructionPeriodEnd); |
2931 | 3000 |
// 日数指定をチェック |
2932 |
radioButton3.Checked = true; |
|
3001 |
//radioButton3.Checked = true;
|
|
2933 | 3002 |
// 日付をセット |
2934 | 3003 |
m_DspLabelCtrl[(int)DspLblCtrlName.SalaryDays].Text = dDiffDays.ToString("#,0"); |
2935 | 3004 |
} |
... | ... | |
4253 | 4322 |
} |
4254 | 4323 |
#endregion |
4255 | 4324 |
|
4256 |
#region 参照モード |
|
4257 |
/// <summary> |
|
4258 |
/// 参照モードにして各コントロールへロックをかける |
|
4259 |
/// </summary> |
|
4260 |
private void SeeModeLock() |
|
4261 |
{ |
|
4262 |
try |
|
4263 |
{ |
|
4264 |
dgvAllDisplay.ReadOnly = true; |
|
4265 |
pnlApproval.Visible = false; |
|
4266 |
pnlApprovalButton.Visible = false; |
|
4267 |
|
|
4268 |
// 最後にボタンの処理を行う |
|
4269 |
btnApprovalList.Visible = false; |
|
4270 |
btnDataEntry.Visible = false; |
|
4271 |
btnDataDelete.Visible = false; |
|
4272 |
btnLineAdd.Visible = false; |
|
4273 |
btnLineDel.Visible = false; |
|
4274 |
|
|
4275 |
} |
|
4276 |
catch (Exception ex) |
|
4277 |
{ |
|
4278 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
4279 |
} |
|
4280 |
} |
|
4281 |
#endregion |
|
4282 |
|
|
4283 | 4325 |
#region セルの入力後処理 |
4284 | 4326 |
/// <summary> |
4285 | 4327 |
/// セルの入力後処理 |
... | ... | |
4484 | 4526 |
} |
4485 | 4527 |
#endregion |
4486 | 4528 |
|
4529 |
#region 経費変更画面表示 |
|
4530 |
/// <summary> |
|
4531 |
/// 経費変更画面表示 |
|
4532 |
/// </summary> |
|
4533 |
private void DspChangeExpens() |
|
4534 |
{ |
|
4535 |
FrmChangeExpenses frm = new FrmChangeExpenses(); |
|
4536 |
try |
|
4537 |
{ |
|
4538 |
// データ取得 |
|
4539 |
ArrayList GridExpens = new ArrayList(); |
|
4540 |
GetExpensesData(ref GridExpens); |
|
4541 |
|
|
4542 |
// パラメタセット |
|
4543 |
frm.OrdersPrice = label6.Text; |
|
4544 |
frm.GridData = GridExpens; |
|
4545 |
|
|
4546 |
// 画面表示 |
|
4547 |
frm.ShowDialog(); |
|
4548 |
|
|
4549 |
// 終了時キャンセルは以下を処理しない |
|
4550 |
if (frm.EndButton == DialogResult.Cancel) return; |
|
4551 |
|
|
4552 |
// データセット |
|
4553 |
SetExpensesData(frm.GridData); |
|
4554 |
|
|
4555 |
// 合計金額 |
|
4556 |
CreateAllTotal(false); |
|
4557 |
|
|
4558 |
// 変更フラグON |
|
4559 |
m_bChengeAns = true; |
|
4560 |
} |
|
4561 |
catch (Exception ex) |
|
4562 |
{ |
|
4563 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
4564 |
} |
|
4565 |
finally |
|
4566 |
{ |
|
4567 |
frm.Dispose(); frm = null; |
|
4568 |
} |
|
4569 |
} |
|
4570 |
#endregion |
|
4571 |
|
|
4572 |
#region 画面より経費データを取得する |
|
4573 |
/// <summary> |
|
4574 |
/// 画面より経費データを取得する |
|
4575 |
/// </summary> |
|
4576 |
/// <param name="GridExpens"></param> |
|
4577 |
private void GetExpensesData(ref ArrayList GridExpens) |
|
4578 |
{ |
|
4579 |
try |
|
4580 |
{ |
|
4581 |
DataGridView dgv = dgvAllDisplay; |
|
4582 |
|
|
4583 |
for (int i = 0; i < dgv.RowCount; i++) |
|
4584 |
{ |
|
4585 |
DataGridViewRow CurRow = dgv.Rows[i]; |
|
4586 |
int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value); |
|
4587 |
int ComponentCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ComponentCode].Value); |
|
4588 |
if (GroupNo != (int)DataGroup.Expenses) continue; |
|
4589 |
if (ComponentCode == 0) continue; |
|
4590 |
|
|
4591 |
// 経費を取得する |
|
4592 |
string ExpensName = CommonMotions.cnvString(CurRow.Cells[(int)GridColumn.ItemName].Value); |
|
4593 |
|
|
4594 |
object[] DataRec = new object[] { CurRow.Cells[(int)GridColumn.No].Value, |
|
4595 |
CurRow.Cells[(int)GridColumn.ComponentCode].Value, |
|
4596 |
ExpensName.Substring(0, ExpensName.IndexOf("(")), |
|
4597 |
CurRow.Cells[(int)GridColumn.Percent].Value, |
|
4598 |
CurRow.Cells[(int)GridColumn.ExecPrice].Value |
|
4599 |
}; |
|
4600 |
GridExpens.Add(DataRec); |
|
4601 |
} |
|
4602 |
} |
|
4603 |
catch (Exception ex) |
|
4604 |
{ |
|
4605 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
4606 |
} |
|
4607 |
} |
|
4608 |
#endregion |
|
4609 |
|
|
4610 |
#region 変更経費表示処理 |
|
4611 |
/// <summary> |
|
4612 |
/// 変更経費表示処理 |
|
4613 |
/// </summary> |
|
4614 |
/// <param name="ExpensList"></param> |
|
4615 |
private void SetExpensesData(ArrayList ExpensList) |
|
4616 |
{ |
|
4617 |
try |
|
4618 |
{ |
|
4619 |
if (ExpensList.Count == 0) return; |
|
4620 |
|
|
4621 |
DataGridView dgv = dgvAllDisplay; |
|
4622 |
int ListCnt = 0; |
|
4623 |
for (int i = 0; i < dgv.RowCount; i++) |
|
4624 |
{ |
|
4625 |
DataGridViewRow CurRow = dgv.Rows[i]; |
|
4626 |
int GroupNo = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.GroupCount].Value); |
|
4627 |
if (GroupNo != (int)DataGroup.Expenses) continue; |
|
4628 |
int ComponentCode = CommonMotions.cnvInt(CurRow.Cells[(int)GridColumn.ComponentCode].Value); |
|
4629 |
if (ComponentCode == 0) continue; |
|
4630 |
|
|
4631 |
object[] DataRec = (object[])ExpensList[ListCnt]; |
|
4632 |
|
|
4633 |
CurRow.Cells[(int)GridColumn.ItemName].Value = string.Format("{0}({1}%)", DataRec[2], CommonMotions.cnvDouble(DataRec[3]).ToString("0.00")); |
|
4634 |
CurRow.Cells[(int)GridColumn.HopePrice].Value = CommonMotions.cnvInt(DataRec[4]).ToString("#,#"); |
|
4635 |
CurRow.Cells[(int)GridColumn.ExecPrice].Value = CommonMotions.cnvInt(DataRec[4]).ToString("#,#"); |
|
4636 |
CurRow.Cells[(int)GridColumn.Percent].Value = CommonMotions.cnvDouble(DataRec[3]).ToString("0.00"); |
|
4637 |
|
|
4638 |
ListCnt++; |
|
4639 |
} |
|
4640 |
} |
|
4641 |
catch (Exception ex) |
|
4642 |
{ |
|
4643 |
logger.ErrorFormat("システムエラー:{0}:{1}", CommonMotions.GetMethodName(), ex.Message); |
|
4644 |
} |
|
4645 |
} |
|
4646 |
#endregion |
|
4487 | 4647 |
// ---------- データコンバートロジック |
4488 | 4648 |
#region 給与計算 |
4489 | 4649 |
/// <summary> |
... | ... | |
4832 | 4992 |
AfterDays = LastDay.Day; |
4833 | 4993 |
} |
4834 | 4994 |
|
4835 |
string strDetail = "SELECT A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, MIN(B.COLUMNCOUNT), C.PERSONCODE, C.PERSONNAME, C.MONTHLYSALARY"; |
|
4995 |
string strDetail = "SELECT A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, MIN(B.COLUMNCOUNT), C.PERSONCODE, C.PERSONNAME, C.MONTHLYSALARY, A.SALARYDAYS";
|
|
4836 | 4996 |
strDetail += " FROM CONSTRUCTIONLEDGERDETAIL A, CONSTRUCTIONLEDGEREXCUTE B, PERSONINCHARGEMASTER C"; |
4837 | 4997 |
strDetail += string.Format(" WHERE A.CONSTRUCTIONCODE = {0}", Constrcode); |
4838 | 4998 |
strDetail += " AND A.OPERATINGFLG = 1 AND B.CONSTRUCTIONCODE = A.CONSTRUCTIONCODE"; |
4839 | 4999 |
strDetail += " AND (A.GROUPCOUNT = 9 Or A.GROUPCOUNT = 10 Or A.GROUPCOUNT = 11)"; |
4840 | 5000 |
strDetail += " AND B.LINECOUNT = A.LINECOUNT AND C.PERSONCODE = A.COMPANYCODE"; |
4841 |
strDetail += " GROUP BY A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, C.PERSONCODE, C.PERSONNAME, C.MONTHLYSALARY"; |
|
5001 |
strDetail += " GROUP BY A.CONSTRUCTIONCODE, B.GROUPCOUNT, B.LINECOUNT, C.PERSONCODE, C.PERSONNAME, C.MONTHLYSALARY, A.SALARYDAYS";
|
|
4842 | 5002 |
|
4843 | 5003 |
ArrayList ExecArrary = new ArrayList(); |
4844 | 5004 |
if (!DetailDB.ExecuteReader(strDetail, ref ExecArrary, false)) continue; |
... | ... | |
4850 | 5010 |
int LINECOUNT = CommonMotions.cnvInt(CurRec[2]); |
4851 | 5011 |
int COLUMNCOUNT = CommonMotions.cnvInt(CurRec[3]); |
4852 | 5012 |
int MONTHLYSALARY = CommonMotions.cnvInt(CurRec[6]); |
5013 |
int SALARYDays = CommonMotions.cnvInt(CurRec[7]); |
|
4853 | 5014 |
|
4854 |
if (Constrcode == 2016024401) |
|
4855 |
{ |
|
4856 |
Debug.WriteLine(""); |
|
4857 |
} |
|
5015 |
if (SALARYDays != 0) AfterDays = SALARYDays; |
|
5016 |
|
|
4858 | 5017 |
int SetSalary = 0; |
4859 | 5018 |
if (GROUPCOUNT == 9 || GROUPCOUNT == 10) |
4860 | 5019 |
{ |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionBudget/ProcessControl.cs | ||
---|---|---|
204 | 204 |
if (Handle.SubFormHandle == null) continue; |
205 | 205 |
|
206 | 206 |
// 画面クローズ |
207 |
Handle.SubFormHandle.Close();
|
|
207 |
Handle.SubFormHandle.Dispose();
|
|
208 | 208 |
ClsExcute.SubFormHandleList[i].SubFormHandle = null; |
209 | 209 |
} |
210 | 210 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedger/ProcessControl.cs | ||
---|---|---|
197 | 197 |
if (Handle.SubFormHandle == null) continue; |
198 | 198 |
|
199 | 199 |
// 画面クローズ |
200 |
Handle.SubFormHandle.Close();
|
|
200 |
Handle.SubFormHandle.Dispose();
|
|
201 | 201 |
ClsExcute.SubFormHandleList[i].SubFormHandle = null; |
202 | 202 |
} |
203 | 203 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.cs | ||
---|---|---|
17 | 17 |
using ProcessManagement.DB.Core; |
18 | 18 |
using ProcessManagement.Forms.CustomControls; |
19 | 19 |
using ProcessManagement.Forms.ControlsAction; |
20 |
using ProcessManagement.Forms.SubForms; |
|
20 | 21 |
//*---------------------------- ?H??????????? --------------------------* |
21 | 22 |
// 2016/05/11 Ver1.0.0.0 Create Source |
22 | 23 |
// |
... | ... | |
25 | 26 |
//*----------------------------------------------------------------------------* |
26 | 27 |
namespace ProcessManagement.Forms.DataEntry |
27 | 28 |
{ |
28 |
public partial class FrmConstructionLedgerList : Form
|
|
29 |
public partial class FrmLedgerStatus : Form
|
|
29 | 30 |
{ |
30 | 31 |
#region ?g?p??` |
31 | 32 |
//log4net???O???g?p???? |
... | ... | |
257 | 258 |
/// </summary> |
258 | 259 |
private bool m_NextProcFlg = false; |
259 | 260 |
#endregion |
261 |
|
|
262 |
/// <summary> |
|
263 |
/// ????m?F??? |
|
264 |
/// </summary> |
|
265 |
private FrmPriceOfBudget m_PriceOfBudget = null; |
|
266 |
|
|
260 | 267 |
#endregion |
261 | 268 |
|
262 | 269 |
#region ?v???p?e?B |
... | ... | |
351 | 358 |
#endregion |
352 | 359 |
|
353 | 360 |
#region ?R???X?g???N?^ |
354 |
public FrmConstructionLedgerList()
|
|
361 |
public FrmLedgerStatus()
|
|
355 | 362 |
{ |
356 | 363 |
InitializeComponent(); |
357 | 364 |
} |
358 | 365 |
#endregion |
359 | 366 |
#region ?f?X?g???N?^ |
360 |
~FrmConstructionLedgerList()
|
|
367 |
~FrmLedgerStatus()
|
|
361 | 368 |
{ |
362 | 369 |
try |
363 | 370 |
{ |
... | ... | |
378 | 385 |
/// <param name="e"></param> |
379 | 386 |
private void FrmConstructionLedgerList_FormClosing(object sender, FormClosingEventArgs e) |
380 | 387 |
{ |
381 |
if (m_CloseingProcessOff) return; |
|
388 |
try |
|
389 |
{ |
|
390 |
if (m_CloseingProcessOff) return; |
|
382 | 391 |
|
383 |
// ?O?v???Z?X???? |
|
384 |
ClsExcute.BackProcess(); |
|
392 |
// ????m?F?????\???????????N???[?Y???? |
|
393 |
if (m_PriceOfBudget != null) |
|
394 |
{ |
|
395 |
m_PriceOfBudget.Dispose(); |
|
396 |
m_PriceOfBudget = null; |
|
397 |
} |
|
398 |
|
|
399 |
// ?O?v???Z?X???? |
|
400 |
ClsExcute.BackProcess(); |
|
401 |
} |
|
402 |
catch (System.Exception ex) |
|
403 |
{ |
|
404 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
405 |
} |
|
385 | 406 |
} |
386 | 407 |
#endregion |
387 | 408 |
|
... | ... | |
393 | 414 |
/// <param name="e"></param> |
394 | 415 |
private void btnEnd_Click(object sender, EventArgs e) |
395 | 416 |
{ |
396 |
// ?O?v???Z?X???? |
|
397 |
ClsExcute.BackProcess(); |
|
398 |
|
|
399 |
m_CloseingProcessOff = true; |
|
400 |
|
|
401 | 417 |
this.Close(); |
402 | 418 |
} |
403 | 419 |
#endregion |
... | ... | |
419 | 435 |
} |
420 | 436 |
#endregion |
421 | 437 |
|
438 |
#region ????m?F?{?^?????? |
|
439 |
/// <summary> |
|
440 |
/// ????m?F?{?^?????? |
|
441 |
/// </summary> |
|
442 |
/// <param name="sender"></param> |
|
443 |
/// <param name="e"></param> |
|
444 |
private void btnLedgerStatus_Click(object sender, EventArgs e) |
|
445 |
{ |
|
446 |
// ?t?H?[?????\?????????????O??\??????????? |
|
447 |
if (m_PriceOfBudget != null) |
|
448 |
{ |
|
449 |
m_PriceOfBudget.Activate(); |
|
450 |
return; |
|
451 |
} |
|
452 |
// ?O??\?? |
|
453 |
DispPriceOfBudget(); |
|
454 |
} |
|
455 |
#endregion |
|
456 |
|
|
457 |
#region ????m?F???N???[?Y |
|
458 |
/// <summary> |
|
459 |
/// ????m?F????N???[?Y???????? |
|
460 |
/// </summary> |
|
461 |
/// <param name="sender"></param> |
|
462 |
/// <param name="e"></param> |
|
463 |
private void FrmPriceOfBudget_FormClosed(object sender, FormClosedEventArgs e) |
|
464 |
{ |
|
465 |
try |
|
466 |
{ |
|
467 |
this.Activate(); |
|
468 |
|
|
469 |
// ?n???h???N???A |
|
470 |
m_PriceOfBudget.Dispose(); |
|
471 |
m_PriceOfBudget = null; |
|
472 |
} |
|
473 |
catch (Exception ex) |
|
474 |
{ |
|
475 |
logger.ErrorFormat("?V?X?e???G???[?F{0}?F{1}", CommonMotions.GetMethodName(), ex.Message); |
|
476 |
} |
|
477 |
} |
|
478 |
#endregion |
|
479 |
|
|
422 | 480 |
#region ?t?H?[?????[?h |
423 | 481 |
/// <summary> |
424 | 482 |
/// ?????t?H?[?????[?h |
... | ... | |
548 | 606 |
{ |
549 | 607 |
m_FirstStartPersonCode = CommonMotions.cnvInt(cmbConstructionPerson.SelectedValue); |
550 | 608 |
} |
609 |
|
|
610 |
// ?f?[?^?\?? |
|
611 |
DataDisplay(); |
|
551 | 612 |
} |
552 | 613 |
#endregion |
553 | 614 |
|
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerList.designer.cs | ||
---|---|---|
1 | 1 |
namespace ProcessManagement.Forms.DataEntry |
2 | 2 |
{ |
3 |
partial class FrmConstructionLedgerList
|
|
3 |
partial class FrmLedgerStatus
|
|
4 | 4 |
{ |
5 | 5 |
/// <summary> |
6 | 6 |
/// 必要なデザイナ変数です。 |
... | ... | |
104 | 104 |
this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
105 | 105 |
this.Column11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
106 | 106 |
this.Column12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); |
107 |
this.btnLedgerStatus = new System.Windows.Forms.Button(); |
|
107 | 108 |
this.groupBox1.SuspendLayout(); |
108 | 109 |
this.pnlPayroll.SuspendLayout(); |
109 | 110 |
((System.ComponentModel.ISupportInitialize)(this.numUDConstPro)).BeginInit(); |
... | ... | |
189 | 190 |
this.pnlPayroll.Controls.Add(this.label15); |
190 | 191 |
this.pnlPayroll.Controls.Add(this.lblCalcValue1); |
191 | 192 |
this.pnlPayroll.Controls.Add(this.label10); |
192 |
this.pnlPayroll.Location = new System.Drawing.Point(3, 36);
|
|
193 |
this.pnlPayroll.Location = new System.Drawing.Point(6, 36);
|
|
193 | 194 |
this.pnlPayroll.Name = "pnlPayroll"; |
194 | 195 |
this.pnlPayroll.Size = new System.Drawing.Size(1320, 84); |
195 | 196 |
this.pnlPayroll.TabIndex = 47; |
... | ... | |
899 | 900 |
this.Column12.Resizable = System.Windows.Forms.DataGridViewTriState.False; |
900 | 901 |
this.Column12.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; |
901 | 902 |
// |
902 |
// FrmConstructionLedgerList
|
|
903 |
// btnLedgerStatus
|
|
903 | 904 |
// |
905 |
this.btnLedgerStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); |
|
906 |
this.btnLedgerStatus.BackColor = System.Drawing.Color.DodgerBlue; |
|
907 |
this.btnLedgerStatus.Font = new System.Drawing.Font("MS 明朝", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(128))); |
|
908 |
this.btnLedgerStatus.ForeColor = System.Drawing.Color.Black; |
|
909 |
this.btnLedgerStatus.Location = new System.Drawing.Point(1185, 5); |
|
910 |
this.btnLedgerStatus.Name = "btnLedgerStatus"; |
|
911 |
this.btnLedgerStatus.Size = new System.Drawing.Size(150, 30); |
|
912 |
this.btnLedgerStatus.TabIndex = 47; |
|
913 |
this.btnLedgerStatus.Text = "未作成台帳確認"; |
|
914 |
this.btnLedgerStatus.UseVisualStyleBackColor = false; |
|
915 |
this.btnLedgerStatus.Click += new System.EventHandler(this.btnLedgerStatus_Click); |
|
916 |
// |
|
917 |
// FrmLedgerStatus |
|
918 |
// |
|
904 | 919 |
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); |
905 | 920 |
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; |
906 | 921 |
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; |
907 | 922 |
this.BackColor = System.Drawing.Color.Black; |
908 | 923 |
this.ClientSize = new System.Drawing.Size(1340, 657); |
924 |
this.Controls.Add(this.btnLedgerStatus); |
|
909 | 925 |
this.Controls.Add(this.lblCellTotal); |
910 | 926 |
this.Controls.Add(this.dgvMaster); |
911 | 927 |
this.Controls.Add(this.groupBox1); |
... | ... | |
916 | 932 |
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Fixed3D; |
917 | 933 |
this.KeyPreview = true; |
918 | 934 |
this.MinimizeBox = false; |
919 |
this.Name = "FrmConstructionLedgerList";
|
|
935 |
this.Name = "FrmLedgerStatus";
|
|
920 | 936 |
this.ShowIcon = false; |
921 | 937 |
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; |
922 | 938 |
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmConstructionLedgerList_FormClosing); |
... | ... | |
993 | 1009 |
private System.Windows.Forms.Label label15; |
994 | 1010 |
private System.Windows.Forms.Label lblCalcValue1; |
995 | 1011 |
private System.Windows.Forms.Label label10; |
1012 |
private System.Windows.Forms.Button btnLedgerStatus; |
|
996 | 1013 |
} |
997 | 1014 |
} |
trunk/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ConstructionLedgerList/FrmConstructionLedgerListAuxiliary.cs | ||
---|---|---|
20 | 20 |
using ProcessManagement.DB.Core; |
21 | 21 |
using ProcessManagement.Forms.CustomControls; |
22 | 22 |
using ProcessManagement.Forms.ControlsAction; |
23 |
using ProcessManagement.Forms.SubForms; |
|
23 | 24 |
//*---------------------------- ?H??????????? --------------------------* |
24 | 25 |
// 2016/05/11 Ver1.0.0.0 Create Source |
25 | 26 |
// |
... | ... | |
28 | 29 |
//*----------------------------------------------------------------------------* |
29 | 30 |
namespace ProcessManagement.Forms.DataEntry |
30 | 31 |
{ |
31 |
partial class FrmConstructionLedgerList
|
|
32 |
partial class FrmLedgerStatus
|
|
32 | 33 |
{ |
33 | 34 |
#region ?? |
34 | 35 |
private const string StaticSQL1 = "SELECT A.ConstructionCode, A.ConstructionPeriod, B.DetailString, A.SalesPersonCode, A.ConstructionPersonCode, A.ConstructionStatusFlg "; |
... | ... | |
61 | 62 |
{ |
62 | 63 |
m_CellSize[wrkCell.Index] = wrkCell.Width; |
63 | 64 |
} |
65 |
|
|
66 |
// ----- ???????m?F???{?^???\???i?o?c?????????????j |
|
67 |
if (CommonMotions.LoginUserData.SecCode == 0) |
|
68 |
{ |
|
69 |
int Master = CommonDefine.SystemManageDiv[(int)CommonDefine.SysManaDivNo.PresidentAuthority].Key; |
|
70 |
if (CommonMotions.LoginUserData.SecurityManagement == Master) btnLedgerStatus.Visible = true; |
|
71 |
else btnLedgerStatus.Visible = false; |
|
72 |
} |
|
73 |
else |
|
74 |
{ |
|
75 |
int Master = CommonDefine.SecurityRankList[(int)CommonDefine.SecurityRankPos.SpecialAuthority].Key; |
|
76 |
if (CommonMotions.LoginUserSecurity.SecRank == Master) btnLedgerStatus.Visible = true; |
|
77 |
else btnLedgerStatus.Visible = false; |
|
78 |
} |
|
64 | 79 |
} |
65 | 80 |
#endregion |
66 | 81 |
|
... | ... | |
136 | 151 |
/// ????SQL??Z?L?????e?B?????????????? |
137 | 152 |
/// </summary> |
138 | 153 |
/// <param name="strSQL"></param> |
139 |
private void CreateSecuritySQL(ref List<string> strSecurity)
|
|
154 |
private void CreateSecuritySQL(ref string strSecurity)
|
|
140 | 155 |
{ |
141 | 156 |
try |
142 | 157 |
{ |
... | ... | |
162 | 177 |
/// ????SQL??Z?L?????e?B??????????????i?V????j |
163 | 178 |
/// </summary> |
164 | 179 |
/// <param name="strSQL"></param> |
165 |
private void CreateNewSecuritySQL(ref List<string> strSecurity)
|
|
180 |
private void CreateNewSecuritySQL(ref string strSecurity)
|
|
166 | 181 |
{ |
167 |
string strSQL = string.Empty; |
|
182 |
//string strSQL = string.Empty;
|
|
168 | 183 |
try |
169 | 184 |
{ |
170 | 185 |
// ?L?[?l?? |
... | ... | |
192 | 207 |
int iStatus = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("?????o")).Key; |
193 | 208 |
int iStatus2 = CommonDefine.ProjectsStatus.First(x => x.Value.Equals("???????p")).Key; |
194 | 209 |
|
195 |
strSQL += " And (A.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
|
|
196 |
strSQL += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
|
|
210 |
strSecurity = " And (D.SalesPersonCode IN (Select A1.PersonCode From PersonInChargeMaster A1";
|
|
211 |
strSecurity += string.Format(" Where A1.DepartmentCode IN (SELECT A2.DEPARTMENTCODE FROM PERSONDEPARTMENTMASTER A2 WHERE A2.PERSONCODE = {0}))", CommonMotions.LoginUserData.PersonCode);
|
|
197 | 212 |
|
他の形式にエクスポート: Unified diff