Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-11-18 a468bd6b4866e7d02df525e7cb077a3753438905

Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

 jrj/project/business/GDN/select.item.po.cpp

Binary files differ

 jrj/project/business/PO/InsertPO.PO.cpp

Binary files differ

 jrj/project/business/SO3.list.cpp

@@ -447,7 +447,7 @@
        dw_list.SetColumnState(L"SOID", false);


        string groupname = publiccode::GetUser().groupname;
        xstring groupname = publiccode::GetUser().groupname;
        if (groupname == L"采购小组")
        {
            dw_list.SetColumnState(L"USDAmount", false);

 jrj/project/business/SO3.maint.cpp

@@ -936,7 +936,7 @@
                for (int ip = 0; ip < lenp; ip++)
                {
                    auto xitem = nlistp.item(ip);
                    string picname = xitem.selectSingleNode(L"PicPath").text();
                    xstring picname = xitem.selectSingleNode(L"PicPath").text();
                    string goodno = xitem.selectSingleNode(L"GoodsNo").text();
                    if (picname == L"/business/products/Thumbs//")
                        picname = L"/business/products/Thumbs/00/00000000-0000-0000-0000-000000000000.jpg";

 jrj/project/tradedocument/DocSelectDlg.cpp

@@ -37,7 +37,7 @@
    {
        if (comdid == L"xmOk")
        {
            string filename = xcontrol(GetControl(L"filename")).GetText();
            xstring filename = xcontrol(GetControl(L"filename")).GetText();
            if (filename == L"") return 1;
            xaserverarg arg = GetArg();
            if (!arg) return 1;

 jrj/xframe/vbusiness/vframe/frame.vframe.vbusiness.hpp

@@ -167,13 +167,13 @@
            if (MessageBoxW(GetHWND(),L"是否确定删除记录!",L"提示", 1) == 2)
                return 1;
        }

		
        xaserverarg& arg = *(new xaserverarg);
        arg.AddArg(L"Action", action);
        KXMLDOMDocument x;

        xstring aurl =L"/workflow/query/actioninfo/" + action;

		
        if (xurl::get(GetServerUrl(),aurl,L"", x) != 1)
            return -1;

@@ -284,8 +284,8 @@
            if (x1.selectSingleNode(L"//process"))
            {
                KXMLDOMElement e1 = x1.selectSingleNode(L"//process");
                string valid = e1.getAttribute(L"valid");
                string finished = e1.getAttribute(L"finished");
                xstring valid = e1.getAttribute(L"valid");
                xstring finished = e1.getAttribute(L"finished");
                xstring errInfo =L"";
                if (valid ==L"0")
                {

 jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp

@@ -437,7 +437,7 @@
            else continue;
            KXMLDOMElement colename = e.selectSingleNode(L"//row[@rowindex='5']/cell[@colindex='" + colindex + L"']");
            //查询列
            string searchcolumn = searchcol(colename);
            xstring searchcolumn = searchcol(colename);
            if (searchcolumn == L"否") continue;
            //英文名
            string ename = colename.selectSingleNode(L"@column").text();
@@ -524,7 +524,7 @@
        //alert("ex");
        int h = dw_col.GetCurSel();
        if (h < 0) return L"";
        string  str = (string)dw_col.GetItemData(h);
        xstring  str = (string)dw_col.GetItemData(h);
        KXMLDOMDocument x;
        if (x.loadXML(str))
        {