From a42d65095896cb92fa0bbe87289b53cab38fcd8e Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 27 六月 2024 18:09:25 +0800
Subject: [PATCH] update set arg
---
jrj/xframe/wobject/xwin.hpp | 2 +-
jrj/project/business/quote.enquiry.cpp | 44 +++++++++++++++++++++-----------------------
2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/jrj/project/business/quote.enquiry.cpp b/jrj/project/business/quote.enquiry.cpp
index d31a72a..c18e069 100644
--- a/jrj/project/business/quote.enquiry.cpp
+++ b/jrj/project/business/quote.enquiry.cpp
@@ -3104,9 +3104,9 @@
return 1;
}
- int OnItemChanged(TEvent*, LPARAM p)
+ int OnItemChanged(TEvent* evt, LPARAM p)
{
- ref DWNMHDR hdr = trust(evt.pnmh as ref DWNMHDR);
+ DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;
xstring colname = hdr.colname;
xstring value = hdr.data;
int row = hdr.row;
@@ -3127,7 +3127,7 @@
int startRow = getItemHeadRow(dw_cell);
//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
- if (startRow < 1) return L"";
+ if (startRow < 1) return 0;
startRow++;
int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
@@ -3251,13 +3251,12 @@
int ProcessItemImage(xstring goodsno, int row)
{
xml xp ;
- xp.setNativePointer(xml::CreateInstance());
xaserverarg arg_pic ;
arg_pic.setNativePointer(arg_pic.CreateInstance());
arg_pic.AddArg(L"SKUNo", goodsno);
ximageview im = GetControl(L"frame:im1");
- im.ResetEx();
+ im.Reset();
xstring res = L"/sale/data/productlibrary3/pref/picture/imagelistskuno";
if (xurl::get(res, arg_pic.GetString(), xp) != 1)
{
@@ -3311,13 +3310,12 @@
int ProcessItemImage1(xstring goodsno, int row)
{
xml xp ;
- xp.setNativePointer(xml::CreateInstance());
xaserverarg arg_pic ;
arg_pic.setNativePointer(arg_pic.CreateInstance());
arg_pic.AddArg(L"GoodsNo", goodsno);
ximageview im = GetControl(L"frame:im1");
- im.ResetEx();
+ im.Reset();
xstring res = L"/sale/data/ProductLibrary3/pref/picture/imagelistItemNo";
if (xurl::get(res, arg_pic.GetString(), xp) != 1)
{
@@ -3343,7 +3341,7 @@
im.AddImages(picname,goodsno);*/
if (ip == 0)
{
- xstring appPath = GetModuleTmpPath();
+ xstring appPath = xutil::GetModuleTmpPath();
xaserver::CreateDirectory(appPath);
xaserver::DownLoadFile(GetServerUrl(), L"/business/products/chanpin/" + id.left(2) + L"/" + name, name, appPath + L"/" + name);
@@ -3469,12 +3467,11 @@
{
xstring suserid = publiccode::GetUser().id;
xaserverarg args ;
- args.setNativePointer(args.CreateInstance());
if (comdid == L"xmNew")
- OpenWindow(L"dev:xpage[TONewSelectDlg.vx]", cast(args as int));
+ OpenWindow(L"dev:xpage[TONewSelectDlg.vx]", args);
else
- OpenWindow(L"dev:xpage[TOSelectDlg.vx]", cast(args as int));
+ OpenWindow(L"dev:xpage[TOSelectDlg.vx]", args);
fileid = args.GetArgString(L"id");
templateID = args.GetArgString(L"templateID");
xstring myaction = args.GetArgString(L"action");
@@ -3499,7 +3496,7 @@
args.AddArg(L"src", L"data/QuoteFile/" + suserid);
args.AddArg(L"process", L"path");
- OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]", cast(args as int));
+ OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]", args);
if (args.GetArgString(L"result") == L"ok")
{
xstring u = args.GetArgString(L"src");
@@ -3507,7 +3504,7 @@
xaserver::LoadUrl(GetServerUrl(), u, L"", x);
trace(x.xml());
- dw_cell.LoadTemplateEx(x.documentElement);
+ dw_cell.LoadTemplateEx(x.documentElement());
dw_cell.Redraw();
filename = args.GetArgString(L"filename");
fileid = args.GetArgString(L"ID");
@@ -3558,6 +3555,7 @@
if (action == L"purch")
{
int crow = dw_cell.GetRow();
+ xstring cmd = comdid.mid(3, comdid.length());
if (getRowID(dw_cell, crow) == L"") SendCtrlCmd(dw_cell, cmd);
return 1;
}
@@ -3656,12 +3654,13 @@
Item += L"<ModifyDate>" + sdate + L"</ModifyDate>";
Item += L"</Item>";
- }
- if (hasNew)
- {
- xstring newItem = L"<data>" + Item + L"</data>";
- trace(newItem);
- if (OnSaveNewItem(newItem) == -1) return 1;
+
+ if (hasNew)
+ {
+ xstring newItem = L"<data>" + Item + L"</data>";
+ trace(newItem);
+ if (OnSaveNewItem(newItem) == -1) return 1;
+ }
}
}
@@ -3685,7 +3684,7 @@
}
else
{
- xstring str = x.documentElement.getAttribute(L"text");
+ xstring str = x.documentElement().getAttribute(L"text");
if (str == L"true")
{
dw_goods.ResetUpdateStatus();
@@ -3873,7 +3872,7 @@
if (pos >= 0)
{
pos1 = content.find(L"</display>", pos);
- str = content.mid(pos1 + L"</display>".length(), 9999999);
+ str = content.mid(pos1 + xstring(L"</display>").length(), 9999999);
content = content.left(pos) + str;
}
else
@@ -3909,7 +3908,7 @@
if (pos >= 0)
{
pos1 = content.find(L"</display>", pos);
- str = content.mid(pos1 + L"</display>".length(), 9999999);
+ str = content.mid(pos1 + xstring(L"</display>").length(), 9999999);
content = content.left(pos) + str;
}
else
@@ -3989,7 +3988,6 @@
xml x ;
xaserverarg args ;
- args.setNativePointer(args.CreateInstance());
args.AddArg(L"myurl", myurl);
args.AddArg(L"name", sfilename);
args.AddArg(L"filepath", sname);
diff --git a/jrj/xframe/wobject/xwin.hpp b/jrj/xframe/wobject/xwin.hpp
index a1afa9b..5929193 100644
--- a/jrj/xframe/wobject/xwin.hpp
+++ b/jrj/xframe/wobject/xwin.hpp
@@ -27,7 +27,7 @@
}
void SetArg()
{
- SetArg(GetWinParam());
+ if(GetWinParam()) SetArg(GetWinParam());
}
public:
xwin(void * impl, HWND hWnd):xview(impl,hWnd){}
--
Gitblit v1.9.3