From d013a35ef5bb3b45b46362c67d6f3ca52a54e96d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 01 七月 2024 16:07:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SO/Product.Select.SO.cpp | 4 ++--
jrj/project/business/Supplier/SupplierSource.cpp | 0
jrj/project/business/GDN/SelectItem.New.GDN.cpp | 0
jrj/project/business/Supplier/maint.Document.SupplierEx.cpp | 0
jrj/project/business/GDN/GDNSourcePaperCard.cpp | 0
jrj/project/business/Supplier/maintex.Owner.Supplier.cpp | 0
jrj/project/business/GDN/GDNDelay.cpp | 0
jrj/project/business/Supplier/maint.Owner.Supplier.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj.filters | 18 ++++++++++++++++++
jrj/project/business/Supplier/list.Owner.Supplier.cpp | 0
jrj/project/business/GDN/GDNSourcePriceMaint.cpp | 0
jrj/project/business/GDN/select.item.po.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 15 +++++++++++++++
13 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index c0aabfc..c8d3637 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -254,6 +254,21 @@
<ClCompile Include="..\project\business\GDN3.maint.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNDelay.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNSourcePaperCard.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|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>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\SelectItem.New.GDN.cpp">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ </ClCompile>
<ClCompile Include="..\project\business\HR\AdministrativeDepartment.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 050eaf0..41b056b 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -73,6 +73,9 @@
<Filter Include="project\business\Supplier">
<UniqueIdentifier>{411fad96-7418-4b98-8e36-3f9893659ea1}</UniqueIdentifier>
</Filter>
+ <Filter Include="project\business\GDN">
+ <UniqueIdentifier>{1d8cf000-b4e6-4f4c-931c-fb1eddc22430}</UniqueIdentifier>
+ </Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="framework.h">
@@ -482,5 +485,20 @@
<ClCompile Include="..\project\business\Supplier\SupplierSource.cpp">
<Filter>project\business\Supplier</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNDelay.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNSourcePaperCard.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\SelectItem.New.GDN.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\GDNSourcePriceMaint.cpp">
+ <Filter>project\business\GDN</Filter>
+ </ClCompile>
+ <ClCompile Include="..\project\business\GDN\select.item.po.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
new file mode 100644
index 0000000..9117b91
--- /dev/null
+++ b/jrj/project/business/GDN/GDNDelay.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/GDNSourcePaperCard.cpp b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
new file mode 100644
index 0000000..ffd8882
--- /dev/null
+++ b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/GDNSourcePriceMaint.cpp b/jrj/project/business/GDN/GDNSourcePriceMaint.cpp
new file mode 100644
index 0000000..3ae1119
--- /dev/null
+++ b/jrj/project/business/GDN/GDNSourcePriceMaint.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/SelectItem.New.GDN.cpp b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
new file mode 100644
index 0000000..207a5db
--- /dev/null
+++ b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/select.item.po.cpp b/jrj/project/business/GDN/select.item.po.cpp
new file mode 100644
index 0000000..edfa38b
--- /dev/null
+++ b/jrj/project/business/GDN/select.item.po.cpp
Binary files differ
diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index be4bddb..372186d 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -672,7 +672,7 @@
dw_list.Redraw();
impStr = L"";
- SendMessageW(hObject, 0x401, ls_nos, 0);
+ SendMessage(hObject, 0x401, ls_nos, 0);
alert(L"转入完成!");
return 1;
}
@@ -833,7 +833,7 @@
}
else if (comdid == L"xmRertieve")
{
- int hItem1 = tv_folder.GetSelectedItem();
+ HTREEITEM hItem1 = tv_folder.GetSelectedItem();
KXMLDOMElement e2 = tv_folder.GetItemData(hItem1);
xstring no1 = e2.getAttribute(L"no");
xml x2 = vcontrol::RetrieveData(L"/sale/data/SO/goods/usergoods/listex1", L"parent", no1);
diff --git a/jrj/project/business/Supplier/SupplierSource.cpp b/jrj/project/business/Supplier/SupplierSource.cpp
index 54c2e94..2c3048d 100644
--- a/jrj/project/business/Supplier/SupplierSource.cpp
+++ b/jrj/project/business/Supplier/SupplierSource.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/list.Owner.Supplier.cpp b/jrj/project/business/Supplier/list.Owner.Supplier.cpp
index ebd0411..1ad49f7 100644
--- a/jrj/project/business/Supplier/list.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/list.Owner.Supplier.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 490f7f9..9e779da 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.Owner.Supplier.cpp b/jrj/project/business/Supplier/maint.Owner.Supplier.cpp
index 62a1cce..55a86bd 100644
--- a/jrj/project/business/Supplier/maint.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/maint.Owner.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
index 78566bc..004a583 100644
--- a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
Binary files differ
--
Gitblit v1.9.3