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

xj qian

2024-09-13 82cebded12a615637871709949b631a55109ddb5

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

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -707,6 +707,9 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\PO\BigPictureView.Product3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\PO\business4.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>

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

@@ -384,6 +384,66 @@
    <ClInclude Include="..\xframe\devloper\XDevEditPage.cpp">
      <Filter>devloper</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch.impl\JStringImpl.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JByteStream.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JCharStream.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JConnect.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JDataSet.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JDataSource.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JDataStore.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JDouble.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JInt.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JObject.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JObjectSvr.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JSession.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JStream.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JString.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JWin.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="..\jarch\JXPage.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="JFactory.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="JFactoryStringImpl.h">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="JItemAlloc.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
    <ClInclude Include="JPtr.hpp">
      <Filter>头文件</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="dllmain.cpp">
@@ -1286,5 +1346,46 @@
    <ClCompile Include="..\project\business\ProductSample\BusinessProduct3.cpp">
      <Filter>project\business\ProductSample</Filter>
    </ClCompile>
    <ClCompile Include="..\jarch.impl\JStringImpl.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\InsuranceExpense.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\InsuranceExpenseBase.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\InsuranceExpenseEx.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\maint.Document.MouldFeeBase.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\MouldFeeBase.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\MouldFeeEx.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="JFactoryStringImpl.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="JItemAlloc.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="JPtr.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\PO\BigPictureView.Product3.cpp">
      <Filter>project\business\PO</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="ext-jrj.def">
      <Filter>源文件</Filter>
    </None>
  </ItemGroup>
</Project>

 jrj/project/business/PO/BigPictureView.Product3.cpp

Binary files differ