xj qian
2024-09-13 f945c112904dfe836621cc7005c53080826c3feb
update
已修改25个文件
188 ■■■■ 文件已修改
jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/AR/ExchageFile.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Customer3.maint.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Enquiry/Enquiry.maint.cpp 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Enquiry/EnquiryEx.quote.vx.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/EnquiryEx3.list.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Expense/ExportCredit.SwitchTo.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Expense/FreightExpenseInput.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Expense/FreightExpenseList.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Expense/SampleFee.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Expense/SampleRequestForm.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/GDN/maintex.gdn3.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/GDN3.maint.cpp 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/PO/Maint.PurcherItem.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Quote3.maint.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/QuoteFile.cpp 120 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SO/Apply.SOItem.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SO/Product.Select.SO.cpp 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/SO3.maint.cpp 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Supplier.maint.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/Supplier/maint.Owner.Supplier.cpp 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/printview/Template.Print.ViewEx.cpp 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/total3/ViewTotalWin.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/xframe/adt/xarray.hpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp
@@ -65,7 +65,7 @@
            while(ll_row > 0 && ll_row <= dw_list.GetRowCount())
            {
                xstring id=dw_list.GetItemString(ll_row,m_entityid.c_str());
                if(EntityIDList == L"") EntityIDList = id; else EntityIDList  += L",L" + id;
                if(EntityIDList == L"") EntityIDList = id; else EntityIDList  += L"," + id;
                ll_row =  dw_list.GetNextSelectRow(ll_row + 1);
            }
            if(EntityIDList != L"") arg.AddArg(L"EntityID",EntityIDList);
jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp
@@ -102,7 +102,7 @@
            while(ll_row > 0 && ll_row <= dw_list.GetRowCount())
            {
                xstring id=dw_list.GetItemString(ll_row,m_entityid.c_str());
                if(EntityIDList == L"") EntityIDList = id; else EntityIDList  += L",L" + id;
                if(EntityIDList == L"") EntityIDList = id; else EntityIDList  += L"" + id;
                ll_row =  dw_list.GetNextSelectRow(ll_row + 1);
            }
            if(EntityIDList != L"") arg.AddArg(L"EntityID",EntityIDList);
jrj/project/business/AR/ExchageFile.cpp
@@ -134,7 +134,7 @@
                if (val.find(L"/") >= 0) val = val.left(val.find(L"/"));
                if (val.find(L"\r") >= 0) val = val.left(val.find(L"\r"));
                if (val.find(L"\n") >= 0) val = val.left(val.find(L"\n"));
                if (head == L"") head = val; else head += L",L" + val;
                if (head == L"") head = val; else head += L"," + val;
            }
            xml x;
jrj/project/business/Customer3.maint.cpp
@@ -994,7 +994,7 @@
                        xstring Name = t.getAttribute(L"Name");
                        if(Names==L"") 
                            Names = Name;
                        else if(Names.find(Name) < 0) Names+=L",L"+Name;
                        else if(Names.find(Name) < 0) Names+=L","+Name;
                    }
                }
                dw.SetItemString(dw.GetRow(),L"CMPersonnel",Names);
@@ -1059,7 +1059,7 @@
                        xstring Name = t.getAttribute(L"Name");
                        if(Names==L"") 
                            Names = Name;
                        else if(Names.find(Name) < 0) Names+=L",L"+Name;
                        else if(Names.find(Name) < 0) Names+=L","+Name;
                    }
                }
                dw.SetItemString(dw.GetRow(),L"CMPersonnel",Names);
jrj/project/business/Enquiry/Enquiry.maint.cpp
@@ -195,7 +195,7 @@
                        Packing = dw_goods.GetItemString(i,L"Packing");
                        if(Packings==L"")
                        Packings = Packing;
                        else if(Packings.find(Packing) < 0) Packings+=L",L"+Packing;
                        else if(Packings.find(Packing) < 0) Packings+=L","+Packing;
                    }*/
                    if (dw_goods.GetItemString(i, L"Packing") == L"")
                    {
@@ -389,7 +389,7 @@
                    Packing = dw_goods.GetItemString(i, L"Packing");
                    if (Packings == L"")
                        Packings = Packing;
                    else if (Packings.find(Packing) < 0) Packings += L",L" + Packing;
                    else if (Packings.find(Packing) < 0) Packings += L"," + Packing;
                }
            }
@@ -918,7 +918,7 @@
                if (i == 1)
                    skunos = skuno;
                else
                    skunos += L",L" + skuno;
                    skunos += L"," + skuno;
            }
            xaserverarg arg_pic;
@@ -1046,7 +1046,7 @@
                    if (skunos == L"")
                        skunos = dw_goods.GetItemString(i, L"SKUNo");
                    else
                        skunos += L",L" + dw_goods.GetItemString(i, L"SKUNo");
                        skunos += L"," + dw_goods.GetItemString(i, L"SKUNo");
                }
            }
            xaserverarg arg ;
jrj/project/business/Enquiry/EnquiryEx.quote.vx.cpp
@@ -97,7 +97,7 @@
                if (items == L"")
                    items = id;
                else
                    items += L",L" + id;
                    items += L"," + id;
                row = dw_list.GetNextSelectRow(row + 1);
            }
            xml x = ViewObject::RetrieveData(L"/sale/data/Enquiry/Update/UpdateQuoteLine", L"ItemList", items);
@@ -127,7 +127,7 @@
                if (items == L"")
                    items = id;
                else
                    items += L",L" + id;
                    items += L"," + id;
                //row =  dw_list.GetNextSelectRow(row + 1);
            }
            arg.AddArg(L"EntityIDList", items);
jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
jrj/project/business/Expense/ExportCredit.SwitchTo.cpp
Binary files differ
jrj/project/business/Expense/FreightExpenseInput.cpp
Binary files differ
jrj/project/business/Expense/FreightExpenseList.cpp
Binary files differ
jrj/project/business/Expense/SampleFee.cpp
Binary files differ
jrj/project/business/Expense/SampleRequestForm.cpp
Binary files differ
jrj/project/business/GDN/maintex.gdn3.cpp
Binary files differ
jrj/project/business/GDN3.maint.cpp
@@ -2132,7 +2132,7 @@
                    if (o.selectSingleNode(L"VATRates"))
                    {
                        xstring str1 = o.selectSingleNode(L"VATRates").text();
                        if (str1.find(L",L") >= 0) str1 = str1.left(str1.find(L",L"));
                        if (str1.find(L",") >= 0) str1 = str1.left(str1.find(L","));
                        dw_custom.SetItemString(i, L"VATRates", str1);
                    }
                    if (o.selectSingleNode(L"CustEName"))
@@ -2185,7 +2185,7 @@
                    if(o.selectSingleNode(L"VATRates"))
                    {
                        xstring str1 = o.selectSingleNode(L"VATRates").text();
                        if(str1.find(L",L")) str1 = str1.left(str1.find(L",L"));
                        if(str1.find(L",")) str1 = str1.left(str1.find(L","));
                        dw_custom.SetItemString(i,L"VATRates",str1);
                    }
                    if(o.selectSingleNode(L"CustEName"))
@@ -2440,7 +2440,7 @@
                    if (o.selectSingleNode(L"VATRates"))
                    {
                        xstring str1 = o.selectSingleNode(L"VATRates").text();
                        if (str1.find(L",L")) str1 = str1.left(str1.find(L",L"));
                        if (str1.find(L",")) str1 = str1.left(str1.find(L","));
                        dw_custom.SetItemString(i, L"VATRates", str1);
                        dw_customex.SetItemString(i, L"VATRates", str1);
                    }
@@ -2615,7 +2615,7 @@
                    }
                    else if (SONos.find(SONo) < 0)
                    {
                        SONos += L",L" + SONo;
                        SONos += L"," + SONo;
                        costs += cost;
                    }
                }
@@ -2625,7 +2625,7 @@
                    xstring CustomerPONo = t.selectSingleNode(L"CustomerPONo").text();
                    if (OrderNos == L"")
                        OrderNos = CustomerPONo;
                    else if (OrderNos.find(CustomerPONo) < 0) OrderNos += L",L" + CustomerPONo;
                    else if (OrderNos.find(CustomerPONo) < 0) OrderNos += L"," + CustomerPONo;
                }
                if (t.selectSingleNode(L"OperationTips"))
@@ -2909,7 +2909,7 @@
            }
            else if (SONo_s.find(SONo) < 0)
            {
                SONo_s += L",L" + SONo;
                SONo_s += L"," + SONo;
            }
            xstring PONo = dw_item.GetItemString(k, L"PONo");
            if (PONo_s == L"")
@@ -2918,7 +2918,7 @@
            }
            else if (PONo_s.find(PONo) < 0)
            {
                PONo_s += L",L" + PONo;
                PONo_s += L"," + PONo;
            }
        }
        dw_base.SetItemString(1, L"OrderNos", PONo_s);
jrj/project/business/PO/Maint.PurcherItem.cpp
Binary files differ
jrj/project/business/Quote3.maint.cpp
Binary files differ
jrj/project/business/QuoteFile.cpp
@@ -166,10 +166,10 @@
            while (true)
            {
                xstring guid = guids;
                if (guids.find(L",L") >= 0)
                if (guids.find(L",") >= 0)
                {
                    guid = guids.left(guids.find(L",L"));
                    guids = guids.mid(guids.find(L",L") + 1, 99999);
                    guid = guids.left(guids.find(L","));
                    guids = guids.mid(guids.find(L",") + 1, 99999);
                }
                else
                {
@@ -201,10 +201,10 @@
            while (true)
            {
                xstring guid = guids;
                if (guids.find(L",L") >= 0)
                if (guids.find(L",") >= 0)
                {
                    guid = guids.left(guids.find(L",L"));
                    guids = guids.mid(guids.find(L",L") + 1, 99999);
                    guid = guids.left(guids.find(L","));
                    guids = guids.mid(guids.find(L",") + 1, 99999);
                }
                else
                {
@@ -231,7 +231,7 @@
        xstring fstr = L"";
        while (strs != L"")
        {
            int pos = strs.find(L",L");
            int pos = strs.find(L",");
            if (pos < 0)
            {
                str = strs;
@@ -245,7 +245,7 @@
            if (fstr == L"")
                fstr = GetImageUrl(str);
            else
                fstr += L",L" + GetImageUrl(str);
                fstr += L"," + GetImageUrl(str);
        }
        return fstr;
    }
@@ -612,12 +612,12 @@
    int getItemCol(xcell dw_obj, int row, xstring head)
    {
        xstring fullhead = L",L" + head + L",L";
        xstring fullhead = L"," + head + L",";
        int headRow = row;
        int colCount = dw_obj.GetValidCol(headRow);
        for (int col = 1; col <= colCount; col++)
        {
            if (fullhead.find(L",L" + dw_obj.GetItemString(headRow, col) + L",L") >= 0) return col;
            if (fullhead.find(L"," + dw_obj.GetItemString(headRow, col) + L",") >= 0) return col;
        }
        return -1;
    }
@@ -645,8 +645,8 @@
            xstring left = str.left(str.find(prop + L":") + prop.length() + 1);
            if (str.find(L";") >= 0)
                right = str.mid(str.find(L";") + 1, 9999);
            else     if (str.find(L",L") >= 0)
                right = str.mid(str.find(L",L") + 1, 9999);
            else     if (str.find(L",") >= 0)
                right = str.mid(str.find(L",") + 1, 9999);
            str = left + val + L";" + right;
            //alert(str);
            dw_obj.SetItemString(row, 0, str);
@@ -664,8 +664,8 @@
            str = str.mid(str.find(prop + L":") + prop.length() + 1, 9999);
            if (str.find(L";") >= 0)
                str = str.left(str.find(L";"));
            else if (str.find(L",L") >= 0)
                str = str.left(str.find(L",L"));
            else if (str.find(L",") >= 0)
                str = str.left(str.find(L","));
            return str;
        }
        return L"";
@@ -749,8 +749,8 @@
            str = str.mid(str.find(L"rowid:") + 6, 99999);
            if (str.find(L";") >= 0)
                str = str.left(str.find(L";"));
            else if (str.find(L",L") >= 0)
                str = str.left(str.find(L",L"));
            else if (str.find(L",") >= 0)
                str = str.left(str.find(L","));
            return str;
        }
        return L"";
@@ -1598,7 +1598,7 @@
            return 1;
        }
        xstring strs = L",L";
        xstring strs = L",";
        row++;
        int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
@@ -1610,11 +1610,11 @@
            if (str == L"")break;
            //ensureRowID(dw_cell,row);
            if (strs.find(L",L" + str + L",L") < 0)
            if (strs.find(L"," + str + L",") < 0)
            {
                if (purcher.selectSingleNode(L"//Name[.='" + str + L"']"))
                {
                    strs += str + L",L";
                    strs += str + L",";
                }
                else
                {
@@ -1624,7 +1624,7 @@
            }
            row++;
        }
        if (strs == L",L")
        if (strs == L",")
        {
            alert(L"请指定采购人员!");
            return 1;
@@ -1666,11 +1666,11 @@
            str = dw_cell.GetItemString(row, purchercol);
            if (str == L"")break;
            if (strs.find(L",L" + str + L",L") < 0)
            if (strs.find(L"," + str + L",") < 0)
            {
                if (purcher.selectSingleNode(L"//Name[.='" + str + L"']"))
                {
                    strs += str + L",L";
                    strs += str + L",";
                }
                else
                {
@@ -1687,16 +1687,16 @@
        xml x ;
        
        if (strs.left(1) == L",L") strs = strs.mid(1, 9999);
        if (strs.right(1) == L",L") strs = strs.left(strs.length() - 1);
        if (strs.left(1) == L",") strs = strs.mid(1, 9999);
        if (strs.right(1) == L",") strs = strs.left(strs.length() - 1);
        xstring purchors = strs;
        xstring supplier;
        if (strs.find(L",L", 0) > 0)
        if (strs.find(L",", 0) > 0)
        {
            supplier = strs.left(strs.find(L",L", 0));
            strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
            supplier = strs.left(strs.find(L",", 0));
            strs = strs.mid(strs.find(L",", 0) + 1, 9999);
        }
        else
        {
@@ -1713,10 +1713,10 @@
            if (supplier == username)  len = 0;
            if (len < 1)
            {
                if (strs.find(L",L", 0) > 0)
                if (strs.find(L",", 0) > 0)
                {
                    supplier = strs.left(strs.find(L",L", 0));
                    strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
                    supplier = strs.left(strs.find(L",", 0));
                    strs = strs.mid(strs.find(L",", 0) + 1, 9999);
                }
                else
                {
@@ -1768,10 +1768,10 @@
            if (SendToPurcher(supplier, cell1.GetData()) == -1) return 1;
            if (strs.find(L",L", 0) > 0)
            if (strs.find(L",", 0) > 0)
            {
                supplier = strs.left(strs.find(L",L", 0));
                strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
                supplier = strs.left(strs.find(L",", 0));
                strs = strs.mid(strs.find(L",", 0) + 1, 9999);
            }
            else
            {
@@ -1956,7 +1956,7 @@
            return 1;
        }
        xstring strs = L",L";
        xstring strs = L",";
        row++;
        int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
@@ -2005,11 +2005,11 @@
            }*/
            ensureRowID(dw_cell, row);
            if (strs.find(L",L" + str + L",L") < 0)
            if (strs.find(L"," + str + L",") < 0)
            {
                if (purcher.selectSingleNode(L"//Name[.='" + str + L"']"))
                {
                    strs += str + L",L";
                    strs += str + L",";
                }
                else
                {
@@ -2019,7 +2019,7 @@
            }
            row++;
        }
        if (strs == L",L")
        if (strs == L",")
        {
            alert(L"找不到采购人员数据!");
            return 1;
@@ -2039,16 +2039,16 @@
        xml x ;
        
        if (strs.left(1) == L",L") strs = strs.mid(1, 9999);
        if (strs.right(1) == L",L") strs = strs.left(strs.length() - 1);
        if (strs.left(1) == L",") strs = strs.mid(1, 9999);
        if (strs.right(1) == L",") strs = strs.left(strs.length() - 1);
        xstring purchors = strs;
        xstring supplier;
        if (strs.find(L",L", 0) > 0)
        if (strs.find(L",", 0) > 0)
        {
            supplier = strs.left(strs.find(L",L", 0));
            strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
            supplier = strs.left(strs.find(L",", 0));
            strs = strs.mid(strs.find(L",", 0) + 1, 9999);
        }
        else
        {
@@ -2065,10 +2065,10 @@
            int len = ts.length();
            if (len < 1)
            {
                if (strs.find(L",L", 0) > 0)
                if (strs.find(L",", 0) > 0)
                {
                    supplier = strs.left(strs.find(L",L", 0));
                    strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
                    supplier = strs.left(strs.find(L",", 0));
                    strs = strs.mid(strs.find(L",", 0) + 1, 9999);
                }
                else
                {
@@ -2169,10 +2169,10 @@
            }
            if (SendToPurcher(supplier, cell1.GetData()) == -1) return 1;
            if (strs.find(L",L", 0) > 0)
            if (strs.find(L",", 0) > 0)
            {
                supplier = strs.left(strs.find(L",L", 0));
                strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
                supplier = strs.left(strs.find(L",", 0));
                strs = strs.mid(strs.find(L",", 0) + 1, 9999);
            }
            else
            {
@@ -2363,7 +2363,7 @@
        {
            int pos = str.find(L";", str.find(tm + L":") + 1);
            if (pos < 0) return 1;
            str = str.left(pos) + L",L" + guid + str.mid(pos, 99999);
            str = str.left(pos) + L"," + guid + str.mid(pos, 99999);
        }
        else
        {
@@ -2385,7 +2385,7 @@
            if (pos > 0 && str.mid(pos - 1, 1) == L":")
                str = str.left(pos) + guid + str.mid(pos, 99999);
            else
                str = str.left(pos) + L",L" + guid + str.mid(pos, 99999);
                str = str.left(pos) + L"," + guid + str.mid(pos, 99999);
        }
        else
        {
@@ -2417,7 +2417,7 @@
        while (true)
        {
            count++;
            spos = images.find(L",L", spos + 1);
            spos = images.find(L",", spos + 1);
            if (spos < 0) break;
        }
        trace(L" count:" + xstring(count));
@@ -2485,11 +2485,11 @@
                while (true)
                {
                    if (i == index) break;
                    spos = images.find(L",L", spos + 1);
                    spos = images.find(L",", spos + 1);
                    if (spos < 0) break;
                    i++;
                }
                int epos = images.find(L",L", spos + 1);
                int epos = images.find(L",", spos + 1);
                if (spos >= 0)
                {
                    if (epos < 0)
@@ -2511,8 +2511,8 @@
            if (im.GetImageCount() - sindex >= 1)
            {
                if (images.find(L",L") == 0) images = images.mid(1, 9999);
                int pos1 = images.find(L",L");
                if (images.find(L",") == 0) images = images.mid(1, 9999);
                int pos1 = images.find(L",");
                if (pos1 < 0) pos1 = images.find(L";");
                xstring id = images;
                if (pos1 >= 0) id = images.left(pos1);
@@ -2587,7 +2587,7 @@
        return 1;
    }
    int GetOpenFileNames(xarray<xstring>& items, xstring initFileName, xstring filter, xstring ext)
    int GetOpenFileNames(xarray<xstring>& items, xstring initFileName, const string filter, xstring ext)
    {
        //xstring path = GetOpenFileName(L"",
        //        "JPEG 文件(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0全部文件(*.*)\0*.*\0",
@@ -2611,7 +2611,7 @@
        int     nFilterIndex = 1;
        OPENFILENAMEW ofn;
        ofn.lStructSize = 88;//sizeof(ofn);
        ofn.lStructSize = sizeof(ofn);
        ofn.hwndOwner = 0;
        ofn.hInstance = 0;
        ofn.lpstrFilter = filter;
@@ -2648,13 +2648,13 @@
            else
            {
                wchar_t* start = szPath;
                start += pos * 2;
                start += pos;;
                xstring str = start;
                while (true)
                {
                    if (str == L"")break;
                    items.push_back(path + L"/" + str);
                    start += (str.length() + 1) * 2;
                    start += (str.length() + 1) ;
                    str = start;
                }
            }
@@ -4984,7 +4984,7 @@
    int LoadPurcher()
    {
        xml purcher ;
        //xml purcher ;
        xaserverarg arg ;
        
        arg.AddArg(L"id", L"采购员");
jrj/project/business/SO/Apply.SOItem.cpp
@@ -50,7 +50,7 @@
            while (ll_row > 0 && ll_row <= dw_list.GetRowCount())
            {
                xstring id = dw_list.GetGuid(ll_row);
                if (EntityIDList == L"") EntityIDList = id; else EntityIDList += L",L" + id;
                if (EntityIDList == L"") EntityIDList = id; else EntityIDList += L"," + id;
                ll_row = dw_list.GetNextSelectRow(ll_row + 1);
            }
            if (EntityIDList != L"") arg.AddArg(L"EntityID", EntityIDList);
@@ -171,7 +171,7 @@
                    if (skunos == L"")
                        skunos = dw_list.GetItemString(i, L"SKUNo");
                    else
                        skunos += L",L" + dw_list.GetItemString(i, L"SKUNo");
                        skunos += L"," + dw_list.GetItemString(i, L"SKUNo");
                }
            }
            xaserverarg arg ;
jrj/project/business/SO/Product.Select.SO.cpp
@@ -599,9 +599,9 @@
                while (rw>0)
                {
                    ls_nos += L",L"+dw_list.GetItemString(rw, L"SKUNo");
                    //ls_nos += L",L"+dw_list.GetItemString(rw, L"GoodsNo");
                    //ls_nos += L",L"+dw_list.GetItemString(rw, L"GoodNo");
                    ls_nos += L","+dw_list.GetItemString(rw, L"SKUNo");
                    //ls_nos += L","+dw_list.GetItemString(rw, L"GoodsNo");
                    //ls_nos += L","+dw_list.GetItemString(rw, L"GoodNo");
                    rw =  dw_list.GetNextSelectRow(rw + 1);
                }
                dw_list.SelectRow(0,false);
jrj/project/business/SO3.maint.cpp
@@ -592,7 +592,7 @@
                if (skunos == L"")
                    skunos = dw_item.GetItemString(i, L"SKUNo");
                else
                    skunos += L",L" + dw_item.GetItemString(i, L"SKUNo");
                    skunos += L"," + dw_item.GetItemString(i, L"SKUNo");
            }
        }
        xaserverarg& arg = *new xaserverarg();
@@ -861,13 +861,13 @@
        else
            src=src.mid(src.find(L"Thumbs", 0)+6, 50);
        */
        xaserverarg& arg = * new xaserverarg;
        xaserverarg arg;
        //arg.AddArg(L"src",L"/business/products/chanpin"+src);    
        arg.AddArg(L"src", src);
        //win::OpenWindow(L"dev:xpage[BigPicture.vx]",arg);    
        int h = openUrl(L"/sale/view/ProductLibrary/xpage/bigpictureview", &arg);
        openUrl(L"/sale/view/ProductLibrary/xpage/bigpictureview", arg);
        /*
        xwin x = new xwin;
        x.setNativePointer(h);
jrj/project/business/Supplier.maint.cpp
Binary files differ
jrj/project/business/Supplier/maint.Owner.Supplier.cpp
Binary files differ
jrj/project/printview/Template.Print.ViewEx.cpp
@@ -509,15 +509,15 @@
            xstring skuno = tail.mid(spos,pos1 - spos ).trim();
            xstring CustomerID=L"";
            xstring CustomerItemNo=L"";
            if(skuno.find(L",L")>0)
            if(skuno.find(L",")>0)
            {
                CustomerID = skuno.left(skuno.find(L",L")).trim();
                skuno = skuno.mid(skuno.find(L",L")+1,256).trim();
                CustomerID = skuno.left(skuno.find(L",")).trim();
                skuno = skuno.mid(skuno.find(L",")+1,256).trim();
            }
            if(skuno.find(L",L")>0)
            if(skuno.find(L",")>0)
            {
                CustomerItemNo = skuno.left(skuno.find(L",L")).trim();
                skuno = skuno.mid(skuno.find(L",L")+1,256).trim();
                CustomerItemNo = skuno.left(skuno.find(L",")).trim();
                skuno = skuno.mid(skuno.find(L",")+1,256).trim();
            }
            xstring src =  DownLoadSKUNoPic(skuno,CustomerID,CustomerItemNo);
            head += tail.left(pos) + L"src=\"" + src;
jrj/project/total3/ViewTotalWin.cpp
@@ -192,7 +192,7 @@
        for (int i = 1; i < dw.GetColumnCount(); i++)
        {
            xstring colname = dw.GetColumnName(i);
            if (str.find(L"!" + colname + L",L") >= 0)
            if (str.find(L"!" + colname + L",") >= 0)
            {
                dw.SetColumnState((LPCTSTR)colname.c_str(), false);
            }
jrj/xframe/adt/xarray.hpp
@@ -123,7 +123,7 @@
                {
                    temp[i] = items[i];
                }
                delete items;
                delete[] items;
                items = temp;
            }
        }