xj qian
2024-07-18 1740c5de8324b8214829429c138e619df1fb9d02
update basecode
已修改36个文件
144 ■■■■ 文件已修改
jrj/ext-jrj/ext-jrj.vcxproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/AccountUnitMaint.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/ColorCardNew.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/ExchangeRate.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/FreightExpenseType.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/ProfitParam.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/SKUTemplate.select.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/SetUpRemarks.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/Simple.Menu.Config.cpp 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/SourceRemark.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/SpecialDeductFeeList.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/TestingCompanyMaint.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/TypeList.maint.supplier.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/BasicCode/basicfareTypeList.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Customer3.list.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Enquiry.list.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Enquiry/Entity.Product.Select.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/EnquiryEx3.list.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/GDN/SelectItem.New.GDN.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/GDN3.list.cpp 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/HR/AdministrativeDepartment.cpp 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/HR/ManpowerFile.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/PO/business4.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Public/GroupManagerList.cpp 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Public/UserGroupShare.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Public/message.business.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Quote3.list3.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SO/Product.Select.SO.cpp 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SO/delivery.base.maint.so.cpp 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Supplier/list.Owner.Supplier.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Supplier3.list.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SystemSettings/Flow3.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SystemSettings/ProcessManagement.cpp 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SystemSettings/SysUser.hpp 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SystemSettings/UserImport.cpp 25 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/vindexmenu.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/ext-jrj/ext-jrj.vcxproj
@@ -753,7 +753,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\SO\maint.Document.SO3.v3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\SO\paymentterm.base.maint.so.cpp">
jrj/project/business/BasicCode/AccountUnitMaint.cpp
@@ -118,7 +118,7 @@
        
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x ;
            
            xaserverarg arg;
            
jrj/project/business/BasicCode/ColorCardNew.cpp
@@ -62,7 +62,7 @@
        arg0.AddArg(L"EntityIDName", L"ColorCardID",L"xs:xstring");
        arg0.AddArg(L"EntityID", guid,L"xs:xstring");
        arg0.AddArg(L"FunctionCode", comdid,L"xs:xstring");
        xml x = new xml;
        xml x ;
        
        if(xurl::get(L"/sale/data/Role.config/sys/sql/action", arg0.GetString(), x) != 1)
@@ -172,7 +172,7 @@
        rec = OnPreSave();
        if (rec == -1)    
            return -1;
        xml x= new xml;
        xml x;
        
        dw_list.DwUpdateAllToEx(x); 
        xaserverarg arg;
jrj/project/business/BasicCode/ExchangeRate.cpp
@@ -55,7 +55,7 @@
            int OnSave()
            {
                xml x = new xml;
                xml x ;
                
                dw_list.AcceptText();
                dw_list.DwUpdateAllToEx(x);
@@ -186,7 +186,7 @@
            
            int  OnRetrieve()
            {
                xml x = new xml;
                xml x ;
                
                xaserverarg arg;
                
jrj/project/business/BasicCode/FreightExpenseType.cpp
@@ -72,7 +72,7 @@
        int OnSave()
        {
            dw_list.AcceptText();
            xml x= new xml;
            xml x;
            
            dw_list.DwUpdateAllToEx(x);
            
@@ -142,7 +142,7 @@
        
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x ;
            
            if (getUrl(L"/sale/data/LogisticsCode/entity/freightexpensetype/list",L"",x)!=1)
            {
jrj/project/business/BasicCode/ProfitParam.cpp
@@ -54,7 +54,7 @@
        }
        int OnSave()
        {
            xml x = new xml;
            xml x ;
            
            dw_list.AcceptText();
            dw_list.DwUpdateAllToEx(x);
@@ -110,7 +110,7 @@
        
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x ;
            x = ViewObject::RetrieveData(L"/sale/data/Gdn/profit/profitParamList");
            if(x)
            {
jrj/project/business/BasicCode/SKUTemplate.select.cpp
@@ -61,7 +61,7 @@
                xstring TemplateContent = e.selectSingleNode(L"TemplateContent").text+L"";
                xstring TemplateID = e.selectSingleNode(L"TemplateID").text+L"";                
                //trace(ItemName);
                xml x = new xml;
                xml x ;
                x.setNativePointer(x.CreateInstance());
                x.LoadXml(TemplateContent);                    
                dw_other.Retrieve(x);
jrj/project/business/BasicCode/SetUpRemarks.cpp
@@ -121,7 +121,7 @@
        
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x;
            
            xaserverarg arg;
            
jrj/project/business/BasicCode/Simple.Menu.Config.cpp
@@ -180,7 +180,7 @@
        
        NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
        HTREEITEM hItem = nmtv.itemNew.hItem;
        KXMLDOMElement& e = *(KXMLDOMElement*)tv_gs.GetItemData(hItem);
        KXMLDOMElement e = tv_gs.GetItemData(hItem);
        //trace(L"%s", e.xml);
        //xstring id = e.selectSingleNode(L"MenuID").text();
        dw_list.AcceptText();
@@ -202,9 +202,9 @@
            tv_gs.DeleteItem(xto);
            return -1;
        }
        KXMLDOMElement& fid = *(KXMLDOMElement*)tv_gs.GetItemData(xto);
        KXMLDOMElement fid = tv_gs.GetItemData(xto);
        HTREEITEM xpto =tv_gs.GetParentItem(xto);
        KXMLDOMElement& tid = *(KXMLDOMElement*)tv_gs.GetItemData(xto);
        KXMLDOMElement tid = tv_gs.GetItemData(xto);
        //trace(L"%s-------------------------%s",fid.xml,tid.xml);
        xml x ;
        
@@ -229,7 +229,7 @@
        //
        HTREEITEM xpfrom =tv_gs.GetParentItem(xfrom);
        //trace(L"%d", xpfrom);
        KXMLDOMElement& fe = *(KXMLDOMElement*)tv_gs.GetItemData(xpfrom);
        KXMLDOMElement fe = tv_gs.GetItemData(xpfrom);
        //trace(L"%s-------------------------%s",fe.xml,tid.xml);
        KXMLDOMElement fe1 = fe.selectSingleNode(L"item[@guid='"+id1+L"']");
        fe.removeChild(fe1);
jrj/project/business/BasicCode/SourceRemark.cpp
@@ -121,7 +121,7 @@
        
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x;
            
            xaserverarg arg;
            
jrj/project/business/BasicCode/SpecialDeductFeeList.cpp
@@ -122,7 +122,7 @@
        
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x ;
            
            xaserverarg arg;
            
jrj/project/business/BasicCode/TestingCompanyMaint.cpp
@@ -285,7 +285,7 @@
            args.AddArg(L"CSpec", cspec);
            args.AddArg(L"SpecRule", SpecRule);
            xml  x = new xml;
            xml  x;
            getUrl(L"/sale/data/LogisticsCode/pref/forwarderno/check", args.GetString(), x);
            if (x.selectSingleNode(L"root/spec"))
jrj/project/business/BasicCode/TypeList.maint.supplier.cpp
@@ -147,7 +147,7 @@
        /*
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x ;
            x.setNativePointer(xml::CreateInstance());
            xaserverarg arg = new xaserverarg;
            arg.setNativePointer(arg.CreateInstance());    
jrj/project/business/BasicCode/basicfareTypeList.cpp
@@ -121,7 +121,7 @@
        
        int  OnRetrieve()
        {
            xml x = new xml;
            xml x ;
            
            xaserverarg arg;
            
jrj/project/business/Customer3.list.cpp
Binary files differ
jrj/project/business/Enquiry.list.cpp
@@ -196,7 +196,7 @@
        xstring name = tv_folder.GetItemLabel(hTopItem);
        HTREEITEM child = tv_folder.GetChildItem(hItem);
        KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
        KXMLDOMElement e = tv_folder.GetItemData(hItem);
        if (!child)ExpandFolderItem(tv_folder,hItem,e.getAttribute(L"no"));
        return 1;
@@ -212,7 +212,7 @@
        xstring name = tv_folder_pricebill.GetItemLabel(hTopItem);
        HTREEITEM child = tv_folder_pricebill.GetChildItem(hItem);
        KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder_pricebill.GetItemData(hItem);
        KXMLDOMElement e = tv_folder_pricebill.GetItemData(hItem);
        if (!child)ExpandFolderItem(tv_folder_pricebill,hItem,e.getAttribute(L"no"));
        return 1;
jrj/project/business/Enquiry/Entity.Product.Select.cpp
@@ -1031,7 +1031,7 @@
        {
            while (true)
            {
                KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
                KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
                xstring str = e1.getAttribute(L"no");
                if (str.find(L"Customer:") >= 0) return hItem;
                hItem = tv_folder.GetParentItem(hItem);
@@ -1044,7 +1044,7 @@
        {
            hItem = LookupCustomerFolder(hItem);
            if (hItem == 0) return L"";
            KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
            KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
            xstring str = e1.getAttribute(L"no");
            return str.mid(xstring(L"Customer:").length(), 9999);
        }
jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
jrj/project/business/GDN/SelectItem.New.GDN.cpp
Binary files differ
jrj/project/business/GDN3.list.cpp
@@ -113,7 +113,7 @@
        xstring name = tv_folder.GetItemLabel(hTopItem);
        HTREEITEM child = tv_folder.GetChildItem(hItem);
        KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
        KXMLDOMElement e = tv_folder.GetItemData(hItem);
        if (!child)ExpandFolderItem(hItem, e.getAttribute(L"no"));
        return 1;
@@ -207,7 +207,7 @@
            if (!hItem)  return 1;
        }
        HCURSOR hCursor = xutil::SetCursorWait();
        KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
        KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
        xstring no = e1.getAttribute(L"no");
        //xml x = 0;
        //x = ViewObject::RetrieveData(myDataUrl,L"no",no,L"QueryTxt", m_QueryTxt,L"rows",rows);
@@ -241,7 +241,7 @@
        HCURSOR hCursor = xutil::SetCursorWait();
        KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
        KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
        xstring no = e1.getAttribute(L"no");
        trace(L"\r\n" + no + L"\r\n" + m_QueryTxt);
jrj/project/business/HR/AdministrativeDepartment.cpp
@@ -124,7 +124,7 @@
            if (!hItem ) return 1;
            //int     hCursor = xutil::SetCursorWait();
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
            KXMLDOMElement e = tv_folder.GetItemData(hItem);
            xstring name = e.getAttribute(L"name");
            xml x = 0;
            xstring parentid = L"";
@@ -157,7 +157,7 @@
            HTREEITEM child = tv_folder.GetChildItem(hItem);
            if (!child) {
                HCURSOR     hCursor = xutil::SetCursorWait();
                KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
                KXMLDOMElement e = tv_folder.GetItemData(hItem);
                if (!e.getAttribute(L"name")) {
                    xstring adid = e.selectSingleNode(L"adid").text();
                    xstring parentid = adid;
@@ -181,7 +181,7 @@
            if (!hItem )
                return 1;
            HCURSOR hCursor = xutil::SetCursorWait();
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
            KXMLDOMElement e = tv_folder.GetItemData(hItem);
            xstring parentid = L"";//父级id
            if (!e.getAttribute(L"name"))
                parentid = e.selectSingleNode(L"adid").text();
jrj/project/business/HR/ManpowerFile.cpp
@@ -201,7 +201,7 @@
            if (!hItem) return 1;
            HCURSOR hCursor = xutil::SetCursorWait();
            KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
            KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
            xstring no = e1.getAttribute(L"no");
            xml x ;
jrj/project/business/PO/business4.cpp
Binary files differ
jrj/project/business/Public/GroupManagerList.cpp
@@ -63,7 +63,7 @@
                
                    KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
                    xstring name = e.selectSingleNode(L"@name").text();
                    HTREEITEM hw = xtreeview::InsertChildItem(wid, h, name,(LPARAM)&e , 15);
                    HTREEITEM hw = tv_folder.InsertChildItem(h, name,(LPARAM)&e , 15);
                    createSubTree(wid, hw, e);
                }
            return 1;
@@ -71,9 +71,9 @@
        int OnCreateTree()
        {
            int wid = tv_folder.GetId();
            while (xtreeview::GetRootItem(wid) > 0)
                xtreeview::DeleteItem(wid, xtreeview::GetRootItem(wid));
            //int wid = tv_folder.GetId();
            while (tv_folder.GetRootItem() > 0)
                tv_folder.DeleteItem(tv_folder.GetRootItem());
            xml x;
            x;
@@ -95,11 +95,11 @@
                {
                    KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
                    xstring name = e.selectSingleNode(L"@name").text();
                    HTREEITEM h = xtreeview::InsertChildItem(wid, 0, name, name, (LPARAM)&e, 15);
                    createSubTree(wid, h, e);
                    xtreeview::ExpandItem(wid, h);
                    HTREEITEM h = tv_folder.InsertChildItem( 0, name, name, (LPARAM)&e, 15);
                    createSubTree(h, e);
                    tv_folder.ExpandItem(h);
                }
                xtreeview::ExpandItem(wid, 0);
                tv_folder.ExpandItem( 0);
            }
            return 1;
@@ -112,7 +112,7 @@
            NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
            HTREEITEM hItem = nmtv.itemNew.hItem;
            KXMLDOMElement e = xtreeview::GetItemData(tv_folder.GetId(), sItem);
            KXMLDOMElement e = tv_folder.GetItemData(hItem);
            xstring UserGroupID = e.selectSingleNode(L"@guid").text();
            OnRetrieve(UserGroupID);
            return 1;
jrj/project/business/Public/UserGroupShare.cpp
@@ -173,7 +173,7 @@
                    "\r\nReciever:"+Reciever + L"\r\nNo:"+NO + L"\r\nEntityID:"+EntityID + L"Subject:"+Subject+
                    "\r\nContent:"+Content);
            */
            x = ViewObject::AddMessage(Category, Reciever, NO, EntityID, Subject, Content);
            x = ViewObject::AddMessage(Category, Reciever, NO, EntityID, Subject, Content);
            return 1;
        }
jrj/project/business/Public/message.business.cpp
Binary files differ
jrj/project/business/Quote3.list3.cpp
Binary files differ
jrj/project/business/SO/Product.Select.SO.cpp
@@ -17,7 +17,7 @@
    class __declspec(dllexport) ProductSelectSOWin : public xwin
    {
    public:
        int hObject = 0;
        HWND hObject = 0;
        xstring CustomerID;
        xstring CustomerName;
@@ -528,7 +528,7 @@
        int ItemMaint()
        {
            HTREEITEM hItem = tv_folder.GetSelectedItem();
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
            KXMLDOMElement& e = tv_folder.GetItemData(hItem);
            //xstring no = e.getAttribute(L"no");
            //if(no==L"") return 1;
            xstring guid = e.getAttribute(L"guid");
@@ -556,7 +556,7 @@
            HTREEITEM hItem = tv_folder.GetSelectedItem();
            
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
            KXMLDOMElement& e = tv_folder.GetItemData(hItem);
            
            
            //alert(e.xml);
@@ -672,7 +672,7 @@
            dw_list.Redraw();
            impStr = L"";
            SendMessage(hObject, 0x401, ls_nos, 0);
            SendMessage(hObject, 0x401, (LPARAM)ls_nos, 0);
            alert(L"转入完成!");
            return 1;
        }
@@ -1044,7 +1044,7 @@
                if (selectname != name)
                {
                    
                    KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
                    KXMLDOMElement& e1 = tv_folder.GetItemData(hItem);
                    xstring str = e1.getAttribute(L"no");
                    if (str.find(L"Customer1:") == 0 || str.find(L"Customer:") == 0 || str.find(L"SO:") == 0 || str.find(L"Quote:") == 0)
                    {
@@ -1242,7 +1242,7 @@
            dw_list.Redraw();
            dwc_list.Redraw();
            impStr = L"";
            win32::SendMessage(hObject, 0x401, ls_nos, 0);
            SendMessageW(hObject, 0x401, (LPARAM)ls_nos, 0);
            xutil::RestoreCursor(hCursor);
            CloseWindow();
@@ -1285,7 +1285,7 @@
            hObject = 0;
            if (arg)
            {
                hObject = (int)arg.GetArgString(L"HWND");
                hObject = arg.GetArgString(L"HWND");
                CustomerID = arg.GetArgString(L"CustomerID");
            }
            InitialFolder();
@@ -1316,7 +1316,7 @@
            //xtreeview::ExpandItem(tv_folder.GetId(),
            //    xtreeview::GetNextItem(tv_folder.GetId(),xtreeview::GetRootItem(tv_folder.GetId())));
            xtreeview::ExpandItem(tv_folder.GetId(), xtreeview::GetRootItem(tv_folder.GetId()));
            tv_folder.ExpandItem(tv_folder.GetRootItem());
            dw_list.SetSelectionMode(3);
            dwc_list.SetSelectionMode(3);
jrj/project/business/SO/delivery.base.maint.so.cpp
@@ -3,7 +3,6 @@
#include <xcontrol/xdwgrid.hpp>
#include <xcontrol/xcell.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -14,7 +13,7 @@
    public:
        xdwtable    dw_1;
        vcontrol vc;
        xvcontrol vc;
        xcell    dw_cell;
    public:
jrj/project/business/Supplier/list.Owner.Supplier.cpp
Binary files differ
jrj/project/business/Supplier3.list.cpp
@@ -130,7 +130,7 @@
            //alert(L"1");
            HTREEITEM h = tv_1.GetSelectedItem();
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_1.GetItemData(h);
            KXMLDOMElement e = tv_1.GetItemData(h);
            xstring t = e.selectSingleNode(L"@type").text();
            m_sType = t + L"";
jrj/project/business/SystemSettings/Flow3.cpp
@@ -333,7 +333,7 @@
            NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
            
            HTREEITEM hItem = nmtv.itemNew.hItem;
            KXMLDOMElement& e = *(KXMLDOMElement*)tv_1.GetItemData(hItem);
            KXMLDOMElement e = tv_1.GetItemData(hItem);
            flowid = e.getAttribute(L"flowID");
                
            HCURSOR hCursor = xutil::SetCursorWait();
jrj/project/business/SystemSettings/ProcessManagement.cpp
@@ -138,7 +138,6 @@
            return 1;
        }
        int  OnRetrieve()
        {
            xml x ;
jrj/project/business/SystemSettings/SysUser.hpp
@@ -10,7 +10,7 @@
#include "viewobject/view.base.hpp"
using xml = KXMLDOMDocument;
class __declspec(dllexport) SysUser : public xwin
class __declspec(dllexport) SysUser : public listwin
{
public:
    xtreeview tv_usergroup;
@@ -18,7 +18,7 @@
    xnode    m_agentNode;
    xstring strJobID;
public:
    SysUser(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
    SysUser(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
public:
    static SysUser* CreateInstance(void* implPtr, void* hWnd)
    {
@@ -54,7 +54,7 @@
        return 1;
    }
    int SetEntityData(param p)
    int SetEntityData(LPARAM p)
    {
        xml x;
@@ -312,8 +312,7 @@
    {
        m_agentNode = new xnode;
        tv_usergroup = new treeview;
        tv_usergroup.setNativePointer(GetControl(L"tv_usergroup"));
        tv_usergroup = GetControl(L"tv_usergroup");
        dw_user = new xdwgrid;
        dw_user.setNativePointer(GetControl(L"dw_user"));
        dw_user.SetDataObject(GetServerUrl(), L"dev:sheet[SysUser.tpl/UserList]");
jrj/project/business/SystemSettings/UserImport.cpp
@@ -100,9 +100,9 @@
        xstring sPositionID, sPositionName;
        xstring sOrgID, sOrgName;
        xstring sJobID, sJobName;
        int wid = lw_obj.tv_usergroup.GetId();
        int hitem = tv_org.GetSelectedItem(wid);
        KXMLDOMElement ele = tv_org.GetItemData(wid, hitem);
        //int wid = lw_obj.tv_usergroup.GetId();
        HTREEITEM hitem = tv_org.GetSelectedItem();
        KXMLDOMElement ele = tv_org.GetItemData(hitem);
        while (row > 0)
@@ -163,8 +163,8 @@
    }
    int OnSubTree(xstring id, HTREEITEM parentitem)
    {
        int wid = tv_org.GetId();
        if (tv_org.GetChildItem(wid, parentitem) > 0) return 1;
        //int wid = tv_org.GetId();
        if (tv_org.GetChildItem( parentitem) > 0) return 1;
        xml x;
        xaserverarg arg;
@@ -207,11 +207,11 @@
        return 1;
    }
    int OnCreateTree(xstring id, int parentitem)
    int OnCreateTree(xstring id, HTREEITEM parentitem)
    {
        //while (tv_1.GetRootItem()>0)
        //    tv_1.DeleteItem(tv_1.GetRootItem());                
        int wid = tv_org.GetId();
        //int wid = tv_org.GetId();
        xml x;
        x.loadXML(L"<item><id>" + id + L"</id><no/><name>凤凰集团</name><typ>Org</typ></item>");
@@ -219,8 +219,8 @@
        //KXMLDOMElement RDoc = x.documentElement();
        //KXMLDOMElement ele = RDoc.SelectSingleNode(L"//Org");
        KXMLDOMElement ele = x.selectSingleNode(L"//item");
        int hItem = tv_org.InsertChildItemEx(wid, 0, L"凤凰集团", ele, 15, 4);
        tv_org.SetItemChild1(wid, hItem, 1);
        HTREEITEM hItem = tv_org.InsertChildItem( 0, L"凤凰集团", ele, 15, 4);
        tv_org.SetItemChild1(hItem, 1);
        return 1;
        /*xaserverarg arg;
@@ -260,7 +260,7 @@
        HCURSOR hCursor = xutil::SetCursorWait();
        //xstring id = tv_org.GetItemData(tv_org.GetId(), sitem);
        KXMLDOMElement ele = tv_org.GetItemData(tv_org.GetId(), sitem);
        KXMLDOMElement ele = tv_org.GetItemData(sitem);
        xstring id = ele.selectSingleNode(L"id").text();
        OnSubTree(id, sitem);
        xutil::RestoreCursor(hCursor);
@@ -270,7 +270,7 @@
    int OnTreeSelChanged(TEvent* evt, LPARAM p)
    {
        //int wid = tv_org.GetId();
        int hitem = tv_org.GetSelectedItem();
        HTREEITEM hitem = tv_org.GetSelectedItem();
        KXMLDOMElement ele = tv_org.GetItemData(hitem);
        if (ele)
        {
@@ -317,8 +317,7 @@
    int onload()
    {
        tv_org = new treeview;
        tv_org.setNativePointer(GetControl(L"tv_org"));
        tv_org = GetControl(L"tv_org");
        dw_list = new xdwgrid;
        dw_list.setNativePointer(GetControl(L"dw_list"));
        dw_list.openUrl(L"系统用户.vface/template/SysUser/EmpSelect");
jrj/project/vindexmenu.cpp
@@ -308,7 +308,7 @@
            {
                LPARAM pa = cbx_panelName.GetItemData(i);
                if (!pa)return 1;
                KXMLDOMElement& hData = *(KXMLDOMElement*)pa;
                KXMLDOMElement hData = pa;
                string Name= hData.selectSingleNode(L"name").text();
                string Image = L"15";
                if(hData.selectSingleNode(L"image")) Image=hData.selectSingleNode(L"image").text();