リビジョン 262
請求過去データ作成プロセス修正
branches/ddl/CreateBilling/CreateBilling/CreateBilling.csproj | ||
---|---|---|
667 | 667 |
<Compile Include="..\..\ProcessManagement\ProcessManagement\DB\IOAccess\IOPersonApprovalCommnet.cs"> |
668 | 668 |
<Link>DB\IOAccess\IOPersonApprovalCommnet.cs</Link> |
669 | 669 |
</Compile> |
670 |
<Compile Include="..\..\ProcessManagement\ProcessManagement\DB\IOAccess\IOPointingOutComment.cs"> |
|
671 |
<Link>DB\IOAccess\IOPointingOutComment.cs</Link> |
|
672 |
</Compile> |
|
673 | 670 |
<Compile Include="..\..\ProcessManagement\ProcessManagement\DB\IOAccess\IOProceedingsData.cs"> |
674 | 671 |
<Link>DB\IOAccess\IOProceedingsData.cs</Link> |
675 | 672 |
</Compile> |
branches/ddl/CreateBilling/CreateBilling/CreateBillingDataAux.cs | ||
---|---|---|
209 | 209 |
// strRet.Append(" A.ConstructionPeriod = 16"); |
210 | 210 |
// strRet.Append(" AND B.ConstructionCode = A.ConstructionCode"); |
211 | 211 |
strRet.Append(" B.ConstructionCode = A.ConstructionCode"); |
212 |
strRet.Append(" AND B.GroupCount = 14");
|
|
212 |
strRet.AppendFormat(" AND B.GroupCount = {0}", (int)DataGroup.BillingAmount);
|
|
213 | 213 |
strRet.Append(" AND C.ConstructionCode = A.ConstructionCode"); |
214 | 214 |
strRet.Append(" AND D.ConstructionCode = A.ConstructionCode"); |
215 | 215 |
strRet.AppendFormat(" AND D.DetailNo = {0}", (int)ConstructionBaseInfoDetail.DetailDataNo.ConstructionName); |
branches/ddl/CreateBilling/CreateBilling/FrmCreateBillingData.cs | ||
---|---|---|
39 | 39 |
private static int m_DefColumn = Enum.GetNames(typeof(IOConstructionLedgerExcute.TableColumn)).Length; |
40 | 40 |
#endregion |
41 | 41 |
|
42 |
#region データグループ |
|
43 |
/// <summary> |
|
44 |
/// データグループ |
|
45 |
/// </summary> |
|
46 |
public enum DataGroup |
|
47 |
{ |
|
48 |
/// <summary> |
|
49 |
/// 0:空白 |
|
50 |
/// </summary> |
|
51 |
Empty = 0, |
|
52 |
/// <summary> |
|
53 |
/// 1:経費 |
|
54 |
/// </summary> |
|
55 |
Expenses, |
|
56 |
/// <summary> |
|
57 |
/// 2:施工費 |
|
58 |
/// </summary> |
|
59 |
ConstructionCosts, |
|
60 |
/// <summary> |
|
61 |
/// 3:交通費(通行料・電車代) |
|
62 |
/// </summary> |
|
63 |
TransportationCosts, |
|
64 |
/// <summary> |
|
65 |
/// 4:購入品 |
|
66 |
/// </summary> |
|
67 |
PurchaseCosts, |
|
68 |
/// <summary> |
|
69 |
/// 5:車両リース代 |
|
70 |
/// </summary> |
|
71 |
VehicleLeaseFee, |
|
72 |
/// <summary> |
|
73 |
/// 6:駐車場・資材置き場 |
|
74 |
/// </summary> |
|
75 |
ParkingCosts, |
|
76 |
/// <summary> |
|
77 |
/// 7:宿泊費 |
|
78 |
/// </summary> |
|
79 |
RoomChargeCosts, |
|
80 |
/// <summary> |
|
81 |
/// 8:処分費等 |
|
82 |
/// </summary> |
|
83 |
DisposeCosts, |
|
84 |
/// <summary> |
|
85 |
/// 9:指導員給料行 |
|
86 |
/// </summary> |
|
87 |
Instructor, |
|
88 |
/// <summary> |
|
89 |
/// 10:副担当者給料行 |
|
90 |
/// </summary> |
|
91 |
Assistant, |
|
92 |
/// <summary> |
|
93 |
/// 11:担当者給料行 |
|
94 |
/// </summary> |
|
95 |
Payroll, |
|
96 |
/// <summary> |
|
97 |
/// 12:純利益 |
|
98 |
/// </summary> |
|
99 |
NetIncome, |
|
100 |
/// <summary> |
|
101 |
/// 13:合計金額 |
|
102 |
/// </summary> |
|
103 |
AllTotal, |
|
104 |
/// <summary> |
|
105 |
/// 14:請求金額 |
|
106 |
/// </summary> |
|
107 |
BillingAmount, |
|
108 |
/// <summary> |
|
109 |
/// 15:現在利益金額 |
|
110 |
/// </summary> |
|
111 |
CurrentProfit, |
|
112 |
} |
|
42 | 113 |
#endregion |
43 | 114 |
|
115 |
#endregion |
|
116 |
|
|
44 | 117 |
#region 変数 |
45 | 118 |
/// <summary> |
46 | 119 |
/// 増減工事リスト |
他の形式にエクスポート: Unified diff