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

xj qian

2024-09-06 9786b6898c79f5de9ca7eeb168fe4b6f5b0d173f

 jrj/project/business/Customer3.maint.cpp

@@ -81,7 +81,7 @@
        e.appendChild(Item);
      }
      
      xml x2= new xml;
      xml x2;
      
      dw_Meetings.DwUpdateAllTo(x2);
      KXMLDOMElement e2=x2.documentElement();
@@ -93,7 +93,7 @@
        e.appendChild(Item2);
      }
      
      xml x3= new xml;
      xml x3;
      
      dw_MeetingsEx.DwUpdateAllTo(x3);
      KXMLDOMElement e3=x3.documentElement();
@@ -140,13 +140,14 @@
   
   xstring GetPartyID(xstring sName,xstring sType)
   {
      xml x1=new xml;
      xml x1;
      
      xaserverarg arg;
      arg.setNativePointer(arg.CreateInstance());		
			
      arg.AddArg(L"sname", sName);
      arg.AddArg(L"type",sType);   
      if(xurl::get(L"/sale/data/"+GetEntityName(1)+L"/pref/searchname",arg.GetString(),x1)!=1)
		
      if(xurl::get(L"/sale/data/"+GetEntityName(1)+ L"/pref/searchname",arg.GetString(),x1)!=1)
      {
         xstring error = x1.text();
         //alert(L"/sale/data/"+GetEntityName(1)+L"/pref/searchname");
@@ -797,7 +798,7 @@
            arg.AddArg(L"FROM", L"Customer");               
            arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));            
            arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsVdVd/view");
            //arg.AddArg(L"CustomerHWND",GetHWND().toString());
            //arg.AddArg(L"CustomerHWND",xstring((__int64)GetHWND()));
            arg.SetParam(L"CustomerHWND", (LPARAM)GetHWND());

            int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, (void *) &arg);
@@ -1135,7 +1136,7 @@
      arg.AddArg(L"CustomerID", this.m_EntityID);
      arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));            
      arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsNewVd/view");
      arg.AddArg(L"CustomerHWND",this.GetHWND().toString());
      arg.AddArg(L"CustomerHWND",this.xstring((__int64)GetHWND()));
      //trace(this.m_EntityID);
      int p =arg.__nativept;*/
      //int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, 0);
@@ -1229,7 +1230,7 @@
            arg.AddArg(L"FROM", L"Customer");               
            arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));            
            arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsVdVd/view");
            //arg.AddArg(L"CustomerHWND",GetHWND().toString());
            //arg.AddArg(L"CustomerHWND",xstring((__int64)GetHWND()));
            arg.SetParam(L"CustomerHWND", (LPARAM)GetHWND());

            int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, (void*)&arg);