From 93698754484a8228a4b861c5d2a062870c68fe5f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 26 六月 2024 08:06:31 +0800
Subject: [PATCH] update enquery
---
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/project/viewobject/enquiry.view.hpp | 67 ++++++++++++++++++++++
jrj/xframe/wobject/xaserverarg.hpp | 78 ++++++++++++++++++++++++++
jrj/xframe/wobject/xwin.hpp | 6 +
jrj/xframe/xcontrol/xdwgrid.hpp | 15 ++++
jrj/ext-jrj/ext-jrj.vcxproj | 2
jrj/project/viewobject/view.base.hpp | 2
jrj/ext-jrj/ext-jrj.vcxproj.filters | 6 ++
8 files changed, 172 insertions(+), 4 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 74854f9..301e3e0 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -150,6 +150,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\project\viewobject\customer.view.hpp" />
+ <ClInclude Include="..\project\viewobject\enquiry.view.hpp" />
<ClInclude Include="..\project\viewobject\productlibrary.view.hpp" />
<ClInclude Include="..\project\viewobject\purchaseorder.view.hpp" />
<ClInclude Include="..\project\viewobject\quote.view.hpp" />
@@ -222,6 +223,7 @@
<ClCompile Include="..\project\business\Enquiry.list.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\EnquiryEx3.list.cpp" />
<ClCompile Include="..\project\business\Product.list.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 34c20e3..a789be6 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -243,6 +243,9 @@
<ClInclude Include="..\xframe\wobject\xint.hpp">
<Filter>xframe\wobject</Filter>
</ClInclude>
+ <ClInclude Include="..\project\viewobject\enquiry.view.hpp">
+ <Filter>project\viewobject</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="dllmain.cpp">
@@ -305,5 +308,8 @@
<ClCompile Include="..\project\vindexmenu.cpp">
<Filter>project\wface</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\EnquiryEx3.list.cpp">
+ <Filter>project\business</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
new file mode 100644
index 0000000..ae103dc
--- /dev/null
+++ b/jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
diff --git a/jrj/project/viewobject/enquiry.view.hpp b/jrj/project/viewobject/enquiry.view.hpp
new file mode 100644
index 0000000..984494b
--- /dev/null
+++ b/jrj/project/viewobject/enquiry.view.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include <wobject/xstring.hpp>
+#include <wobject/xaserverarg.hpp>
+#include <win32/win.hpp>
+#include <vbusiness/vutil/publiccode.vutil.vbusiness.hpp>
+#include <wobject/xurl.hpp>
+#include <xcontrol/xdwgrid.hpp>
+#include <xcontrol/xdwtable.hpp>
+#include "view.base.hpp"
+
+class EnquiryView : public ViewObject
+{
+ static KXMLDOMDocument GetSimulationView(string EnquiryNo)
+ {
+ xaserverarg arg = MakeArg(L"EnquiryNo", EnquiryNo);
+ return FecthData(L"/sale/data/Enquiry/fullview", arg.GetString());
+ }
+public:
+ //主信息维护
+ static KXMLDOMDocument GetMaintFormForBase()
+ {
+ return FecthData(L"/sale/data/Enquiry/maint/form/base", L"");
+ }
+
+ //商品维护列表
+ static KXMLDOMDocument GetMaintFormForItemList()
+ {
+ return FecthData(L"/sale/data/Enquiry/maint/form/item/list", L"");
+ }
+
+ //商品维护商品细节
+ static KXMLDOMDocument GetMaintFormForItemDetail()
+ {
+ return FecthData(L"/sale/data/Enquiry/maint/form/item/detail", L"");
+ }
+ static KXMLDOMDocument GetMaintFormForItemDetail(string guid)
+ {
+ xaserverarg arg = MakeArg(L"guid", guid);
+ return FecthData(L"/sale/data/Enquiry/goods/maint/form", arg.GetString());
+ }
+
+public:
+ //主信息
+ static KXMLDOMDocument GetMaintDataForBase(string No)
+ {
+ xaserverarg arg = MakeArg(L"id", No);
+ return FecthData(L"/sale/data/Enquiry/maint/base", arg.GetString());
+ }
+ //产品数据
+ static KXMLDOMDocument GetMaintFormForItemList(string No)
+ {
+ xaserverarg arg = MakeArg(L"id", No);
+ return FecthData(L"/sale/data/Enquiry/maint/item", arg.GetString());
+ }
+
+ static bstring MakeBillNo()
+ {
+ KXMLDOMDocument x = RetrieveData(L"/sale/data/Enquiry/makebillno");
+ if (!x)
+ {
+ alert(L"error");
+ }
+ return x.text();
+ }
+
+};
\ No newline at end of file
diff --git a/jrj/project/viewobject/view.base.hpp b/jrj/project/viewobject/view.base.hpp
index b93cc53..2c90dbf 100644
--- a/jrj/project/viewobject/view.base.hpp
+++ b/jrj/project/viewobject/view.base.hpp
@@ -276,7 +276,7 @@
dwobj.Redraw();
}
- int AddMessage(string serverUrl, string Category, string Reciever, string EntityNo, string EntityID, string Subject, string Content)
+ static int AddMessage(string serverUrl, string Category, string Reciever, string EntityNo, string EntityID, string Subject, string Content)
{
KXMLDOMDocument x;
xaserverarg arg;
diff --git a/jrj/xframe/wobject/xaserverarg.hpp b/jrj/xframe/wobject/xaserverarg.hpp
index 0faff43..9445853 100644
--- a/jrj/xframe/wobject/xaserverarg.hpp
+++ b/jrj/xframe/wobject/xaserverarg.hpp
@@ -112,4 +112,82 @@
return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->GetParam(pArgName);
}
+};
+
+class xaserverargPtr
+{
+public:
+ xaserverarg* arg;
+public:
+ xaserverargPtr() :arg(new xaserverarg) {}
+public:
+ operator xaserverarg& () { return *arg; }
+ operator xaserverarg* () { return arg; }
+ xaserverarg* operator ->() { return arg; }
+public:
+ int AddArg(string argname, string val, string typ = NULL) //alias "?AddArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_W00@Z";
+ {
+ return arg->AddArg(argname, val, typ);
+ }
+
+ int ClearArgs() //alias "?ClearArgs@IXAServerArg@XFrame@Hxsoft@@QAEHXZ" from "xframe.dll";
+ {
+ return arg->ClearArgs();
+ }
+
+ int RemoveArg(string argname) //alias "?RemoveArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_W@Z";
+ {
+ return arg->RemoveArg(argname);
+ }
+ /*int SetArg(string argname,double val,string typ=NULL) //alias "?SetArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_WNO@Z";
+ {
+ return arg->SetArg(argname,val,typ);
+ }
+ int SetArg(string argname,int val,string typ=NULL) //alias "?SetArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_WHO@Z";
+ {
+ return arg->SetArg(argname,val,typ);
+ }*/
+ int SetArg(string argname, string val, string typ = NULL) //alias "?SetArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_W00@Z";
+ {
+ return arg->SetArg(argname, val, typ);
+ }
+ string GetString() //alias "?GetString@IXAServerArg@XFrame@Hxsoft@@QAEPB_WXZ" from "xframe.dll";
+ {
+ return arg->GetString();
+ }
+ static void* CreateInstance() //alias "?CreateInstance@IXAServerArg@XFrame@Hxsoft@@SAPAV123@XZ";
+ {
+ return Hxsoft::XFrame::IXAServerArg::CreateInstance();
+ }
+ static int ReleaseInstance(void* p) //alias "?ReleaseInstance@IXAServerArg@XFrame@Hxsoft@@SAHPAV123@@Z";
+ {
+ Hxsoft::XFrame::IXAServerArg::ReleaseInstance((Hxsoft::XFrame::IXAServerArg*)p);
+ return 1;
+ }
+ bool GetArgBool(string argname) //alias "?GetArgBool@IXAServerArg@XFrame@Hxsoft@@QAE_NPA_W@Z";
+ {
+ return arg->GetArgBool((LPTSTR)argname);
+ }
+ double GetArgDouble(string argname) //alias "?GetArgDouble@IXAServerArg@XFrame@Hxsoft@@QAENPA_W@Z";
+ {
+ return arg->GetArgDouble((LPTSTR)argname);
+ }
+ int GetArgInt(string argname) //alias "?GetArgInt@IXAServerArg@XFrame@Hxsoft@@QAEHPA_W@Z";
+ {
+ return arg->GetArgInt((LPTSTR)argname);
+ }
+ string GetArgString(string argname) //alias "?GetArgString@IXAServerArg@XFrame@Hxsoft@@QAEPA_WPA_W@Z";
+ {
+ return arg->GetArgString((LPTSTR)argname);
+ }
+
+ int SetParam(LPCTSTR pArgName, LPARAM pValue)
+ {
+ return arg->SetParam(pArgName, pValue);
+ }
+
+ LPARAM GetParam(LPCTSTR pArgName)
+ {
+ return arg->GetParam(pArgName);
+ }
};
\ No newline at end of file
diff --git a/jrj/xframe/wobject/xwin.hpp b/jrj/xframe/wobject/xwin.hpp
index 6b58a9f..099e1b7 100644
--- a/jrj/xframe/wobject/xwin.hpp
+++ b/jrj/xframe/wobject/xwin.hpp
@@ -66,7 +66,11 @@
if(!w) return 0; //response
return (xwin*)GetPropW(w->GetHWND(),L"AttachObject");
}
-
+ xwin* OpenWindow(string url, xaserver& arg)
+ {
+ return OpenWindow(url, (LPARAM)&arg);
+ }
+
int trace(string info)
{
return 1;
diff --git a/jrj/xframe/xcontrol/xdwgrid.hpp b/jrj/xframe/xcontrol/xdwgrid.hpp
index 8f4a517..254e5ff 100644
--- a/jrj/xframe/xcontrol/xdwgrid.hpp
+++ b/jrj/xframe/xcontrol/xdwgrid.hpp
@@ -302,9 +302,9 @@
{
return getKReport()->RetrieveDiff(xml);
}
- int Filter(LPTSTR pColumn, LPTSTR pStr)
+ int Filter(LPCTSTR pColumn, LPCTSTR pStr)
{
- return getKReport()->Filter(pColumn, pStr);
+ return getKReport()->Filter((LPTSTR)pColumn, (LPTSTR)pStr);
}
public:
int SetHeaderText(int row, int col, LPTSTR name)
@@ -460,6 +460,17 @@
return L"";
}
+ int SetGuid(int row,xstring val)
+ {
+ KXMLDOMElement e = GetRowElement(row);
+ if (e)
+ {
+ e.setAttribute(L"guid",val.c_str());
+ return 1;
+ }
+ return 0;
+ }
+
public:
int DwRetrieve(string ServerUrl, string src, string argstr)
--
Gitblit v1.9.3