From 86996f38d6dc5bb6a049f3ab6aa492bd22f7dde0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 05 九月 2024 15:03:14 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SystemSettings/BindComputer.cpp | 1 -
jrj/project/business/ProductSample/ProductLibraryItemMaint3.cpp | 0
jrj/project/business/Expense/MouldFeeBase.cpp | 0
jrj/project/business/Expense/MouldFeeEx.cpp | 0
jrj/project/business/Expense/InsuranceExpense.cpp | 0
jrj/project/business/Expense/InsuranceExpenseBase.cpp | 0
jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 7 +++++++
jrj/project/business/Expense/InsuranceExpenseEx.cpp | 0
jrj/project/business/SystemSettings/UserImport.cpp | 2 +-
jrj/project/business/Expense/CommodityInspectionExpense.cpp | 0
11 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index d441f91..3e3dcac 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -550,6 +550,7 @@
<ClCompile Include="..\project\business\Expense\CommissionExpenseItem.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\CommodityInspectionExpense.cpp" />
<ClCompile Include="..\project\business\Expense\Drawback.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -575,6 +576,9 @@
</ClCompile>
<ClCompile Include="..\project\business\Expense\FreightExpenseList.cpp" />
<ClCompile Include="..\project\business\Expense\GdnSourceSplit.cpp" />
+ <ClCompile Include="..\project\business\Expense\InsuranceExpense.cpp" />
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseBase.cpp" />
+ <ClCompile Include="..\project\business\Expense\InsuranceExpenseEx.cpp" />
<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">
@@ -583,6 +587,7 @@
<ClCompile Include="..\project\business\Expense\maint.Document.ExportCredit.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\maint.Document.MouldFeeBase.cpp" />
<ClCompile Include="..\project\business\Expense\maint.Document.SampleRequestForm.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
@@ -599,6 +604,8 @@
<ClCompile Include="..\project\business\Expense\MouldFee.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\Expense\MouldFeeBase.cpp" />
+ <ClCompile Include="..\project\business\Expense\MouldFeeEx.cpp" />
<ClCompile Include="..\project\business\Expense\PaperCardCheck.cpp" />
<ClCompile Include="..\project\business\Expense\PaperCardReconciliation.cpp" />
<ClCompile Include="..\project\business\Expense\PaperCardReconciliationEx.cpp">
diff --git a/jrj/project/business/Expense/CommodityInspectionExpense.cpp b/jrj/project/business/Expense/CommodityInspectionExpense.cpp
new file mode 100644
index 0000000..01ed3b5
--- /dev/null
+++ b/jrj/project/business/Expense/CommodityInspectionExpense.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/InsuranceExpense.cpp b/jrj/project/business/Expense/InsuranceExpense.cpp
new file mode 100644
index 0000000..545b85a
--- /dev/null
+++ b/jrj/project/business/Expense/InsuranceExpense.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/InsuranceExpenseBase.cpp b/jrj/project/business/Expense/InsuranceExpenseBase.cpp
new file mode 100644
index 0000000..4a66b0b
--- /dev/null
+++ b/jrj/project/business/Expense/InsuranceExpenseBase.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/InsuranceExpenseEx.cpp b/jrj/project/business/Expense/InsuranceExpenseEx.cpp
new file mode 100644
index 0000000..7e019c2
--- /dev/null
+++ b/jrj/project/business/Expense/InsuranceExpenseEx.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/MouldFeeBase.cpp b/jrj/project/business/Expense/MouldFeeBase.cpp
new file mode 100644
index 0000000..37ad396
--- /dev/null
+++ b/jrj/project/business/Expense/MouldFeeBase.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/MouldFeeEx.cpp b/jrj/project/business/Expense/MouldFeeEx.cpp
new file mode 100644
index 0000000..70421e7
--- /dev/null
+++ b/jrj/project/business/Expense/MouldFeeEx.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp b/jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp
new file mode 100644
index 0000000..5b924eb
--- /dev/null
+++ b/jrj/project/business/Expense/maint.Document.MouldFeeBase.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/ProductLibraryItemMaint3.cpp b/jrj/project/business/ProductSample/ProductLibraryItemMaint3.cpp
index 319aab7..e9d6a48 100644
--- a/jrj/project/business/ProductSample/ProductLibraryItemMaint3.cpp
+++ b/jrj/project/business/ProductSample/ProductLibraryItemMaint3.cpp
Binary files differ
diff --git a/jrj/project/business/SystemSettings/BindComputer.cpp b/jrj/project/business/SystemSettings/BindComputer.cpp
index 73bc5aa..bf3cc96 100644
--- a/jrj/project/business/SystemSettings/BindComputer.cpp
+++ b/jrj/project/business/SystemSettings/BindComputer.cpp
@@ -25,7 +25,6 @@
{
xml x;
-
xaserverarg arg;
arg = GetArg();
diff --git a/jrj/project/business/SystemSettings/UserImport.cpp b/jrj/project/business/SystemSettings/UserImport.cpp
index 2180585..211a62c 100644
--- a/jrj/project/business/SystemSettings/UserImport.cpp
+++ b/jrj/project/business/SystemSettings/UserImport.cpp
@@ -168,7 +168,7 @@
xml x;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"sguid", id);
if (xurl::post(L"/sale/data/OrganizationStruct/tree.child.OrgChart", arg.GetString(), x) != 1)
{
--
Gitblit v1.9.3