From a468bd6b4866e7d02df525e7cb077a3753438905 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 18 十一月 2024 23:16:46 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp | 8 ++++----
jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp | 4 ++--
jrj/project/business/GDN/select.item.po.cpp | 0
jrj/project/business/SO3.list.cpp | 2 +-
jrj/project/tradedocument/DocSelectDlg.cpp | 2 +-
jrj/project/business/SO3.maint.cpp | 2 +-
jrj/project/business/PO/InsertPO.PO.cpp | 0
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/jrj/project/business/GDN/select.item.po.cpp b/jrj/project/business/GDN/select.item.po.cpp
index 3444ce1..8241085 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/PO/InsertPO.PO.cpp b/jrj/project/business/PO/InsertPO.PO.cpp
index fd0c091..fd0bda2 100644
--- a/jrj/project/business/PO/InsertPO.PO.cpp
+++ b/jrj/project/business/PO/InsertPO.PO.cpp
Binary files differ
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index aa206cd..fa374db 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -447,7 +447,7 @@
dw_list.SetColumnState(L"SOID", false);
- string groupname = publiccode::GetUser().groupname;
+ xstring groupname = publiccode::GetUser().groupname;
if (groupname == L"采购小组")
{
dw_list.SetColumnState(L"USDAmount", false);
diff --git a/jrj/project/business/SO3.maint.cpp b/jrj/project/business/SO3.maint.cpp
index 3587db6..588633e 100644
--- a/jrj/project/business/SO3.maint.cpp
+++ b/jrj/project/business/SO3.maint.cpp
@@ -936,7 +936,7 @@
for (int ip = 0; ip < lenp; ip++)
{
auto xitem = nlistp.item(ip);
- string picname = xitem.selectSingleNode(L"PicPath").text();
+ xstring picname = xitem.selectSingleNode(L"PicPath").text();
string goodno = xitem.selectSingleNode(L"GoodsNo").text();
if (picname == L"/business/products/Thumbs//")
picname = L"/business/products/Thumbs/00/00000000-0000-0000-0000-000000000000.jpg";
diff --git a/jrj/project/tradedocument/DocSelectDlg.cpp b/jrj/project/tradedocument/DocSelectDlg.cpp
index 8e748e0..ddb159c 100644
--- a/jrj/project/tradedocument/DocSelectDlg.cpp
+++ b/jrj/project/tradedocument/DocSelectDlg.cpp
@@ -37,7 +37,7 @@
{
if (comdid == L"xmOk")
{
- string filename = xcontrol(GetControl(L"filename")).GetText();
+ xstring filename = xcontrol(GetControl(L"filename")).GetText();
if (filename == L"") return 1;
xaserverarg arg = GetArg();
if (!arg) return 1;
diff --git a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
index 9b6f92d..76b8051 100644
--- a/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp
@@ -167,13 +167,13 @@
if (MessageBoxW(GetHWND(),L"是否确定删除记录!",L"提示", 1) == 2)
return 1;
}
-
+
xaserverarg& arg = *(new xaserverarg);
arg.AddArg(L"Action", action);
KXMLDOMDocument x;
xstring aurl =L"/workflow/query/actioninfo/" + action;
-
+
if (xurl::get(GetServerUrl(),aurl,L"", x) != 1)
return -1;
@@ -284,8 +284,8 @@
if (x1.selectSingleNode(L"//process"))
{
KXMLDOMElement e1 = x1.selectSingleNode(L"//process");
- string valid = e1.getAttribute(L"valid");
- string finished = e1.getAttribute(L"finished");
+ xstring valid = e1.getAttribute(L"valid");
+ xstring finished = e1.getAttribute(L"finished");
xstring errInfo =L"";
if (valid ==L"0")
{
diff --git a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
index 695c6bf..7d49ef7 100644
--- a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
@@ -437,7 +437,7 @@
else continue;
KXMLDOMElement colename = e.selectSingleNode(L"//row[@rowindex='5']/cell[@colindex='" + colindex + L"']");
//查询列
- string searchcolumn = searchcol(colename);
+ xstring searchcolumn = searchcol(colename);
if (searchcolumn == L"否") continue;
//英文名
string ename = colename.selectSingleNode(L"@column").text();
@@ -524,7 +524,7 @@
//alert("ex");
int h = dw_col.GetCurSel();
if (h < 0) return L"";
- string str = (string)dw_col.GetItemData(h);
+ xstring str = (string)dw_col.GetItemData(h);
KXMLDOMDocument x;
if (x.loadXML(str))
{
--
Gitblit v1.9.3