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

xj qian

2025-04-24 acc693e6caf0b4888c4006a4b539cf550476a854

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

@@ -97,6 +97,7 @@

         xstring NInvoiceNoEx = dw_list.GetItemString(dw_list.GetRow(), L"NInvoiceNo");
         xstring InvoiceNoEx = dw_list.GetItemString(dw_list.GetRow(), L"InvoiceNo");
         xstring SupplierName = dw_list.GetItemString(dw_list.GetRow(), L"ShortName");
         if (NInvoiceNoEx != InvoiceNoEx)
         {
            NInvoiceNoEx = InvoiceNoEx;
@@ -106,6 +107,7 @@
         arg.AddArg(L"EntityNoEx", NInvoiceNoEx, L"");
         arg.AddArg(L"SupplierID", SupplierID);
         arg.AddArg(L"VATNotifyID", L"");
         arg.AddArg(L"SupplierName", SupplierName);
         trace(InvoiceNo + L"==1" + NInvoiceNoEx + L"==2" + SupplierID + L"==3" + dw_list.GetGuid(dw_list.GetRow()));
         
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
@@ -128,10 +130,12 @@
            NInvoiceNoEx = InvoiceNoEx;
         }
         xstring SupplierID = dw_list.GetItemString(dw_list.GetRow(), L"SupplierID");
         xstring SupplierName = dw_list.GetItemString(dw_list.GetRow(), L"ShortName");
         arg.AddArg(L"EntityNo", InvoiceNo, L"");
         arg.AddArg(L"EntityNoEx", NInvoiceNoEx, L"");
         arg.AddArg(L"SupplierID", SupplierID);
         arg.AddArg(L"VATNotifyID", dw_list.GetGuid(dw_list.GetRow()));
         arg.AddArg(L"SupplierName", SupplierName);
         trace(L"=====L" + InvoiceNo + L"=====L" + SupplierID + L"=====L" + dw_list.GetGuid(dw_list.GetRow()));
         
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
@@ -375,6 +379,8 @@
      {
         dw_list = GetControl(L"dw_list");
         dw_list.openUrl(L"/sale/view/VATNotify/template/VATNotify/list");
         dw_list.SetColumnState(L"ShortName", false);

         dw_arg = GetControl(L"dw_arg");
         dw_arg.openUrl(L"/sale/view/AR/template/queryarg");
         dw_arg.SetColHeaderHeight(0);