From 47180b84a17b15c976b96343449cc5747f9c14f7 Mon Sep 17 00:00:00 2001 From: xj qian <qianxj15@sina.com> Date: 星期六, 14 九月 2024 19:31:44 +0800 Subject: [PATCH] update --- jrj/project/business/SO/Product.Select.SO.cpp | 2 +- jrj/project/business/VATNotify/list.vatinvoice.cpp | 4 ++-- jrj/project/business/Enquiry/Entity.Product.Select.cpp | 6 ++---- jrj/project/business/Quote3.maint.cpp | 0 jrj/project/business/VATNotify/simple.maint.vatnotify.cpp | 2 +- jrj/project/business/AP/list.ap.cpp | 2 +- jrj/project/business/Expense/list.manage.ap.cpp | 0 jrj/project/business/SystemSettings/level.Customer.v3.cpp | 2 +- jrj/project/business/ProductSample/ProductLibrary4.cpp | 0 jrj/project/business/Expense/TestExpenseBase.cpp | 0 jrj/project/start.vframe.vbusiness.cpp | 4 ++-- jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp | 2 +- jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp | 2 +- jrj/project/business/Expense/FreightExpenseList.cpp | 0 jrj/project/business/Supplier/maintex.Owner.Supplier.cpp | 0 jrj/project/business/Enquiry.list.cpp | 2 +- jrj/project/business/Expense/FreightExpenseInput.cpp | 0 jrj/project/business/ProductSample/PictureView.Product3.cpp | 0 jrj/project/total3/ProductNewList.cpp | 2 +- jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp | 2 +- jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp | 2 +- jrj/project/business/Product.list.cpp | 4 ++-- jrj/project/business/Supplier.maint.cpp | 0 jrj/project/business/Customer3.maint.cpp | 4 ++-- jrj/project/business/Enquiry/Enquiry.maint.cpp | 4 ++-- jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp | 2 +- jrj/project/business/GDN/listex.GDN3.cpp | 0 jrj/project/business/Expense/TestExpenseBase2.cpp | 0 jrj/project/business/SO3.maint.cpp | 2 +- 29 files changed, 24 insertions(+), 26 deletions(-) diff --git a/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp b/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp index 63d0ed7..f127e29 100644 --- a/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp +++ b/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp @@ -196,7 +196,7 @@ return 0; } - int ViewUpdate(int pr,xstring updateItem,xaserverarg arg) + int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg) { if( updateItem==L"setstate") { diff --git a/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp b/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp index 1186c18..b69ce3d 100644 --- a/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp +++ b/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp @@ -195,7 +195,7 @@ return 0; } - int ViewUpdate(int pr,xstring updateItem,xaserverarg arg) + int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg) { if( updateItem==L"setstate") { diff --git a/jrj/project/business/AP/list.ap.cpp b/jrj/project/business/AP/list.ap.cpp index d39bd70..8b315aa 100644 --- a/jrj/project/business/AP/list.ap.cpp +++ b/jrj/project/business/AP/list.ap.cpp @@ -71,7 +71,7 @@ return L"APID"; } - xstring GetEntityID(int /*param*/ pr) + xstring GetEntityID(LPARAM /*param*/ pr) { return dw_list.GetItemString(dw_list.GetRow(), L"APID"); } diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp index d28e9e0..ff73ed9 100644 --- a/jrj/project/business/Customer3.maint.cpp +++ b/jrj/project/business/Customer3.maint.cpp @@ -51,7 +51,7 @@ return publiccode::GetGuid(); } - int ViewUpdate(int pr,xstring updateItem,xaserverarg arg) + int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg) { if(updateItem==L"update") { @@ -913,7 +913,7 @@ return 1; } - int OnItemClickEx(TEvent* evt, int pr) + int OnItemClickEx(TEvent* evt, LPARAM pr) { xdwtable dw = dw_visit.FindDwTable(L"item",0); diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp index 091b778..0896f61 100644 --- a/jrj/project/business/Enquiry.list.cpp +++ b/jrj/project/business/Enquiry.list.cpp @@ -447,7 +447,7 @@ return 1; } - int ViewUpdate(int pr,xstring updateItem,xaserverarg arg) + int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg) { if( updateItem==L"del") { diff --git a/jrj/project/business/Enquiry/Enquiry.maint.cpp b/jrj/project/business/Enquiry/Enquiry.maint.cpp index 659422b..a0ffc18 100644 --- a/jrj/project/business/Enquiry/Enquiry.maint.cpp +++ b/jrj/project/business/Enquiry/Enquiry.maint.cpp @@ -57,7 +57,7 @@ return 1; } - xstring GetEntityData(int pr) + xstring GetEntityData(LPARAM pr) { dw_base.AcceptText(); dw_goods.AcceptText(); @@ -1186,7 +1186,7 @@ return 0; } - int OnImgDBClicked(TEvent* evt, int pr) + int OnImgDBClicked(TEvent* evt, LPARAM pr) { IMGNNMHDR& nmtv = *(IMGNNMHDR*)evt->notify.pnmh; xstring src = nmtv.path; diff --git a/jrj/project/business/Enquiry/Entity.Product.Select.cpp b/jrj/project/business/Enquiry/Entity.Product.Select.cpp index feb3058..4523de6 100644 --- a/jrj/project/business/Enquiry/Entity.Product.Select.cpp +++ b/jrj/project/business/Enquiry/Entity.Product.Select.cpp @@ -870,15 +870,13 @@ OpenWindow(L"dev:xpage[PackSchemaMaint.goodslib.vx]"); }else { - int pr = dw_list; - OpenWindow(L"dev:xpage[ProductLibraryItemMaint.vx]",pr); + OpenWindow(L"dev:xpage[ProductLibraryItemMaint.vx]",dw_list); } */ //KXMLDOMElement ele = dw_list.getRowElement(L"data/Item", 1); //alert(ele.xml); - int pr = dw_list; - OpenWindow(L"dev:xpage[ProductLibraryItemMaint3.vx]", pr); + OpenWindow(L"dev:xpage[ProductLibraryItemMaint3.vx]", dw_list); return 1; } diff --git a/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp b/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp index fca596d..bc2201d 100644 --- a/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp +++ b/jrj/project/business/Enquiry/SKU.PictureView.Product3.cpp @@ -41,7 +41,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; diff --git a/jrj/project/business/Expense/FreightExpenseInput.cpp b/jrj/project/business/Expense/FreightExpenseInput.cpp index a4972a4..c02e075 100644 --- a/jrj/project/business/Expense/FreightExpenseInput.cpp +++ b/jrj/project/business/Expense/FreightExpenseInput.cpp Binary files differ diff --git a/jrj/project/business/Expense/FreightExpenseList.cpp b/jrj/project/business/Expense/FreightExpenseList.cpp index 9d9f877..98534e0 100644 --- a/jrj/project/business/Expense/FreightExpenseList.cpp +++ b/jrj/project/business/Expense/FreightExpenseList.cpp Binary files differ diff --git a/jrj/project/business/Expense/TestExpenseBase.cpp b/jrj/project/business/Expense/TestExpenseBase.cpp index c3f6bbd..0bff000 100644 --- a/jrj/project/business/Expense/TestExpenseBase.cpp +++ b/jrj/project/business/Expense/TestExpenseBase.cpp Binary files differ diff --git a/jrj/project/business/Expense/TestExpenseBase2.cpp b/jrj/project/business/Expense/TestExpenseBase2.cpp index cde82b0..9e14639 100644 --- a/jrj/project/business/Expense/TestExpenseBase2.cpp +++ b/jrj/project/business/Expense/TestExpenseBase2.cpp Binary files differ diff --git a/jrj/project/business/Expense/list.manage.ap.cpp b/jrj/project/business/Expense/list.manage.ap.cpp index 75a4c4f..03adf38 100644 --- a/jrj/project/business/Expense/list.manage.ap.cpp +++ b/jrj/project/business/Expense/list.manage.ap.cpp Binary files differ diff --git a/jrj/project/business/GDN/listex.GDN3.cpp b/jrj/project/business/GDN/listex.GDN3.cpp index 36fbaa6..8748337 100644 --- a/jrj/project/business/GDN/listex.GDN3.cpp +++ b/jrj/project/business/GDN/listex.GDN3.cpp Binary files differ diff --git a/jrj/project/business/Product.list.cpp b/jrj/project/business/Product.list.cpp index 4dd240e..1d26f23 100644 --- a/jrj/project/business/Product.list.cpp +++ b/jrj/project/business/Product.list.cpp @@ -766,7 +766,7 @@ OpenWindow(L"dev:xpage[PackSchemaMaint.goodslib.vx]"); }else { - int pr = g_xdoc_product; + LPARAM pr = g_xdoc_product; OpenWindow(L"dev:xpage[ProductLibraryItemMaint.vx]",pr); } */ @@ -1552,7 +1552,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; diff --git a/jrj/project/business/ProductSample/PictureView.Product3.cpp b/jrj/project/business/ProductSample/PictureView.Product3.cpp index f6432e4..986b65c 100644 --- a/jrj/project/business/ProductSample/PictureView.Product3.cpp +++ b/jrj/project/business/ProductSample/PictureView.Product3.cpp Binary files differ diff --git a/jrj/project/business/ProductSample/ProductLibrary4.cpp b/jrj/project/business/ProductSample/ProductLibrary4.cpp index 6bf9283..3654de3 100644 --- a/jrj/project/business/ProductSample/ProductLibrary4.cpp +++ b/jrj/project/business/ProductSample/ProductLibrary4.cpp Binary files differ diff --git a/jrj/project/business/Quote3.maint.cpp b/jrj/project/business/Quote3.maint.cpp index c8f786b..cba99d6 100644 --- a/jrj/project/business/Quote3.maint.cpp +++ b/jrj/project/business/Quote3.maint.cpp Binary files differ diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp index bbcb0f7..7b6ee38 100644 --- a/jrj/project/business/SO/Product.Select.SO.cpp +++ b/jrj/project/business/SO/Product.Select.SO.cpp @@ -538,7 +538,7 @@ OpenWindow(L"dev:xpage[PackSchemaMaint.goodslib.vx]"); }else { - int pr = g_xdoc_product; + LPARAM pr = g_xdoc_product; OpenWindow(L"dev:xpage[ProductLibraryItemMaint.vx]",pr); } */ diff --git a/jrj/project/business/SO3.maint.cpp b/jrj/project/business/SO3.maint.cpp index 198e996..2e168a0 100644 --- a/jrj/project/business/SO3.maint.cpp +++ b/jrj/project/business/SO3.maint.cpp @@ -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; diff --git a/jrj/project/business/Supplier.maint.cpp b/jrj/project/business/Supplier.maint.cpp index 9976ace..56049e7 100644 --- a/jrj/project/business/Supplier.maint.cpp +++ b/jrj/project/business/Supplier.maint.cpp Binary files differ diff --git a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp index 023a8fc..e3fd19b 100644 --- a/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp +++ b/jrj/project/business/Supplier/maintex.Owner.Supplier.cpp Binary files differ diff --git a/jrj/project/business/SystemSettings/level.Customer.v3.cpp b/jrj/project/business/SystemSettings/level.Customer.v3.cpp index a4b1a7e..9548411 100644 --- a/jrj/project/business/SystemSettings/level.Customer.v3.cpp +++ b/jrj/project/business/SystemSettings/level.Customer.v3.cpp @@ -75,7 +75,7 @@ return 1; } - int ViewUpdate(int pr,xstring updateItem,xaserverarg arg) + int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg) { if(updateItem == L"refresh") { diff --git a/jrj/project/business/VATNotify/list.vatinvoice.cpp b/jrj/project/business/VATNotify/list.vatinvoice.cpp index 7f299f7..df070fc 100644 --- a/jrj/project/business/VATNotify/list.vatinvoice.cpp +++ b/jrj/project/business/VATNotify/list.vatinvoice.cpp @@ -62,12 +62,12 @@ return L"VTAInvoiceID"; } - xstring GetEntityID(int /*param*/ pr) + xstring GetEntityID(LPARAM /*param*/ pr) { return dw_list.GetItemString(dw_list.GetRow(),L"VATInvoiceID"); } - int ViewUpdate(int pr,xstring updateItem,xaserverarg arg) + int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg) { if( updateItem==L"del") { diff --git a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp index f11d770..2f46136 100644 --- a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp +++ b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp @@ -45,7 +45,7 @@ return 1; } - xstring GetEntityData(int pr) + xstring GetEntityData(LPARAM pr) { xml x ; dw_item.AcceptText(); diff --git a/jrj/project/start.vframe.vbusiness.cpp b/jrj/project/start.vframe.vbusiness.cpp index 3f2c1eb..5e688d7 100644 --- a/jrj/project/start.vframe.vbusiness.cpp +++ b/jrj/project/start.vframe.vbusiness.cpp @@ -257,7 +257,7 @@ return 1; } - int pr = pr1; + LPARAM pr = pr1; xstring action = comdid.mid(comdid.find(L"action:", 0) + 7, 9999); if (action == L"bill.delete" || action == L"bill.deleteEx") { @@ -481,7 +481,7 @@ return 1; } - int pr = pr1; + LPARAM pr = pr1; xstring action = comdid.mid(comdid.find(L"action:",0)+7,9999); if(action == L"bill.delete" || action == L"bill.deleteEx") { diff --git a/jrj/project/total3/ProductNewList.cpp b/jrj/project/total3/ProductNewList.cpp index 9834f2e..98337ab 100644 --- a/jrj/project/total3/ProductNewList.cpp +++ b/jrj/project/total3/ProductNewList.cpp @@ -395,7 +395,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; diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp index 7d3007d..2127cef 100644 --- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp +++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp @@ -41,7 +41,7 @@ return L""; } - string GetEntityIDName(/*param*/int pr) + string GetEntityIDName(/*param*/LPARAM pr) { if (m_configDoc) { diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp index 58be1c6..dd30cea 100644 --- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp +++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp @@ -55,7 +55,7 @@ return L""; } - virtual string GetEntityRowData(int pr) + virtual string GetEntityRowData(LPARAM pr) { return GetEntityData(pr); } -- Gitblit v1.9.3