リビジョン 249
請求まとめ（担当者承認からの一覧表示を受付日の年月で抽出する様に変更）
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/ApprovalPerson/FrmApprovalPerson.cs | ||
|---|---|---|
| 721 | 721 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Labor); |
| 722 | 722 |
?@?@ ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear(); |
| 723 | 723 |
DataRec = new PaymentApprovalInfo(); |
| 724 |
DataRec.ApprovalPerson = m_PersonCode; // ?S????R?[?h |
|
| 724 |
// ???N???i??t???t??N??????j?j |
|
| 725 |
DataRec.TargetDate = CommonMotions.cnvInt(m_OrderDate.ToString("yyyyMM"));
|
|
| 726 |
// ?S????R?[?h |
|
| 727 |
DataRec.ApprovalPerson = m_PersonCode; |
|
| 725 | 728 |
DataList = new ArrayList(); |
| 726 | 729 |
DataList.Add(DataRec); |
| 727 | 730 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Add(DataList); |
| ... | ... | |
| 730 | 733 |
ClsExcute.ProcControlPara[NowPoint].IntExecParameter.Add((int)CommonDefine.LabourKinds.Normal); |
| 731 | 734 |
?@?@ ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Clear(); |
| 732 | 735 |
DataRec = new PaymentApprovalInfo(); |
| 733 |
DataRec.ApprovalPerson = m_PersonCode; // ?S????R?[?h |
|
| 736 |
// ???N???i??t???t??N??????j?j |
|
| 737 |
DataRec.TargetDate = CommonMotions.cnvInt(m_OrderDate.ToString("yyyyMM"));
|
|
| 738 |
// ?S????R?[?h |
|
| 739 |
DataRec.ApprovalPerson = m_PersonCode; |
|
| 734 | 740 |
DataList = new ArrayList(); |
| 735 | 741 |
DataList.Add(DataRec); |
| 736 | 742 |
ClsExcute.ProcControlPara[NowPoint].ArrayParameter.Add(DataList); |
| branches/src/ProcessManagement/ProcessManagement/Forms/DataEntry/Request/RequestSummaryList/FrmRequestSummaryListAuxiliary.cs | ||
|---|---|---|
| 2443 | 2443 |
sql.Append(" and Bdd.SeqNo = Pdd.SeqNo ");
|
| 2444 | 2444 |
sql.Append(" and Bdd.LineCount = Pdd.LineCount ");
|
| 2445 | 2445 |
sql.AppendFormat(" and Pdd.ApprovalPersonCode = {0} ", PaInfo.ApprovalPerson);
|
| 2446 |
sql.AppendFormat(" and DATE_FORMAT(Pdd.ApprovalDate, '%Y%m') = {0} ", PaInfo.ApprovalDate.ToString("yyyyMM"));
|
|
| 2446 | 2447 |
sql.Append(" left join ( ");
|
| 2447 | 2448 |
sql.Append(" ConstructionBaseInfo as Cbi ");
|
| 2448 | 2449 |
sql.Append(" left join ( ");
|
| ... | ... | |
| 2464 | 2465 |
sql.Append(" on Bd.CompanyCode = Bdd.CompanyCode ");
|
| 2465 | 2466 |
sql.Append(" and Bd.TargetDate = Bdd.TargetDate ");
|
| 2466 | 2467 |
sql.Append(" and Bd.SeqNo = Bdd.SeqNo ");
|
| 2467 |
sql.AppendFormat(" and Bd.TargetDate = {0} ", m_Select_TargetDate);
|
|
| 2468 |
sql.Append(" and Bd.TargetDate = Pdd.TargetDate ");
|
|
| 2468 | 2469 |
sql.Append(" left join ( ");
|
| 2469 | 2470 |
sql.Append(" PurchaseOrderDate as Pod ");
|
| 2470 | 2471 |
sql.Append(" ) on Bd.CompanyCode = Pod.CompanyCode ");
|
他の形式にエクスポート: Unified diff