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

xj qian

2024-07-08 7f45e69221d65ec15b0684680c85fb7ed28169f3

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

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -368,7 +368,7 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\PO\paperImage.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\PO\PO.BatchPrecess.polist.cpp">

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

Binary files differ

 jrj/project/business/PO/paperImage.cpp

Binary files differ

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

Binary files differ

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

@@ -54,7 +54,7 @@
            if (GetWinParam())
            {
                xaserverarg arg = GetArg();
                arg.AddArg(L"text", GetControl(L"sl_search").GetText());
                arg.AddArg(L"text", xcontrol(GetControl(L"sl_search")).GetText());
                CloseWindow();
            }
            return 1;
@@ -99,7 +99,7 @@
            if (GetWinParam())
            {
                xaserverarg arg = GetArg();
                GetControl(L"sl_search").SetText(arg.GetArgString(L"text"));
                xcontrol(GetControl(L"sl_search")).SetText(arg.GetArgString(L"text"));
            }

            return 1;

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

@@ -239,7 +239,7 @@
            }
            else if (comdid == L"find")
            {
                m_QueryTxt = GetControl(L"txt").GetText();
                m_QueryTxt = xcontrol(GetControl(L"txt")).GetText();
                return OnRetrieve(DatePicker);
            }
            else if (comdid == L"xmRefresh")

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

@@ -369,7 +369,7 @@
        {
            xml x ;
            
            xaserverarg arg = ViewObject::MakeArg();
            xaserverarg arg ;
            arg.AddArg(L"ClassifyID", ClassifyID);
            arg.AddArg(L"InvoiceNo", InvoiceNo);
            arg.AddArg(L"InvoiceExcept", InvoiceNoExcept);
@@ -390,7 +390,7 @@
        {
            xml x ;
            
            xaserverarg arg = ViewObject::MakeArg();
            xaserverarg arg ;
            arg.AddArg(L"ClassifyID", ClassifyID);
            arg.AddArg(L"InvoiceNo", InvoiceNo);
            arg.AddArg(L"InvoiceExcept", InvoiceNoExcept);
@@ -607,7 +607,7 @@
            
            dw_item.AcceptText();
            dw_item.DwUpdateAllToEx(x);
            xaserverarg arg = ViewObject::MakeArg();
            xaserverarg arg ;
            arg.AddArg(L"content", x.xml());



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

@@ -57,7 +57,7 @@
            
            dw_list.AcceptText();
            dw_list.DwUpdateAllToEx(x);
            xaserverarg arg = ViewObject::MakeArg();
            xaserverarg arg;
            arg.AddArg(L"content", x.xml());

            trace(x.xml());