From 6bbf32755ffadc2aa930a7736c82722fd0751c37 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 05 三月 2025 19:10:22 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SO3.maint.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jrj/project/business/SO3.maint.cpp b/jrj/project/business/SO3.maint.cpp
index 2e168a0..588633e 100644
--- a/jrj/project/business/SO3.maint.cpp
+++ b/jrj/project/business/SO3.maint.cpp
@@ -567,7 +567,7 @@
 		{
 			xstring sSalespersonID = dw_base.GetItemString(1, L"SalespersonID");
 			//alert(sSalespersonID);
-			hdr->data = sSalespersonID;
+			hdr->data = sSalespersonID.c_str(true);
 		}
 
 
@@ -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";

--
Gitblit v1.9.3