Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-07-12 117c81ecd565a564d8926a3338cb51350c9eff3c

 jrj/ext-jrj/ext-jrj.vcxproj.filters

@@ -106,6 +106,12 @@
    <Filter Include="project\business\Expense">
      <UniqueIdentifier>{50e3db89-5f6f-425b-8a5d-3cb86b80eacb}</UniqueIdentifier>
    </Filter>
    <Filter Include="project\business\Enquiry">
      <UniqueIdentifier>{ac880186-5122-46db-b017-b44f7fdacc38}</UniqueIdentifier>
    </Filter>
    <Filter Include="project\business\ProductSample">
      <UniqueIdentifier>{4e706812-0c60-49af-ae6c-3f9e18a2cd65}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="framework.h">
@@ -431,9 +437,6 @@
    <ClCompile Include="..\project\business\SO\paymentterm.base.maint.so.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\quote.enquiry.cpp">
      <Filter>project\business</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\SO\delivery.base.maint.so.cpp">
      <Filter>project\business\SO</Filter>
    </ClCompile>
@@ -665,7 +668,7 @@
    <ClCompile Include="..\project\analysis\DataVanalysisWin.cpp">
      <Filter>vbusiness\analysis</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\ViewTotalWin.cpp">
    <ClCompile Include="..\project\total3\ViewExTotalWin.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\tradedocument\DocFileSaveDlg.cpp">
@@ -770,5 +773,71 @@
    <ClCompile Include="..\project\business\Expense\TestExpenseBase2.cpp">
      <Filter>project\business\Expense</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\Enquiry.maint.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\EnquiryEx.quote.vx.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\Entity.Product.Select.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelect.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelectEx.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\ProductSchema.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\ProductSchemaSelect.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\SKU.PictureView.Product3.cpp">
      <Filter>project\business\Enquiry</Filter>
    </ClCompile>
    <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>
    <ClCompile Include="..\project\business\ProductSample\CheckOut.instore.Sample.cpp">
      <Filter>project\business\ProductSample</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\ViewTotalArgWin.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\QuoteFile.cpp">
      <Filter>project\business</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\FactoryPayment.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\GDNItem.GDN.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\ProductNewList.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\ProductNoOut.SO.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\viewex.total.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\viewex.total1.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
    <ClCompile Include="..\project\total3\viewex.total2.cpp">
      <Filter>vbusiness\total</Filter>
    </ClCompile>
  </ItemGroup>
</Project>