update

xj qian

2024-10-09 ad9621a05edde475cbad1efa31e4646093f2c3dc

update

 jrj/project/business/QuoteFile.cpp

@@ -275,6 +275,7 @@
        int colSKUID = getItemCol(cell, startRow - 1, L"SKUID");
        int colSaleRemark = getItemCol(cell, startRow - 1, L"业务To采购备注");

        int colBuyerMOQ = getItemCol(cell, startRow - 1, L"MOQ");
        int colBuyerRemark = getItemCol(cell, startRow - 1, L"采购To业务备注");
        int colFactoryImage = getItemCol(cell, startRow - 1, L"工厂图片");
        int colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)");
@@ -326,6 +327,7 @@
            itemStr += L"<BuyerPrice>" + cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
            itemStr += L"<SaleRemark>" + cell.GetItemString(row, colSaleRemark) + L"</SaleRemark>";

            itemStr += L"<BuyerMOQ>" + cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
            itemStr += L"<BuyerRemark>" + cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
            itemStr += L"<FactoryImage>" + cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
            itemStr += L"<GWT>" + cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -375,6 +377,7 @@
        int colSKUID = getItemCol(cell, startRow - 1, L"SKUID");
        int colSaleRemark = getItemCol(cell, startRow - 1, L"业务To采购备注");

        int colBuyerMOQ = getItemCol(cell, startRow - 1, L"MOQ");
        int colBuyerRemark = getItemCol(cell, startRow - 1, L"采购To业务备注");
        int colFactoryImage = getItemCol(cell, startRow - 1, L"工厂图片");
        int colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)");
@@ -432,6 +435,7 @@
            itemStr += L"<BuyerPrice>" + cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
            itemStr += L"<SaleRemark>" + cell.GetItemString(row, colSaleRemark) + L"</SaleRemark>";

            itemStr += L"<BuyerMOQ>" + cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
            itemStr += L"<BuyerRemark>" + cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
            itemStr += L"<FactoryImage>" + cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
            itemStr += L"<GWT>" + cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -827,6 +831,7 @@
        int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
        int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");

        int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
        int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
        int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
        int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -879,6 +884,7 @@
            {
                if (dw_cell.GetItemString(row, colPOPrice1) == L"") return L"采购价格1没有录入";
            }
            itemStr += L"<BuyerMOQ>" + dw_cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
            itemStr += L"<BuyerRemark>" + dw_cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
            itemStr += L"<FactoryImage>" + dw_cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
            itemStr += L"<GWT>" + dw_cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -1218,6 +1224,7 @@
        int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
        int colPurchor = getItemCol(dw_cell, startRow - 1, L"采购员,采购人员");

        int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
        int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
        int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
        int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -1430,6 +1437,7 @@
                if(dw_cell.GetItemString(row, colVolDesc)==L"") return L"体积信息没有录入";
            }
            */
            itemStr += L"<BuyerMOQ>" + dw_cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
            itemStr += L"<BuyerRemark>" + dw_cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
            itemStr += L"<FactoryImage>" + dw_cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
            itemStr += L"<GWT>" + dw_cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -2933,44 +2941,50 @@
            /*计算体积*/
            double v = 0.0;
            xstring desc = dw_cell.GetItemString(row, colVolDesc);
            if (desc.find(L"cm") >= 0)
            if(desc!=L"")
            {
                desc = desc.replace(L"cm", L"");
                dw_cell.SetItemString(row, colVolDesc, desc);
            }
            if (desc.find(L"CM") >= 0)
            {
                desc = desc.replace(L"CM", L"");
                dw_cell.SetItemString(row, colVolDesc, desc);
            }
            if (desc == L"")
                dw_cell.SetItemString(row, colVol, L"");
            else
            {
                v = calcVol(desc) / 1000000.00;
                xstring str = xstring(v);
                if (str.find(L".") >= 0)    str = str.left(str.find(L".") + 5);
                dw_cell.SetItemString(row, colVol, str);
                dw_cell.Redraw();
            }

            xstring qtyperPack = dw_cell.GetItemString(row, colQtyPerPack);
            if (qtyperPack != L"")
            {
                xstring qty1 = qtyperPack;
                xstring qty2 = L"";
                double qty = 0.00;
                int pos2 = qtyperPack.find(L"/");
                if (pos2 >= 0)
                if (desc.find(L"cm") >= 0)
                {
                    qty1 = qtyperPack.left(qtyperPack.find(L"/"));
                    qty2 = qtyperPack.mid(qtyperPack.find(L"/") + 1, 9999);
                    desc = desc.replace(L"cm", L"");
                    dw_cell.SetItemString(row, colVolDesc, desc);
                }
                //if(qty1 !=L"") qty = qty1.toDouble();
                //if(qty2 !=L"") qty = qty*qty2.toDouble();
                qty = qty2.toDouble();
                double ttl = 65.0 * qty / v;
                dw_cell.SetItemString(row, col40HQ, xstring((int)ttl));
                if (desc.find(L"CM") >= 0)
                {
                    desc = desc.replace(L"CM", L"");
                    dw_cell.SetItemString(row, colVolDesc, desc);
                }
                if (desc == L"")
                    dw_cell.SetItemString(row, colVol, L"");
                else
                {
                    v = calcVol(desc) / 1000000.00;
                    xstring str = xstring(v);
                    if (str.find(L".") >= 0)    str = str.left(str.find(L".") + 5);
                    dw_cell.SetItemString(row, colVol, str);
                    dw_cell.Redraw();
                }

                xstring qtyperPack = dw_cell.GetItemString(row, colQtyPerPack);
                if (qtyperPack != L"")
                {
                    xstring qty1 = qtyperPack;
                    xstring qty2 = L"";
                    double qty = 0.00;
                    int pos2 = qtyperPack.find(L"/");
                    if (pos2 >= 0)
                    {
                        qty1 = qtyperPack.left(qtyperPack.find(L"/"));
                        qty2 = qtyperPack.mid(qtyperPack.find(L"/") + 1, 9999);
                    }
                    //if(qty1 !=L"") qty = qty1.toDouble();
                    //if(qty2 !=L"") qty = qty*qty2.toDouble();
                    if (qty2 != L"")
                    {
                        qty = qty2.toDouble();
                        double ttl = 65.0 * qty / v;
                        dw_cell.SetItemString(row, col40HQ, xstring((int)ttl));
                    }
                }
            }
        }

@@ -3147,6 +3161,7 @@
        int colFOBPrice = getItemCol(dw_cell, startRow - 1, L"FOB Price,FOB Price(USD),Fob Price");
        int colQuantity = getItemCol(dw_cell, startRow - 1, L"数量,Qty");

        int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
        int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
        int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
        int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -4618,6 +4633,7 @@
        int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
        int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");

        int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
        int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
        int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
        int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -4639,6 +4655,7 @@
            KXMLDOMElement ele = items.item(i);
            xstring rowid = ele.selectSingleNode(L"RowID").text();
            xstring BuyerPrice = ele.selectSingleNode(L"BuyerPrice").text();
            xstring BuyerMOQ = L"";
            xstring BuyerRemark = L"";
            xstring FactoryImage = L"";
            xstring GWT = L"";
@@ -4653,6 +4670,7 @@
            xstring  EnquiryLineID = L"";
            xstring  Buyer = L"";

            if (ele.selectSingleNode(L"BuyerMOQ")) BuyerMOQ = ele.selectSingleNode(L"BuyerMOQ").text();
            if (ele.selectSingleNode(L"BuyerRemark")) BuyerRemark = ele.selectSingleNode(L"BuyerRemark").text();
            if (ele.selectSingleNode(L"FactoryImage"))FactoryImage = ele.selectSingleNode(L"FactoryImage").text();
            if (ele.selectSingleNode(L"GWT")) GWT = ele.selectSingleNode(L"GWT").text();
@@ -4661,7 +4679,7 @@
            if (ele.selectSingleNode(L"Vol")) Vol = ele.selectSingleNode(L"Vol").text();
            if (ele.selectSingleNode(L"F40HQ")) F40HQ = ele.selectSingleNode(L"F40HQ").text();
            if (ele.selectSingleNode(L"PurchedDate")) PurchedDate = ele.selectSingleNode(L"PurchedDate").text();
            trace(L"\r\n******" + PurchedDate);
            //trace(L"\r\n******" + PurchedDate);
            if (ele.selectSingleNode(L"supplier-photo")) supplierphoto = ele.selectSingleNode(L"supplier-photo").text();
            if (ele.selectSingleNode(L"ProductInfo")) productInfo = ele.selectSingleNode(L"ProductInfo").text();
            if (ele.selectSingleNode(L"ProductInfo1")) productInfo1 = ele.selectSingleNode(L"ProductInfo1").text();
@@ -4676,6 +4694,7 @@
                if (getRowID(dw_cell, row) == rowid)
                {
                    dw_cell.SetItemString(row, colBuyerPrice, BuyerPrice);
                    dw_cell.SetItemString(row, colBuyerMOQ, BuyerMOQ);
                    dw_cell.SetItemString(row, colBuyerRemark, BuyerRemark);
                    dw_cell.SetItemString(row, colFactoryImage, FactoryImage);
                    dw_cell.SetItemString(row, colGWT, GWT);
@@ -4898,7 +4917,7 @@
            dw_cell.SetColumnCount(dw_cell.GetValidCol() + 6);
        }
        else
            dw_cell.SetColumnCount(dw_cell.GetValidCol());
            dw_cell.SetColumnCount(dw_cell.GetValidCol()+3);

        //OnRetrieve();


 jrj/project/start.vframe.vbusiness.cpp

@@ -35,7 +35,7 @@

        dw_list.Retrieve(doc);
        dw_list.CreateTree((LPCWSTR)L"node()", 1, 15, 16);

        dw_list.Redraw();
        /*
        dw_list.Redraw();
        dw_list.SetReadOnly(true);