From e09a044ccb0bf15c498da39e5954827456e677e1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 13 九月 2024 16:25:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index d441f91..aad4d00 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -268,6 +268,7 @@
<ClInclude Include="framework.h" />
<ClInclude Include="JFactory.hpp" />
<ClInclude Include="JFactoryStringImpl.h" />
+ <ClInclude Include="JItemAlloc.hpp" />
<ClInclude Include="JPtr.hpp" />
<ClInclude Include="pch.h" />
</ItemGroup>
@@ -503,7 +504,7 @@
</ClCompile>
<ClCompile Include="..\project\business\Enquiry\Entity.Product.Select.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelect.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -550,6 +551,7 @@
<ClCompile Include="..\project\business\Expense\CommissionExpenseItem.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp" />
<ClCompile Include="..\project\business\Expense\Drawback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -575,6 +577,9 @@
</ClCompile>
<ClCompile Include="..\project\business\Expense\FreightExpenseList.cpp" />
<ClCompile Include="..\project\business\Expense\GdnSourceSplit.cpp" />
+ <ClCompile Include="..\project\business\Expense\InsuranceExpense.cpp" />
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseBase.cpp" />
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseEx.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">
@@ -583,6 +588,7 @@
<ClCompile Include="..\project\business\Expense\maint.Document.ExportCredit.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.Document.MouldFeeBase.cpp" />
<ClCompile Include="..\project\business\Expense\maint.Document.SampleRequestForm.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -599,6 +605,8 @@
<ClCompile Include="..\project\business\Expense\MouldFee.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\MouldFeeBase.cpp" />
+ <ClCompile Include="..\project\business\Expense\MouldFeeEx.cpp" />
<ClCompile Include="..\project\business\Expense\PaperCardCheck.cpp" />
<ClCompile Include="..\project\business\Expense\PaperCardReconciliation.cpp" />
<ClCompile Include="..\project\business\Expense\PaperCardReconciliationEx.cpp">
@@ -699,6 +707,10 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\PO\BigPictureView.Product3.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\project\business\PO\business4.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -778,8 +790,8 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\ProductSample\ProductLibraryItemMaint3.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\ProductSample\ProductNewItem.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -971,11 +983,11 @@
</ClCompile>
<ClCompile Include="..\project\business\SystemSettings\BindComputer.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\SystemSettings\Buglist.Developer.hxsoft.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\SystemSettings\BugMaint.Developer.hxsoft.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -1032,8 +1044,8 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\SystemSettings\UserImport.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\SystemSettings\UserPassDlg.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -1120,6 +1132,7 @@
<ClCompile Include="..\xframe\src\xstring.cpp" />
<ClCompile Include="dllmain.cpp" />
<ClCompile Include="JFactoryStringImpl.cpp" />
+ <ClCompile Include="JItemAlloc.cpp" />
<ClCompile Include="JPtr.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
--
Gitblit v1.9.3