From 539130eff1bc899ec8dcdb312d5b5b2bec402bd2 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 19 七月 2024 09:38:39 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/GDN3.list.cpp | 2 +-
jrj/project/business/PO/business4.cpp | 0
jrj/project/business/GDN/maintex.gdn3.cpp | 0
jrj/project/business/GDN/GDNDelay.cpp | 0
jrj/project/business/GDN/listex.GDN3.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 2 ++
jrj/ext-jrj/ext-jrj.vcxproj.filters | 6 ++++++
7 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 4dd4cc9..46bf3a4 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -605,6 +605,8 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\GDN\list.SOTrace3.cpp" />
+ <ClCompile Include="..\project\business\GDN\listex.GDN3.cpp" />
+ <ClCompile Include="..\project\business\GDN\maintex.gdn3.cpp" />
<ClCompile Include="..\project\business\GDN\po.paper.cpp" />
<ClCompile Include="..\project\business\GDN\select.item.po.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 3e0d53c..b80ebd1 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -1130,5 +1130,11 @@
<ClCompile Include="..\project\business\Quote\Product.Select.cpp">
<Filter>project\business\Quote</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\GDN\listex.GDN3.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\maintex.gdn3.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/GDN/GDNDelay.cpp b/jrj/project/business/GDN/GDNDelay.cpp
index b49b1e6..c615f0b 100644
--- a/jrj/project/business/GDN/GDNDelay.cpp
+++ b/jrj/project/business/GDN/GDNDelay.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/listex.GDN3.cpp b/jrj/project/business/GDN/listex.GDN3.cpp
new file mode 100644
index 0000000..a7f61be
--- /dev/null
+++ b/jrj/project/business/GDN/listex.GDN3.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/maintex.gdn3.cpp b/jrj/project/business/GDN/maintex.gdn3.cpp
new file mode 100644
index 0000000..b606900
--- /dev/null
+++ b/jrj/project/business/GDN/maintex.gdn3.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index fe164f6..a3637f5 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -433,7 +433,7 @@
xstring EntityIDEx = dw_list.GetGuid(dw_list.GetRow());
xaserverarg argEx;
- alert(EntityIDEx);
+ //alert(EntityIDEx);
argEx.AddArg(L"GDNID", EntityIDEx);
OpenWindow(L"dev:xpage[GDNDelay.vx]", argEx);
return 1;
diff --git a/jrj/project/business/PO/business4.cpp b/jrj/project/business/PO/business4.cpp
index cff6a3f..5a77cf7 100644
--- a/jrj/project/business/PO/business4.cpp
+++ b/jrj/project/business/PO/business4.cpp
Binary files differ
--
Gitblit v1.9.3