From 93bcd5b07de35fe16f990b35864dc935b67b84ea Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 27 六月 2024 16:53:50 +0800
Subject: [PATCH] update modifyMerge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/quote.enquiry.cpp | 101 ++++++++++++++++++++++++--------------------------
1 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/jrj/project/business/quote.enquiry.cpp b/jrj/project/business/quote.enquiry.cpp
index 2e88c47..5e5912d 100644
--- a/jrj/project/business/quote.enquiry.cpp
+++ b/jrj/project/business/quote.enquiry.cpp
@@ -4023,9 +4023,9 @@
return 1;
}
- int OnCellClicked(TEvent*, LPARAM p)
+ int OnCellClicked(TEvent* evt, LPARAM p)
{
- ref DWNMHDR dwhdr = cast(evt.pnmh as ref DWNMHDR);
+ DWNMHDR& dwhdr=*(DWNMHDR*)evt->notify.pnmh;
int row = dwhdr.row;
int col = dwhdr.col;
//xstring col = dwhdr.colname;
@@ -4061,7 +4061,7 @@
if (row < startRow + 1) return 1;
startRow++;
- trace(xstring(row) + L"---" + (startRow - 1).toString());
+ trace(xstring(row) + L"---" + xstring(startRow - 1));
int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
@@ -4129,13 +4129,13 @@
xstring pitems = L"";
for (int i = 0; i < count; i++)
{
- pitems += L"<row><鏄剧ず鍒�>" + items.item(i).selectSingleNode(L"Name").text + L"</鏄剧ず鍒�><鏁版嵁鍒�>"
- + items.item(i).selectSingleNode(L"Name").text + L"</鏁版嵁鍒�></row>";
+ pitems += (xstring)L"<row><鏄剧ず鍒�>" + items.item(i).selectSingleNode(L"Name").text() + L"</鏄剧ず鍒�><鏁版嵁鍒�>"
+ + items.item(i).selectSingleNode(L"Name").text() + L"</鏁版嵁鍒�></row>";
}
- xstring prop = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
- "<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems + L"</data>'/>" +
- "</cellprop>";
+ xstring prop = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
+ L"<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems + L"</data>'/>" +
+ L"</cellprop>";
dw_cell.SetCellProps(row, col, prop);
}
}
@@ -4199,24 +4199,24 @@
{
if (dw_cell.GetItemString(row, col) == L"")
dw_cell.SetItemString(row, col, L" ");
- xstring prop2 = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
- "<edit edittype='query' dddwxpageurl='' dddwdataurl='xquery:[Convert.quickcode.xq]?id=Supplier' dddwtemplateurl='dev:sheet[Supplier.v3.tpl/List]' dddwdatacolumn='Name' dddwdisplaycolumn='Name' dddwwidth='' dddwheight='' dddwautoselect='N' dddwshowbutton='鍚�' dddwcanedit='鏄�'/>" +
- "</cellprop>";
+ xstring prop2 = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
+ L"<edit edittype='query' dddwxpageurl='' dddwdataurl='xquery:[Convert.quickcode.xq]?id=Supplier' dddwtemplateurl='dev:sheet[Supplier.v3.tpl/List]' dddwdatacolumn='Name' dddwdisplaycolumn='Name' dddwwidth='' dddwheight='' dddwautoselect='N' dddwshowbutton='鍚�' dddwcanedit='鏄�'/>" +
+ L"</cellprop>";
dw_cell.SetCellProps(row, col, prop2);
dw_cell.Redraw();
}
else if (col == colTyp1 || col == colTyp || col == colTyp2 || col == colTyp3)
{
xstring pitems1 = L"";
- pitems1 += L"<row><鏄剧ず鍒�>鎴愬搧</鏄剧ず鍒�><鏁版嵁鍒�>"
+ pitems1 += (xstring)L"<row><鏄剧ず鍒�>鎴愬搧</鏄剧ず鍒�><鏁版嵁鍒�>"
+ L"鎴愬搧</鏁版嵁鍒�></row>";
- pitems1 += L"<row><鏄剧ず鍒�>鏁ｈ揣</鏄剧ず鍒�><鏁版嵁鍒�>"
+ pitems1 += (xstring)L"<row><鏄剧ず鍒�>鏁ｈ揣</鏄剧ず鍒�><鏁版嵁鍒�>"
+ L"鏁ｈ揣</鏁版嵁鍒�></row>";
- pitems1 += L"<row><鏄剧ず鍒�>鍖呰</鏄剧ず鍒�><鏁版嵁鍒�>"
+ pitems1 += (xstring)L"<row><鏄剧ず鍒�>鍖呰</鏄剧ず鍒�><鏁版嵁鍒�>"
+ L"鍖呰</鏁版嵁鍒�></row>";
- xstring prop1 = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
- "<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems1 + L"</data>'/>" +
- "</cellprop>";
+ xstring prop1 = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
+ L"<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems1 + L"</data>'/>" +
+ L"</cellprop>";
dw_cell.SetCellProps(row, col, prop1);
}
}
@@ -4229,9 +4229,9 @@
}
- int OnCellClicked1(TEvent*, LPARAM p)
+ int OnCellClicked1(TEvent* evt, LPARAM p)
{
- ref DWNMHDR dwhdr = cast(evt.pnmh as ref DWNMHDR);
+ DWNMHDR dwhdr = *(DWNMHDR*)evt->notify.pnmh;
int row = dwhdr.row;
int col = dwhdr.col;
//xstring col = dwhdr.colname;
@@ -4248,7 +4248,7 @@
if (row < startRow + 1) return 1;
startRow++;
- trace(xstring(row) + L"---" + (startRow - 1).toString());
+ trace(xstring(row) + L"---" + xstring(startRow - 1));
int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
@@ -4302,13 +4302,13 @@
xstring pitems = L"";
for (int i = 0; i < count; i++)
{
- pitems += L"<row><鏄剧ず鍒�>" + items.item(i).selectSingleNode(L"Name").text + L"</鏄剧ず鍒�><鏁版嵁鍒�>"
- + items.item(i).selectSingleNode(L"Name").text + L"</鏁版嵁鍒�></row>";
+ pitems += (xstring)L"<row><鏄剧ず鍒�>" + items.item(i).selectSingleNode(L"Name").text() + L"</鏄剧ず鍒�><鏁版嵁鍒�>"
+ + items.item(i).selectSingleNode(L"Name").text() + L"</鏁版嵁鍒�></row>";
}
- xstring prop = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
- "<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems + L"</data>'/>" +
- "</cellprop>";
+ xstring prop = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
+ L"<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems + L"</data>'/>" +
+ L"</cellprop>";
dw_cell.SetCellProps(row, col, prop);
}
if (col == colPackage)
@@ -4326,7 +4326,7 @@
xaserverarg argx ;
argx.setNativePointer(argx.CreateInstance());
argx.AddArg(L"GoodsNo", dw_cell.GetItemString(ARow, colItemNo));
- OpenWindow(L"dev:xpage[CustomerItemNoList.vx]", cast(argx as int));
+ OpenWindow(L"dev:xpage[CustomerItemNoList.vx]", argx);
if (argx.GetArgString(L"action") != L"ok")
{
ARow = row;
@@ -4394,11 +4394,12 @@
{
/*璁＄畻浣撶Н*/
xstring desc = dw_cell.GetItemString(ARow, colVolDesc);
+ double v = 0.0;
if (desc == L"")
dw_cell.SetItemString(ARow, colVol, L"");
else
{
- double v = calcVol(desc) / 1000000.00;
+ v = calcVol(desc) / 1000000.00;
xstring str = xstring(v);
if (str.find(L".") >= 0) str = str.left(str.find(L".") + 5);
dw_cell.SetItemString(ARow, colVol, str);
@@ -4420,7 +4421,7 @@
if (qty1 != L"") qty = qty1.toDouble();
if (qty2 != L"") qty = qty * qty2.toDouble();
double ttl = 65.0 * qty / v;
- dw_cell.SetItemString(ARow, col40HQ, ttl.toInt().toString());
+ dw_cell.SetItemString(ARow, col40HQ, xstring((int)ttl));
}
}
@@ -4468,8 +4469,8 @@
pitems1 += (xstring)L"<row><鏄剧ず鍒�>鍖呰</鏄剧ず鍒�><鏁版嵁鍒�>"
+ L"鍖呰</鏁版嵁鍒�></row>";
xstring prop1 = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
- "<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems1 + L"</data>'/>" +
- "</cellprop>";
+ L"<edit edittype='ddlb' ddlbdataurl='' ddlbxml='<data>" + pitems1 + L"</data>'/>" +
+ L"</cellprop>";
dw_cell.SetCellProps(row, col, prop1);
}
@@ -4553,18 +4554,18 @@
int OnAttachListon()
{
//缁戝畾宸ュ叿鏉＄偣鍑讳簨浠�
- AttachEvent(L"WM_XCOMMAND", OnXCommand);
+ AttachEvent(L"WM_XCOMMAND", (FEvent)&QuoteFileView::OnXCommand);
//鑾峰彇鐒︾偣浜嬩欢锛岀敤浜庨噸缃伐鍏锋潯
- AttachEvent(L"WM_SETFOCUS", OnSetFocus);
+ AttachEvent(L"WM_SETFOCUS", (FEvent)&QuoteFileView::OnSetFocus);
- AttachEvent(L"frame:im1", L"IMG_LDBCLICK", OnImgDBClicked);
+ AttachEvent(L"frame:im1", L"IMG_LDBCLICK", (FEvent)&QuoteFileView::OnImgDBClicked);
- AttachEvent(L"dw_base", L"DWV_ITEMCHANGED", OnItemChanged);
- AttachEvent(L"dw_goods", L"DWV_ROWFOCUSCHANGED", OnRowChanged);
+ AttachEvent(L"dw_base", L"DWV_ITEMCHANGED", (FEvent)&QuoteFileView::OnItemChanged);
+ AttachEvent(L"dw_goods", L"DWV_ROWFOCUSCHANGED", (FEvent)&QuoteFileView::OnRowChanged);
- AttachEvent(L"dw_cell", L"DWV_CLICKED", OnCellClicked);
- AttachEvent(L"dw_cell", L"CELL_ITEMCHANGED", OnCellItemChanged);
- AttachEvent(L"dw_cell", L"CELL_SELECTCHANGED", OnCellSelectChanged);
+ AttachEvent(L"dw_cell", L"DWV_CLICKED", (FEvent)&QuoteFileView::OnCellClicked);
+ AttachEvent(L"dw_cell", L"CELL_ITEMCHANGED", (FEvent)&QuoteFileView::OnCellItemChanged);
+ AttachEvent(L"dw_cell", L"CELL_SELECTCHANGED", (FEvent)&QuoteFileView::OnCellSelectChanged);
return 1;
}
@@ -4739,9 +4740,8 @@
xstring templ = L"";
taskid = L"";
xaserverarg arg;
- if (GetParam()) {
- arg ;
- arg.setNativePointer(GetParam());
+ if (GetWinParam()) {
+ arg = GetArg();
templ = arg.GetArgString(L"template");
entityID = arg.GetArgString(L"EntityID");
taskid = arg.GetArgString(L"TaskID");
@@ -4842,7 +4842,7 @@
}
}
- OnAttachEvent();
+ OnAttachListon();
filename = L"";
/* #define LayerFlow_None 0x00000001 //not layer space
@@ -4964,7 +4964,7 @@
xaserverarg arg ;
arg.setNativePointer(xaserverarg::CreateInstance());
arg.AddArg(L"value", content);
- OpenWindow(L"dev:xpage[QuoteSupplierItem.vx]", cast(arg as int));
+ OpenWindow(L"dev:xpage[QuoteSupplierItem.vx]", arg);
return 1;
}
@@ -4972,15 +4972,14 @@
bool hasParty(xstring name)
{
xml x ;
-
xaserverarg arg ;
arg.setNativePointer(xaserverarg::CreateInstance());
arg.AddArg(L"Name", name);
if (getUrl(L"/sale/data/SupplierV3/HasParty", arg.GetString(), x) != 1)
{
- alert(L"error:" + x.xml());
+ alert((xstring)L"error:" + x.xml());
}
- xstring count = x.documentElement.getAttribute(L"count");
+ xstring count = x.documentElement().getAttribute(L"count");
if (count != L"0") return true;
return false;
@@ -4988,14 +4987,13 @@
int LoadPurcher()
{
- purcher ;
- purcher.setNativePointer(xml::CreateInstance());
+ xml purcher ;
xaserverarg arg ;
arg.setNativePointer(xaserverarg::CreateInstance());
arg.AddArg(L"id", L"閲囪喘鍛�");
if (getUrl(L"/sale/data/Quote/Purcher", arg.GetString(), purcher) != 1)
{
- alert(L"error:" + purcher.GetXml());
+ alert((xstring)L"error:" + purcher.xml());
}
return 1;
}
@@ -5018,9 +5016,8 @@
LoadPurcher();
xaserverarg arg;
- if (GetParam()) {
- arg ;
- arg.setNativePointer(GetParam());
+ if (GetWinParam()) {
+ arg = GetArg();
if (arg.GetArgString(L"bill.purchor") == L"1") OnNextPurch();
}
return 1;
--
Gitblit v1.9.3