update

LiFan

2024-07-08 97e2acb59314e2ca4bee55abc9571c1c5045f73d

update

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -258,13 +258,13 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\AP\Select.AP.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\AR\CustomerTran.AR.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\AR\Deduction.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\AR\ExchageFile.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -334,7 +334,7 @@
    <ClCompile Include="..\project\business\HR\GraduationSchool.cpp" />
    <ClCompile Include="..\project\business\HR\GraduationSchoolWin.vx.cpp" />
    <ClCompile Include="..\project\business\HR\ManpowerFile.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\HR\ManpowerFileWindow.cpp">
@@ -445,7 +445,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'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\SO\paymentterm.base.maint.so.cpp">

 jrj/project/business/AP/APNew3.warizd.cpp

@@ -550,11 +550,8 @@
                            KXMLDOMElement fe = x1.createElement(L"FilterColumn");
                            fe.text = filterStr;
                            e.appendChild(fe);
                            fe.Release();
                            e.Release();
							
                        }
                        docElement.Release();
                        lst.Release();
                        dw_2.Retrieve(x1);
                    }
                    else

 jrj/project/business/AP/list.ap.cpp

@@ -162,7 +162,7 @@
                if (row < 1) return 1;
                KXMLDOMElement ele = dw_list.GetRowElement(row);
                xstring APID = ele.selectSingleNode(L"APID").text();
                ele.Release();
				
                xaserverarg arg;
                
                arg.AddArg(L"APID", APID);
@@ -188,10 +188,10 @@
        {
            xstring id = L"";
            xstring name = L"";
            int h = xcombobox::GetCurSel(evt.hCtrl);
            int h = xcombobox::GetCurSel(evt->command.hCtrl);
            if (h > -1)
            {
                xstring txt = xcombobox::GetLBText(evt.hCtrl, h);
                xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
                apType = L"---";
                if (txt == L"已付货款")
                {
@@ -297,10 +297,10 @@
            xstring payTypeTwo = GetPayType();
            if (payTypeTwo == L"已付货款" || payTypeTwo == L"待付货款")
            {
                int h = xcombobox::GetCurSel(evt.hCtrl);
                int h = xcombobox::GetCurSel(evt->command.hCtrl);
                if (h > -1)
                {
                    xstring txt = xcombobox::GetLBText(evt.hCtrl, h);
                    xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
                    if (txt == L"出运日期")
                    {
                        apType = L"000";
@@ -323,10 +323,10 @@
            }
            else if (payTypeTwo == L"预付货款")
            {
                int h1 = xcombobox::GetCurSel(evt.hCtrl);
                int h1 = xcombobox::GetCurSel(evt->command.hCtrl);
                if (h1 > -1)
                {
                    xstring txt1 = xcombobox::GetLBText(evt.hCtrl, h1);
                    xstring txt1 = xcombobox::GetLBText(evt->command.hCtrl, h1);
                    if (txt1 == L"出运日期")
                    {
                        apType = L"001";
@@ -349,10 +349,10 @@
            }
            else if (payTypeTwo == L"预付货款(已冲)L")
            {
                int h2 = xcombobox::GetCurSel(evt.hCtrl);
                int h2 = xcombobox::GetCurSel(evt->command.hCtrl);
                if (h2 > -1)
                {
                    xstring txt2 = xcombobox::GetLBText(evt.hCtrl, h2);
                    xstring txt2 = xcombobox::GetLBText(evt->command.hCtrl, h2);
                    if (txt2 == L"出运日期")
                    {
                        apType = L"001";

 jrj/project/business/AR/Deduction.cpp

@@ -161,7 +161,7 @@
            xaserverarg arg ;
        
            arg.AddArg(L"InvoiceNo", InvoiceNo);
            arg.AddArg(L"InvoiceNoEx", GetControl(L"search").GetText());
            arg.AddArg(L"InvoiceNoEx", xcontrol(GetControl(L"search")).GetText());
            arg.AddArg(L"EntityID", EntityID);

            //trace(GetControl(L"search").GetText());

 jrj/project/business/AR/ExchageInput3.cpp

@@ -353,15 +353,15 @@
        }


        int OnCombboChanged(ref TCommandEvent evt, int lParam)
        int OnCombboChanged(TEvent* evt, int lParam)
        {
            xstring id = L"";
            xstring name = L"";
            int h = xcombobox::GetCurSel(evt.hCtrl);
            int h = xcombobox::GetCurSel(evt->command.hCtrl);
            if (h > -1)
            {
                tabname = xcombobox::GetItemData(evt.hCtrl, h);
                SwitchLayer(L"sheet" + (h + 1).toString(), L"frame");
                tabname = xcombobox::GetItemData(evt->command.hCtrl, h);
                SwitchLayer(L"sheet" + xstring((h + 1)), L"frame");
                RetrieveData();
                SetAgent();
            }
@@ -428,7 +428,7 @@
            xaserverarg arg ;

            arg.setNativePointer(arg.CreateInstance());
            arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());
            arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
            arg.AddArg(L"QueryArg", GetQueryArg());
            //trace(L"QueryArg======L"+GetQueryArg());
            if (getUrl(dataUrl, arg.GetString(), x) != 1)

 jrj/project/business/AR/ExchangeSignFast.cpp

@@ -75,7 +75,7 @@
            dw_list.DwUpdateAllToEx(x);

            //trace(x.xml());
            xml x0 = ViewObject::MakeXml();
            xml x0 ;
            x0.loadXML(L"<data/>");

            KXMLDOMNodeList t = x.selectNodes(L"data/Item[@update.modify or @update.delete]");
@@ -85,7 +85,7 @@
            {
                e1.appendChild(t.item(i));
            }
            xaserverarg arg = ViewObject::MakeArg();
            xaserverarg arg ;
            arg.AddArg(L"content", x0.xml());

            if (xurl::get(L"/sale/data/AR/update/item", arg.GetString(), x) != 1)
@@ -127,14 +127,14 @@
            return 0;
        }

        int OnCombboChanged(ref TCommandEvent evt, int lParam)
        int OnCombboChanged(TEvent* evt, int lParam)
        {
            xstring id = L"";
            xstring name = L"";
            int h = xcombobox::GetCurSel(evt.hCtrl);
            int h = xcombobox::GetCurSel(evt->command.hCtrl);
            if (h > -1)
            {
                xstring txt = xcombobox::GetLBText(evt.hCtrl, h);
                xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
                if (txt == L"限定客户")
                {
                    OnRetrieve(1);
@@ -152,7 +152,7 @@
            dw_unexch.AcceptText();
            int row = dw_unexch.GetRow();

            int hCursor = xutil::SetCursorWait();
            HCURSOR hCursor = xutil::SetCursorWait();
            double AdjustAmount = dw_unexch.GetItemDouble(row, L"AdjustAmount");//调整数
            double amted = dw_unexch.GetItemDouble(row, L"实收汇金额");//往次
            double samt = dw_unexch.GetItemDouble(row, L"应收汇金额");//应收汇金额
@@ -348,9 +348,9 @@
            xstring path1 = L"/sale/data/AR/item/exch/listwithcustomer";
            if (customer == 0)  path1 = L"/sale/data/AR/item/exch/list";

            arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());
            arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
            arg.AddArg(L"QueryArg", GetQueryArg());
            trace(L"SEID+++L" + SEID + L"+++QueryTxt+++L" + GetControl(L"sle_search").GetText() + L"+++QueryArg+++L" + GetQueryArg());
            trace(L"SEID+++L" + SEID + L"+++QueryTxt+++L" + xcontrol(GetControl(L"sle_search")).GetText() + L"+++QueryArg+++L" + GetQueryArg());
            if (getUrl(path, arg.GetString(), x) != 1)
            {
                trace(L"错误信息1=L" + xstring(x.text()));

 jrj/project/business/Enquiry.list.cpp

@@ -634,13 +634,11 @@
                }
                KXMLDOMNodeList items = ele.selectNodes(L"data/Item");
                AddItems(id,items);
                items.Release();
                ele.Release();
				
            }
            x.Free();
            nodes.Release();
			
			
        }
        arg.Free();
        //OnRetrieveItem(dw_pricelist.GetGuid(row));
        return  1;
    }
@@ -683,12 +681,9 @@
            }
            KXMLDOMNodeList items = ele.selectNodes(L"data/Item");
            AddItems(id,items);
            items.Release();
            ele.Release();
			
        }
        nodes.Release();
        x.Free();
        arg.Free();
		
        
        //OnRetrieveItem(dw_pricelist.GetGuid(row));
        return  1;
@@ -745,7 +740,7 @@
            x.LoadXml(content);
            KXMLDOMNodeList nodes = x.selectNodes(L"data/Item");
            AddItems(id,nodes);
            nodes.Release();
		
            xstring PriceInfo = L"";
            for(int i=1;i<=dw_pricelist.GetRowCount();i++)
            {

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

Binary files differ

 jrj/project/business/GDN3.maint.cpp

@@ -1005,7 +1005,7 @@
        KXMLDOMElement e = dw_item.GetRowElement(nRow);
        KXMLDOMNode n = e.cloneNode(-1);
        x.documentElement().appendChild(n);
        n.Release();
		
        xstring val = x.xml();
        trace(L"=======L" + val + L"=======L");

@@ -1083,7 +1083,7 @@
        KXMLDOMElement e = dw_item.GetRowElement(nRow);
        KXMLDOMNode n = e.cloneNode(-1);
        x.documentElement().appendChild(n);
        n.Release();
		
        xstring val = x.xml();
        trace(L"123=======L" + val + L"=======123");

@@ -3352,13 +3352,13 @@
                        if (n)
                        {
                            tax = xstring(n.text()).toDouble();
                            n.Release();
							
                        }
                        n = o.selectSingleNode(L"VATRefundRate");
                        if (n)
                        {
                            retax = xstring(n.text()).toDouble();
                            n.Release();
							
                        }
                        o.Release();
                    }

 jrj/project/business/Public/UserGroupShare.cpp

@@ -167,7 +167,7 @@
            KXMLDOMNodeList nlist = x.selectNodes(L"//data/Item");
            KXMLDOMElement xitem = nlist.item(0);
            xstring Reciever = xitem.selectSingleNode(L"userno").text();
            xitem.Release();
		

            /*alert(L"Category:"+Category +
                    "\r\nReciever:"+Reciever + L"\r\nNo:"+NO + L"\r\nEntityID:"+EntityID + L"Subject:"+Subject+
@@ -209,7 +209,7 @@
                        Send(PersonID, CName, EntityNo, EntityID);
                    }
                }
                xitem.Release();
				
                //return 1;
            }


 jrj/project/business/SO/delivery.base.maint.so.cpp

@@ -145,7 +145,7 @@

        int OnInit()
        {
            int iArgs = GetParam();
            int iArgs = GetArg();

            XXmlContentSvr xdoc = new XXmlContentSvr;
            xdoc.setNativePointer(iArgs);
@@ -157,7 +157,7 @@

            xml x;
            x ;
            x.setNativePointer(xml::CreateInstance());
		
            x.LoadXml(vc.GetContent());

            dw_1.Retrieve(x);

 jrj/project/business/VATNotify/list.vatnotify.cpp

@@ -286,10 +286,10 @@
            
            DWNMHDR& hdr = *(DWNMHDR*)evt->notify.pnmh;

            int h = xcombobox::GetCurSel(evt.hCtrl);
            int h = xcombobox::GetCurSel(evt->command.hCtrl);
            if (h > -1)
            {
                xstring txt = xcombobox::GetLBText(evt.hCtrl, h);
                xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
                if (txt == L"通知日期")
                {


 jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp

@@ -644,10 +644,9 @@
                        {
                            KXMLDOMElement e = lst.item(i);
                            docElement.appendChild(e);
                            e.Release();
							
                        }
                        docElement.Release();
                        lst.Release();
						
                        dw_fob.Retrieve(x1);
                    }
                    else

 jrj/project/business/VATNotify/simple.maint.vatnotify.cpp

@@ -730,10 +730,9 @@
                        {
                            KXMLDOMElement e = lst.item(i);
                            docElement.appendChild(e);
                            e.Release();
							
                        }
                        docElement.Release();
                        lst.Release();
					
                        dw_fob.Retrieve(x1);
                    }
                    else