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

xj qian

2025-03-13 cf8dba7748cc9826d744069b5063a14e3fcd2fa8

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

@@ -45,7 +45,7 @@
         return 1;
      }

      xstring  GetEntityData(int pr)
      xstring  GetEntityData(LPARAM  pr)
      {
         xml x ;
         dw_item.AcceptText();
@@ -63,7 +63,7 @@

      int OnPrint()
      {
         xaserverarg& arg = *new xaserverarg;
         xaserverarg  arg;
         
         arg.AddArg(L"EntityName", L"VATNotify");
         arg.AddArg(L"EntityID", L"", L"");
@@ -74,13 +74,13 @@
         arg.AddArg(L"SupplierID", SupplierID);
         arg.AddArg(L"VATNotifyID", L"");
         
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
         return 1;
      }

      int OnPrintItem()
      {
         xaserverarg& arg = *new xaserverarg;
         xaserverarg arg;
         
         arg.AddArg(L"EntityName", L"VATNotify", L"");
         arg.AddArg(L"EntityID", L"", L"");
@@ -92,7 +92,7 @@
         arg.AddArg(L"VATNotifyID", dw_item.GetGuid(dw_item.GetRow()));
         trace(InvoiceNo + L"====L" + dw_item.GetGuid(dw_item.GetRow()));
         
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
         return 1;
      }

@@ -821,7 +821,7 @@
         if (x == L"userInvoiceNo") //下拉
         {
            xstring sInvoiceNo = dw_item.GetItemString(row, L"NInvoiceNo");
            hdr.data = sInvoiceNo;
            hdr.data = sInvoiceNo.c_str(true);
         }

         return 1;