From a4344c9bada0722c6ef7fac5d95f29a110eea0f1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 21 四月 2025 10:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SO3.maint.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jrj/project/business/SO3.maint.cpp b/jrj/project/business/SO3.maint.cpp
index 198e996..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);
}
@@ -852,7 +852,7 @@
return 1;
}
- int OnImgDBClicked(TEvent* evt, int pr)
+ int OnImgDBClicked(TEvent* evt, LPARAM pr)
{
IMGNNMHDR* nmtv = (IMGNNMHDR *)evt->notify.pnmh;
xstring src = nmtv->path;
@@ -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