From 2f2eb9a7c4e99e663c82d156bf5af7ecdbc8fa39 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 02 九月 2024 18:02:52 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/start.vframe.vbusiness.cpp | 3 +--
jrj/project/business/GDN/select.item.po.cpp | 0
jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp | 4 ++--
jrj/project/business/Customer3.maint.cpp | 2 +-
jrj/project/business/Supplier/maintex.Owner.Supplier.cpp | 0
jrj/project/business/Enquiry/Entity.Product.Select.cpp | 1 +
jrj/project/tradedocument/DocSelectDlg.cpp | 2 +-
jrj/project/business/Customer3.list.cpp | 0
jrj/project/business/Supplier/maint.Owner.Supplier.cpp | 0
jrj/project/business/SystemSettings/Resource.select.data.config.cpp | 2 +-
10 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/jrj/project/business/Customer3.list.cpp b/jrj/project/business/Customer3.list.cpp
index 683fb4c..bcaafeb 100644
--- a/jrj/project/business/Customer3.list.cpp
+++ b/jrj/project/business/Customer3.list.cpp
Binary files differ
diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index d2c8ebd..42305ad 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -140,7 +140,7 @@
xstring GetPartyID(xstring sName,xstring sType)
{
- xml x1=new xml;
+ xml x1;
xaserverarg arg;
diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
index 268ae59..cace6fe 100644
--- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp
+++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -318,6 +318,7 @@
xaserverarg arg;
arg.AddArg(L"content", x.xml());
+ alert(x.xml());
if (xurl::get(L"/sale/data/ProductLibrary/image/update", arg.GetString(), x) != 1)
{
alert(x.text());
diff --git a/jrj/project/business/GDN/select.item.po.cpp b/jrj/project/business/GDN/select.item.po.cpp
index 91ee9d4..3444ce1 100644
--- a/jrj/project/business/GDN/select.item.po.cpp
+++ b/jrj/project/business/GDN/select.item.po.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 50a4fa4..f187507 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 80200ee..25411ee 100644
--- a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
+++ b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/SystemSettings/Resource.select.data.config.cpp b/jrj/project/business/SystemSettings/Resource.select.data.config.cpp
index ea28235..3c16b35 100644
--- a/jrj/project/business/SystemSettings/Resource.select.data.config.cpp
+++ b/jrj/project/business/SystemSettings/Resource.select.data.config.cpp
@@ -67,7 +67,7 @@
return 1;
}
- int OnCmdDispatch(string comdid)
+ int OnCmdDispatch(xstring comdid)
{
if (comdid=="SelectAll") OnSelectAll();
else if (comdid=="SelectNo") OnSelectNo();
diff --git a/jrj/project/start.vframe.vbusiness.cpp b/jrj/project/start.vframe.vbusiness.cpp
index 87c8560..23b27dd 100644
--- a/jrj/project/start.vframe.vbusiness.cpp
+++ b/jrj/project/start.vframe.vbusiness.cpp
@@ -123,8 +123,7 @@
{
//return frame::GetReason(pr);
arg.AddArg(L"EntityID", GetEntityID(2));
- arg.AddArg(L"_ModuelPage", L"dev:xpage[workflow.chkdlg.vx]");
- OpenWindow(L"dev:xpage[vindexforold.vx]", arg);
+ OpenWindow(L"dev:xpage[workflow.chkdlg.vx]", arg);
//openUrl(L"/sale/view/workflow.view/xpage/chkdlg", arg);
xstring comdid2 = arg.GetArgString(L"comdid");
if (comdid2 == L"xmOK")
diff --git a/jrj/project/tradedocument/DocSelectDlg.cpp b/jrj/project/tradedocument/DocSelectDlg.cpp
index e656d33..8e748e0 100644
--- a/jrj/project/tradedocument/DocSelectDlg.cpp
+++ b/jrj/project/tradedocument/DocSelectDlg.cpp
@@ -33,7 +33,7 @@
//命令发布函数
- int OnCmdDispatch(string comdid)
+ int OnCmdDispatch(xstring comdid)
{
if (comdid == L"xmOk")
{
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index f0f46b6..58be1c6 100644
--- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
@@ -203,13 +203,13 @@
return 1;
}
- virtual int PreOnCmdDispatch(string comdid)
+ virtual int PreOnCmdDispatch(xstring comdid)
{
//返回0——不在执行以下代码；返回其他——执行以下代码。
return 1;
}
- virtual int PostOnCmdDispatch(string comdid)
+ virtual int PostOnCmdDispatch(xstring comdid)
{
return 1;
}
--
Gitblit v1.9.3