From 05327a1e8a3448b96ffad5c14163b16d5a6c184a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 09 七月 2024 13:31:04 +0800
Subject: [PATCH] update
---
jrj/project/business/AR/ExchangeSignFast.cpp | 4 +-
jrj/project/business/AP/maint.ap.cpp | 2
jrj/project/business/AR/ExchageFile.cpp | 14 +++---
jrj/project/viewobject/view.base.hpp | 1
jrj/project/business/Enquiry.list.cpp | 62 ++++++++++++++-----------------
jrj/project/business/HR/ManpowerFile.cpp | 2
6 files changed, 40 insertions(+), 45 deletions(-)
diff --git a/jrj/project/business/AP/maint.ap.cpp b/jrj/project/business/AP/maint.ap.cpp
index b5723e2..ff6ba9e 100644
--- a/jrj/project/business/AP/maint.ap.cpp
+++ b/jrj/project/business/AP/maint.ap.cpp
@@ -293,7 +293,7 @@
{
xstring col = dw_base.GetColumnName(m);
if (col == L"OrgName" || col == L"APNo")
- dw_base.SetColumnProp(col, L"cellprotect", L"1");
+ dw_base.SetColumnProp(col.c_str(), L"cellprotect", L"1");
}
return 1;
}
diff --git a/jrj/project/business/AR/ExchageFile.cpp b/jrj/project/business/AR/ExchageFile.cpp
index f03cdd1..32df8f3 100644
--- a/jrj/project/business/AR/ExchageFile.cpp
+++ b/jrj/project/business/AR/ExchageFile.cpp
@@ -2,6 +2,7 @@
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
#include <xcontrol/xcell.hpp>
+#include <adt/xarray.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -139,7 +140,6 @@
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
arg.AddArg(L"head", head);
//alert(head);
if (getUrl(L"/sale/data/AR/match/bank", arg.GetString(), x) != 1)return 1;
@@ -152,8 +152,8 @@
KXMLDOMNodeList items = n.selectNodes(L"Item");
int len = items.length();
- IntegerArray indexs = IntegerArray::make();
- StringArray columns = StringArray::make();
+ xarray<int> indexs;
+ xarray<xstring> columns;
xstring bank = n.selectSingleNode(L"@name").text();
for (int i = 0; i < len; i++)
{
@@ -233,13 +233,13 @@
if (n1)
{
//alert(n1.xml);
- if (n1.selectSingleNode(L"DataColumn"))dw_exch.SetItemString(curRow, columns.item(k), n1.selectSingleNode(L"DataColumn").text());
- if (n1.selectSingleNode(L"DataColumn/@_displaystring"))dw_exch.SetItemDisplayString(curRow, columns.item(k), n1.selectSingleNode(L"DataColumn/@_displaystring").text());
+ if (n1.selectSingleNode(L"DataColumn"))dw_exch.SetItemString(curRow, columns.item(k).c_str(), n1.selectSingleNode(L"DataColumn").text());
+ if (n1.selectSingleNode(L"DataColumn/@_displaystring"))dw_exch.SetItemDisplayString(curRow, columns.item(k).c_str(), n1.selectSingleNode(L"DataColumn/@_displaystring").text());
}
}
}
else
- dw_exch.SetItemString(curRow, columns.item(k), val);
+ dw_exch.SetItemString(curRow, columns.item(k).c_str(), val);
}
}
xutil::RestoreCursor(hCursor);
@@ -373,7 +373,7 @@
int SendCtrlCmd(xcontrol xc, xstring cmd)
{
- SendMessage(xc.GetId(), 0x401, cmd, 0);
+ SendMessage(xc.GetHWND(), 0x401, (WPARAM)cmd.c_str(), 0);
return 1;
}
diff --git a/jrj/project/business/AR/ExchangeSignFast.cpp b/jrj/project/business/AR/ExchangeSignFast.cpp
index 1fae6e8..63e1b6c 100644
--- a/jrj/project/business/AR/ExchangeSignFast.cpp
+++ b/jrj/project/business/AR/ExchangeSignFast.cpp
@@ -246,11 +246,11 @@
if (dw_obj.GetRowCount() > 0)
dw_list.SetItemString(crow, L"SEID", dw_obj.GetGuid(dw_obj.GetRow()));
}
- dw_list.SetItemString(crow, colname, value);
+ dw_list.SetItemString(crow, colname.c_str(), value);
}
else
{
- dw_list.SetItemString(crow, colname, value);
+ dw_list.SetItemString(crow, colname.c_str(), value);
}
dw_list.Redraw();
evalExchAmt();
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index 9e6968c..e07aea8 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -20,8 +20,8 @@
}
public:
- xstring m_sType; //鏍戦�変腑鐨勭被鍨�
- xstring m_sTypeTxt; //鏍戦�変腑鐨勬暟鎹�
+ xstring m_sType; //树选中的类型
+ xstring m_sTypeTxt; //树选中的数据
xstring urlTree;
xstring myDataUrl;
xstring myDataUrl1;
@@ -147,7 +147,7 @@
}
//process tree
- //鏌ユ壘褰撳墠鏍戦」鐨勯《绾х洰褰�
+ //查找当前树项的顶级目录
HTREEITEM LookupTopFolder(HTREEITEM hItem)
{
HTREEITEM hRoot = tv_folder.GetRootItem();
@@ -187,7 +187,7 @@
return 1;
}
- //鏍戝睍寮�
+ //树展开
int OnTreeExpanding(TEvent* evt, int p)
{
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
@@ -289,11 +289,11 @@
xstring str = x.documentElement().getAttribute(L"text");
if(str == L"true")
{
- alert(L"淇濆瓨鎴愬姛!");
+ alert(L"保存成功!");
dw_pricelistshare.ResetUpdateStatus();
}else
{
- alert(L"淇濆瓨澶辫触!");
+ alert(L"保存失败!");
}
}
@@ -306,10 +306,10 @@
KXMLDOMElement xitem = nlist.item(0);
xstring Reciever = xitem.selectSingleNode(L"userno").text();
- xstring Subject = L"浠锋牸鍗曞凡鍏变韩["+CName+L"]";
- xstring Category = L"浠锋牸鍗曞叡浜�";
+ xstring Subject = L"价格单已共享["+CName+L"]";
+ xstring Category = L"价格单共享";
xstring Content = L"";
- ViewObject::AddMessage(Category, Reciever, NO, EntityID, Subject, Content);
+ ViewObject::AddMessage(GetServerUrl(),Category, Reciever, NO, EntityID, Subject, Content);
return 1;
}
int SendNotice(xml content)
@@ -380,7 +380,7 @@
dw_pricelistex.ResetUpdateStatus();
}else
{
- alert(L"鎴愬搧浠锋牸鍗曚繚瀛樺け璐�!");
+ alert(L"成品价格单保存失败!");
return 1;
}
}
@@ -413,7 +413,7 @@
dw_priceitem.ResetUpdateStatus();
}else
{
- alert(L"缁勪欢浠锋牸鍗曚繚瀛樺け璐�!");
+ alert(L"组件价格单保存失败!");
return 1;
}
}
@@ -435,12 +435,12 @@
if(str == L"true")
{
dw_pricelistshare.ResetUpdateStatus();
- alert(L"淇濆瓨鎴愬姛!");
- OnProductPriceShareRetrieve();//鍒锋柊鏁版嵁
- SendNotice(x2);//鍙戦�侀�氱煡
+ alert(L"保存成功!");
+ OnProductPriceShareRetrieve();//刷新数据
+ SendNotice(x2);//发送通知
}else
{
- alert(L"鍏变韩鏁版嵁淇濆瓨澶辫触!");
+ alert(L"共享数据保存失败!");
}
}
@@ -487,12 +487,12 @@
return false;
}
- //妫�绱�
+ //检索
int OnPreRetrieve()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if(hItem <=0) return 1;
+ if(!hItem) return 1;
HCURSOR hCursor = xutil::SetCursorWait();
KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
@@ -556,7 +556,7 @@
return 1;
}
- //鍘嗗彶鏁版嵁
+ //历史数据
int Onhistroydata()
{
return 1;
@@ -868,7 +868,7 @@
dw_pricelistshare.SetItemString(crow,L"NO",No);
dw_pricelistshare.SetItemString(crow,L"GroupOrEmp",GroupOrEmp);
dw_pricelistshare.SetItemString(crow,L"EntityID",EntityID);
- dw_pricelistshare.SetItemString(crow,L"EntityName",L"浜у搧浠锋牸鍗�");
+ dw_pricelistshare.SetItemString(crow,L"EntityName",L"产品价格单");
if(node.selectSingleNode(L"UserGroupID"))
dw_pricelistshare.SetItemString(crow,L"UserGroupID",node.selectSingleNode(L"UserGroupID").text());
if(node.selectSingleNode(L"PersonID"))
@@ -1216,9 +1216,9 @@
xml supplier_x = ViewObject::RetrieveData(L"/sale/data/SupplierV3/entity/FindBySaleType",L"id", s);
if(supplier_x)
{
- if((xstring)supplier_x.text() == L"閲囪喘缁忕悊")
+ if((xstring)supplier_x.text() == L"采购经理")
{
- alert(L"褰撳墠瑙掕壊涓嶆槸閲囪喘鍛樹笉鑳芥柊澧炲崟瀛愶紝璇烽噸鏂伴�夋嫨瑙掕壊");
+ alert(L"当前角色不是采购员不能新增单子，请重新选择角色");
return 0;
}
}
@@ -1281,7 +1281,7 @@
return 1;
}
- //xcombobox涓嬫媺
+ //xcombobox下拉
int OnSelectDdlb(TEvent* evt,int p)
{
changeddlb=1;
@@ -1405,17 +1405,11 @@
xutil::RestoreCursor(hCursor);
return 1;
}
- int OnDoubleClicked(TEvent* evt, LPARAM pr)
- {
- HCURSOR hCursor = xutil::SetCursorWait();
- OnCmdDispatch(L"action:bill.open");
- xutil::RestoreCursor(hCursor);
- return 1;
- }
+
int AttachListon()
{
- AttachEvent(L"tv_folder", L"TVN_SELCHANGED",(FEvent)&Enquiry3list::OnTreeSelChanged); //鏍戦�夋嫨
- AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnTreeExpanding); //鏍戝睍寮�
+ AttachEvent(L"tv_folder", L"TVN_SELCHANGED",(FEvent)&Enquiry3list::OnTreeSelChanged); //树选择
+ AttachEvent(L"tv_folder", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnTreeExpanding); //树展开
AttachEvent(L"dw_list",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged);
AttachEvent(L"dw_list2",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged2);
AttachEvent(L"dw_list1",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnRowChanged1);
@@ -1423,7 +1417,7 @@
AttachEvent(L"WM_COMMAND", (FEvent)&Enquiry3list::OnCkbCLick);
AttachEvent(L"dw_list",L"DWV_ASKSTYLE", (FEvent)&Enquiry3list::OnItemAskStyle);
AttachEvent(L"dw_pricelist",L"DWV_ROWFOCUSCHANGED", (FEvent)&Enquiry3list::OnPriceListRowChanged);
- AttachEvent(L"tv_folder_pricebill", L"TVN_SELCHANGED", (FEvent)&Enquiry3list::OnPriceBillTreeSelChanged); //鏍戦�夋嫨
+ AttachEvent(L"tv_folder_pricebill", L"TVN_SELCHANGED", (FEvent)&Enquiry3list::OnPriceBillTreeSelChanged); //树选择
AttachEvent(L"tv_folder_pricebill", L"TVN_ITEMEXPANDING", (FEvent)&Enquiry3list::OnPriceBillTreeExpanding);
AttachEvent(L"dw_pricelistex",L"DWV_DOUBLECLICKED", (FEvent)&Enquiry3list::OnPriceListDoubleClicked);
@@ -1615,7 +1609,7 @@
tv_folder_pricebill = GetControl(L"tv_folder_pricebill");
InitialFolderPriceBill();
-
+ return 1;
}
int onloaded()
@@ -1663,7 +1657,7 @@
{
HTREEITEM hItem = tv_folder.GetCaretItem();
arg.AddArg(L"sheetname",sheetname);
- if(hItem > 0)
+ if(!hItem)
{
KXMLDOMElement e = tv_folder.GetItemData(hItem);
diff --git a/jrj/project/business/HR/ManpowerFile.cpp b/jrj/project/business/HR/ManpowerFile.cpp
index af1bb77..c3c5509 100644
--- a/jrj/project/business/HR/ManpowerFile.cpp
+++ b/jrj/project/business/HR/ManpowerFile.cpp
@@ -198,7 +198,7 @@
int OnRetrieveEx1()
{
HTREEITEM hItem = tv_folder.GetSelectedItem();
- if (hItem <= 0) return 1;
+ if (!hItem) return 1;
HCURSOR hCursor = xutil::SetCursorWait();
KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
diff --git a/jrj/project/viewobject/view.base.hpp b/jrj/project/viewobject/view.base.hpp
index 4fa582c..262f212 100644
--- a/jrj/project/viewobject/view.base.hpp
+++ b/jrj/project/viewobject/view.base.hpp
@@ -284,6 +284,7 @@
}
}
dwobj.Redraw();
+ return 1;
}
static int AddMessage(string serverUrl, string Category, string Reciever, string EntityNo, string EntityID, string Subject, string Content)
--
Gitblit v1.9.3