From 7a91c3a1ed37b0332d4ff0ebeae60bd6da3665c0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 16 七月 2024 18:28:58 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/ext-jrj/ext-jrj.vcxproj.filters |  186 +++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 183 insertions(+), 3 deletions(-)

diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 7638a8b..965a48d 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -112,6 +112,12 @@
     <Filter Include="project\business\ProductSample">
       <UniqueIdentifier>{4e706812-0c60-49af-ae6c-3f9e18a2cd65}</UniqueIdentifier>
     </Filter>
+    <Filter Include="project\business\Company">
+      <UniqueIdentifier>{84413ffb-b8a4-4dfe-a715-ef03dec8f2ef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="project\business\BasicCode">
+      <UniqueIdentifier>{64c23153-69c8-4db3-9225-9e5375e489ff}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="framework.h">
@@ -668,9 +674,6 @@
     <ClCompile Include="..\project\analysis\DataVanalysisWin.cpp">
       <Filter>vbusiness\analysis</Filter>
     </ClCompile>
-    <ClCompile Include="..\project\total3\ViewExTotalWin.cpp">
-      <Filter>vbusiness\total</Filter>
-    </ClCompile>
     <ClCompile Include="..\project\tradedocument\DocFileSaveDlg.cpp">
       <Filter>vbusiness\tradedocument</Filter>
     </ClCompile>
@@ -839,5 +842,182 @@
     <ClCompile Include="..\project\total3\viewex.total2.cpp">
       <Filter>vbusiness\total</Filter>
     </ClCompile>
+    <ClCompile Include="..\project\business\GDN\po.paper.cpp">
+      <Filter>project\business\GDN</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\GDN\tracer.so.cpp">
+      <Filter>project\business\GDN</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\GDN\AdvanceChargeList.cpp">
+      <Filter>project\business\AP</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\GDN\list.SOTrace3.cpp">
+      <Filter>project\business\SO</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\CompanyList.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\CompanyMaint.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HR_Address.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrEmployee.hpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrEmployeeAdd.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrEmployeex.hpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrJob.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrOrg.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrOrgChart.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrOrgMaint.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrOrgType.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HRPerson.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrPersonAdd.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrPersonMaint.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrPersonSel.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrPosition.hpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\Company\HrPositionAdd.cpp">
+      <Filter>project\business\Company</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\total3\ViewTotalWin.cpp">
+      <Filter>vbusiness\total</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\GDN\CustomCodeNew.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\AccountUnitMaint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\AddUomGroup.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\basicfareTypeList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\brand.regtype.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\BrandInforList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\BrandInforMaint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\CartermList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ColorCardNew.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\CustomerMarketList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\CustomerMarketMaint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ExchangeRate.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ExpressList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ExpressMaint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\FCL.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ForwarderList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ForwarderMaint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\FreightExpenseType.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\PaymentTerm.list.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\PaymentTerm.maint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ProfitParam.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\QuickCode.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\QuickCode_Tree.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SetUpRemarks.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ShipcompanyList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\ShipcompanyMaint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\Simple.Menu.Config.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SKUItem.categoryselect.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SKUItem.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SKUItem.select.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SKUTemplate.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SKUTemplate.select.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SourceRemark.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\SpecialDeductFeeList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\TestingCompanyList.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\TestingCompanyMaint.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
+    <ClCompile Include="..\project\business\BasicCode\TypeList.maint.supplier.cpp">
+      <Filter>project\business\BasicCode</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.3