From 9c190b7a9a845bcb35d3d09d255f12d9c879e403 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:50 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index c8440a1..7d78754 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -216,6 +216,7 @@
<ClInclude Include="..\xframe\kobject\kwin.hpp" />
<ClInclude Include="..\xframe\kobject\kxaserver.hpp" />
<ClInclude Include="..\xframe\kobject\kxml.hpp" />
+ <ClInclude Include="..\xframe\kobject\kxsedit.hpp" />
<ClInclude Include="..\xframe\platform\nmemory.hpp" />
<ClInclude Include="..\xframe\platform\nstring.hpp" />
<ClInclude Include="..\xframe\system\base.hpp" />
@@ -263,12 +264,14 @@
<ClInclude Include="..\xframe\xcontrol\xlistview.hpp" />
<ClInclude Include="..\xframe\xcontrol\xoffice.hpp" />
<ClInclude Include="..\xframe\xcontrol\xreport.hpp" />
+ <ClInclude Include="..\xframe\xcontrol\xsedit.hpp" />
<ClInclude Include="..\xframe\xcontrol\xshtml.hpp" />
<ClInclude Include="..\xframe\xcontrol\xtreeview.hpp" />
<ClInclude Include="framework.h" />
<ClInclude Include="JAlloc.hpp" />
<ClInclude Include="JFactory.hpp" />
<ClInclude Include="JFactoryStringImpl.h" />
+ <ClInclude Include="JGui.hpp" />
<ClInclude Include="JItemAlloc.hpp" />
<ClInclude Include="JLang.hpp" />
<ClInclude Include="JPlatform.hpp" />
@@ -596,6 +599,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.Document.Test.v3.cpp" />
<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>
@@ -746,6 +750,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\PO\paymentmethod.cpp" />
<ClCompile Include="..\project\business\PO\PO.BatchPrecess.polist.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
@@ -879,6 +884,7 @@
<ClCompile Include="..\project\business\Quote\QuoteFilePurch.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Quote\QuoteFilePurch2Select.cpp" />
<ClCompile Include="..\project\business\Quote\QuoteFilePurched.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -927,6 +933,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\SO\select.gdnitem.so.cpp" />
<ClCompile Include="..\project\business\SO\select.item.so.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
@@ -1130,13 +1137,18 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\xframe\devloper\devloper.cpp" />
+ <ClCompile Include="..\xframe\devloper\sqlwatch.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\xframe\devloper\XDevItemDlg.cpp" />
<ClCompile Include="..\xframe\src\nmemory.cpp" />
<ClCompile Include="..\xframe\src\nstring.cpp" />
<ClCompile Include="..\xframe\src\xstring.cpp" />
<ClCompile Include="dllmain.cpp" />
- <ClCompile Include="JAlloc.cpp" />
+ <ClCompile Include="JAllocImpl.cpp" />
<ClCompile Include="JFactoryStringImpl.cpp" />
+ <ClCompile Include="JGuiImpl.cpp" />
<ClCompile Include="JItemAlloc.cpp" />
<ClCompile Include="JLang.cpp" />
<ClCompile Include="JPlatform.cpp" />
--
Gitblit v1.9.3