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

xj qian

2024-07-08 502ef949a7f5f681225695c116a40ccc8d438434

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

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -261,7 +261,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\AR\CustomerTran.AR.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\AR\Deduction.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -404,19 +404,19 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\SupplierUserGroupPersonSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupMaint.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupPersonSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupPersonSelectEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupShare.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -461,7 +461,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\SO\select.item.so.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Supplier.maint.cpp">
@@ -483,15 +483,15 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Supplier\maint.Document.Supplier.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Supplier\maint.Document.SupplierEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Supplier\maint.Document.SupplierSD.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Supplier\maint.Owner.Supplier.cpp">
@@ -507,7 +507,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Supplier\SupplierSource.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\VATNotify\list.vatnotify.cpp">

 jrj/project/business/AP/APBank.cpp

@@ -110,6 +110,7 @@

        int onload()
        {
            SetArg();
            dw_base = GetControl(L"dw_base");
            dw_base.openUrl(L"/sale/view/AP/template/PayBank");


 jrj/project/business/AP/Select.AP.cpp

@@ -6,9 +6,9 @@
#include "viewobject/view.base.hpp"

using xml = KXMLDOMDocument;
    class __declspec(dllexport) APSelectDlg : public xframe
    {
    public:
class __declspec(dllexport) APSelectDlg : public xframe
{
public:
        xdwgrid    dw_list;
        xcontrol query;

@@ -110,6 +110,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/PurchaseOrder/template/purchaseorder/POAdvance");
            OnAttachEvent();

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

@@ -251,6 +251,7 @@

        int onload()
        {
            SetArg();
            APID = L"";
            APType = L"";
            if (GetWinParam())

 jrj/project/business/AR/CustomerTran.AR.cpp

@@ -132,7 +132,7 @@
            xml x;
            
            xaserverarg arg ;
            arg.setNativePointer(arg.CreateInstance());
		
            dw_list.DwUpdateAllToEx(x);
            arg.AddArg(L"content", x.xml());
            if (getUrl(L"/sale/data/AR/update/tran/customer", arg.GetString(), x) != 1)
@@ -152,8 +152,8 @@
        {
            xml x;
            
            xaserverarg arg ;
            arg.setNativePointer(arg.CreateInstance());
            xaserverarg arg =GetArg();
			
            if (getUrl(L"/sale/data/AR/tran/customer", arg.GetString(), x) != 1)
            {
                trace(x.text());
@@ -169,6 +169,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/AR/template/customertran");
            dw_list.SetAskStyle(true);

 jrj/project/business/AR/Deduction.cpp

@@ -159,12 +159,12 @@
            xml x;
            
            xaserverarg arg ;
            arg.setNativePointer(arg.CreateInstance());
		
            arg.AddArg(L"InvoiceNo", InvoiceNo);
            arg.AddArg(L"InvoiceNoEx", GetControl(L"search").GetText());
            arg.AddArg(L"EntityID", EntityID);

            trace(GetControl(L"search").GetText());
            //trace(GetControl(L"search").GetText());
            if (getUrl(L"/sale/data/AR/DeductionList", arg.GetString(), x) != 1)
            {
                trace(x.text());
@@ -181,6 +181,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/AR/template/Deduction");


 jrj/project/business/AR/ExchageFile.cpp

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

#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -318,9 +319,9 @@
            if (filename == L"" || saveas)
            {
                xaserverarg arg ;
                arg.setNativePointer(arg.CreateInstance());
				
                arg.AddArg(L"src", L"data/SettleExchange");
                OpenWindow(L"dev:xpage[trade.document.saveas.vx]", cast(arg as int));
                OpenWindow(L"dev:xpage[trade.document.saveas.vx]",arg);
                if (arg.GetArgString(L"result") == L"ok")
                {
                    sfilename = arg.GetArgString(L"filename");
@@ -346,7 +347,7 @@
            xml x;
            
            xaserverarg args ;
            args.setNativePointer(args.CreateInstance());
			
            args.AddArg(L"myurl", myurl);
            args.AddArg(L"name", sfilename);
            args.AddArg(L"filepath", sname);
@@ -383,10 +384,10 @@
            if (comdid == L"xmFileOpen")
            {
                xaserverarg args ;
                args.setNativePointer(args.CreateInstance());
			
                args.AddArg(L"src", L"data/SettleExchange");
                args.AddArg(L"process", L"path");
                OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]", cast(args as int));
                OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]",args);
                if (args.GetArgString(L"result") == L"ok")
                {
                    xstring u = args.GetArgString(L"src");

 jrj/project/business/AR/ExchangeSignFast.cpp

@@ -382,6 +382,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/AR/template/unexch");
            dw_unexch = GetControl(L"dw_unexch");

 jrj/project/business/AR/maint.SettlementExchange.cpp

@@ -202,6 +202,7 @@
        }
        int onload()
        {
            SetArg();
            dw_base = GetControl(L"dw_base");
            dw_base.openUrl(L"/sale/view/AR/template/SEMaint");
            dw_base.SetColHeaderHeight(0);

 jrj/project/business/GDN/GDNSourcePaperCard.cpp

Binary files differ

 jrj/project/business/GDN/GDNSourcePriceMaint.cpp

Binary files differ

 jrj/project/business/GDN/SelectItem.New.GDN.cpp

Binary files differ

 jrj/project/business/GDN/select.item.po.cpp

Binary files differ

 jrj/project/business/HR/AdministrativeDepartmentFolder.cpp

@@ -173,7 +173,7 @@

        int onload()
        {

            SetArg();
            dw_base = GetControl(L"dw_base");
            dw_base.openUrl(L"/sale/view/AdministrativeDepartment/template/adwin");
            getsingle_url = L"/sale/data/AdministrativeDepartment/ad_getsingle";

 jrj/project/business/HR/ManpowerFileWindow.cpp

@@ -162,6 +162,7 @@

        int onload()
        {
            SetArg();
            dw_base = GetControl(L"dw_base");
            dw_base.openUrl(L"/sale/view/ManpowerFile/template/win");
            mfid = L"";

 jrj/project/business/PO/Habit.PO.cpp

Binary files differ

 jrj/project/business/PO/InsertPO.PO.cpp

Binary files differ

 jrj/project/business/PO/Maint.PaperCard.PO.cpp

Binary files differ

 jrj/project/business/PO/Maint.PurcherItem.cpp

Binary files differ

 jrj/project/business/PO/MakeAllPOEx.PO.cpp

Binary files differ

 jrj/project/business/PO/PO.BatchPrecess.polist.cpp

Binary files differ

 jrj/project/business/PO/PO.maint.base.cpp

Binary files differ

 jrj/project/business/PO/maint.Document.PO.v3 .cpp

Binary files differ

 jrj/project/business/PO/paperImage.cpp

Binary files differ

 jrj/project/business/Public/SupplierUserGroupPersonSelect.cpp

@@ -138,6 +138,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"组织架构.vface/template/HrEmployee/PersonSel");
            dw_list.SetSelectionMode(3);

 jrj/project/business/Public/UserGroupPersonSelect.cpp

@@ -138,6 +138,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"组织架构.vface/template/HrEmployee/PersonSel");
            dw_list.SetSelectionMode(3);

 jrj/project/business/Public/UserGroupPersonSelectEx.cpp

@@ -138,6 +138,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"组织架构.vface/template/HrEmployee/PersonSel");
            dw_list.SetSelectionMode(3);

 jrj/project/business/Public/UserGroupSelect.cpp

@@ -135,6 +135,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/UserGroup/template/list");
            dw_list.SetSelectionMode(3);

 jrj/project/business/Public/UserGroupShare.cpp

@@ -275,6 +275,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/UserGroup/template/entityusergrouplist");
            dw_list.SetReadOnly(true);

 jrj/project/business/Public/UserGroupShareEx.cpp

@@ -134,6 +134,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/UserGroup/template/entityusergrouplist");
            dw_list.SetReadOnly(true);

 jrj/project/business/Public/message.business.cpp

Binary files differ

 jrj/project/business/Public/search.dialog.cpp

@@ -89,6 +89,7 @@

        int onload()
        {
            SetArg();
            sle_1 = GetControl(L"sl_search");
            int x = GetWindowLong(GetHWND(), -16); //GWL_STYLE
            x = x + 0x0008;

 jrj/project/business/SO/Product.FetchNo.cpp

@@ -301,6 +301,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(L"").xml());
            dw_list.SetColumnState(L"SKUID", false);

 jrj/project/business/SO/Product.Select.SO.cpp

@@ -1270,6 +1270,7 @@

        int onload()
        {
            SetArg();
            agentFor = L"goodslib";

            OnAttachEvent();

 jrj/project/business/SO/delivery.base.maint.so.cpp

@@ -174,6 +174,7 @@

        int onload()
        {
            SetArg();
            dw_1 = GetControl(L"dw_1");
            dw_1.openUrl(L"/sale/view/SaleOrder/template/delivery"); //base.maint.so.tpl/delivery
            dw_1.SetColHeaderHeight(0);

 jrj/project/business/SO/maint.Document.SO3.v3.cpp

@@ -449,7 +449,7 @@

        int onload()
        {

            SetArg();
            lv_view = GetControl(L"lv_view");
            columnCount = 0;
            SetListViewHeaderColumn(L"");

 jrj/project/business/SO/paymentterm.base.maint.so.cpp

@@ -375,6 +375,7 @@

        int onload()
        {
            SetArg();
            dw_1 = GetControl(L"dw_1");
            dw_1.openUrl(L"/sale/view/SaleOrder/template/payment"); //base.maint.so.tpl/payment


 jrj/project/business/SO/select.item.so.cpp

@@ -115,6 +115,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/SaleOrder/template/item");


 jrj/project/business/Supplier/Inspection.Supplie.cpp

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

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

Binary files differ

 jrj/project/business/VATNotify/VATNotifyParse.cpp

@@ -111,6 +111,7 @@

        int onload()
        {
            SetArg();
            dw_base = GetControl(L"dw_base");
            dw_base.openUrl(L"/sale/view/VATNotify/template/VATNotify/ParseNumber");


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

@@ -737,6 +737,7 @@

        int onload()
        {
            SetArg();
            dw_item = GetControl(L"dw_item");
            dw_item.openUrl(L"/sale/view/VATNotify/template/VATNotify/item");
            dw_item.SetColumnState(L"CName", false);

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

@@ -830,6 +830,7 @@

        int onload()
        {
            SetArg();
            dw_item = GetControl(L"dw_item");
            dw_item.openUrl(L"/sale/view/VATNotify/template/VATNotify/item");
            dw_item.SetColumnState(L"InvoiceNo", false);

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

@@ -343,6 +343,7 @@

        int onload()
        {
            SetArg();
            dw_list = GetControl(L"dw_list");
            dw_list.openUrl(L"/sale/view/VATNotify/template/VATNotify/item");
            dw_item = GetControl(L"dw_item");