From a709604d7ff72738395bbd6e99c646f9b68539b6 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 09 七月 2024 16:57:38 +0800
Subject: [PATCH] update Exxpense
---
jrj/project/business/Expense/CommissionExpenseBase.cpp | 0
jrj/project/business/Expense/Drawback.cpp | 0
jrj/project/business/Expense/basicfareTypeList.cpp | 0
jrj/project/business/HR/BlankExcelTemplate.cpp | 2
jrj/project/business/GDN/GDNSourcePaperCard.cpp | 0
jrj/project/business/Expense/CommissionExpenseItem.cpp | 0
jrj/project/business/Expense/ExportCreditMaint.cpp | 0
jrj/project/business/Expense/ExportCredit.cpp | 0
jrj/project/business/Expense/FreightExpenseItem.cpp | 0
jrj/project/business/AR/maint.SettlementExchange.cpp | 4 +-
jrj/project/business/Expense/CommissionExpense.cpp | 0
jrj/project/business/Expense/ExportCredit.SwitchTo.cpp | 0
jrj/project/business/Expense/maint.basicfare.cpp | 0
jrj/project/business/Expense/BasicFare.cpp | 0
jrj/xframe/xcontrol/xdatetimepick.hpp | 11 -----
jrj/project/business/Expense/Salaryslip.cpp | 0
jrj/project/business/PO/PO.BatchPrecess.polist.cpp | 0
jrj/project/business/Expense/ExchangeRate.cpp | 0
jrj/project/business/Expense/FreightExpenseInput.cpp | 0
jrj/project/business/Expense/PaperCardReconciliationEx.cpp | 0
jrj/project/business/GDN/select.item.po.cpp | 0
jrj/project/business/Expense/SampleFee.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 76 +++++++++++++++++++-------------------
jrj/project/business/Expense/SampleRequestForm.cpp | 0
jrj/project/business/Expense/maint.salaryslip.cpp | 0
25 files changed, 41 insertions(+), 52 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index d4bcc2a..f4b9ad2 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -258,7 +258,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AP\maint.ap.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AP\Select.AP.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -270,7 +270,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AR\ExchageFile.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AR\ExchageInput3.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -282,7 +282,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AR\ExchangeSignFast.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AR\maint.SettlementExchange.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -294,99 +294,99 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Enquiry.list.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\EnquiryEx3.list.cpp" />
<ClCompile Include="..\project\business\Expense\BasicFare.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\basicfareTypeList.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\CommissionExpense.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\CommissionExpenseBase.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\CommissionExpenseItem.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\Drawback.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\ExchangeRate.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\ExportCredit.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\ExportCredit.SwitchTo.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\ExportCreditMaint.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\FreightExpenseInput.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\FreightExpenseItem.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\maint.basicfare.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\maint.Document.ExportCredit.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\maint.Document.SampleRequestForm.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\maint.salaryslip.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\maint.samplefee.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\maint.samplesequest.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\MouldFee.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\PaperCardReconciliationEx.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\Reimbursement.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\ReimbursementMaint.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\Salaryslip.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\SampleFee.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\SampleRequestForm.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\SelectSalaryslip.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\SpecialDeductFeeList.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\TestExpense.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\TestExpenseBase.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Expense\TestExpenseBase2.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\GDN3.list.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -398,14 +398,14 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\GDN\GDNSourcePaperCard.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\GDN\GDNSourcePriceMaint.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\GDN\select.item.po.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\GDN\SelectItem.New.GDN.cpp">
@@ -421,7 +421,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\HR\BlankExcelTemplate.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\HR\GraduationSchool.cpp" />
@@ -465,7 +465,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\PO.BatchPrecess.polist.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\PO\PO.maint.base.cpp">
diff --git a/jrj/project/business/AR/maint.SettlementExchange.cpp b/jrj/project/business/AR/maint.SettlementExchange.cpp
index 2bc9485..7a6b5ce 100644
--- a/jrj/project/business/AR/maint.SettlementExchange.cpp
+++ b/jrj/project/business/AR/maint.SettlementExchange.cpp
@@ -114,7 +114,7 @@
int OnSign()
{
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
xml x;
@@ -185,7 +185,7 @@
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"SEID", SettlementExchangeID);
if (getUrl(L"/sale/data/AR/se/getsebyid", arg.GetString(), x) != 1)
diff --git a/jrj/project/business/Expense/BasicFare.cpp b/jrj/project/business/Expense/BasicFare.cpp
index e74b03a..9fb8658 100644
--- a/jrj/project/business/Expense/BasicFare.cpp
+++ b/jrj/project/business/Expense/BasicFare.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/CommissionExpense.cpp b/jrj/project/business/Expense/CommissionExpense.cpp
index 99ccd69..70496b8 100644
--- a/jrj/project/business/Expense/CommissionExpense.cpp
+++ b/jrj/project/business/Expense/CommissionExpense.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/CommissionExpenseBase.cpp b/jrj/project/business/Expense/CommissionExpenseBase.cpp
index 6a433f6..f76d20c 100644
--- a/jrj/project/business/Expense/CommissionExpenseBase.cpp
+++ b/jrj/project/business/Expense/CommissionExpenseBase.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/CommissionExpenseItem.cpp b/jrj/project/business/Expense/CommissionExpenseItem.cpp
index a1080f7..052b2dd 100644
--- a/jrj/project/business/Expense/CommissionExpenseItem.cpp
+++ b/jrj/project/business/Expense/CommissionExpenseItem.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/Drawback.cpp b/jrj/project/business/Expense/Drawback.cpp
index d5729b3..931b4c4 100644
--- a/jrj/project/business/Expense/Drawback.cpp
+++ b/jrj/project/business/Expense/Drawback.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/ExchangeRate.cpp b/jrj/project/business/Expense/ExchangeRate.cpp
index 4015b3b..79927ec 100644
--- a/jrj/project/business/Expense/ExchangeRate.cpp
+++ b/jrj/project/business/Expense/ExchangeRate.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp b/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp
index c6a5f19..c606c21 100644
--- a/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp
+++ b/jrj/project/business/Expense/ExportCredit.SwitchTo.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/ExportCredit.cpp b/jrj/project/business/Expense/ExportCredit.cpp
index bf0f8b8..59804e1 100644
--- a/jrj/project/business/Expense/ExportCredit.cpp
+++ b/jrj/project/business/Expense/ExportCredit.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/ExportCreditMaint.cpp b/jrj/project/business/Expense/ExportCreditMaint.cpp
index 3ff980d..7f3f94e 100644
--- a/jrj/project/business/Expense/ExportCreditMaint.cpp
+++ b/jrj/project/business/Expense/ExportCreditMaint.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/FreightExpenseInput.cpp b/jrj/project/business/Expense/FreightExpenseInput.cpp
index 8bc89e8..ef76584 100644
--- a/jrj/project/business/Expense/FreightExpenseInput.cpp
+++ b/jrj/project/business/Expense/FreightExpenseInput.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/FreightExpenseItem.cpp b/jrj/project/business/Expense/FreightExpenseItem.cpp
index ecfacbe..7c1f2a1 100644
--- a/jrj/project/business/Expense/FreightExpenseItem.cpp
+++ b/jrj/project/business/Expense/FreightExpenseItem.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/PaperCardReconciliationEx.cpp b/jrj/project/business/Expense/PaperCardReconciliationEx.cpp
index 60e5b48..9d5ac81 100644
--- a/jrj/project/business/Expense/PaperCardReconciliationEx.cpp
+++ b/jrj/project/business/Expense/PaperCardReconciliationEx.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/Salaryslip.cpp b/jrj/project/business/Expense/Salaryslip.cpp
index a305606..857dec4 100644
--- a/jrj/project/business/Expense/Salaryslip.cpp
+++ b/jrj/project/business/Expense/Salaryslip.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SampleFee.cpp b/jrj/project/business/Expense/SampleFee.cpp
index 1eacdfc..80cad5d 100644
--- a/jrj/project/business/Expense/SampleFee.cpp
+++ b/jrj/project/business/Expense/SampleFee.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SampleRequestForm.cpp b/jrj/project/business/Expense/SampleRequestForm.cpp
index c4d1236..75dc44d 100644
--- a/jrj/project/business/Expense/SampleRequestForm.cpp
+++ b/jrj/project/business/Expense/SampleRequestForm.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/basicfareTypeList.cpp b/jrj/project/business/Expense/basicfareTypeList.cpp
index f26ab11..adc1e07 100644
--- a/jrj/project/business/Expense/basicfareTypeList.cpp
+++ b/jrj/project/business/Expense/basicfareTypeList.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.basicfare.cpp b/jrj/project/business/Expense/maint.basicfare.cpp
index c32b7c1..3354131 100644
--- a/jrj/project/business/Expense/maint.basicfare.cpp
+++ b/jrj/project/business/Expense/maint.basicfare.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.salaryslip.cpp b/jrj/project/business/Expense/maint.salaryslip.cpp
index 9208779..cf3eb47 100644
--- a/jrj/project/business/Expense/maint.salaryslip.cpp
+++ b/jrj/project/business/Expense/maint.salaryslip.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/GDNSourcePaperCard.cpp b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
index 8fbe206..6ab0b08 100644
--- a/jrj/project/business/GDN/GDNSourcePaperCard.cpp
+++ b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/select.item.po.cpp b/jrj/project/business/GDN/select.item.po.cpp
index 854592f..91ee9d4 100644
--- a/jrj/project/business/GDN/select.item.po.cpp
+++ b/jrj/project/business/GDN/select.item.po.cpp
Binary files differ
diff --git a/jrj/project/business/HR/BlankExcelTemplate.cpp b/jrj/project/business/HR/BlankExcelTemplate.cpp
index c73e4ef..70a02b4 100644
--- a/jrj/project/business/HR/BlankExcelTemplate.cpp
+++ b/jrj/project/business/HR/BlankExcelTemplate.cpp
@@ -60,7 +60,7 @@
dw_list.DwUpdateAllToEx(x);
xaserverarg arg;
- arg.AddArg(L"content", x.xml().replace(L" 00:00:00", L"").replace(L"0000-00-00", L""));
+ arg.AddArg(L"content", xstring(x.xml()).replace(L" 00:00:00", L"").replace(L"0000-00-00", L""));
//trace(x.xml().replace(L" 00:00:00", L"").replace(L"0000-00-00", L""));//运行界面打印
if (getUrl(L"/sale/data/ManpowerFile/multiUpdate", arg.GetString(), x) != 1) {
xstring error = x.text();
diff --git a/jrj/project/business/PO/PO.BatchPrecess.polist.cpp b/jrj/project/business/PO/PO.BatchPrecess.polist.cpp
index c9e1a73..ec6452d 100644
--- a/jrj/project/business/PO/PO.BatchPrecess.polist.cpp
+++ b/jrj/project/business/PO/PO.BatchPrecess.polist.cpp
Binary files differ
diff --git a/jrj/xframe/xcontrol/xdatetimepick.hpp b/jrj/xframe/xcontrol/xdatetimepick.hpp
index e4c8c76..450b983 100644
--- a/jrj/xframe/xcontrol/xdatetimepick.hpp
+++ b/jrj/xframe/xcontrol/xdatetimepick.hpp
@@ -3,17 +3,6 @@
#include "wobject/xcontrol.hpp"
#include "win32/win.hpp"
-struct SYSTEMTIME
-{
- short wYear;
- short wMonth;
- short wDayOfWeek; //星期，0=星期日，1=星期一
- short wDay;
- short wHour;
- short wMinute;
- short wSecond;
- short wMilliseconds; //毫秒
-};
class xdatetimepick: public xcontrol
{
--
Gitblit v1.9.3