From 2f2eb9a7c4e99e663c82d156bf5af7ecdbc8fa39 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 02 九月 2024 18:02:52 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/SO/delivery.base.maint.so.cpp | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/jrj/project/business/SO/delivery.base.maint.so.cpp b/jrj/project/business/SO/delivery.base.maint.so.cpp
index cb56b16..a464f22 100644
--- a/jrj/project/business/SO/delivery.base.maint.so.cpp
+++ b/jrj/project/business/SO/delivery.base.maint.so.cpp
@@ -3,18 +3,17 @@
#include <xcontrol/xdwgrid.hpp>
#include <xcontrol/xcell.hpp>
-
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
-
+using xml = KXMLDOMDocument;
class __declspec(dllexport) DeliveryEdit : public xframe
{
public:
xdwtable dw_1;
- vcontrol vc;
+ xvcontrol vc;
xcell dw_cell;
public:
@@ -145,7 +144,7 @@
int OnInit()
{
- int iArgs = GetParam();
+ int iArgs = GetArg();
XXmlContentSvr xdoc = new XXmlContentSvr;
xdoc.setNativePointer(iArgs);
@@ -157,8 +156,8 @@
xml x;
x ;
- x.setNativePointer(xml::CreateInstance());
- x.LoadXml(vc.GetContent());
+
+ x.loadXML(vc.GetContent());
dw_1.Retrieve(x);
--
Gitblit v1.9.3