update item

xj qian

2024-07-11 91f1a3b5e0319c5b77a8811217d8f218641b18fb

update item

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -153,7 +153,7 @@
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <EnableUAC>false</EnableUAC>
      <AdditionalLibraryDirectories>D:\xclient64r\sdk\lib</AdditionalLibraryDirectories>
      <AdditionalDependencies>xarch.shape.lib;xarch.base.lib;xarch.util.lib;xarch.network.lib;xarch.xframe.lib;xarch.xcontrol.lib;xoffice.xcell.lib;xoffice.xgrid.lib;xoffice.xreport.lib;shlwapi.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalDependencies>xarch.shape.lib;xarch.base.lib;xarch.util.lib;xarch.network.lib;xarch.xframe.lib;xarch.xcontrol.lib;xoffice.xcell.lib;xoffice.xgrid.lib;xoffice.xreport.lib;xoffice.frame.lib;shlwapi.lib;xoffice.xflow.lib;comsuppw.lib;tsclib.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
    <PostBuildEvent>
      <Command>copy $(OutDirFullPath)ext-jrj.dll D:\xclient64r\ext\ext-jrj.dll</Command>
@@ -300,30 +300,39 @@
    <ClCompile Include="..\project\business\EnquiryEx3.list.cpp" />
    <ClCompile Include="..\project\business\Enquiry\Enquiry.maint.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\EnquiryEx.quote.vx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\Entity.Product.Select.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\PriceList.PurcharItemSelectEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\ProductSchema.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\ProductSchemaSelect.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\SKU.PictureView.Product3.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Enquiry\ViewPictures.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Expense\BasicFare.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -508,12 +517,14 @@
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\CheckOut.instore.Sample.cpp" />
    <ClCompile Include="..\project\business\ProductSample\InstoreSample3Win.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp" />
    <ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp" />
    <ClCompile Include="..\project\business\Public\GroupManagerList.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\memo.edit.new.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -546,9 +557,11 @@
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupShare.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\Public\UserGroupShareEx.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\QuoteFile.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
@@ -674,19 +687,19 @@
    <ClCompile Include="..\project\vindexformex.cpp" />
    <ClCompile Include="..\project\vindexmenu.cpp" />
    <ClCompile Include="..\project\workflow\workflow.actionlog.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\workflow\workflow.actionlog_vd.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\workflow\workflow.chkdlg.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\workflow\workflow.chkdlg_vd.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\xframe\src\nmemory.cpp" />

 jrj/ext-jrj/ext-jrj.vcxproj.filters

@@ -809,11 +809,11 @@
    <ClCompile Include="..\project\business\ProductSample\OutstoreSample3Win.cpp">
      <Filter>project\business\ProductSample</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\CheckOut.instore.Sample.cpp">
      <Filter>源文件</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\SampleBarcodePrint.cpp">
      <Filter>源文件</Filter>
      <Filter>project\business\ProductSample</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\ProductSample\CheckOut.instore.Sample.cpp">
      <Filter>project\business\ProductSample</Filter>
    </ClCompile>
  </ItemGroup>
</Project>

 jrj/project/business/Enquiry/Enquiry.maint.cpp

@@ -441,11 +441,9 @@

                    eleColumn = x.createElement(L"LineType");
                    eleColumn.setAttribute(L"update.modify", L"1"); //delete
                    eleColumn.text = L"1";
                    eleColumn.settext(L"1");
                    eleItem.appendChild(eleColumn);
                    ele.appendChild(eleItem);
                    eleColumn.release();
                    eleItem.release();
                    processed = true;
                }
                else if (itemModify == L"1")
@@ -461,17 +459,14 @@
                        eleColumn = x.createElement(L"RealEnquiryLineID");
                        eleColumn.setAttribute(L"update.modify", L"1");
                        guid = publiccode::GetGuid();
                        eleColumn.text = guid;
                        eleColumn.settext(guid);
                        eleItem.appendChild(eleColumn);
                        eleColumn.release();

                        eleColumn = x.createElement(L"LineType");
                        eleColumn.setAttribute(L"update.modify", L"1");
                        eleColumn.text = L"1"; //modify
                        eleColumn.settext(L"1"); //modify
                        eleItem.appendChild(eleColumn);
                        ele.appendChild(eleItem);
                        eleColumn.release();
                        eleItem.release();

                        //insert new row
                        eleItem = e.cloneNode(-1);
@@ -481,35 +476,30 @@

                        eleColumn = x.createElement(L"LineType");
                        eleColumn.setAttribute(L"update.modify", L"1");
                        eleColumn.text = L"0";  //normal
                        eleColumn.settext(L"0");  //normal
                        eleItem.appendChild(eleColumn);
                        eleColumn.release();

                        nodeColumn = e.selectSingleNode(L"ModifyDate");
                        if (!nodeColumn)
                            eleColumn = x.createElement(L"ModifyDate");
                        else
                            eleColumn = nodeColumn;
                        eleColumn.text = publiccode::GetCurrentDate();
                        eleColumn.settext(publiccode::GetCurrentDate());
                        eleItem.appendChild(eleColumn);
                        eleColumn.release();

                        ele.appendChild(eleItem);
                        eleItem.release();
                    }
                    else
                    {
                        guid = e.getAttribute(L"guid");
                        child = e.cloneNode(-1);
                        child.selectSingleNode(L"RealEnquiryLineID").text = guid;
                        child.selectSingleNode(L"RelEnquiryLineID").text = guid;
                        child.selectSingleNode(L"RealEnquiryLineID").settext(guid);
                        child.selectSingleNode(L"RelEnquiryLineID").settext(guid);
                        ele.appendChild(child);
                        //trace(child.xml);
                        child.release();
                    }
                }
                //}
                e.release();
            }
            
            xstring error = L"";
@@ -899,7 +889,7 @@

        int OnPriceEval()
        {
            OpenWindow(L"dev:xpage[eval.Enquiry3.vx]", cast(dw_goods as int));
            OpenWindow(L"dev:xpage[eval.Enquiry3.vx]", (LPARAM)&dw_goods);
            return 1;
        }

@@ -934,7 +924,7 @@
            xaserverarg arg_pic;
            
            arg_pic.AddArg(L"SKUNoList", skunos);
            arg_pic.AddArg(L"ParentWindow", GetHWND());
            arg_pic.SetParam(L"ParentWindow", GetHWND());
            arg_pic.AddArg(L"OpenFlag", L"1");
            OpenWindow(L"dev:xpage[SKU.PictureView.Product3.vx]",arg_pic);

@@ -1088,7 +1078,7 @@
                {
                    xaserverarg arg1;
                    arg1.setNativePointer(arg1.CreateInstance());
                    arg1.AddArg(L"HWND", GetHWND().toString());
                    arg1.SetParam(L"HWND", GetHWND());
                    arg1.AddArg(L"CustomerID", dw_base.GetItemString(1, L"CustomerID"));
                    OpenWindow(L"dev:xpage[Entity.Product.Select.vx]",arg1);
                    int row = dw_goods.GetRow();
@@ -1183,7 +1173,7 @@
            }
            else if (comdid.find(L"ImportXml:", 0) == 0)
            {
                xstring strImport = comdid.mid(L"ImportXml:".length(), 9999);
                xstring strImport = comdid.mid(((xstring)L"ImportXml:").length(), 9999);
                
                ImportProductByText(strImport);
                return 1;

 jrj/project/business/Enquiry/Entity.Product.Select.cpp

@@ -63,7 +63,7 @@
            {
                KXMLDOMElement e = nlist.item(i);
                xstring name = e.getAttribute(L"name");
                xcombobox::AddItem(xc.GetId(), name);
                xcombobox::AddItem(xc.GetHWND(), name);
            }
            return 1;
        }
@@ -100,7 +100,7 @@
        KXMLDOMElement OnGetCarListRowElement(int row = 0)
        {
            if (row < 1) row = dwc_list.GetRow();
            if (row < 1 || row > dwc_list.GetRowCount()) return 0;
            if (row < 1 || row > dwc_list.GetRowCount()) return KXMLDOMElement();
            KXMLDOMElement e = g_xdoc_shoppingcart.getRowElement(L"data/Item", row);
            return e;
        }

 jrj/project/business/ProductSample/InstoreSample3Win.cpp

Binary files differ

 jrj/project/business/ProductSample/OutstoreSample3Win.cpp

Binary files differ

 jrj/project/business/ProductSample/SampleBarcodePrint.cpp

Binary files differ

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

@@ -69,7 +69,7 @@
            xaserverarg arg;
            if (colname == L"SONo")
            {
                xstring SONo = dw_list.GetItemString(row, colname);
                xstring SONo = dw_list.GetItemString(row, colname.c_str());
                ;
                
                arg.AddArg(L"EntityNo", SONo);
@@ -78,7 +78,7 @@
            }
            if (colname == L"InvoiceNo")
            {
                xstring InvoiceNo = dw_list.GetItemString(row, colname);
                xstring InvoiceNo = dw_list.GetItemString(row, colname.c_str());
                ;
                
                arg.AddArg(L"EntityNo", InvoiceNo);
@@ -338,7 +338,7 @@
            {
                //trace(x.xml);
                KXMLDOMElement ele = x.documentElement();
                if (dw_pages.ptr_native_)
                if (dw_pages.getNativePointer())
                {
                    if (ele.selectSingleNode(L"@TotalPage"))
                    {