From 69a689380016fadf6d8fbeb1e5f809566bf3846b Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期一, 22 七月 2024 16:58:43 +0800 Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj --- jrj/project/business/Expense/APOther.cpp | 0 jrj/project/business/Expense/GdnSourceSplit.cpp | 0 jrj/project/business/Expense/VATNotityListShiftToList.cpp | 0 jrj/ext-jrj/ext-jrj.vcxproj | 5 +++++ jrj/project/business/Expense/VATInvoiceAdd.cpp | 0 jrj/project/business/Expense/APNew.cpp | 0 6 files changed, 5 insertions(+), 0 deletions(-) diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj index c78927f..f512512 100644 --- a/jrj/ext-jrj/ext-jrj.vcxproj +++ b/jrj/ext-jrj/ext-jrj.vcxproj @@ -501,6 +501,8 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild> </ClCompile> <ClCompile Include="..\project\business\Expense\APCheckList.cpp" /> + <ClCompile Include="..\project\business\Expense\APNew.cpp" /> + <ClCompile Include="..\project\business\Expense\APOther.cpp" /> <ClCompile Include="..\project\business\Expense\APSplite.cpp" /> <ClCompile Include="..\project\business\Expense\APSpliteLine.cpp" /> <ClCompile Include="..\project\business\Expense\BasicFare.cpp"> @@ -541,6 +543,7 @@ <ClCompile Include="..\project\business\Expense\FreightExpenseItem.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> </ClCompile> + <ClCompile Include="..\project\business\Expense\GdnSourceSplit.cpp" /> <ClCompile Include="..\project\business\Expense\list.expense.ap.cpp" /> <ClCompile Include="..\project\business\Expense\list.manage.ap.cpp" /> <ClCompile Include="..\project\business\Expense\maint.basicfare.cpp"> @@ -601,6 +604,8 @@ <ClCompile Include="..\project\business\Expense\TestExpenseBase2.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> </ClCompile> + <ClCompile Include="..\project\business\Expense\VATInvoiceAdd.cpp" /> + <ClCompile Include="..\project\business\Expense\VATNotityListShiftToList.cpp" /> <ClCompile Include="..\project\business\GDN3.list.cpp"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild> </ClCompile> diff --git a/jrj/project/business/Expense/APNew.cpp b/jrj/project/business/Expense/APNew.cpp new file mode 100644 index 0000000..b703bed --- /dev/null +++ b/jrj/project/business/Expense/APNew.cpp Binary files differ diff --git a/jrj/project/business/Expense/APOther.cpp b/jrj/project/business/Expense/APOther.cpp new file mode 100644 index 0000000..1a3356f --- /dev/null +++ b/jrj/project/business/Expense/APOther.cpp Binary files differ diff --git a/jrj/project/business/Expense/GdnSourceSplit.cpp b/jrj/project/business/Expense/GdnSourceSplit.cpp new file mode 100644 index 0000000..a5d18da --- /dev/null +++ b/jrj/project/business/Expense/GdnSourceSplit.cpp Binary files differ diff --git a/jrj/project/business/Expense/VATInvoiceAdd.cpp b/jrj/project/business/Expense/VATInvoiceAdd.cpp new file mode 100644 index 0000000..90e7a21 --- /dev/null +++ b/jrj/project/business/Expense/VATInvoiceAdd.cpp Binary files differ diff --git a/jrj/project/business/Expense/VATNotityListShiftToList.cpp b/jrj/project/business/Expense/VATNotityListShiftToList.cpp new file mode 100644 index 0000000..2e2b186 --- /dev/null +++ b/jrj/project/business/Expense/VATNotityListShiftToList.cpp Binary files differ -- Gitblit v1.9.3