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

xj qian

2024-07-09 d8ccb3822dcf4b507b121b97c297e7ee6d09d2d6

 jrj/project/business/GDN3.maint.cpp

@@ -956,7 +956,7 @@

   bool validProfit()
   {
      double amt = dw_profit.GetItemString(1, L"ProfitAmountEx");
      double amt = dw_profit.GetItemDouble(1, L"ProfitAmountEx");
      if (amt < 0.0)
      {
         if (dw_profit.GetItemString(1, L"Note") == L"")
@@ -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();
               }