From 1e7ba9db116d9ada12aedfa60e5482100abda0b8 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期五, 15 十一月 2024 16:31:06 +0800
Subject: [PATCH] update
---
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
6 files changed, 5 insertions(+), 5 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 b4a4a97..22a9966 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/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