From eb39d3d2ca26581f9f0254acd0b1f5d56c9869a8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 23 七月 2024 11:19:29 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/ext-jrj/ext-jrj.vcxproj.filters | 249 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 240 insertions(+), 9 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 965a48d..c1e1e2d 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -118,6 +118,12 @@
<Filter Include="project\business\BasicCode">
<UniqueIdentifier>{64c23153-69c8-4db3-9225-9e5375e489ff}</UniqueIdentifier>
</Filter>
+ <Filter Include="project\business\SystemSettings">
+ <UniqueIdentifier>{9d76dee1-2190-4b2c-8f17-bd2e54140f7d}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="project\business\Quote">
+ <UniqueIdentifier>{8b3b4162-bfac-425e-b44d-ae8482f17564}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="framework.h">
@@ -366,6 +372,9 @@
<ClInclude Include="..\xframe\xcontrol\xdatetimepick.hpp">
<Filter>xframe\xcontrol</Filter>
</ClInclude>
+ <ClInclude Include="..\project\business\SystemSettings\SysUser.hpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
@@ -423,9 +432,6 @@
<Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\vindexform.cpp">
- <Filter>vbusiness\wface</Filter>
- </ClCompile>
- <ClCompile Include="..\project\vindexmenu.cpp">
<Filter>vbusiness\wface</Filter>
</ClCompile>
<ClCompile Include="..\project\business\EnquiryEx3.list.cpp">
@@ -803,12 +809,6 @@
<ClCompile Include="..\project\business\Enquiry\ViewPictures.cpp">
<Filter>project\business\Enquiry</Filter>
</ClCompile>
- <ClCompile Include="..\project\business\ProductSample\InstoreSample3Win.cpp">
- <Filter>project\business\ProductSample</Filter>
- </ClCompile>
- <ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp">
- <Filter>project\business\ProductSample</Filter>
- </ClCompile>
<ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp">
<Filter>project\business\ProductSample</Filter>
</ClCompile>
@@ -1019,5 +1019,236 @@
<ClCompile Include="..\project\business\BasicCode\TypeList.maint.supplier.cpp">
<Filter>project\business\BasicCode</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\AddUser.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\AddUserGroup.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\BindComputer.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\Data.config.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\Developer.Synch.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\Flow3.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\FlowTermImport.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\FlowTermSelect.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\level.Customer.v3.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\LogList.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\maint.Level.Customer3.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\Resource.select.data.config.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\Role.config.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\SysLoginRecord.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\SysUser.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\TestRetrieveing.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\UserImport.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\UserPassDlg.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\view.assignadjust.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\Buglist.Developer.hxsoft.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\BugMaint.Developer.hxsoft.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\Organization.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\OrganizationBase.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\SystemSettings\ProcessManagement.cpp">
+ <Filter>project\business\SystemSettings</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\CustomerItemNoList.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\XmShare.Quote.v3.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\xmQuoteBillList.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\trade.document.selectdlg.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\trade.document.saveas.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\TOSelectDlg.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\QuoteSupplierItem.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\QuoteFilePurched.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\QuoteFilePurch.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Quote\Product.Select.cpp">
+ <Filter>project\business\Quote</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\listex.GDN3.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\maintex.gdn3.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\PO\PO.maint.item.line.cpp">
+ <Filter>project\business\PO</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\VATNotify\del.vatinvoice.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\VATNotify\list.vatinvoice.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\VATNotify\maint.vatinvoice..cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\VATNotify\maint.vatinvoiceEx.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\VATNotify\VATInvoiceNew.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\AP\list.RefundGDNLine.Entity.xarch.cpp">
+ <Filter>project\business\AP</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\AP\list.RefundSourcingLine.Entity.xarch.cpp">
+ <Filter>project\business\AP</Filter>
+ </ClCompile>
+ <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>
+ <ClCompile Include="..\project\business\ProductSample\ItemCustomerPicture.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\new.Sample3.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\outstorekind.Sample3.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\PictureView.Product3.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\Product.SearchDlg.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\ProductLibrary4.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\ProductLibraryItemMaint3.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\ProductNewItem.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\Quick.Input.NewProduct.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\SampleAbnormal.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\ShipmentNew.Sample3.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\UserProductApply.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\instore.Sample3.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\outstore.Sample3.cpp">
+ <Filter>project\business\ProductSample</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\ProductSample\ViewPicturesEx.cpp">
+ <Filter>vbusiness\total</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\VATNotityListShiftToList.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\VATInvoiceAdd.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\GdnSourceSplit.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\APOther.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\Expense\APNew.cpp">
+ <Filter>project\business\VATNotify</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\vindexmenu.cpp">
+ <Filter>vbusiness\wface</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.3