From d013a35ef5bb3b45b46362c67d6f3ca52a54e96d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 16:07:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj.filters | 170 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 151 insertions(+), 19 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 9962a4a..41b056b 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -49,17 +49,32 @@
<Filter Include="project\business">
<UniqueIdentifier>{6d7b6d05-6db8-4a9e-9295-7415fc8ba8c2}</UniqueIdentifier>
</Filter>
- <Filter Include="project\viewobject">
- <UniqueIdentifier>{1204eabe-475a-4239-9711-8e90447311db}</UniqueIdentifier>
- </Filter>
- <Filter Include="project\wface">
- <UniqueIdentifier>{3a03feca-5a89-4ea0-8ebf-c396a17eccfb}</UniqueIdentifier>
- </Filter>
<Filter Include="project\business\SO">
<UniqueIdentifier>{22bae563-5202-4217-b8fc-3e83febc6b91}</UniqueIdentifier>
</Filter>
<Filter Include="project\business\HR">
<UniqueIdentifier>{5f718d5a-c9c4-4438-95e8-b079e44db2aa}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="project\business\Public">
+ <UniqueIdentifier>{84061804-77b3-4859-b7b2-60cfa03c9463}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="vbusiness\viewobject">
+ <UniqueIdentifier>{1204eabe-475a-4239-9711-8e90447311db}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="vbusiness\wface">
+ <UniqueIdentifier>{3a03feca-5a89-4ea0-8ebf-c396a17eccfb}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="vbusiness\workflow">
+ <UniqueIdentifier>{da2d41e8-53e0-476d-9ffb-dacb19c73d3c}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="vbusiness\printview">
+ <UniqueIdentifier>{6f77cfbf-b9ec-4031-9d7a-6925116f657b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="project\business\Supplier">
+ <UniqueIdentifier>{411fad96-7418-4b98-8e36-3f9893659ea1}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="project\business\GDN">
+ <UniqueIdentifier>{1d8cf000-b4e6-4f4c-931c-fb1eddc22430}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
@@ -214,25 +229,25 @@
<Filter>xframe\kobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\customer.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\productlibrary.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\purchaseorder.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\saleorder.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\shoppingcart.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\supplier.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\quote.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\xframe\kobject\kapp.hpp">
<Filter>xframe\kobject</Filter>
@@ -250,7 +265,7 @@
<Filter>xframe\wobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\enquiry.view.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClInclude>
<ClInclude Include="..\project\viewobject\custom.view.hpp">
<Filter>澶存枃浠�</Filter>
@@ -273,6 +288,24 @@
<ClInclude Include="..\xframe\xcontrol\xcell.hpp">
<Filter>澶存枃浠�</Filter>
</ClInclude>
+ <ClInclude Include="..\xframe\xcontrol\xflowchart.hpp">
+ <Filter>xframe\xcontrol</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\kobject\kflowchart.hpp">
+ <Filter>xframe\kobject</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\kobject\khtml.hpp">
+ <Filter>xframe\kobject</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\xcontrol\xhtml.hpp">
+ <Filter>xframe\xcontrol</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\kobject\kexcel.hpp">
+ <Filter>xframe\kobject</Filter>
+ </ClInclude>
+ <ClInclude Include="..\xframe\xcontrol\xexcel.hpp">
+ <Filter>xframe\xcontrol</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
@@ -291,7 +324,7 @@
<Filter>xframe\src</Filter>
</ClCompile>
<ClCompile Include="..\project\viewobject\view.base.hpp">
- <Filter>project\viewobject</Filter>
+ <Filter>vbusiness\viewobject</Filter>
</ClCompile>
<ClCompile Include="..\project\business\SO3.list.cpp">
<Filter>project\business</Filter>
@@ -327,13 +360,13 @@
<Filter>project\business</Filter>
</ClCompile>
<ClCompile Include="..\project\start.vframe.vbusiness.cpp">
- <Filter>project\wface</Filter>
+ <Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\vindexform.cpp">
- <Filter>project\wface</Filter>
+ <Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\vindexmenu.cpp">
- <Filter>project\wface</Filter>
+ <Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\business\EnquiryEx3.list.cpp">
<Filter>project\business</Filter>
@@ -365,8 +398,107 @@
<ClCompile Include="..\project\business\SO\select.item.so.cpp">
<Filter>project\business\SO</Filter>
</ClCompile>
- <ClCompile Include="GraduationSchool.cpp">
+ <ClCompile Include="..\project\business\HR\GraduationSchool.cpp">
<Filter>project\business\HR</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\HR\GraduationSchoolWin.vx.cpp">
+ <Filter>project\business\HR</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\HR\AdministrativeDepartment.cpp">
+ <Filter>project\business\HR</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\HR\AdministrativeDepartmentFolder.cpp">
+ <Filter>project\business\HR</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\HR\BlankExcelTemplate.cpp">
+ <Filter>project\business\HR</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\HR\ManpowerFile.cpp">
+ <Filter>project\business\HR</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\HR\ManpowerFileWindow.cpp">
+ <Filter>project\business\HR</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SO\Product.FetchNo.cpp">
+ <Filter>project\business\SO</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Public\memo.edit.new.cpp">
+ <Filter>project\business\Public</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Public\message.business.cpp">
+ <Filter>project\business\Public</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Public\message.supplier.cpp">
+ <Filter>project\business\Public</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SO\Apply.SOItem.cpp">
+ <Filter>project\business\SO</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\workflow\workflow.actionlog.cpp">
+ <Filter>vbusiness\workflow</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\workflow\workflow.actionlog_vd.cpp">
+ <Filter>vbusiness\workflow</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\workflow\workflow.chkdlg.cpp">
+ <Filter>vbusiness\workflow</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\workflow\workflow.chkdlg_vd.cpp">
+ <Filter>vbusiness\workflow</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\printview\Maint.Template.PrintEx.cpp">
+ <Filter>vbusiness\printview</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\printview\Template.Print.Dialog.cpp">
+ <Filter>vbusiness\printview</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\printview\Template.Print.ViewEx.cpp">
+ <Filter>vbusiness\printview</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\asklist.Owner.Supplier.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\Inspection.Supplie.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\list.Owner.Supplier.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\maint.Document.Supplier.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\maint.Document.SupplierEx.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\maint.Document.SupplierSD.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\maint.Owner.Supplier.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\maintex.Owner.Supplier.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\paymen.Supplie.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Supplier\SupplierSource.cpp">
+ <Filter>project\business\Supplier</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNDelay.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNSourcePaperCard.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\SelectItem.New.GDN.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNSourcePriceMaint.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\select.item.po.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3