From c66cdc8546d1939c3a63e20cd387de2ece20b88b Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 02 七月 2024 13:58:33 +0800
Subject: [PATCH] update

---
 jrj/project/business/SO/Product.Select.SO.cpp               |    4 ++--
 jrj/project/business/Supplier/list.Owner.Supplier.cpp       |    0 
 jrj/project/business/SO/Product.FetchNo.cpp                 |    5 +++--
 jrj/project/business/Supplier/asklist.Owner.Supplier.cpp    |    0 
 jrj/project/business/GDN/SelectItem.New.GDN.cpp             |    0 
 jrj/project/business/Supplier/maint.Document.SupplierEx.cpp |    0 
 jrj/project/business/Supplier/maintex.Owner.Supplier.cpp    |    0 
 jrj/project/business/Public/message.business.cpp            |    0 
 jrj/project/business/SO/select.item.so.cpp                  |    1 +
 9 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/jrj/project/business/GDN/SelectItem.New.GDN.cpp b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
index 207a5db..585449c 100644
--- a/jrj/project/business/GDN/SelectItem.New.GDN.cpp
+++ b/jrj/project/business/GDN/SelectItem.New.GDN.cpp
Binary files differ
diff --git a/jrj/project/business/Public/message.business.cpp b/jrj/project/business/Public/message.business.cpp
index 83fd2aa..68a29cb 100644
--- a/jrj/project/business/Public/message.business.cpp
+++ b/jrj/project/business/Public/message.business.cpp
Binary files differ
diff --git a/jrj/project/business/SO/Product.FetchNo.cpp b/jrj/project/business/SO/Product.FetchNo.cpp
index 4b837d9..410b806 100644
--- a/jrj/project/business/SO/Product.FetchNo.cpp
+++ b/jrj/project/business/SO/Product.FetchNo.cpp
@@ -6,6 +6,7 @@
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
+#include "viewobject/productlibrary.view.hpp"
 
 using xml = KXMLDOMDocument;
 	class  __declspec(dllexport)  ProductFetchNoWin : public xframe
@@ -81,7 +82,7 @@
 			xstring Reciever = L"00908";
 			xstring Content = L"";
 			//alert(L"EntityID:"+EntityID);
-			xml x = ViewObject::AddMessage(Category, Reciever, EntityNo, EntityID, Subject, Content);
+			xml x = ViewObject::AddMessage( Category, Reciever, EntityNo, EntityID, Subject, Content);
 			return 1;
 		}
 
@@ -300,7 +301,7 @@
 		int onload()
 		{
 			dw_list = GetControl(L"dw_list");
-			dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(L"").GetXmlDoc());
+			dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(L"").xml());
 			dw_list.SetColumnState(L"SKUID", false);
 			dw_list.SetColumnState(L"category1", false);
 			dw_list.SetColumnState(L"Submitter1", false);
diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index 372186d..f59552d 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -1035,7 +1035,7 @@
 
 			xcontrol query = GetControl(L"sl_search");
 			xstring queryString = query.GetText();
-
+			xshtml xs;
 			if (name == L"购物车")
 			{
 				if (agentFor != L"goodscar")SwitchLayer(L"goodscarsheet", L"sheetframe");
@@ -1105,7 +1105,7 @@
 						no = e.getAttribute(L"guid");
 					}
 
-					dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no).GetXmlDoc());
+					dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no).xml());
 					dw_list = GetControl(L"dw_list");
 					dw_list.SetReadOnly(true);
 
diff --git a/jrj/project/business/SO/select.item.so.cpp b/jrj/project/business/SO/select.item.so.cpp
index e6369a6..feabc76 100644
--- a/jrj/project/business/SO/select.item.so.cpp
+++ b/jrj/project/business/SO/select.item.so.cpp
@@ -4,6 +4,7 @@
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
+#include "viewobject/saleorder.view.hpp"
 
 using xml = KXMLDOMDocument;
 	class  __declspec(dllexport) SelectItemSOWin : public xframe
diff --git a/jrj/project/business/Supplier/asklist.Owner.Supplier.cpp b/jrj/project/business/Supplier/asklist.Owner.Supplier.cpp
index 027d255..3de43a9 100644
--- a/jrj/project/business/Supplier/asklist.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/asklist.Owner.Supplier.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 1ad49f7..3c51265 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 9e779da..a16617c 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/maintex.Owner.Supplier.cpp b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
index 004a583..2ae50d2 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