update

LiFan

2024-07-05 54aa6f0768d1d78e54513aa1ac89a310a53db13d

update

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -243,7 +243,7 @@
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\project\business\AP\APBank.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\AP\APNew3.warizd.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

 jrj/project/business/AP/APNew3.warizd.cpp

@@ -1,6 +1,7 @@
#include <wobject/xstring.hpp>
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
#include <wobject/xdouble.hpp>

#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -79,7 +80,7 @@
            {
                double Amount1 = dw_3.GetItemDouble(hdr.row, L"Amount");
                double PrePayAmount = dw_3.GetItemDouble(hdr.row, L"PrePayAmount");
                dw_3.SetItemDouble(hdr.row, L"PayedAmount", (Amount - PrePayAmount).round(2));
                dw_3.SetItemDouble(hdr.row, L"PayedAmount", xdouble(Amount - PrePayAmount).round(2));
            }
            return 1;
        }
@@ -112,7 +113,7 @@
                /*}*/
                if (inserted)
                {
                    xstring sdate = win32::GetLocalDate();
                    xstring sdate = publiccode::GetCurrentDate();
                    dw_3.SetItemString(row, L"APDate", sdate);

                    dw_3.SetItemString(row, L"CreateDate", sdate);
@@ -577,9 +578,9 @@
            arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());

            xcombobox cbx_type = GetControl(L"cbx_ship");
            int h = xcombobox::GetCurSel(cbx_type.GetId());
            int h = xcombobox::GetCurSel(cbx_type.GetHWND());
            if (h < 0) return 1;
            xstring str = xcombobox::GetItemData(cbx_type.GetId());
            xstring str = xcombobox::GetItemData(cbx_type.GetHWND());
            arg.AddArg(L"ShipDays", str);
            trace(str);
            if (getUrl(L"/sale/data/AP/list101", arg.GetString(), x) != 1)

 jrj/project/business/AP/list.ap.cpp

@@ -56,9 +56,9 @@
        xstring GetPayType()
        {
            xcombobox cbx_type = GetControl(L"cbx_type");
            int h = xcombobox::GetCurSel(cbx_type.GetId());
            if (h < 0) return "";
            return xcombobox::GetLBText(cbx_type.GetId(), h);
            int h = xcombobox::GetCurSel(cbx_type.GetHWND());
            if (h < 0) return L"";
            return xcombobox::GetLBText(cbx_type.GetHWND(), h);
        }

        xstring GetEntityName(int pr)
@@ -168,7 +168,7 @@
                arg.AddArg(L"APID", APID);
                arg.AddArg(L"APType", apType);
                
                OpenWindow(L"dev:xpage[maint.ap.vx]", pa);
                OpenWindow(L"dev:xpage[maint.ap.vx]", arg);
                return 1;
            }
            if (comdid.find(L"action:", 0) >= 0)

 jrj/project/business/AP/maint.ap.cpp

@@ -13,7 +13,7 @@
        xstring APType;
        xdwtable dw_base;
        xnode    m_agentNode;    //Agent Condition
        int hObject = 0;
        HWND hObject = 0;
    public:
        MaintAP(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
    public:
@@ -115,7 +115,8 @@
                dw_base.ResetUpdateStatus();
                updateAdvance();
                alert(L"保存成功!");
                SendMessage(hObject, 0x401, L"xmRefresh", 0);
				
                SendMessage(hObject, 0x401, (LPARAM)L"xmRefresh", 0);
                CloseWindow();
            }
            else

 jrj/project/business/Supplier/maint.Document.Supplier.cpp

Binary files differ

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

@@ -90,7 +90,7 @@

        int OnPrint()
        {
            xaserverarg arg;
            xaserverarg& arg = *new xaserverarg;
            
            arg.AddArg(L"EntityName", L"VATNotify");
            arg.AddArg(L"EntityID", L"", L"");
@@ -110,13 +110,13 @@
            arg.AddArg(L"VATNotifyID", L"");
            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);
            openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
            return 1;
        }

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

@@ -169,7 +169,7 @@
            arg.AddArg(L"SupplierID", supplierID);
            arg.AddArg(L"CName", cname);
            
            OpenWindow(L"dev:xpage[maint.papercard.vatnotify.vx]", p);
            OpenWindow(L"dev:xpage[maint.papercard.vatnotify.vx]", arg);
            return 1;
        }


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

@@ -56,25 +56,25 @@

        int OnPrint()
        {
            xaserverarg arg;
            xaserverarg& arg = *new xaserverarg;
            
            arg.AddArg(L"EntityName", L"VATNotify", L"");
            arg.AddArg(L"EntityID", L"", L"");
            arg.AddArg(L"EntityNo", dw_item.GetItemString(1, L"InvoiceNo"), L"");
            
            openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", p);
            openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
            return 1;
        }

        int OnPrintItem()
        {
            xaserverarg arg;
            xaserverarg& arg = *new xaserverarg;
            
            arg.AddArg(L"EntityName", L"VATNotify", L"");
            arg.AddArg(L"EntityID", L"", L"");
            arg.AddArg(L"EntityNo", dw_item.GetItemString(1, L"InvoiceNo"), L"");
            
            openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", p);
            openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
            return 1;
        }


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

@@ -63,7 +63,7 @@

        int OnPrint()
        {
            xaserverarg arg;
            xaserverarg& arg = *new xaserverarg;
            
            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;
            xaserverarg& arg = *new xaserverarg;
            
            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", p);
            openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
            return 1;
        }