update

LiFan

2024-07-05 5d2965493771ebc5f3216cb0a18012713b054c6a

update

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -376,7 +376,9 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\GroupManagerList.cpp" />
    <ClCompile Include="..\project\business\Public\GroupManagerList.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\memo.edit.new.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
@@ -388,14 +390,30 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\search.dialog.cpp" />
    <ClCompile Include="..\project\business\Public\SupplierUserGroupPersonSelect.cpp" />
    <ClCompile Include="..\project\business\Public\UserGroupMaint.cpp" />
    <ClCompile Include="..\project\business\Public\UserGroupPersonSelect.cpp" />
    <ClCompile Include="..\project\business\Public\UserGroupPersonSelectEx.cpp" />
    <ClCompile Include="..\project\business\Public\UserGroupSelect.cpp" />
    <ClCompile Include="..\project\business\Public\UserGroupShare.cpp" />
    <ClCompile Include="..\project\business\Public\UserGroupShareEx.cpp" />
    <ClCompile Include="..\project\business\Public\search.dialog.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\SupplierUserGroupPersonSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupMaint.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupPersonSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupPersonSelectEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupShare.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupShareEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\quote.enquiry.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>

 jrj/project/business/AP/APBank.cpp

@@ -84,6 +84,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&APListBankMaint::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&APListBankMaint::OnSetFocus);
            return 1;
        }

        /*

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

@@ -93,6 +93,7 @@
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&APSelectDlg::OnSetFocus);
            AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&APSelectDlg::onOk);
            return 1;
        }

        int RetrieveData()

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

@@ -289,6 +289,7 @@
            AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&ListAP::OnDoubleClicked);//行双击
            AttachEvent(L"cbx_state", L"CBN_SELCHANGE", (FEvent)&ListAP::OnDatePicker);
            AttachEvent(L"dw_list", L"DWV_ITEMCHANGED", (FEvent)&ListAP::OnItemChanged);
            return 1;
        }

        int OnDatePicker(TEvent* evt, int lParam)

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

@@ -226,6 +226,7 @@
            AttachEvent(L"dw_base", L"DWV_ITEMCHANGED", (FEvent)&MaintAP::OnItemChanged);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&MaintAP::OnSetFocus);
            return 1;
        }

        int  OnRetrieve()

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

@@ -123,6 +123,7 @@
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&CustomerTranARView::OnSetFocus);
            AttachEvent(L"dw_list", L"DWV_ASKSTYLE", (FEvent)&CustomerTranARView::OnItemAskStyle);
            return 1;
        }

        int OnSave()

 jrj/project/business/AR/Deduction.cpp

@@ -150,6 +150,7 @@
            AttachEvent(L"WM_SETFOCUS", (FEvent)&Deduction::OnSetFocus);
            AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&Deduction::OnRowChanged);
            AttachEvent(L"dw_list", L"DWV_ITEMCHANGED", (FEvent)&Deduction::OnItemChanged);
            return 1;
        }



 jrj/project/business/AR/ExchageFile.cpp

@@ -470,6 +470,7 @@
            AttachEvent(L"WM_SETFOCUS", (FEvent)&ExchangeFileView::OnSetFocus);
            AttachEvent(L"dw_exchangefile", L"CELL_ITEMCHANGED", (FEvent)&ExchangeFileView::OnCellItemChanged);
            AttachEvent(L"dw_exchangefile", L"DWV_CLICKED", (FEvent)&ExchangeFileView::OnCellClicked);
            return 1;
        }



 jrj/project/business/AR/ExchageInput3.cpp

@@ -406,6 +406,7 @@
            AttachEvent(L"cbx_type", L"CBN_SELCHANGE", (FEvent)&ExchangeInputView::OnCombboChanged);//属性组切换list中列的数量变化
            AttachEvent(L"dw_adjust", L"DWV_ITEMCHANGED", (FEvent)&ExchangeInputView::OnBaseItemChanged);
            AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&ExchangeInputView::OnDoubleClicked);//行双击
            return 1;

        }


 jrj/project/business/AR/ExchangeBankTran.cpp

@@ -91,6 +91,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&ExchangeBankTranView::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&ExchangeBankTranView::OnSetFocus);
            return 1;
        }

        int OnSave()

 jrj/project/business/AR/ExchangeColumnTran.cpp

@@ -91,6 +91,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&ExchangeColumnTranView::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&ExchangeColumnTranView::OnSetFocus);
            return 1;
        }

        int OnSave()

 jrj/project/business/AR/ExchangeSignFast.cpp

@@ -311,6 +311,7 @@
            AttachEvent(L"dw_unexch", L"DWV_DOUBLECLICKED", (FEvent)&ExchangeSignFastWin::OnDoubleClicked);//行双击
            AttachEvent(L"cbx_customer", L"CBN_SELCHANGE", (FEvent)&ExchangeSignFastWin::OnCombboChanged);//属性组切换list中列的数量变化
            AttachEvent(L"dw_unexch", L"DWV_ITEMCHANGED", (FEvent)&ExchangeSignFastWin::OnItemChanged);
            return 1;

        }


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

@@ -176,6 +176,7 @@
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&SettlementExchangeEdit::OnSetFocus);
            AttachEvent(L"dw_base", L"DWV_ITEMCHANGED", (FEvent)&SettlementExchangeEdit::OnItemChanged);
            return 1;
        }



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

Binary files differ

 jrj/project/business/HR/BlankExcelTemplate.cpp

@@ -101,6 +101,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&BlankExcelTemplateView::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&BlankExcelTemplateView::OnSetFocus);
            return 1;
        }

        /*//加载数据

 jrj/project/business/HR/ManpowerFile.cpp

@@ -274,6 +274,7 @@
            AttachEvent(L"WM_SETFOCUS", (FEvent)&ViewManpowerFileList::OnSetFocus);
            AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&ViewManpowerFileList::OnDoubleClicked);//行双击
            AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&ViewManpowerFileList::OnTreeSelChanged); //树选择
            return 1;
        }

        //数据传输函数

 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/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/Public/GroupManagerList.cpp

@@ -1,6 +1,8 @@
#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"
@@ -58,9 +60,10 @@
            if (s > 0)
                for (i = 0; i < s; i++)
                {
                    KXMLDOMElement e = nlist.item(i);
				
                    KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
                    xstring name = e.selectSingleNode(L"@name").text();
                    HTREEITEM hw = xtreeview::InsertChildItem(wid, h, name,e , 15);
                    HTREEITEM hw = xtreeview::InsertChildItem(wid, h, name,(LPARAM)&e , 15);
                    createSubTree(wid, hw, e);
                }
            return 1;
@@ -90,9 +93,9 @@
                int i;
                for (i = 0; i < len; i++)
                {
                    KXMLDOMElement e = nlist.item(i);
                    KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
                    xstring name = e.selectSingleNode(L"@name").text();
                    int h = xtreeview::InsertChildItem(wid, 0, name, trust(e as int), 15);
                    HTREEITEM h = xtreeview::InsertChildItem(wid, 0, name, name, (LPARAM)&e, 15);
                    createSubTree(wid, h, e);
                    xtreeview::ExpandItem(wid, h);
                }
@@ -200,6 +203,7 @@
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&GroupManagerList::OnSetFocus);
            AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&GroupManagerList::OnTreeSelChanged); //树选择
            return 1;
        }



 jrj/project/business/Public/SupplierUserGroupPersonSelect.cpp

@@ -126,6 +126,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&SupplierUserGroupPersonSelect::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&SupplierUserGroupPersonSelect::OnSetFocus);
            return 1;
        }

        int OnInitial()

 jrj/project/business/Public/UserGroupMaint.cpp

@@ -109,6 +109,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&UserGroupMaintWin::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&UserGroupMaintWin::OnSetFocus);
            return 1;
        }

        /*

 jrj/project/business/Public/UserGroupPersonSelect.cpp

@@ -126,6 +126,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&UserGroupPersonSelectWin::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&UserGroupPersonSelectWin::OnSetFocus);
            return 1;
        }

        int OnInitial()

 jrj/project/business/Public/UserGroupPersonSelectEx.cpp

@@ -126,6 +126,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&UserGroupPersonSelectWinEx::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&UserGroupPersonSelectWinEx::OnSetFocus);
            return 1;
        }

        int OnInitial()

 jrj/project/business/Public/UserGroupSelect.cpp

@@ -123,6 +123,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&UserGroupSelectWin::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&UserGroupSelectWin::OnSetFocus);
            return 1;
        }

        int OnInitial()

 jrj/project/business/Public/UserGroupShare.cpp

@@ -152,6 +152,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&UserGroupShareWin::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&UserGroupShareWin::OnSetFocus);
            return 1;
        }

        int Send(xstring PersonID, xstring CName, xstring NO, xstring EntityID)

 jrj/project/business/Public/UserGroupShareEx.cpp

@@ -129,6 +129,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&UserGroupShareExWin::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&UserGroupShareExWin::OnSetFocus);
            return 1;
        }

        int onload()

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

Binary files differ

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

@@ -84,6 +84,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&SearchDlg::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&SearchDlg::OnSetFocus);
            return 1;
        }

        int onload()

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

@@ -275,6 +275,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&ProductFetchNoWin::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&ProductFetchNoWin::OnSetFocus);
            return 1;
        }

        /*

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

@@ -1265,6 +1265,7 @@
            AttachEvent(L"dwc_list", L"DWV_CLICKED", (FEvent)&ProductSelectSOWin::OnDwcClicked);

            AttachEvent(L"dwc_list", L"DWV_DOUBLECLICKED", (FEvent)&ProductSelectSOWin::OnImport);
            return 1;
        }

        int onload()

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

@@ -364,6 +364,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&DocSO3::OnXCommand);
            //获取焦点事件，用于重置工具条
            //AttachEvent(L"WM_SETFOCUS",OnSetFocus);
            return 1;
        }

        /*

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

@@ -110,6 +110,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&SelectItemSOWin::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&SelectItemSOWin::OnSetFocus);
            return 1;
        }

        int onload()

 jrj/project/business/Supplier/SupplierSource.cpp

Binary files differ

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

Binary files differ

 jrj/project/business/Supplier/list.Owner.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/VATNotify/VATNotifyParse.cpp

@@ -85,6 +85,7 @@
            AttachEvent(L"WM_XCOMMAND", (FEvent)&VATNotifyParse::OnXCommand);
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&VATNotifyParse::OnSetFocus);
            return 1;
        }

        /*

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

@@ -278,6 +278,7 @@
            AttachEvent(L"WM_SETFOCUS", (FEvent)&listvatnotifyWin::OnSetFocus);
            AttachEvent(L"dw_list", L"DWV_CLICKED", (FEvent)&listvatnotifyWin::OnDWClick);
            AttachEvent(L"cbx_state", L"CBN_SELCHANGE", (FEvent)&listvatnotifyWin::OnDatePicker);
            return 1;
        }

        int OnDatePicker(TEvent* evt, int lParam)

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

@@ -599,6 +599,7 @@
            AttachEvent(L"dw_fob", L"DWV_ITEMCHANGED", (FEvent)&maintpapercardvatnotifyWin::OnFobItemChanged);
            AttachEvent(L"dw_item", L"DWV_ROWFOCUSCHANGED", (FEvent)&maintpapercardvatnotifyWin::OnRowChanged);
            AttachEvent(L"dw_item", L"DWV_ASKDATA", (FEvent)&maintpapercardvatnotifyWin::OnAskDataItem);
            return 1;
        }

        int RetrieveFob(xstring InvoiceNo, bool start = false)

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

@@ -685,6 +685,7 @@
            AttachEvent(L"dw_item", L"DWV_ROWFOCUSCHANGED", (FEvent)&simplemaintvatnotifyWin::OnRowChanged);
            AttachEvent(L"dw_item", L"DWV_ASKDATA", (FEvent)&simplemaintvatnotifyWin::OnAskDataItem);
            AttachCloseWindow();
            return 1;
        }

        int RetrieveFob(xstring InvoiceNo, bool start = false)

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

@@ -246,7 +246,7 @@
            //获取焦点事件，用于重置工具条
            AttachEvent(L"WM_SETFOCUS", (FEvent)&UpdateVatNotifyWin::OnSetFocus);
            AttachEvent(L"dw_item", L"DWV_ROWFOCUSCHANGED", (FEvent)&UpdateVatNotifyWin::OnRowChanged);

            return 1;
        }

        int RetrieveCustomSource(xstring classifyID, xstring supplierID)