update

lifan

12 小时以前 8825070c92cfabd6fc4e2f5896103ef8b4800a33

update

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -668,8 +668,10 @@
    <ClCompile Include="..\project\business\Expense\Salaryslip.cpp">

      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>

    </ClCompile>

    <ClCompile Include="..\project\business\Expense\SalaryslipBonus.cpp" />

    <ClCompile Include="..\project\business\Expense\SalaryslipEx.cpp" />

    <ClCompile Include="..\project\business\Expense\SalaryslipExMaint.cpp" />

    <ClCompile Include="..\project\business\Expense\SalaryslipExs.cpp" />

    <ClCompile Include="..\project\business\Expense\SalaryslipImp.cpp" />

    <ClCompile Include="..\project\business\Expense\SaleCostBase.cpp" />

    <ClCompile Include="..\project\business\Expense\SaleCostList.cpp" />


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

@@ -1643,6 +1643,12 @@
    <ClCompile Include="..\project\business\ProductSample\ProductNewList.cpp">

      <Filter>project\business\ProductSample</Filter>

    </ClCompile>

    <ClCompile Include="..\project\business\Expense\SalaryslipBonus.cpp">

      <Filter>project\business\Expense</Filter>

    </ClCompile>

    <ClCompile Include="..\project\business\Expense\SalaryslipExs.cpp">

      <Filter>project\business\Expense</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <None Include="ext-jrj.def">


 jrj/project/business/Expense/SalaryslipBonus.cpp

Binary files differ

 jrj/project/business/Expense/SalaryslipExs.cpp

Binary files differ

 jrj/project/business/Expense/SalaryslipImp.cpp

Binary files differ

 jrj/xframe/xcontrol/xexcel.hpp

@@ -52,7 +52,9 @@
    }
    xstring GetCellString(int row, int col)
    {
        return xstring(GetKExcel()->GetCellString(row, col),true);
        wchar_t* value = GetKExcel()->GetCellString(row, col);
        if(value)return xstring(value,true);
        return xstring(L"", false);
    }
    int SetCellString(int row, int col, const wchar_t* val)
    {