update

lifan

2025-09-11 9459286625f095613a7074c1cfd9cf95d88091f3

 jrj/project/business/QuoteFile.cpp

@@ -254,10 +254,10 @@
   {
      xstring content = L"";
      xstring base = L"";
      base += L"<QuoteNo>" + getBaseItem(cell, L"报价单号:") + L"</QuoteNo>";
      base += L"<ExpDate>" + getBaseItem(cell, L"报价截止日期：") + L"</ExpDate>";
      base += L"<PrjName>" + getBaseItem(cell, L"项目名称:") + L"</PrjName>";
      base += L"<QuoteDate>" + dw_base.GetItemString(1, L"QuoteDate") + L"</QuoteDate>";
      base += L"<QuoteNo>" + getBaseXmlItem(cell, L"报价单号:") + L"</QuoteNo>";
      base += L"<ExpDate>" + getBaseXmlItem(cell, L"报价截止日期：") + L"</ExpDate>";
      base += L"<PrjName>" + getBaseXmlItem(cell, L"项目名称:") + L"</PrjName>";
      base += L"<QuoteDate>" + dw_base.GetItemXmlString(1, L"QuoteDate") + L"</QuoteDate>";

      int startRow = getItemHeadRow(cell);

@@ -313,34 +313,34 @@
         xstring itemStr = L"";
         rowid = getRowID(cell, row);
         itemStr += L"<RowID>" + getRowID(cell, row) + L"</RowID>";
         itemStr += L"<SKUID>" + cell.GetItemString(row, colSKUID) + L"</SKUID>";
         itemStr += L"<SKUID>" + cell.GetItemXmlString(row, colSKUID) + L"</SKUID>";
         itemStr += L"<customer-photo>" + getRowTerm(cell, row, L"customer-photo") + L"</customer-photo>";
         itemStr += L"<supplier-photo>" + getRowTerm(cell, row, L"supplier-photo") + L"</supplier-photo>";
         itemStr += L"<customer-photo-url>" + getImageList(getRowTerm(cell, row, L"customer-photo")) + L"</customer-photo-url>";
         itemStr += L"<supplier-photo-url>" + getImageList(getRowTerm(cell, row, L"supplier-photo")) + L"</supplier-photo-url>";
         itemStr += L"<ItemNo>" + cell.GetItemString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomItemNo>" + cell.GetItemString(row, colCustomerItemNo) + L"</CustomItemNo>";
         itemStr += L"<ItemName>" + cell.GetItemString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + cell.GetItemString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + cell.GetItemString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<CustomerImage>" + cell.GetItemString(row, colCustomerImage) + L"</CustomerImage>";
         itemStr += L"<BuyerPrice>" + cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<SaleRemark>" + cell.GetItemString(row, colSaleRemark) + L"</SaleRemark>";
         itemStr += L"<ItemNo>" + cell.GetItemXmlString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomItemNo>" + cell.GetItemXmlString(row, colCustomerItemNo) + L"</CustomItemNo>";
         itemStr += L"<ItemName>" + cell.GetItemXmlString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + cell.GetItemXmlString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + cell.GetItemXmlString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<CustomerImage>" + cell.GetItemXmlString(row, colCustomerImage) + L"</CustomerImage>";
         itemStr += L"<BuyerPrice>" + cell.GetItemXmlString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<SaleRemark>" + cell.GetItemXmlString(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>";
         itemStr += L"<NWT>" + cell.GetItemString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + cell.GetItemString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + cell.GetItemString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + cell.GetItemString(row, col40HQ) + L"</F40HQ>";
         itemStr += L"<Packing>" + cell.GetItemString(row, colInnerOuter) + L"</Packing>";
         itemStr += L"<Quantity>" + cell.GetItemString(row, colItemQty) + L"</Quantity>";
         itemStr += L"<Package>" + cell.GetItemString(row, colPackage) + L"</Package>";
         itemStr += L"<Buyer>" + cell.GetItemString(row, colBuyer) + L"</Buyer>";
         itemStr += L"<RemarkS>" + cell.GetItemString(row, colRemark) + L"</RemarkS>";
         itemStr += L"<FOBPrice>" + cell.GetItemString(row, colFOBPrice) + L"</FOBPrice>";
         itemStr += L"<BuyerMOQ>" + cell.GetItemXmlString(row, colBuyerMOQ) + L"</BuyerMOQ>";
         itemStr += L"<BuyerRemark>" + cell.GetItemXmlString(row, colBuyerRemark) + L"</BuyerRemark>";
         itemStr += L"<FactoryImage>" + cell.GetItemXmlString(row, colFactoryImage) + L"</FactoryImage>";
         itemStr += L"<GWT>" + cell.GetItemXmlString(row, colGWT)+ L"</GWT>";
         itemStr += L"<NWT>" + cell.GetItemXmlString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + cell.GetItemXmlString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + cell.GetItemXmlString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + cell.GetItemXmlString(row, col40HQ) + L"</F40HQ>";
         itemStr += L"<Packing>" + cell.GetItemXmlString(row, colInnerOuter) + L"</Packing>";
         itemStr += L"<Quantity>" + cell.GetItemXmlString(row, colItemQty) + L"</Quantity>";
         itemStr += L"<Package>" + cell.GetItemXmlString(row, colPackage) + L"</Package>";
         itemStr += L"<Buyer>" + cell.GetItemXmlString(row, colBuyer) + L"</Buyer>";
         itemStr += L"<RemarkS>" + cell.GetItemXmlString(row, colRemark) + L"</RemarkS>";
         itemStr += L"<FOBPrice>" + cell.GetItemXmlString(row, colFOBPrice) + L"</FOBPrice>";


         itemStr += L"<PurchedDate>" + sdate + L"</PurchedDate>";
@@ -356,10 +356,10 @@
   {
      xstring content = L"";
      xstring base = L"";
      base += L"<QuoteNo>" + getBaseItem(cell, L"报价单号:") + L"</QuoteNo>";
      base += L"<ExpDate>" + getBaseItem(cell, L"报价截止日期：") + L"</ExpDate>";
      base += L"<PrjName>" + getBaseItem(cell, L"项目名称:") + L"</PrjName>";
      base += L"<QuoteDate>" + dw_base.GetItemString(1, L"QuoteDate") + L"</QuoteDate>";
      base += L"<QuoteNo>" + getBaseXmlItem(cell, L"报价单号:") + L"</QuoteNo>";
      base += L"<ExpDate>" + getBaseXmlItem(cell, L"报价截止日期：") + L"</ExpDate>";
      base += L"<PrjName>" + getBaseXmlItem(cell, L"项目名称:") + L"</PrjName>";
      base += L"<QuoteDate>" + dw_base.GetItemXmlString(1, L"QuoteDate") + L"</QuoteDate>";

      int startRow = getItemHeadRow(cell);

@@ -423,46 +423,46 @@

         xstring itemStr = L"";
         itemStr += L"<RowID>" + getRowID(cell, row) + L"</RowID>";
         itemStr += L"<SKUID>" + cell.GetItemString(row, colSKUID) + L"</SKUID>";
         itemStr += L"<SKUID>" + cell.GetItemXmlString(row, colSKUID) + L"</SKUID>";
         itemStr += L"<customer-photo>" + getRowTerm(cell, row, L"customer-photo") + L"</customer-photo>";
         itemStr += L"<supplier-photo>" + getRowTerm(cell, row, L"supplier-photo") + L"</supplier-photo>";
         itemStr += L"<ItemNo>" + cell.GetItemString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomItemNo>" + cell.GetItemString(row, colCustomerItemNo) + L"</CustomItemNo>";
         itemStr += L"<ItemName>" + cell.GetItemString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + cell.GetItemString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + cell.GetItemString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<CustomerImage>" + cell.GetItemString(row, colCustomerImage) + L"</CustomerImage>";
         itemStr += L"<BuyerPrice>" + cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<SaleRemark>" + cell.GetItemString(row, colSaleRemark) + L"</SaleRemark>";
         itemStr += L"<ItemNo>" + cell.GetItemXmlString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomItemNo>" + cell.GetItemXmlString(row, colCustomerItemNo) + L"</CustomItemNo>";
         itemStr += L"<ItemName>" + cell.GetItemXmlString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + cell.GetItemXmlString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + cell.GetItemXmlString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<CustomerImage>" + cell.GetItemXmlString(row, colCustomerImage) + L"</CustomerImage>";
         itemStr += L"<BuyerPrice>" + cell.GetItemXmlString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<SaleRemark>" + cell.GetItemXmlString(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>";
         itemStr += L"<NWT>" + cell.GetItemString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + cell.GetItemString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + cell.GetItemString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + cell.GetItemString(row, col40HQ) + L"</F40HQ>";
         itemStr += L"<Packing>" + cell.GetItemString(row, colInnerOuter) + L"</Packing>";
         itemStr += L"<Quantity>" + cell.GetItemString(row, colItemQty) + L"</Quantity>";
         itemStr += L"<Package>" + cell.GetItemString(row, colPackage) + L"</Package>";
         itemStr += L"<Buyer>" + cell.GetItemString(row, colBuyer) + L"</Buyer>";
         itemStr += L"<RemarkS>" + cell.GetItemString(row, colRemark) + L"</RemarkS>";
         itemStr += L"<FOBPrice>" + cell.GetItemString(row, colFOBPrice) + L"</FOBPrice>";
         itemStr += L"<BuyerMOQ>" + cell.GetItemXmlString(row, colBuyerMOQ) + L"</BuyerMOQ>";
         itemStr += L"<BuyerRemark>" + cell.GetItemXmlString(row, colBuyerRemark) + L"</BuyerRemark>";
         itemStr += L"<FactoryImage>" + cell.GetItemXmlString(row, colFactoryImage) + L"</FactoryImage>";
         itemStr += L"<GWT>" + cell.GetItemXmlString(row, colGWT) + L"</GWT>";
         itemStr += L"<NWT>" + cell.GetItemXmlString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + cell.GetItemXmlString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + cell.GetItemXmlString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + cell.GetItemXmlString(row, col40HQ) + L"</F40HQ>";
         itemStr += L"<Packing>" + cell.GetItemXmlString(row, colInnerOuter) + L"</Packing>";
         itemStr += L"<Quantity>" + cell.GetItemXmlString(row, colItemQty) + L"</Quantity>";
         itemStr += L"<Package>" + cell.GetItemXmlString(row, colPackage) + L"</Package>";
         itemStr += L"<Buyer>" + cell.GetItemXmlString(row, colBuyer) + L"</Buyer>";
         itemStr += L"<RemarkS>" + cell.GetItemXmlString(row, colRemark) + L"</RemarkS>";
         itemStr += L"<FOBPrice>" + cell.GetItemXmlString(row, colFOBPrice) + L"</FOBPrice>";

         itemStr += L"<Supplier>" + cell.GetItemString(row, colSupplier) + L"</Supplier>";
         itemStr += L"<Supplier1>" + cell.GetItemString(row, colSupplier1) + L"</Supplier1>";
         itemStr += L"<Supplier2>" + cell.GetItemString(row, colSupplier2) + L"</Supplier2>";
         itemStr += L"<Supplier3>" + cell.GetItemString(row, colSupplier3) + L"</Supplier3>";
         itemStr += L"<POPrice>" + cell.GetItemString(row, colPOPrice) + L"</POPrice>";
         itemStr += L"<POPrice1>" + cell.GetItemString(row, colPOPrice1) + L"</POPrice1>";
         itemStr += L"<POPrice2>" + cell.GetItemString(row, colPOPrice2) + L"</POPrice2>";
         itemStr += L"<POPrice3>" + cell.GetItemString(row, colPOPrice3) + L"</POPrice3>";
         itemStr += L"<Supplier>" + cell.GetItemXmlString(row, colSupplier) + L"</Supplier>";
         itemStr += L"<Supplier1>" + cell.GetItemXmlString(row, colSupplier1) + L"</Supplier1>";
         itemStr += L"<Supplier2>" + cell.GetItemXmlString(row, colSupplier2) + L"</Supplier2>";
         itemStr += L"<Supplier3>" + cell.GetItemXmlString(row, colSupplier3) + L"</Supplier3>";
         itemStr += L"<POPrice>" + cell.GetItemXmlString(row, colPOPrice) + L"</POPrice>";
         itemStr += L"<POPrice1>" + cell.GetItemXmlString(row, colPOPrice1) + L"</POPrice1>";
         itemStr += L"<POPrice2>" + cell.GetItemXmlString(row, colPOPrice2) + L"</POPrice2>";
         itemStr += L"<POPrice3>" + cell.GetItemXmlString(row, colPOPrice3) + L"</POPrice3>";

         itemStr += L"<BOMType>" + cell.GetItemString(row, colBOMType) + L"</BOMType>";
         itemStr += L"<BOMType1>" + cell.GetItemString(row, colBOMType1) + L"</BOMType1>";
         itemStr += L"<BOMType2>" + cell.GetItemString(row, colBOMType2) + L"</BOMType2>";
         itemStr += L"<BOMType3>" + cell.GetItemString(row, colBOMType2) + L"</BOMType3>";
         itemStr += L"<BOMType>" + cell.GetItemXmlString(row, colBOMType) + L"</BOMType>";
         itemStr += L"<BOMType1>" + cell.GetItemXmlString(row, colBOMType1) + L"</BOMType1>";
         itemStr += L"<BOMType2>" + cell.GetItemXmlString(row, colBOMType2) + L"</BOMType2>";
         itemStr += L"<BOMType3>" + cell.GetItemXmlString(row, colBOMType2) + L"</BOMType3>";
         itemStr += L"<PurchedDate>" + sdate + L"</PurchedDate>";
         itemStr += L"<EnquiryLineID>" + getRowTerm(cell, row, L"EnquiryLineID") + L"</EnquiryLineID>";

@@ -474,19 +474,19 @@
            if (cell.GetItemString(row, colItemName) != L"" || cell.GetItemString(row, colItemSpec) != L"") break;
            if (cell.GetItemString(row, colSupplier) == L"")break;
            xstring extStr = L"";
            extStr += L"<Supplier>" + cell.GetItemString(row, colSupplier) + L"</Supplier>";
            extStr += L"<Supplier1>" + cell.GetItemString(row, colSupplier1) + L"</Supplier1>";
            extStr += L"<Supplier2>" + cell.GetItemString(row, colSupplier2) + L"</Supplier2>";
            extStr += L"<Supplier3>" + cell.GetItemString(row, colSupplier3) + L"</Supplier3>";
            extStr += L"<POPrice>" + cell.GetItemString(row, colPOPrice) + L"</POPrice>";
            extStr += L"<POPrice1>" + cell.GetItemString(row, colPOPrice1) + L"</POPrice1>";
            extStr += L"<POPrice2>" + cell.GetItemString(row, colPOPrice2) + L"</POPrice2>";
            extStr += L"<POPrice3>" + cell.GetItemString(row, colPOPrice3) + L"</POPrice3>";
            extStr += L"<Supplier>" + cell.GetItemXmlString(row, colSupplier) + L"</Supplier>";
            extStr += L"<Supplier1>" + cell.GetItemXmlString(row, colSupplier1) + L"</Supplier1>";
            extStr += L"<Supplier2>" + cell.GetItemXmlString(row, colSupplier2) + L"</Supplier2>";
            extStr += L"<Supplier3>" + cell.GetItemXmlString(row, colSupplier3) + L"</Supplier3>";
            extStr += L"<POPrice>" + cell.GetItemXmlString(row, colPOPrice) + L"</POPrice>";
            extStr += L"<POPrice1>" + cell.GetItemXmlString(row, colPOPrice1) + L"</POPrice1>";
            extStr += L"<POPrice2>" + cell.GetItemXmlString(row, colPOPrice2) + L"</POPrice2>";
            extStr += L"<POPrice3>" + cell.GetItemXmlString(row, colPOPrice3) + L"</POPrice3>";

            extStr += L"<BOMType>" + cell.GetItemString(row, colBOMType) + L"</BOMType>";
            extStr += L"<BOMType1>" + cell.GetItemString(row, colBOMType1) + L"</BOMType1>";
            extStr += L"<BOMType2>" + cell.GetItemString(row, colBOMType2) + L"</BOMType2>";
            extStr += L"<BOMType3>" + cell.GetItemString(row, colBOMType2) + L"</BOMType3>";
            extStr += L"<BOMType>" + cell.GetItemXmlString(row, colBOMType) + L"</BOMType>";
            extStr += L"<BOMType1>" + cell.GetItemXmlString(row, colBOMType1) + L"</BOMType1>";
            extStr += L"<BOMType2>" + cell.GetItemXmlString(row, colBOMType2) + L"</BOMType2>";
            extStr += L"<BOMType3>" + cell.GetItemXmlString(row, colBOMType2) + L"</BOMType3>";

            itemStr += L"<ExtItem>" + extStr + L"</ExtItem>"; //备用采购信息
            xstring eid = GetGuid();
@@ -567,6 +567,11 @@
      im.Redraw();

      return 1;
   }

   xstring getBaseXmlItem(xcell dw_cell, xstring colname)
   {
      return xutil::ToXmlText(getBaseItem(dw_cell, colname));
   }

   xstring getBaseItem(xcell dw_cell, xstring colname)
@@ -858,14 +863,14 @@

         xstring itemStr = L"";
         itemStr += L"<RowID>" + getRowID(dw_cell, row) + L"</RowID>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomerItemNo>" + dw_cell.GetItemString(row, colCustomerItemNo) + L"</CustomerItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<BuyerPrice>" + dw_cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemString(row, colProductInfo1) + L"</ProductInfo1>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemXmlString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomerItemNo>" + dw_cell.GetItemXmlString(row, colCustomerItemNo) + L"</CustomerItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemXmlString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemXmlString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemXmlString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<BuyerPrice>" + dw_cell.GetItemXmlString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemXmlString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemXmlString(row, colProductInfo1) + L"</ProductInfo1>";

         if (dw_cell.GetItemString(row, colBuyerPrice) == L"") return L"采购价格没有录入";
         if (dw_cell.GetItemString(row, colGWT) == L"") return L"毛重没有录入";
@@ -884,14 +889,14 @@
         {
            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>";
         itemStr += L"<NWT>" + dw_cell.GetItemString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + dw_cell.GetItemString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + dw_cell.GetItemString(row, col40HQ) + L"</F40HQ>";
         itemStr += L"<BuyerMOQ>" + dw_cell.GetItemXmlString(row, colBuyerMOQ) + L"</BuyerMOQ>";
         itemStr += L"<BuyerRemark>" + dw_cell.GetItemXmlString(row, colBuyerRemark) + L"</BuyerRemark>";
         itemStr += L"<FactoryImage>" + dw_cell.GetItemXmlString(row, colFactoryImage) + L"</FactoryImage>";
         itemStr += L"<GWT>" + dw_cell.GetItemXmlString(row, colGWT) + L"</GWT>";
         itemStr += L"<NWT>" + dw_cell.GetItemXmlString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemXmlString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + dw_cell.GetItemXmlString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + dw_cell.GetItemXmlString(row, col40HQ) + L"</F40HQ>";

         itemStr += L"<PurchedDate>" + sdate + L"</PurchedDate>";
         itemStr += L"<EnquiryLineID>" + getRowTerm(dw_cell, row, L"EnquiryLineID") + L"</EnquiryLineID>";
@@ -1057,25 +1062,25 @@
         xstring itemStr = L"";
         xstring issend = L"1";
         itemStr += L"<RowID>" + getRowID(dw_cell, row) + L"</RowID>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemXmlString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemXmlString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemXmlString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemXmlString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<RowNo>" + xstring(row - startRow + 1) + L"</RowNo>";
         itemStr += L"<Purchor>" + dw_cell.GetItemString(row, colBuyer) + L"</Purchor>";
         itemStr += L"<Package>" + dw_cell.GetItemString(row, colPackage) + L"</Package>";
         itemStr += L"<NWT>" + dw_cell.GetItemString(row, colNW) + L"</NWT>";
         itemStr += L"<GWT>" + dw_cell.GetItemString(row, colGW) + L"</GWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Supplier>" + dw_cell.GetItemString(row, colSupplier) + L"</Supplier>";
         itemStr += L"<BuyPrice>" + dw_cell.GetItemString(row, colPOPrice) + L"</BuyPrice>";
         itemStr += L"<Supplier1>" + dw_cell.GetItemString(row, colSupplier1) + L"</Supplier1>";
         itemStr += L"<BuyPrice1>" + dw_cell.GetItemString(row, colPOPrice1) + L"</BuyPrice1>";
         itemStr += L"<BOMType1>" + dw_cell.GetItemString(row, colBOMType1) + L"</BOMType1>";
         itemStr += L"<BOMType>" + dw_cell.GetItemString(row, colBOMType) + L"</BOMType>";
         itemStr += L"<POPrice>" + dw_cell.GetItemString(row, colPrice) + L"</POPrice>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemString(row, colProductInfo1) + L"</ProductInfo1>";
         itemStr += L"<Purchor>" + dw_cell.GetItemXmlString(row, colBuyer) + L"</Purchor>";
         itemStr += L"<Package>" + dw_cell.GetItemXmlString(row, colPackage) + L"</Package>";
         itemStr += L"<NWT>" + dw_cell.GetItemXmlString(row, colNW) + L"</NWT>";
         itemStr += L"<GWT>" + dw_cell.GetItemXmlString(row, colGW) + L"</GWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemXmlString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Supplier>" + dw_cell.GetItemXmlString(row, colSupplier) + L"</Supplier>";
         itemStr += L"<BuyPrice>" + dw_cell.GetItemXmlString(row, colPOPrice) + L"</BuyPrice>";
         itemStr += L"<Supplier1>" + dw_cell.GetItemXmlString(row, colSupplier1) + L"</Supplier1>";
         itemStr += L"<BuyPrice1>" + dw_cell.GetItemXmlString(row, colPOPrice1) + L"</BuyPrice1>";
         itemStr += L"<BOMType1>" + dw_cell.GetItemXmlString(row, colBOMType1) + L"</BOMType1>";
         itemStr += L"<BOMType>" + dw_cell.GetItemXmlString(row, colBOMType) + L"</BOMType>";
         itemStr += L"<POPrice>" + dw_cell.GetItemXmlString(row, colPrice) + L"</POPrice>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemXmlString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemXmlString(row, colProductInfo1) + L"</ProductInfo1>";

         if (dw_cell.GetItemString(row, colBuyer) == L"")issend = L"0";
         itemStr += L"<IsSend>" + issend + L"</IsSend>";
@@ -1123,19 +1128,19 @@
         xstring itemStr = L"";
         xstring issend = L"1";
         itemStr += L"<RowID>" + getRowID(dw_cell, row) + L"</RowID>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomerItemNo>" + dw_cell.GetItemString(row, colCustomerItemNo) + L"</CustomerItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemXmlString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<CustomerItemNo>" + dw_cell.GetItemXmlString(row, colCustomerItemNo) + L"</CustomerItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemXmlString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemXmlString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemXmlString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<RowNo>" + xstring(row - startRow + 1) + L"</RowNo>";
         itemStr += L"<Purchor>" + dw_cell.GetItemString(row, colBuyer) + L"</Purchor>";
         itemStr += L"<Package>" + dw_cell.GetItemString(row, colPackage) + L"</Package>";
         itemStr += L"<NWT>" + dw_cell.GetItemString(row, colNW) + L"</NWT>";
         itemStr += L"<GWT>" + dw_cell.GetItemString(row, colGW) + L"</GWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemString(row, colProductInfo1) + L"</ProductInfo1>";
         itemStr += L"<Purchor>" + dw_cell.GetItemXmlString(row, colBuyer) + L"</Purchor>";
         itemStr += L"<Package>" + dw_cell.GetItemXmlString(row, colPackage) + L"</Package>";
         itemStr += L"<NWT>" + dw_cell.GetItemXmlString(row, colNW) + L"</NWT>";
         itemStr += L"<GWT>" + dw_cell.GetItemXmlString(row, colGW) + L"</GWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemXmlString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemXmlString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemXmlString(row, colProductInfo1) + L"</ProductInfo1>";
         if (dw_cell.GetItemString(row, colBuyer) == L"")issend = L"0";
         itemStr += L"<IsSend>" + issend + L"</IsSend>";

@@ -1177,14 +1182,14 @@
         xstring itemStr = L"";
         xstring issend=L"1";
         itemStr += L"<RowID>"+getRowID(dw_cell,row)+L"</RowID>";
         itemStr += L"<ItemNo>"+dw_cell.GetItemString(row, colItemNo)+L"</ItemNo>";
         itemStr += L"<ItemName>"+dw_cell.GetItemString(row, colItemName)+L"</ItemName>";
         itemStr += L"<ItemCName>"+dw_cell.GetItemString(row, colItemCName)+L"</ItemCName>";
         itemStr += L"<ItemSpec>"+dw_cell.GetItemString(row, colItemSpec)+L"</ItemSpec>";
         itemStr += L"<ItemNo>"+dw_cell.GetItemXmlString(row, colItemNo)+L"</ItemNo>";
         itemStr += L"<ItemName>"+dw_cell.GetItemXmlString(row, colItemName)+L"</ItemName>";
         itemStr += L"<ItemCName>"+dw_cell.GetItemXmlString(row, colItemCName)+L"</ItemCName>";
         itemStr += L"<ItemSpec>"+dw_cell.GetItemXmlString(row, colItemSpec)+L"</ItemSpec>";
         itemStr += L"<RowNo>"+(row - startRow +1).toString()+L"</RowNo>";
         itemStr += L"<Purchor>"+dw_cell.GetItemString(row, colBuyer)+L"</Purchor>";
         itemStr += L"<Package>"+dw_cell.GetItemString(row, colPackage)+L"</Package>";
         if(dw_cell.GetItemString(row, colBuyer) ==L"")issend=L"0";
         itemStr += L"<Purchor>"+dw_cell.GetItemXmlString(row, colBuyer)+L"</Purchor>";
         itemStr += L"<Package>"+dw_cell.GetItemXmlString(row, colPackage)+L"</Package>";
         if(dw_cell.GetItemXmlString(row, colBuyer) ==L"")issend=L"0";
         itemStr += L"<IsSend>"+issend+L"</IsSend>";

         items += L"<Item>"+itemStr+L"</Item>";
@@ -1397,14 +1402,14 @@
         //if(dw_cell.GetItemString(row, colItemName)==L"")continue;
         xstring itemStr = L"";
         itemStr += L"<RowID>" + getRowID(dw_cell, row) + L"</RowID>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<BuyerPrice>" + dw_cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemString(row, colProductInfo1) + L"</ProductInfo1>";
         itemStr += L"<Buyer>" + dw_cell.GetItemString(row, colPurchor) + L"</Buyer>";
         itemStr += L"<ItemNo>" + dw_cell.GetItemXmlString(row, colItemNo) + L"</ItemNo>";
         itemStr += L"<ItemName>" + dw_cell.GetItemXmlString(row, colItemName) + L"</ItemName>";
         itemStr += L"<ItemCName>" + dw_cell.GetItemXmlString(row, colItemCName) + L"</ItemCName>";
         itemStr += L"<ItemSpec>" + dw_cell.GetItemXmlString(row, colItemSpec) + L"</ItemSpec>";
         itemStr += L"<BuyerPrice>" + dw_cell.GetItemXmlString(row, colBuyerPrice) + L"</BuyerPrice>";
         itemStr += L"<ProductInfo>" + dw_cell.GetItemXmlString(row, colProductInfo) + L"</ProductInfo>";
         itemStr += L"<ProductInfo1>" + dw_cell.GetItemXmlString(row, colProductInfo1) + L"</ProductInfo1>";
         itemStr += L"<Buyer>" + dw_cell.GetItemXmlString(row, colPurchor) + L"</Buyer>";

         /*
         if(dw_cell.GetItemString(row, colBuyerPrice)==L"") return L"采购价格没有录入";
@@ -1437,14 +1442,14 @@
            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>";
         itemStr += L"<NWT>" + dw_cell.GetItemString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + dw_cell.GetItemString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + dw_cell.GetItemString(row, col40HQ) + L"</F40HQ>";
         itemStr += L"<BuyerMOQ>" + dw_cell.GetItemXmlString(row, colBuyerMOQ) + L"</BuyerMOQ>";
         itemStr += L"<BuyerRemark>" + dw_cell.GetItemXmlString(row, colBuyerRemark) + L"</BuyerRemark>";
         itemStr += L"<FactoryImage>" + dw_cell.GetItemXmlString(row, colFactoryImage) + L"</FactoryImage>";
         itemStr += L"<GWT>" + dw_cell.GetItemXmlString(row, colGWT) + L"</GWT>";
         itemStr += L"<NWT>" + dw_cell.GetItemXmlString(row, colNWT) + L"</NWT>";
         itemStr += L"<VolDesc>" + dw_cell.GetItemXmlString(row, colVolDesc) + L"</VolDesc>";
         itemStr += L"<Vol>" + dw_cell.GetItemXmlString(row, colVol) + L"</Vol>";
         itemStr += L"<F40HQ>" + dw_cell.GetItemXmlString(row, col40HQ) + L"</F40HQ>";

         itemStr += L"<PurchedDate>" + sdate + L"</PurchedDate>";
         itemStr += L"<supplier-photo>" + getRowTerm(dw_cell, row, L"supplier-photo") + L"</supplier-photo>";
@@ -1853,7 +1858,7 @@
                  }
                  dw_cell.SetRowColumn(lastrow, 1);
                  dw_cell.SetAnchorRowColumn(lastrow, 1);
                  //SendCtrlCmd(dw_cell, L"xmFormatCellDeleteRow");
                  //SendCtrlCmd(dw_cell, L"xmFormatCellDeleteRow");  //now not direct delete purch next
                  drow++;
               }
            }
@@ -1862,12 +1867,16 @@
      }

      xstring finished = L"1";
      PUser& user = publiccode::GetUser();
      xstring myname = user.name;
      for (row = startRow; row <= rowCount; row++)
      {
         if (getRowID(dw_cell, row) == L"") continue;
         if (dw_cell.GetItemString(row, colItemName) == L"")continue;
         if (dw_cell.GetItemString(row, colSalebackDate) == L"")
         {
            xstring purchor = dw_cell.GetItemString(row, purchercol);
            if (purchor != L"" && purchor != myname) continue; //purchnext
            finished = L"0";
            break;
         }
@@ -1876,11 +1885,7 @@
      if (0 == 1)OnUpdateEntityFile();
      OnUpdate();

      if (finished == L"1")
      {
         OnUpdateProcessed();
         alert(L"xxxxx");
      }
      if (finished == L"1")OnUpdateProcessed();

      //OnSaveEx(true);
      //alert(L"询价信息已发送给:"+purchors);
@@ -2220,7 +2225,10 @@
   {
      trace(L"BusinessItemID:" + id);
      xml x = ViewObject::RetrieveData(L"/sale/data/TO/business/document", L"BusinessItemID", id);

		
      BSTR str;
      x.get_xml(str);
      ::SysFreeString(str);
      /*
      xml sheet ;
      sheet.setNativePointer(x.CreateInstance());
@@ -3879,7 +3887,7 @@
            dw_goods.SetItemString(i, L"ItemID", ItemID);
            xstring Item = L"<Item update.new='1' update.modify='1' guid='" + ItemID + L"'>";
            Item += L"<SKUID>" + ItemID + L"</SKUID>";
            Item += L"<GoodsNo>" + dw_goods.GetItemString(i, L"GoodsNo") + L"</GoodsNo>";
            Item += L"<GoodsNo>" + dw_goods.GetItemXmlString(i, L"GoodsNo") + L"</GoodsNo>";
            xstring SKUNo = GetNo();
            dw_goods.SetItemString(i, L"SKUNo", SKUNo);
            dw_goods.Redraw();
@@ -3890,9 +3898,9 @@

            Item += L"<No>" + SKUNo + L"</No>";
            Item += L"<SKUNo>" + SKUNo + L"</SKUNo>";
            Item += L"<CName>" + dw_goods.GetItemString(i, L"CName") + L"</CName>";
            Item += L"<EName>" + dw_goods.GetItemString(i, L"ItemName") + L"</EName>";
            Item += L"<Packing>" + dw_goods.GetItemString(i, L"Packing") + L"</Packing>";
            Item += L"<CName>" + dw_goods.GetItemXmlString(i, L"CName") + L"</CName>";
            Item += L"<EName>" + dw_goods.GetItemXmlString(i, L"ItemName") + L"</EName>";
            Item += L"<Packing>" + dw_goods.GetItemXmlString(i, L"Packing") + L"</Packing>";

            Item += L"<CategoryID>" + categoryID + L"</CategoryID>";
            Item += L"<FolderID>" + folderID + L"</FolderID>";
@@ -4148,6 +4156,7 @@
      ensureRowID();

      xstring content = dw_cell.GetData();
      string val = content.c_str();
      content = content.mid(content.find(L"<xsheet"), 9999999);
      while (true)
      {
@@ -5059,7 +5068,7 @@
         dw_cell.SetColumnWidth(colCustomerItemNo, 0);
         dw_cell.SetColumnWidth(colItemName, 0);
         dw_cell.SetColumnWidth(colItemCName, 0);
         dw_cell.SetColumnWidth(colBuyerRemark, 0);
         //dw_cell.SetColumnWidth(colBuyerRemark, 0);
         dw_cell.SetColumnWidth(colPackage, 0);
         dw_cell.SetColumnWidth(colQty, 0);
         dw_cell.SetColumnWidth(col40HQ, 0);
@@ -5109,7 +5118,7 @@
               }
            }
         }
         if (!bPrice1)
         if (!bPrice1 && colSupplier1 > 0)
         {
            dw_cell.SetRowColumn(1, colSupplier1);
            dw_cell.SetAnchorRowColumn(1, colSupplier1);
@@ -5340,8 +5349,8 @@
               if (hasParty(dw_cell.GetItemString(row, colSupplier)) == false)
               {
                  itemStr += L"<Item update.new='1' update.modify='1'>";
                  itemStr += L"<Name>" + dw_cell.GetItemString(row, colSupplier) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemString(row, colSupplier) + L"</ShortName>";
                  itemStr += L"<Name>" + dw_cell.GetItemXmlString(row, colSupplier) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemXmlString(row, colSupplier) + L"</ShortName>";
                  itemStr += L"</Item>";
               }
            }
@@ -5353,8 +5362,8 @@
               if (hasParty(dw_cell.GetItemString(row, colSupplier1)) == false)
               {
                  itemStr += L"<Item update.new='1' update.modify='1'>";
                  itemStr += L"<Name>" + dw_cell.GetItemString(row, colSupplier1) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemString(row, colSupplier1) + L"</ShortName>";
                  itemStr += L"<Name>" + dw_cell.GetItemXmlString(row, colSupplier1) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemXmlString(row, colSupplier1) + L"</ShortName>";
                  itemStr += L"</Item>";
               }
            }
@@ -5366,8 +5375,8 @@
               if (hasParty(dw_cell.GetItemString(row, colSupplier2)) == false)
               {
                  itemStr += L"<Item update.new='1' update.modify='1'>";
                  itemStr += L"<Name>" + dw_cell.GetItemString(row, colSupplier2) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemString(row, colSupplier2) + L"</ShortName>";
                  itemStr += L"<Name>" + dw_cell.GetItemXmlString(row, colSupplier2) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemXmlString(row, colSupplier2) + L"</ShortName>";
                  itemStr += L"</Item>";
               }
            }
@@ -5379,8 +5388,8 @@
               if (hasParty(dw_cell.GetItemString(row, colSupplier3)) == false)
               {
                  itemStr += L"<Item update.new='1' update.modify='1'>";
                  itemStr += L"<Name>" + dw_cell.GetItemString(row, colSupplier3) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemString(row, colSupplier3) + L"</ShortName>";
                  itemStr += L"<Name>" + dw_cell.GetItemXmlString(row, colSupplier3) + L"</Name>";
                  itemStr += L"<ShortName>" + dw_cell.GetItemXmlString(row, colSupplier3) + L"</ShortName>";
                  itemStr += L"</Item>";
               }
            }