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

xj qian

2025-04-24 acc693e6caf0b4888c4006a4b539cf550476a854

 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();
@@ -70,9 +70,12 @@
         xstring InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"NInvoiceNo");
         if (InvoiceNo == L"") InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"InvoiceNo");
         xstring SupplierID = dw_item.GetItemString(dw_item.GetRow(), L"SupplierID");
         xstring SupplierName = dw_item.GetItemString(dw_item.GetRow(), L"ShortName");
         arg.AddArg(L"EntityNo", InvoiceNo, L"");
         arg.AddArg(L"EntityNoEx", InvoiceNo, L"");
         arg.AddArg(L"SupplierID", SupplierID);
         arg.AddArg(L"VATNotifyID", L"");
         arg.AddArg(L"SupplierName", SupplierName);
         
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
         return 1;
@@ -87,9 +90,12 @@
         xstring InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"NInvoiceNo");
         if (InvoiceNo == L"") InvoiceNo = dw_item.GetItemString(dw_item.GetRow(), L"InvoiceNo");
         xstring SupplierID = dw_item.GetItemString(dw_item.GetRow(), L"SupplierID");
         xstring SupplierName = dw_item.GetItemString(dw_item.GetRow(), L"ShortName");
         arg.AddArg(L"EntityNo", InvoiceNo, L"");
         arg.AddArg(L"EntityNoEx", InvoiceNo, L"");
         arg.AddArg(L"SupplierID", SupplierID);
         arg.AddArg(L"VATNotifyID", dw_item.GetGuid(dw_item.GetRow()));
         arg.AddArg(L"SupplierName", SupplierName);
         trace(InvoiceNo + L"====L" + dw_item.GetGuid(dw_item.GetRow()));
         
         openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
@@ -821,7 +827,7 @@
         if (x == L"userInvoiceNo") //下拉
         {
            xstring sInvoiceNo = dw_item.GetItemString(row, L"NInvoiceNo");
            hdr.data = sInvoiceNo;
            hdr.data = sInvoiceNo.c_str(true);
         }

         return 1;
@@ -843,6 +849,7 @@
         dw_item.SetColumnState(L"QtyUnitName", false);
         dw_item.SetColumnState(L"QtyUnit", false);
         dw_item.SetColumnState(L"CQtyUnit", false);
         dw_item.SetColumnState(L"ShortName", false);

         dw_fob = GetControl(L"dw_fob");
         dw_fob.openUrl(L"/sale/view/VATNotify/template/VATNotify/fob");