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

xj qian

2024-07-22 58e8606b84f8b929817978f43438b480f94ad34f

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

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -500,6 +500,9 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\APCheckList.cpp" />
    <ClCompile Include="..\project\business\Expense\APSplite.cpp" />
    <ClCompile Include="..\project\business\Expense\APSpliteLine.cpp" />
    <ClCompile Include="..\project\business\Expense\BasicFare.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
@@ -530,12 +533,16 @@
    <ClCompile Include="..\project\business\Expense\ExportCreditMaint.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\FactoryTempDeduct.cpp" />
    <ClCompile Include="..\project\business\Expense\FreightExpenseImport.cpp" />
    <ClCompile Include="..\project\business\Expense\FreightExpenseInput.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\FreightExpenseItem.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\list.expense.ap.cpp" />
    <ClCompile Include="..\project\business\Expense\list.manage.ap.cpp" />
    <ClCompile Include="..\project\business\Expense\maint.basicfare.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
@@ -545,6 +552,7 @@
    <ClCompile Include="..\project\business\Expense\maint.Document.SampleRequestForm.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\maint.expense.ap.cpp" />
    <ClCompile Include="..\project\business\Expense\maint.salaryslip.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
@@ -557,9 +565,12 @@
    <ClCompile Include="..\project\business\Expense\MouldFee.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\PaperCardCheck.cpp" />
    <ClCompile Include="..\project\business\Expense\PaperCardReconciliation.cpp" />
    <ClCompile Include="..\project\business\Expense\PaperCardReconciliationEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\PaperItemMaint.cpp" />
    <ClCompile Include="..\project\business\Expense\Reimbursement.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>

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

@@ -1163,5 +1163,38 @@
    <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>
  </ItemGroup>
</Project>

 jrj/project/business/Expense/APCheckList.cpp

Binary files differ

 jrj/project/business/Expense/APSplite.cpp

Binary files differ

 jrj/project/business/Expense/APSpliteLine.cpp

Binary files differ

 jrj/project/business/Expense/FactoryTempDeduct.cpp

Binary files differ

 jrj/project/business/Expense/FreightExpenseImport.cpp

Binary files differ

 jrj/project/business/Expense/PaperCardCheck.cpp

Binary files differ

 jrj/project/business/Expense/PaperCardReconciliation.cpp

Binary files differ

 jrj/project/business/Expense/PaperItemMaint.cpp

Binary files differ

 jrj/project/business/Expense/list.expense.ap.cpp

Binary files differ

 jrj/project/business/Expense/list.manage.ap.cpp

Binary files differ

 jrj/project/business/Expense/maint.expense.ap.cpp

Binary files differ