From a9541d57fa9ea409140703aeda369c19d842c601 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期一, 08 七月 2024 10:35:30 +0800
Subject: [PATCH] update
---
jrj/project/business/AR/Deduction.cpp | 2 +-
jrj/project/business/Supplier/maint.Document.SupplierEx.cpp | 0
jrj/project/business/AR/ExchageFile.cpp | 1 +
jrj/project/business/Supplier/maint.Document.SupplierSD.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 22 +++++++++++-----------
jrj/project/business/PO/PO.BatchPrecess.polist.cpp | 0
jrj/project/business/AP/Select.AP.cpp | 6 +++---
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index ba7c9d7..e9105d9 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'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AR\CustomerTran.AR.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AR\Deduction.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -401,19 +401,19 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\SupplierUserGroupPersonSelect.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\UserGroupMaint.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\UserGroupPersonSelect.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\UserGroupPersonSelectEx.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\UserGroupSelect.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Public\UserGroupShare.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -458,7 +458,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\SO\select.item.so.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\Supplier.maint.cpp">
@@ -480,15 +480,15 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Supplier\maint.Document.Supplier.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\Supplier\maint.Document.SupplierEx.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\Supplier\maint.Document.SupplierSD.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\Supplier\maint.Owner.Supplier.cpp">
@@ -504,7 +504,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\Supplier\SupplierSource.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\VATNotify\list.vatnotify.cpp">
diff --git a/jrj/project/business/AP/Select.AP.cpp b/jrj/project/business/AP/Select.AP.cpp
index 44a979b..a33f245 100644
--- a/jrj/project/business/AP/Select.AP.cpp
+++ b/jrj/project/business/AP/Select.AP.cpp
@@ -6,9 +6,9 @@
#include "viewobject/view.base.hpp"
using xml = KXMLDOMDocument;
- class __declspec(dllexport) APSelectDlg : public xframe
- {
- public:
+class __declspec(dllexport) APSelectDlg : public xframe
+{
+public:
xdwgrid dw_list;
xcontrol query;
diff --git a/jrj/project/business/AR/Deduction.cpp b/jrj/project/business/AR/Deduction.cpp
index 4c29afa..c2d29b0 100644
--- a/jrj/project/business/AR/Deduction.cpp
+++ b/jrj/project/business/AR/Deduction.cpp
@@ -164,7 +164,7 @@
arg.AddArg(L"InvoiceNoEx", GetControl(L"search").GetText());
arg.AddArg(L"EntityID", EntityID);
- trace(GetControl(L"search").GetText());
+ //trace(GetControl(L"search").GetText());
if (getUrl(L"/sale/data/AR/DeductionList", arg.GetString(), x) != 1)
{
trace(x.text());
diff --git a/jrj/project/business/AR/ExchageFile.cpp b/jrj/project/business/AR/ExchageFile.cpp
index 34ba750..0824aad 100644
--- a/jrj/project/business/AR/ExchageFile.cpp
+++ b/jrj/project/business/AR/ExchageFile.cpp
@@ -1,6 +1,7 @@
#include <wobject/xstring.hpp>
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
+#include <xcontrol/xcell.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
diff --git a/jrj/project/business/PO/PO.BatchPrecess.polist.cpp b/jrj/project/business/PO/PO.BatchPrecess.polist.cpp
index ad5a866..c9e1a73 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/project/business/Supplier/maint.Document.SupplierEx.cpp b/jrj/project/business/Supplier/maint.Document.SupplierEx.cpp
index 9e02bfd..9828da7 100644
--- a/jrj/project/business/Supplier/maint.Document.SupplierEx.cpp
+++ b/jrj/project/business/Supplier/maint.Document.SupplierEx.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp b/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp
index 4f599d7..dccdf65 100644
--- a/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp
+++ b/jrj/project/business/Supplier/maint.Document.SupplierSD.cpp
Binary files differ
--
Gitblit v1.9.3