From 58e8606b84f8b929817978f43438b480f94ad34f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 22 七月 2024 16:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Expense/PaperItemMaint.cpp | 0
jrj/project/business/Expense/APSplite.cpp | 0
jrj/project/business/Expense/PaperCardReconciliation.cpp | 0
jrj/project/business/Expense/list.expense.ap.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj.filters | 33 +++++++++++++++++++++++++++++++++
jrj/project/business/Expense/FreightExpenseImport.cpp | 0
jrj/project/business/Expense/PaperCardCheck.cpp | 0
jrj/project/business/Expense/APSpliteLine.cpp | 0
jrj/project/business/Expense/list.manage.ap.cpp | 0
jrj/project/business/Expense/APCheckList.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 11 +++++++++++
jrj/project/business/Expense/FactoryTempDeduct.cpp | 0
jrj/project/business/Expense/maint.expense.ap.cpp | 0
13 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 14404ea..c78927f 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -500,6 +500,9 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\APCheckList.cpp" />
+ <ClCompile Include="..\project\business\Expense\APSplite.cpp" />
+ <ClCompile Include="..\project\business\Expense\APSpliteLine.cpp" />
<ClCompile Include="..\project\business\Expense\BasicFare.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -530,12 +533,16 @@
<ClCompile Include="..\project\business\Expense\ExportCreditMaint.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\FactoryTempDeduct.cpp" />
+ <ClCompile Include="..\project\business\Expense\FreightExpenseImport.cpp" />
<ClCompile Include="..\project\business\Expense\FreightExpenseInput.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\FreightExpenseItem.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <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">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -545,6 +552,7 @@
<ClCompile Include="..\project\business\Expense\maint.Document.SampleRequestForm.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.expense.ap.cpp" />
<ClCompile Include="..\project\business\Expense\maint.salaryslip.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -557,9 +565,12 @@
<ClCompile Include="..\project\business\Expense\MouldFee.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\PaperCardCheck.cpp" />
+ <ClCompile Include="..\project\business\Expense\PaperCardReconciliation.cpp" />
<ClCompile Include="..\project\business\Expense\PaperCardReconciliationEx.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\PaperItemMaint.cpp" />
<ClCompile Include="..\project\business\Expense\Reimbursement.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 784eab9..ab458d8 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -1163,5 +1163,38 @@
<ClCompile Include="..\project\business\VATNotify\import.vatnotify.cpp">
<Filter>project\business\VATNotify</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\PaperCardCheck.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\APCheckList.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\APSpliteLine.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\APSplite.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\FreightExpenseImport.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.expense.ap.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\list.expense.ap.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\FactoryTempDeduct.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\PaperItemMaint.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\list.manage.ap.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\PaperCardReconciliation.cpp">
+ <Filter>project\business\Expense</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/Expense/APCheckList.cpp b/jrj/project/business/Expense/APCheckList.cpp
new file mode 100644
index 0000000..30d7579
--- /dev/null
+++ b/jrj/project/business/Expense/APCheckList.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/APSplite.cpp b/jrj/project/business/Expense/APSplite.cpp
new file mode 100644
index 0000000..011ff6c
--- /dev/null
+++ b/jrj/project/business/Expense/APSplite.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/APSpliteLine.cpp b/jrj/project/business/Expense/APSpliteLine.cpp
new file mode 100644
index 0000000..1cbd912
--- /dev/null
+++ b/jrj/project/business/Expense/APSpliteLine.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/FactoryTempDeduct.cpp b/jrj/project/business/Expense/FactoryTempDeduct.cpp
new file mode 100644
index 0000000..694e7eb
--- /dev/null
+++ b/jrj/project/business/Expense/FactoryTempDeduct.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/FreightExpenseImport.cpp b/jrj/project/business/Expense/FreightExpenseImport.cpp
new file mode 100644
index 0000000..1b09bfc
--- /dev/null
+++ b/jrj/project/business/Expense/FreightExpenseImport.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/PaperCardCheck.cpp b/jrj/project/business/Expense/PaperCardCheck.cpp
new file mode 100644
index 0000000..d6be056
--- /dev/null
+++ b/jrj/project/business/Expense/PaperCardCheck.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/PaperCardReconciliation.cpp b/jrj/project/business/Expense/PaperCardReconciliation.cpp
new file mode 100644
index 0000000..6582b86
--- /dev/null
+++ b/jrj/project/business/Expense/PaperCardReconciliation.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/PaperItemMaint.cpp b/jrj/project/business/Expense/PaperItemMaint.cpp
new file mode 100644
index 0000000..e71780c
--- /dev/null
+++ b/jrj/project/business/Expense/PaperItemMaint.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/list.expense.ap.cpp b/jrj/project/business/Expense/list.expense.ap.cpp
new file mode 100644
index 0000000..0e24d94
--- /dev/null
+++ b/jrj/project/business/Expense/list.expense.ap.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/list.manage.ap.cpp b/jrj/project/business/Expense/list.manage.ap.cpp
new file mode 100644
index 0000000..df91714
--- /dev/null
+++ b/jrj/project/business/Expense/list.manage.ap.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.expense.ap.cpp b/jrj/project/business/Expense/maint.expense.ap.cpp
new file mode 100644
index 0000000..dbd297d
--- /dev/null
+++ b/jrj/project/business/Expense/maint.expense.ap.cpp
Binary files differ
--
Gitblit v1.9.3