From 8825070c92cfabd6fc4e2f5896103ef8b4800a33 Mon Sep 17 00:00:00 2001
From: lifan <2308045698@qq.com>
Date: 星期五, 07 十一月 2025 16:02:08 +0800
Subject: [PATCH] update
---
jrj/project/business/Expense/SalaryslipExs.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 2 ++
jrj/xframe/xcontrol/xexcel.hpp | 4 +++-
jrj/project/business/Expense/SalaryslipBonus.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj.filters | 6 ++++++
jrj/project/business/Expense/SalaryslipImp.cpp | 0
6 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 5150497..3322168 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/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" />
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index ed8af57..2e519d7 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/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">
diff --git a/jrj/project/business/Expense/SalaryslipBonus.cpp b/jrj/project/business/Expense/SalaryslipBonus.cpp
new file mode 100644
index 0000000..505ef3c
--- /dev/null
+++ b/jrj/project/business/Expense/SalaryslipBonus.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SalaryslipExs.cpp b/jrj/project/business/Expense/SalaryslipExs.cpp
new file mode 100644
index 0000000..f63d110
--- /dev/null
+++ b/jrj/project/business/Expense/SalaryslipExs.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SalaryslipImp.cpp b/jrj/project/business/Expense/SalaryslipImp.cpp
index 3808c28..6f49a6f 100644
--- a/jrj/project/business/Expense/SalaryslipImp.cpp
+++ b/jrj/project/business/Expense/SalaryslipImp.cpp
Binary files differ
diff --git a/jrj/xframe/xcontrol/xexcel.hpp b/jrj/xframe/xcontrol/xexcel.hpp
index 4f86373..ae6b81d 100644
--- a/jrj/xframe/xcontrol/xexcel.hpp
+++ b/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)
{
--
Gitblit v1.9.3