upadte

LiFan

2024-07-18 a5289d51bd57a99a2377c5590bc61cb7a42e61d4

upadte

 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/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/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;

@@ -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;
        }
@@ -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/SystemSettings/ProcessManagement.cpp

@@ -138,7 +138,6 @@
            return 1;
        }


        int  OnRetrieve()
        {
            xml x ;

 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");