From e4b4c508c599943ddb22b7d4868ccd40ac05a043 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 27 六月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 9535065..9904f87 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -169,6 +169,7 @@
<ClInclude Include="..\project\viewobject\saleorder.view.hpp" />
<ClInclude Include="..\project\viewobject\shoppingcart.view.hpp" />
<ClInclude Include="..\project\viewobject\supplier.view.hpp" />
+ <ClInclude Include="..\xframe\adt\xarray.hpp" />
<ClInclude Include="..\xframe\kobject\kapp.hpp" />
<ClInclude Include="..\xframe\kobject\kbase.hpp" />
<ClInclude Include="..\xframe\kobject\kcachemgr.hpp" />
@@ -198,6 +199,8 @@
<ClInclude Include="..\xframe\vbusiness\vframe\maint.vframe.vbusiness.hpp" />
<ClInclude Include="..\xframe\vbusiness\vframe\responsewin.vframe.vbusiness.hpp" />
<ClInclude Include="..\xframe\vbusiness\vutil\publiccode.vutil.vbusiness.hpp" />
+ <ClInclude Include="..\xframe\win32\win.hpp" />
+ <ClInclude Include="..\xframe\win32\xfile.hpp" />
<ClInclude Include="..\xframe\wobject\xapp.hpp" />
<ClInclude Include="..\xframe\wobject\xaserver.hpp" />
<ClInclude Include="..\xframe\wobject\xaserverarg.hpp" />
@@ -252,7 +255,9 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="..\project\business\quote.enquiry.cpp" />
+ <ClCompile Include="..\project\business\quote.enquiry.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\project\business\Quote3.list3.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -263,6 +268,7 @@
<ClCompile Include="..\project\business\SO3.maint.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\SO\paymentterm.base.maint.so.cpp" />
<ClCompile Include="..\project\business\Supplier.maint.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -276,13 +282,17 @@
<ClCompile Include="..\xframe\src\nmemory.cpp" />
<ClCompile Include="..\xframe\src\nstring.cpp" />
<ClCompile Include="..\xframe\src\xstring.cpp" />
+ <ClCompile Include="delivery.base.maint.so.cpp" />
<ClCompile Include="dllmain.cpp" />
+ <ClCompile Include="maint.Document.SO3.v3.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
+ <ClCompile Include="Product.Select.SO.cpp" />
+ <ClCompile Include="select.item.so.cpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
--
Gitblit v1.9.3