From b559ec3076676e68139d51b9ae5374f31b94a4e1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 28 六月 2024 09:30:59 +0800
Subject: [PATCH] update message proc and edit proc

---
 jrj/xframe/adt/xarray.hpp                                |    9 
 jrj/xframe/wobject/xbase.hpp                             |   41 +
 jrj/project/business/HR/ManpowerFileWindow.cpp           |    2 
 jrj/xframe/wobject/xnode.hpp                             |    2 
 jrj/project/vindexmenu.cpp                               |    6 
 jrj/project/business/quote.enquiry.cpp                   |  964 +++++++++++++++++++++++++-------------------------
 jrj/xframe/win32/xfile.hpp                               |   38 --
 jrj/xframe/system/base.hpp                               |   12 
 jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp   |    2 
 jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp |    2 
 jrj/project/business/SO3.list.cpp                        |    2 
 jrj/ext-jrj/ext-jrj.vcxproj                              |    4 
 jrj/project/business/Supplier3.list.cpp                  |    2 
 13 files changed, 533 insertions(+), 553 deletions(-)

diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 82b24eb..49ca2cc 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -126,7 +126,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableUAC>false</EnableUAC>
-      <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;%(AdditionalDependencies);$(CoreLibraryDependencies)</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;shlwapi.lib;%(AdditionalDependencies);$(CoreLibraryDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>D:\xclient64</AdditionalLibraryDirectories>
     </Link>
     <PostBuildEvent>
@@ -273,7 +273,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\quote.enquiry.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\Quote3.list3.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
diff --git a/jrj/project/business/HR/ManpowerFileWindow.cpp b/jrj/project/business/HR/ManpowerFileWindow.cpp
index 9107ff0..2075a76 100644
--- a/jrj/project/business/HR/ManpowerFileWindow.cpp
+++ b/jrj/project/business/HR/ManpowerFileWindow.cpp
@@ -5,7 +5,7 @@
 use "vbind.vbind.wface.vd"
 use "publiccode.vutil.vbusiness.vd"
 use "multi.vbind.vbind.wface.vd"
-xxxxxxx
+
 unit trade
 [
 	class ViewManpowerFileWiondow : public xframe
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index 2169958..6056ff2 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -406,7 +406,7 @@
 	{
 		AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&SO3list::OnTreeSelChanged); //树选择
 		AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&SO3list::OnRowChanged);//绑定行更改触发事件OnRowChanged
-		AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listwin::OnDoubleClicked);
+		//AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listwin::OnDoubleClicked);
 		AttachEvent(L"cbx_1", L"CBN_SELCHANGE", (FEvent)&SO3list::OnSelectDdlb);//绑定下拉框更改触发事件OnSelectDdlb
 		AttachEvent(L"cbx_datashow", L"CBN_SELCHANGE", (FEvent)&SO3list::OnSelectDataShowDdlb);//绑定选择数据显示下拉列表事件OnSelectDataShowDdlb
 		return 1;
diff --git a/jrj/project/business/Supplier3.list.cpp b/jrj/project/business/Supplier3.list.cpp
index 2125201..6c3d5bb 100644
--- a/jrj/project/business/Supplier3.list.cpp
+++ b/jrj/project/business/Supplier3.list.cpp
@@ -450,7 +450,7 @@
 		AttachEvent(L"cbx_1", L"CBN_SELCHANGE", (FEvent)&listSupplierv3::OnSelectDdlb);
 		AttachEvent(L"pages", L"PAGE_CLICK", (FEvent)&listSupplierv3::OnChangePages);
 		AttachEvent(L"dw_list", L"DWV_RCLICKED", (FEvent)&listSupplierv3::OnRClick);//鼠标右键		
-		AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listSupplierv3::OnDoubleClicked);
+		//AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listSupplierv3::OnDoubleClicked);
 
 		return 1;
 	}
diff --git a/jrj/project/business/quote.enquiry.cpp b/jrj/project/business/quote.enquiry.cpp
index c18e069..ed954ef 100644
--- a/jrj/project/business/quote.enquiry.cpp
+++ b/jrj/project/business/quote.enquiry.cpp
@@ -103,7 +103,7 @@
 		int rowCount = dw_obj.GetValidRow();
 		for (int row = 1; row <= rowCount; row++)
 		{
-			if (dw_obj.GetItemString(row, 0) == L"鏍囬") return row;
+			if (dw_obj.GetItemString(row, 0) == L"标题") return row;
 			if (dw_obj.GetItemString(row, 1) == L"SKUID" || dw_obj.GetItemString(row, 2) == L"SKUID") return row;
 		}
 		return -1;
@@ -213,8 +213,8 @@
 				}
 				if (guid != L"")
 				{
-					xstring goodno = L"瀹㈡埛鍥剧墖";
-					if (tm == L"supplier-photo") goodno = L"渚涘簲鍟嗗浘鐗�";
+					xstring goodno = L"客户图片";
+					if (tm == L"supplier-photo") goodno = L"供应商图片";
 					xstring picname = GetImageUrl(guid);//"/business/products/chanpin/"+guid.left(2)+L"/"+guid+L".jpg";
 					im.AddImages(picname, goodno);
 				}
@@ -254,44 +254,44 @@
 	{
 		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"<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>";
 
 		int startRow = getItemHeadRow(cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return L"";
 		startRow++;
 
-		int colItemNo = getItemCol(cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
-		int colCustomerImage = getItemCol(cell, startRow - 1, L"Photo,鍥剧墖");
+		int colItemCName = getItemCol(cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(cell, startRow - 1, L"采购价,采购价格");
+		int colCustomerImage = getItemCol(cell, startRow - 1, L"Photo,图片");
 		int colSKUID = getItemCol(cell, startRow - 1, L"SKUID");
-		int colSaleRemark = getItemCol(cell, startRow - 1, L"涓氬姟To閲囪喘澶囨敞");
+		int colSaleRemark = getItemCol(cell, startRow - 1, L"业务To采购备注");
 
-		int colBuyerRemark = getItemCol(cell, startRow - 1, L"閲囪喘To涓氬姟澶囨敞");
-		int colFactoryImage = getItemCol(cell, startRow - 1, L"宸ュ巶鍥剧墖");
-		int colGWT = getItemCol(cell, startRow - 1, L"姣涢噸,姣涢噸(KG)L");
-		int colNWT = getItemCol(cell, startRow - 1, L"鍑�閲�,鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
+		int colBuyerRemark = getItemCol(cell, startRow - 1, L"采购To业务备注");
+		int colFactoryImage = getItemCol(cell, startRow - 1, L"工厂图片");
+		int colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)L");
+		int colNWT = getItemCol(cell, startRow - 1, L"净重,净重(KG)L");
+		int colVolDesc = getItemCol(cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(cell, startRow - 1, L"体积,体积(M3)L");
 		int col40HQ = getItemCol(cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 
-		int colSupplier1 = getItemCol(cell, startRow - 1, L"渚涘簲鍟�1");
-		int colSupplier = getItemCol(cell, startRow - 1, L"渚涘簲鍟�");
-		int colPOPrice1 = getItemCol(cell, startRow - 1, L"浠锋牸1");
-		int colPOPrice = getItemCol(cell, startRow - 1, L"浠锋牸");
+		int colSupplier1 = getItemCol(cell, startRow - 1, L"供应商1");
+		int colSupplier = getItemCol(cell, startRow - 1, L"供应商");
+		int colPOPrice1 = getItemCol(cell, startRow - 1, L"价格1");
+		int colPOPrice = getItemCol(cell, startRow - 1, L"价格");
 
-		int colInnerOuter = getItemCol(cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�)L");
-		int colItemQty = getItemCol(cell, startRow - 1, L"鏁伴噺,Qty");
-		int colPackage = getItemCol(cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
-		int colBuyer = getItemCol(cell, startRow - 1, L"閲囪喘浜哄憳");
+		int colInnerOuter = getItemCol(cell, startRow - 1, L"装箱数(内/外)L");
+		int colItemQty = getItemCol(cell, startRow - 1, L"数量,Qty");
+		int colPackage = getItemCol(cell, startRow - 1, L"Package,包装方式");
+		int colBuyer = getItemCol(cell, startRow - 1, L"采购人员");
 		int colRemark = getItemCol(cell, startRow - 1, L"Remarks");
 		int colFOBPrice = getItemCol(cell, startRow - 1, L"FOB Price,FOB Price(USD),Fob Price");
 
@@ -354,52 +354,52 @@
 	{
 		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"<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>";
 
 		int startRow = getItemHeadRow(cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return L"";
 		startRow++;
 
-		int colItemNo = getItemCol(cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
-		int colCustomerImage = getItemCol(cell, startRow - 1, L"Photo,鍥剧墖");
+		int colItemCName = getItemCol(cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(cell, startRow - 1, L"采购价,采购价格");
+		int colCustomerImage = getItemCol(cell, startRow - 1, L"Photo,图片");
 		int colSKUID = getItemCol(cell, startRow - 1, L"SKUID");
-		int colSaleRemark = getItemCol(cell, startRow - 1, L"涓氬姟To閲囪喘澶囨敞");
+		int colSaleRemark = getItemCol(cell, startRow - 1, L"业务To采购备注");
 
-		int colBuyerRemark = getItemCol(cell, startRow - 1, L"閲囪喘To涓氬姟澶囨敞");
-		int colFactoryImage = getItemCol(cell, startRow - 1, L"宸ュ巶鍥剧墖");
-		int colGWT = getItemCol(cell, startRow - 1, L"姣涢噸,姣涢噸(KG)L");
-		int colNWT = getItemCol(cell, startRow - 1, L"鍑�閲�,鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
+		int colBuyerRemark = getItemCol(cell, startRow - 1, L"采购To业务备注");
+		int colFactoryImage = getItemCol(cell, startRow - 1, L"工厂图片");
+		int colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)L");
+		int colNWT = getItemCol(cell, startRow - 1, L"净重,净重(KG)L");
+		int colVolDesc = getItemCol(cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(cell, startRow - 1, L"体积,体积(M3)L");
 		int col40HQ = getItemCol(cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 
-		int colPOPrice = getItemCol(cell, startRow - 1, L"浠锋牸");
-		int colSupplier = getItemCol(cell, startRow - 1, L"渚涘簲鍟�");
-		int colPOPrice1 = getItemCol(cell, startRow - 1, L"浠锋牸1");
-		int colSupplier1 = getItemCol(cell, startRow - 1, L"渚涘簲鍟�1");
-		int colPOPrice2 = getItemCol(cell, startRow - 1, L"浠锋牸2");
-		int colSupplier2 = getItemCol(cell, startRow - 1, L"渚涘簲鍟�2");
-		int colPOPrice3 = getItemCol(cell, startRow - 1, L"浠锋牸3");
-		int colSupplier3 = getItemCol(cell, startRow - 1, L"渚涘簲鍟�3");
-		int colBOMType = getItemCol(cell, startRow - 1, L"绫诲瀷");
-		int colBOMType1 = getItemCol(cell, startRow - 1, L"绫诲瀷1");
-		int colBOMType2 = getItemCol(cell, startRow - 1, L"绫诲瀷2");
-		int colBOMType3 = getItemCol(cell, startRow - 1, L"绫诲瀷3");
+		int colPOPrice = getItemCol(cell, startRow - 1, L"价格");
+		int colSupplier = getItemCol(cell, startRow - 1, L"供应商");
+		int colPOPrice1 = getItemCol(cell, startRow - 1, L"价格1");
+		int colSupplier1 = getItemCol(cell, startRow - 1, L"供应商1");
+		int colPOPrice2 = getItemCol(cell, startRow - 1, L"价格2");
+		int colSupplier2 = getItemCol(cell, startRow - 1, L"供应商2");
+		int colPOPrice3 = getItemCol(cell, startRow - 1, L"价格3");
+		int colSupplier3 = getItemCol(cell, startRow - 1, L"供应商3");
+		int colBOMType = getItemCol(cell, startRow - 1, L"类型");
+		int colBOMType1 = getItemCol(cell, startRow - 1, L"类型1");
+		int colBOMType2 = getItemCol(cell, startRow - 1, L"类型2");
+		int colBOMType3 = getItemCol(cell, startRow - 1, L"类型3");
 
-		int colInnerOuter = getItemCol(cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�)L");
-		int colItemQty = getItemCol(cell, startRow - 1, L"鏁伴噺,Qty");
-		int colPackage = getItemCol(cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
-		int colBuyer = getItemCol(cell, startRow - 1, L"閲囪喘浜哄憳");
+		int colInnerOuter = getItemCol(cell, startRow - 1, L"装箱数(内/外)L");
+		int colItemQty = getItemCol(cell, startRow - 1, L"数量,Qty");
+		int colPackage = getItemCol(cell, startRow - 1, L"Package,包装方式");
+		int colBuyer = getItemCol(cell, startRow - 1, L"采购人员");
 		int colRemark = getItemCol(cell, startRow - 1, L"Remarks");
 		int colFOBPrice = getItemCol(cell, startRow - 1, L"FOB Price,FOB Price(USD),Fob Price");
 
@@ -484,7 +484,7 @@
 				extStr += L"<BOMType2>" + cell.GetItemString(row, colBOMType2) + L"</BOMType2>";
 				extStr += L"<BOMType3>" + cell.GetItemString(row, colBOMType2) + L"</BOMType3>";
 
-				itemStr += L"<ExtItem>" + extStr + L"</ExtItem>"; //澶囩敤閲囪喘淇℃伅
+				itemStr += L"<ExtItem>" + extStr + L"</ExtItem>"; //备用采购信息
 				xstring eid = GetGuid();
 				setRowTerm(cell, row, L"EnquiryLineID", eid);
 				itemStr += L"<EnquiryLineID>" + getRowTerm(cell, row, L"EnquiryLineID") + L"</EnquiryLineID>";
@@ -501,7 +501,7 @@
 
 		if (dw_base.GetItemString(1, L"QuoteNo") == L"")
 		{
-			alert(L"璇峰厛淇濆瓨鏁版嵁!");
+			alert(L"请先保存数据!");
 			return 1;
 		}
 
@@ -543,7 +543,7 @@
 		im.Reset();
 
 		int startRow = getItemHeadRow(dw_cell);
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 1;
 		if (row <= startRow) return 1;
 
@@ -674,16 +674,16 @@
 	int ensureRowID()
 	{
 		int startRow = getItemHeadRow(dw_cell);
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
 
 		int LastRow = dw_cell.GetValidRow();
 		for (int row = startRow; row <= LastRow; row++)
@@ -708,7 +708,7 @@
 	int LookupCellRow(xcell cell, xstring rowid)
 	{
 		int startRow = getItemHeadRow(cell);
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 
@@ -812,36 +812,36 @@
 		return 1;
 	}
 
-	//鐢熸垚杩斿洖閿�鍞汉鍛樼殑閲囪喘浜у搧淇℃伅
+	//生成返回销售人员的采购产品信息
 	xstring makeMessageBacktoSaler(xstring myurl)
 	{
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return L"";
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
 
-		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)L");
-		int colNWT = getItemCol(dw_cell, startRow - 1, L"鍑�閲�,鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(dw_cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
+		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)L");
+		int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)L");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 
-		int colSupplier = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�");
-		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�1");
-		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"浠锋牸");
-		int colPOPrice1 = getItemCol(dw_cell, startRow - 1, L"浠锋牸1");
-		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"涓氬姟閮ㄤ骇鍝佷俊鎭�");
-		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"閲囪喘閮ㄤ骇鍝佷俊鎭�");
+		int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商");
+		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1");
+		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"价格");
+		int colPOPrice1 = getItemCol(dw_cell, startRow - 1, L"价格1");
+		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
+		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
 
 		int LastRow = dw_cell.GetValidRow();
 		xstring content = L"";
@@ -863,22 +863,22 @@
 			itemStr += L"<ProductInfo>" + dw_cell.GetItemString(row, colProductInfo) + L"</ProductInfo>";
 			itemStr += L"<ProductInfo1>" + dw_cell.GetItemString(row, colProductInfo1) + L"</ProductInfo1>";
 
-			if (dw_cell.GetItemString(row, colBuyerPrice) == L"") return L"閲囪喘浠锋牸娌℃湁褰曞叆";
-			if (dw_cell.GetItemString(row, colGWT) == L"") return L"姣涢噸娌℃湁褰曞叆";
-			if (dw_cell.GetItemString(row, colNWT) == L"") return L"鍑�閲嶆病鏈夊綍鍏�";
-			if (dw_cell.GetItemString(row, colVolDesc) == L"") return L"闀縓瀹絏楂樻病鏈夊綍鍏�";
-			if (dw_cell.GetItemString(row, colFactoryImage) == L"") return L"鍥剧墖娌℃湁褰曞叆";
+			if (dw_cell.GetItemString(row, colBuyerPrice) == L"") return L"采购价格没有录入";
+			if (dw_cell.GetItemString(row, colGWT) == L"") return L"毛重没有录入";
+			if (dw_cell.GetItemString(row, colNWT) == L"") return L"净重没有录入";
+			if (dw_cell.GetItemString(row, colVolDesc) == L"") return L"长X宽X高没有录入";
+			if (dw_cell.GetItemString(row, colFactoryImage) == L"") return L"图片没有录入";
 
-			if (dw_cell.GetItemString(row, colSupplier) == L"")return L"渚涘簲鍟嗘病鏈夊綍鍏�";
-			if (dw_cell.GetItemString(row, colPOPrice) == L"")return L"閲囪喘浠锋牸娌℃湁褰曞叆";
+			if (dw_cell.GetItemString(row, colSupplier) == L"")return L"供应商没有录入";
+			if (dw_cell.GetItemString(row, colPOPrice) == L"")return L"采购价格没有录入";
 
 			if (dw_cell.GetItemString(row, colPOPrice1) != L"")
 			{
-				if (dw_cell.GetItemString(row, colSupplier1) == L"") return L"渚涘簲鍟�1娌℃湁褰曞叆";
+				if (dw_cell.GetItemString(row, colSupplier1) == L"") return L"供应商1没有录入";
 			}
 			if (dw_cell.GetItemString(row, colSupplier1) != L"")
 			{
-				if (dw_cell.GetItemString(row, colPOPrice1) == L"") return L"閲囪喘浠锋牸1娌℃湁褰曞叆";
+				if (dw_cell.GetItemString(row, colPOPrice1) == L"") return L"采购价格1没有录入";
 			}
 			itemStr += L"<BuyerRemark>" + dw_cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
 			itemStr += L"<FactoryImage>" + dw_cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
@@ -981,28 +981,28 @@
 		arg.AddArg(L"FlowID",L"DCC32D5B-9FCD-4F53-B7CF-630441DE2B47");
 		arg.AddArg(L"EntityID",fileid);
 		//arg.AddArg(L"EntityID",L"DCC32D5B-9FCD-4F53-B7CF-630441DE2B47");
-		arg.AddArg(L"EntityNo",L"娴嬭瘯");
-		arg.AddArg(L"Subject",L"---娴嬭瘯鏁版嵁----:璇互涓嬩骇鍝佷环鏍�");
+		arg.AddArg(L"EntityNo",L"测试");
+		arg.AddArg(L"Subject",L"---测试数据----:询以下产品价格");
 		arg.AddArg(L"Content",content);
-		arg.AddArg(L"Status",L"閲囪喘璇环");
+		arg.AddArg(L"Status",L"采购询价");
 		arg.AddArg(L"Category",L"QuoteEnquiry");
 		arg.AddArg(L"Reciever",empno+L"|admin|00601");
 
 		xstring path=L"/sale/data/Thing/task/add/content1";
 		if (xurl::get(path,arg.GetString(),x) != 1)
 		{
-			alert(L"鍙戦�佸嚭閿欎簡!");
+			alert(L"发送出错了!");
 			return -1;
 		}else
 		{
 			if(x.xml().find(L"error")>=0)
 			{
-				alert(L"鍙戦�佸嚭閿欎簡!"+x.xml());
+				alert(L"发送出错了!"+x.xml());
 				return -1;
 			}
 			trace(x.xml());
 		}
-		trace(L"\r\n"+L"璇环鍗曞凡鍙戦�佺粰"+purchor);
+		trace(L"\r\n"+L"询价单已发送给"+purchor);
 
 		return 1;
 		*/
@@ -1015,29 +1015,29 @@
 		if (startRow < 1) return L"<data/>";
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyer = getItemCol(dw_cell, startRow - 1, L"閲囪喘浜哄憳");
-		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");
+		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,包装方式");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 
-		int colGW = getItemCol(dw_cell, startRow - 1, L"姣涢噸(KG)L");
-		int colNW = getItemCol(dw_cell, startRow - 1, L"鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"闀縓瀹絏楂�(CM)L");
+		int colGW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)L");
+		int colNW = getItemCol(dw_cell, startRow - 1, L"净重(KG)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"长X宽X高(CM)L");
 
-		int colPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�");
+		int colPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
 
-		int colSupplier = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�");
-		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�1");
-		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"浠锋牸");
-		int colPOPrice1 = getItemCol(dw_cell, startRow - 1, L"浠锋牸1");
-		int colBOMType = getItemCol(dw_cell, startRow - 1, L"绫诲瀷");
-		int colBOMType1 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷1");
-		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"涓氬姟閮ㄤ骇鍝佷俊鎭�");
-		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"閲囪喘閮ㄤ骇鍝佷俊鎭�");
+		int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商");
+		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1");
+		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"价格");
+		int colPOPrice1 = getItemCol(dw_cell, startRow - 1, L"价格1");
+		int colBOMType = getItemCol(dw_cell, startRow - 1, L"类型");
+		int colBOMType1 = getItemCol(dw_cell, startRow - 1, L"类型1");
+		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
+		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
 
 		xstring items = L"<data>";
 		int LastRow = dw_cell.GetValidRow();
@@ -1089,21 +1089,21 @@
 		if (startRow < 1) return L"<data/>";
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyer = getItemCol(dw_cell, startRow - 1, L"閲囪喘浜哄憳");
-		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");
+		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,包装方式");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 
-		int colGW = getItemCol(dw_cell, startRow - 1, L"姣涢噸(KG)L");
-		int colNW = getItemCol(dw_cell, startRow - 1, L"鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"闀縓瀹絏楂�(CM)L");
+		int colGW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)L");
+		int colNW = getItemCol(dw_cell, startRow - 1, L"净重(KG)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"长X宽X高(CM)L");
 
-		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"涓氬姟閮ㄤ骇鍝佷俊鎭�");
-		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"閲囪喘閮ㄤ骇鍝佷俊鎭�");
+		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
+		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
 
 		xstring items = L"<data>";
 		int LastRow = dw_cell.GetValidRow();
@@ -1149,15 +1149,15 @@
 		if(startRow < 1) return L"<data/>";
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell,startRow - 1,L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell,startRow - 1,L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell,startRow - 1,L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell,startRow - 1,L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell,startRow - 1,L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell,startRow - 1,L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell,startRow - 1,L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyer = getItemCol(dw_cell,startRow - 1,L"閲囪喘浜哄憳");
-		int colPackage = getItemCol(dw_cell,startRow - 1,L"Package,鍖呰鏂瑰紡");
+		int colItemCName = getItemCol(dw_cell,startRow - 1,L"中文品名");
+		int colItemSpec = getItemCol(dw_cell,startRow - 1,L"Specifications,规格,产品规格");
+		int colBuyer = getItemCol(dw_cell,startRow - 1,L"采购人员");
+		int colPackage = getItemCol(dw_cell,startRow - 1,L"Package,包装方式");
 		int col40HQ= getItemCol(dw_cell,startRow - 1,L"40HQ,QTY(40HQ)L");
-		int colBuyer = getItemCol(dw_cell,startRow - 1,L"閲囪喘浜哄憳");
+		int colBuyer = getItemCol(dw_cell,startRow - 1,L"采购人员");
 
 		xstring items=L"<data>";
 		int LastRow = dw_cell.GetValidRow();
@@ -1205,40 +1205,40 @@
 
 		if (row >= rowCount)
 		{
-			alert(L"鎵句笉鍒板晢鍝佽!");
+			alert(L"找不到商品行!");
 			return 1;
 		}
 
 		headrow = row;
 		int startRow = headrow + 1;
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
-		int colPurchor = getItemCol(dw_cell, startRow - 1, L"閲囪喘鍛�,閲囪喘浜哄憳");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
+		int colPurchor = getItemCol(dw_cell, startRow - 1, L"采购员,采购人员");
 
-		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)L");
-		int colNWT = getItemCol(dw_cell, startRow - 1, L"鍑�閲�,鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(dw_cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
+		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)L");
+		int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)L");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 
-		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�1");
-		int colPOPrice1 = getItemCol(dw_cell, startRow - 1, L"浠锋牸1");
-		int colSupplier = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�");
-		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"浠锋牸");
-		int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�2");
-		int colPOPrice2 = getItemCol(dw_cell, startRow - 1, L"浠锋牸2");
-		int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�3");
-		int colPOPrice3 = getItemCol(dw_cell, startRow - 1, L"浠锋牸3");
+		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1");
+		int colPOPrice1 = getItemCol(dw_cell, startRow - 1, L"价格1");
+		int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商");
+		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"价格");
+		int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"供应商2");
+		int colPOPrice2 = getItemCol(dw_cell, startRow - 1, L"价格2");
+		int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"供应商3");
+		int colPOPrice3 = getItemCol(dw_cell, startRow - 1, L"价格3");
 
-		int colSalebackDate = getItemCol(dw_cell, startRow - 1, L"閲囪喘鎻愪氦涓氬姟鏃堕棿");
-		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"涓氬姟閮ㄤ骇鍝佷俊鎭�");
-		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"閲囪喘閮ㄤ骇鍝佷俊鎭�");
+		int colSalebackDate = getItemCol(dw_cell, startRow - 1, L"采购提交业务时间");
+		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
+		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
 
 		int LastRow = dw_cell.GetValidRow();
 		int count = 0;
@@ -1255,37 +1255,37 @@
 			/*
 			if(dw_cell.GetItemString(row, colBuyerPrice)==L"")
 			{
-				alert(L"閲囪喘浠锋牸娌℃湁褰曞叆");
+				alert(L"采购价格没有录入");
 				return 1;
 			}
 			if(dw_cell.GetItemString(row, colGWT)==L"")
 			{
-				alert(L"姣涢噸娌℃湁褰曞叆");
+				alert(L"毛重没有录入");
 				return 1;
 			}
 			if(dw_cell.GetItemString(row, colNWT)==L"")
 			{
-				alert(L"鍑�閲嶆病鏈夊綍鍏�");
+				alert(L"净重没有录入");
 				return 1;
 			}
 			if(dw_cell.GetItemString(row, colVolDesc)==L"")
 			{
-				alert(L"闀縓瀹絏楂樻病鏈夊綍鍏�");
+				alert(L"长X宽X高没有录入");
 				return 1;
 			}
 			if(dw_cell.GetItemString(row, colFactoryImage)==L"")
 			{
-				alert(L"宸ュ巶鍥剧墖娌℃湁褰曞叆");
+				alert(L"工厂图片没有录入");
 				return 1;
 			}
 			if(dw_cell.GetItemString(row, colSupplier)==L"")
 			{
-				alert(L"渚涘簲鍟嗘病鏈夊綍鍏�");
+				alert(L"供应商没有录入");
 				return 1;
 			}
 			if(dw_cell.GetItemString(row, colPOPrice)==L"")
 			{
-				alert(L"閲囪喘浠锋牸娌℃湁褰曞叆");
+				alert(L"采购价格没有录入");
 				return 1;
 			}*/
 
@@ -1294,7 +1294,7 @@
 			{
 				if(dw_cell.GetItemString(row, colSupplier1)==L"")
 				{
-					alert(L"渚涘簲鍟�1娌℃湁褰曞叆");
+					alert(L"供应商1没有录入");
 					return 1;
 				}
 			}
@@ -1302,7 +1302,7 @@
 			{
 				if(dw_cell.GetItemString(row, colPOPrice1)==L"")
 				{
-					alert(L"閲囪喘浠锋牸1娌℃湁褰曞叆");
+					alert(L"采购价格1没有录入");
 					return 1;
 				}
 			}*/
@@ -1321,8 +1321,8 @@
 			head = dw_cell.GetItemString(row, col);
 			if (head == L"Product Name" || head == L"Product Description") namecol = col;
 			if (head == L"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)L") pricecol = col;
-			if (head == L"閲囪喘To涓氬姟澶囨敞") purchremarkcol = col;
-			if (head == L"閲囪喘浜哄憳") purchercol = col;
+			if (head == L"采购To业务备注") purchremarkcol = col;
+			if (head == L"采购人员") purchercol = col;
 		}
 
 		xstring items = GetPurchedItems();
@@ -1353,37 +1353,37 @@
 
 			if (dw_cell.GetItemString(row, colBuyerPrice) == L"")
 			{
-				alert(L"閲囪喘浠锋牸娌℃湁褰曞叆");
+				alert(L"采购价格没有录入");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colGWT) == L"")
 			{
-				alert(L"姣涢噸娌℃湁褰曞叆");
+				alert(L"毛重没有录入");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colNWT) == L"")
 			{
-				alert(L"鍑�閲嶆病鏈夊綍鍏�");
+				alert(L"净重没有录入");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colVolDesc) == L"")
 			{
-				alert(L"闀縓瀹絏楂樻病鏈夊綍鍏�");
+				alert(L"长X宽X高没有录入");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colFactoryImage) == L"")
 			{
-				alert(L"宸ュ巶鍥剧墖娌℃湁褰曞叆");
+				alert(L"工厂图片没有录入");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colSupplier) == L"")
 			{
-				alert(L"渚涘簲鍟嗘病鏈夊綍鍏�");
+				alert(L"供应商没有录入");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colPOPrice) == L"")
 			{
-				alert(L"閲囪喘浠锋牸娌℃湁褰曞叆");
+				alert(L"采购价格没有录入");
 				return 1;
 			}
 
@@ -1401,34 +1401,34 @@
 			itemStr += L"<Buyer>" + dw_cell.GetItemString(row, colPurchor) + L"</Buyer>";
 
 			/*
-			if(dw_cell.GetItemString(row, colBuyerPrice)==L"") return L"閲囪喘浠锋牸娌℃湁褰曞叆";
-			if(dw_cell.GetItemString(row, colGWT)==L"") return L"姣涢噸娌℃湁褰曞叆";
-			if(dw_cell.GetItemString(row, colNWT)==L"") return L"鍑�閲嶆病鏈夊綍鍏�";
-			if(dw_cell.GetItemString(row, colVolDesc)==L"") return L"闀縓瀹絏楂樻病鏈夊綍鍏�";
-			if(dw_cell.GetItemString(row, colFactoryImage)==L"") return L"鍥剧墖娌℃湁褰曞叆";
+			if(dw_cell.GetItemString(row, colBuyerPrice)==L"") return L"采购价格没有录入";
+			if(dw_cell.GetItemString(row, colGWT)==L"") return L"毛重没有录入";
+			if(dw_cell.GetItemString(row, colNWT)==L"") return L"净重没有录入";
+			if(dw_cell.GetItemString(row, colVolDesc)==L"") return L"长X宽X高没有录入";
+			if(dw_cell.GetItemString(row, colFactoryImage)==L"") return L"图片没有录入";
 
-			if(dw_cell.GetItemString(row, colSupplier)==L"") return L"渚涘簲鍟嗘病鏈夊綍鍏�";
-			if(dw_cell.GetItemString(row, colPOPrice)==L"") return L"閲囪喘浠锋牸娌℃湁褰曞叆";
+			if(dw_cell.GetItemString(row, colSupplier)==L"") return L"供应商没有录入";
+			if(dw_cell.GetItemString(row, colPOPrice)==L"") return L"采购价格没有录入";
 
 			if(dw_cell.GetItemString(row, colPOPrice1)!=L"")
 			{
-				if(dw_cell.GetItemString(row, colSupplier1)==L"") return L"渚涘簲鍟�1娌℃湁褰曞叆";
+				if(dw_cell.GetItemString(row, colSupplier1)==L"") return L"供应商1没有录入";
 			}
 			if(dw_cell.GetItemString(row, colSupplier1)!=L"")
 			{
-				if(dw_cell.GetItemString(row, colPOPrice1)==L"") return L"閲囪喘浠锋牸1娌℃湁褰曞叆";
+				if(dw_cell.GetItemString(row, colPOPrice1)==L"") return L"采购价格1没有录入";
 			}
 			if(dw_cell.GetItemString(row, colGWT)!=L"")
 			{
-				if(dw_cell.GetItemString(row, colGWT)==L"") return L"姣涢噸娌℃湁褰曞叆";
+				if(dw_cell.GetItemString(row, colGWT)==L"") return L"毛重没有录入";
 			}
 			if(dw_cell.GetItemString(row, colNWT)!=L"")
 			{
-				if(dw_cell.GetItemString(row, colNWT)==L"") return L"鍑�閲嶆病鏈夊綍鍏�";
+				if(dw_cell.GetItemString(row, colNWT)==L"") return L"净重没有录入";
 			}
 			if(dw_cell.GetItemString(row, colVolDesc)!=L"")
 			{
-				if(dw_cell.GetItemString(row, colVolDesc)==L"") return L"浣撶Н淇℃伅娌℃湁褰曞叆";
+				if(dw_cell.GetItemString(row, colVolDesc)==L"") return L"体积信息没有录入";
 			}
 			*/
 			itemStr += L"<BuyerRemark>" + dw_cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
@@ -1494,21 +1494,21 @@
 
 		if (row >= rowCount)
 		{
-			alert(L"鎵句笉鍒板晢鍝佽!");
+			alert(L"找不到商品行!");
 			return 1;
 		}
 
 		headrow = row;
 		int startRow = headrow + 1;
-		int colCustomerItemNo = getItemCol(dw_cell, headrow, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colCustomerItemNo = getItemCol(dw_cell, headrow, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, headrow, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, headrow, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, headrow, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colItemQty = getItemCol(dw_cell, headrow, L"鏁伴噺,Qty");
-		//int colItemSpec = getItemCol(dw_cell,headrow,L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colItemPurchDate = getItemCol(dw_cell, headrow, L"涓氬姟鍙戦�侀噰璐椂闂�");
+		int colItemCName = getItemCol(dw_cell, headrow, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, headrow, L"Specifications,规格,产品规格");
+		int colItemQty = getItemCol(dw_cell, headrow, L"数量,Qty");
+		//int colItemSpec = getItemCol(dw_cell,headrow,L"Specifications,规格,产品规格");
+		int colItemPurchDate = getItemCol(dw_cell, headrow, L"业务发送采购时间");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
-		int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�)L");
+		int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外)L");
 		int col = 0;
 		int namecol = 0;
 		int pricecol = 0;
@@ -1521,13 +1521,13 @@
 			head = dw_cell.GetItemString(row, col);
 			if (head == L"Product Name" || head == L"Product Description") namecol = col;
 			if (head == L"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)L") pricecol = col;
-			if (head == L"閲囪喘To涓氬姟澶囨敞") purchremarkcol = col;
-			if (head == L"閲囪喘浜哄憳") purchercol = col;
+			if (head == L"采购To业务备注") purchremarkcol = col;
+			if (head == L"采购人员") purchercol = col;
 		}
 
 		if (purchercol == 0)
 		{
-			alert(L"鎵句笉鍒伴噰璐汉鍛樻暟鎹�!");
+			alert(L"找不到采购人员数据!");
 			return 1;
 		}
 
@@ -1560,22 +1560,22 @@
 
 		if (row >= rowCount)
 		{
-			alert(L"鎵句笉鍒板晢鍝佽!");
+			alert(L"找不到商品行!");
 			return 1;
 		}
 
 		headrow = row;
 		int startRow = headrow + 1;
-		int colCustomerItemNo = getItemCol(dw_cell, headrow, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colCustomerItemNo = getItemCol(dw_cell, headrow, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, headrow, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, headrow, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, headrow, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colItemQty = getItemCol(dw_cell, headrow, L"鏁伴噺,Qty");
-		//int colItemSpec = getItemCol(dw_cell,headrow,L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colItemPurchDate = getItemCol(dw_cell, headrow, L"涓氬姟鍙戦�侀噰璐椂闂�");
+		int colItemCName = getItemCol(dw_cell, headrow, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, headrow, L"Specifications,规格,产品规格");
+		int colItemQty = getItemCol(dw_cell, headrow, L"数量,Qty");
+		//int colItemSpec = getItemCol(dw_cell,headrow,L"Specifications,规格,产品规格");
+		int colItemPurchDate = getItemCol(dw_cell, headrow, L"业务发送采购时间");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
-		int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�)L");
-		int colSalebackDate = getItemCol(dw_cell, startRow - 1, L"閲囪喘鎻愪氦涓氬姟鏃堕棿");
+		int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外)L");
+		int colSalebackDate = getItemCol(dw_cell, startRow - 1, L"采购提交业务时间");
 
 		int col = 0;
 		int namecol = 0;
@@ -1589,12 +1589,12 @@
 			head = dw_cell.GetItemString(row, col);
 			if (head == L"Product Name" || head == L"Product Description") namecol = col;
 			if (head == L"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)L") pricecol = col;
-			if (head == L"閲囪喘To涓氬姟澶囨敞") purchremarkcol = col;
-			if (head == L"閲囪喘浜哄憳") purchercol = col;
+			if (head == L"采购To业务备注") purchremarkcol = col;
+			if (head == L"采购人员") purchercol = col;
 		}
 		if (purchercol == 0)
 		{
-			alert(L"鎵句笉鍒伴噰璐汉鍛樻暟鎹�!");
+			alert(L"找不到采购人员数据!");
 			return 1;
 		}
 
@@ -1602,7 +1602,7 @@
 		row++;
 
 		int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
+		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,包装方式");
 
 		while (row <= rowCount)
 		{
@@ -1618,7 +1618,7 @@
 				}
 				else
 				{
-					alert(L"娌℃湁閲囪喘鍛橈細" + str);
+					alert(L"没有采购员：" + str);
 					return 1;
 				}
 			}
@@ -1626,7 +1626,7 @@
 		}
 		if (strs == L",L")
 		{
-			alert(L"璇锋寚瀹氶噰璐汉鍛�!");
+			alert(L"请指定采购人员!");
 			return 1;
 		}
 
@@ -1674,7 +1674,7 @@
 				}
 				else
 				{
-					alert(L"娌℃湁閲囪喘鍛橈細" + str);
+					alert(L"没有采购员：" + str);
 					return 1;
 				}
 			}
@@ -1794,7 +1794,7 @@
 			}
 			else
 			{
-				alert(L"鍑虹幇閿欒");
+				alert(L"出现错误");
 				return 1;
 			}
 
@@ -1811,7 +1811,7 @@
 
 			headrow1 = row2;
 			startrow1 = headrow1 + 1;
-			purchercol1 = getItemCol(cell1, headrow1, L"閲囪喘浜哄憳");
+			purchercol1 = getItemCol(cell1, headrow1, L"采购人员");
 		}
 		
 
@@ -1876,7 +1876,7 @@
 		}
 
 		//OnSaveEx(true);
-		//alert(L"璇环淇℃伅宸插彂閫佺粰:"+purchors);
+		//alert(L"询价信息已发送给:"+purchors);
 		return 1;
 	}
 
@@ -1895,45 +1895,45 @@
 
 		if (dw_base.GetItemString(1, L"CustomerID") == L"")
 		{
-			alert(L"璇疯緭鍏ユ姤浠风殑瀹㈡埛!");
+			alert(L"请输入报价的客户!");
 			return 1;
 		}
 
 		if (row >= rowCount)
 		{
-			alert(L"鎵句笉鍒板晢鍝佽!");
+			alert(L"找不到商品行!");
 			return 1;
 		}
 
-		if (getBaseItem(dw_cell, L"鎶ヤ环鎴鏃ユ湡锛�") == L"")
+		if (getBaseItem(dw_cell, L"报价截止日期：") == L"")
 		{
-			if (getBaseItem(dw_cell, L"鎶ヤ环鎴鏃ユ湡:") == L"")
+			if (getBaseItem(dw_cell, L"报价截止日期:") == L"")
 			{
-				alert(L"鎶ヤ环鎴鏃ユ湡鏈緭鍏�!");
+				alert(L"报价截止日期未输入!");
 				return 1;
 			}
 		}
 
-		if (getBaseItem(dw_cell, L"椤圭洰鍚嶇О:") == L"")
+		if (getBaseItem(dw_cell, L"项目名称:") == L"")
 		{
-			if (getBaseItem(dw_cell, L"椤圭洰鍚嶇О锛�") == L"")
+			if (getBaseItem(dw_cell, L"项目名称：") == L"")
 			{
-				alert(L"椤圭洰鍚嶇О鏈緭鍏�!");
+				alert(L"项目名称未输入!");
 				return 1;
 			}
 		}
 
 		headrow = row;
 		int startRow = headrow + 1;
-		int colCustomerItemNo = getItemCol(dw_cell, headrow, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colCustomerItemNo = getItemCol(dw_cell, headrow, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, headrow, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, headrow, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, headrow, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colItemQty = getItemCol(dw_cell, headrow, L"鏁伴噺,Qty");
-		//int colItemSpec = getItemCol(dw_cell,headrow,L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colItemPurchDate = getItemCol(dw_cell, headrow, L"涓氬姟鍙戦�侀噰璐椂闂�");
+		int colItemCName = getItemCol(dw_cell, headrow, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, headrow, L"Specifications,规格,产品规格");
+		int colItemQty = getItemCol(dw_cell, headrow, L"数量,Qty");
+		//int colItemSpec = getItemCol(dw_cell,headrow,L"Specifications,规格,产品规格");
+		int colItemPurchDate = getItemCol(dw_cell, headrow, L"业务发送采购时间");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
-		int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�)L");
+		int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外)L");
 
 		int col = 0;
 		int namecol = 0;
@@ -1947,12 +1947,12 @@
 			head = dw_cell.GetItemString(row, col);
 			if (head == L"Product Name" || head == L"Product Description") namecol = col;
 			if (head == L"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)L") pricecol = col;
-			if (head == L"閲囪喘To涓氬姟澶囨敞") purchremarkcol = col;
-			if (head == L"閲囪喘浜哄憳") purchercol = col;
+			if (head == L"采购To业务备注") purchremarkcol = col;
+			if (head == L"采购人员") purchercol = col;
 		}
 		if (purchercol == 0)
 		{
-			alert(L"鎵句笉鍒伴噰璐汉鍛樻暟鎹�!");
+			alert(L"找不到采购人员数据!");
 			return 1;
 		}
 
@@ -1960,7 +1960,7 @@
 		row++;
 
 		int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
+		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,包装方式");
 
 		while (row <= rowCount)
 		{
@@ -1969,38 +1969,38 @@
 
 			/*if(dw_cell.GetItemString(row,colCustomerItemNo)==L"")
 			{
-				alert(L"绗�"+xstring(row)+L"琛岃杈撳叆瀹㈡埛鍨嬪彿!");
+				alert(L"第"+xstring(row)+L"行请输入客户型号!");
 				return 1;
 			}*/
 			if (dw_cell.GetItemString(row, colItemName) == L"" || dw_cell.GetItemString(row, colItemCName) == L"")
 			{
-				alert(L"绗�" + xstring(row) + L"琛岃杈撳叆浜у搧鍚嶇О!");
+				alert(L"第" + xstring(row) + L"行请输入产品名称!");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colPackage) == L"")
 			{
-				alert(L"绗�" + xstring(row) + L"琛岃杈撳叆浜у搧鍖呰鏂瑰紡!");
+				alert(L"第" + xstring(row) + L"行请输入产品包装方式!");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colCustomerPhoto) == L"")
 			{
-				alert(L"绗�" + xstring(row) + L"琛岃閫夋嫨瀹㈡埛鍥剧墖!");
+				alert(L"第" + xstring(row) + L"行请选择客户图片!");
 				return 1;
 			}
 			if (dw_cell.GetItemString(row, colInnerOuter) == L"")
 			{
-				alert(L"绗�" + xstring(row) + L"琛岃褰曞叆鍐呭绠辫鏁�!");
+				alert(L"第" + xstring(row) + L"行请录入内外箱装数!");
 				return 1;
 			}
 			/*if(dw_cell.GetItemString(row,col40HQ)==L"")
 			{
-				alert(L"绗�"+xstring(row)+L"琛�40HQ鐨勬暟鎹槸绌虹殑!");
+				alert(L"第"+xstring(row)+L"行40HQ的数据是空的!");
 				return 1;
 			}*/
 
 			/*if(dw_cell.GetItemString(row,colItemQty)==L"")
 			{
-				alert(L"绗�"+xstring(row)+L"琛屾暟閲忔槸绌虹殑!");
+				alert(L"第"+xstring(row)+L"行数量是空的!");
 				return 1;
 			}*/
 
@@ -2013,7 +2013,7 @@
 				}
 				else
 				{
-					alert(L"娌℃湁閲囪喘鍛橈細" + str);
+					alert(L"没有采购员：" + str);
 					return 1;
 				}
 			}
@@ -2021,7 +2021,7 @@
 		}
 		if (strs == L",L")
 		{
-			alert(L"鎵句笉鍒伴噰璐汉鍛樻暟鎹�!");
+			alert(L"找不到采购人员数据!");
 			return 1;
 		}
 
@@ -2126,7 +2126,7 @@
 				cell1.SetRowColumn(1, purchercol);
 				cell1.SetAnchorRowColumn(1, purchercol);
 				SendCtrlCmd(cell1, L"xmFormatCellInsertCol");
-				cell1.SetItemString(headrow, purchercol, L"涓氬姟鍛�");
+				cell1.SetItemString(headrow, purchercol, L"业务员");
 
 				cell1.SetRowColumn(1, pricecol);
 				cell1.SetAnchorRowColumn(1, pricecol);
@@ -2142,12 +2142,12 @@
 				SendCtrlCmd(cell1, L"xmFormatCellInsertCol");
 				SendCtrlCmd(cell1, L"xmFormatCellInsertCol");
 
-				cell1.SetItemString(headrow, purchremarkcol + 1, L"渚涘簲鍟�");
-				cell1.SetItemString(headrow, purchremarkcol + 2, L"绫诲瀷");
-				cell1.SetItemString(headrow, purchremarkcol + 3, L"浠锋牸");
-				cell1.SetItemString(headrow, purchremarkcol + 4, L"渚涘簲鍟�1");
-				cell1.SetItemString(headrow, purchremarkcol + 5, L"绫诲瀷1");
-				cell1.SetItemString(headrow, purchremarkcol + 6, L"浠锋牸1");
+				cell1.SetItemString(headrow, purchremarkcol + 1, L"供应商");
+				cell1.SetItemString(headrow, purchremarkcol + 2, L"类型");
+				cell1.SetItemString(headrow, purchremarkcol + 3, L"价格");
+				cell1.SetItemString(headrow, purchremarkcol + 4, L"供应商1");
+				cell1.SetItemString(headrow, purchremarkcol + 5, L"类型1");
+				cell1.SetItemString(headrow, purchremarkcol + 6, L"价格1");
 
 				int colRemark = getItemCol(cell1, headrow, L"Remarks");
 				cell1.SetRowColumn(1, colRemark);
@@ -2183,15 +2183,15 @@
 		}
 		OnUpdate();
 		//OnSaveEx(true);
-		//alert(L"璇环淇℃伅宸插彂閫佺粰:"+purchors);
+		//alert(L"询价信息已发送给:"+purchors);
 
 		return 1;
 	}
 
-	//鐒︾偣婵�娲诲鐞嗗嚱鏁�
+	//焦点激活处理函数
 	int OnSetFocus(TEvent* evt, LPARAM param)
 	{
-		//閲嶇疆宸ュ叿鏉�
+		//重置工具条
 		SetAgent();
 		return 1;
 	}
@@ -2275,7 +2275,7 @@
 		if (ret == -1) return L"";
 		if (ret == 0)
 		{
-			alert(L"鍥剧墖涓婁紶澶辫触锛�");
+			alert(L"图片上传失败！");
 			return L"";
 		}
 		return GetImageUrl(guid);
@@ -2286,7 +2286,7 @@
 		ret = xaserver::DownLoadFile(GetServerUrl(),L"/business/products/chanpin/"+str+L"/"+name,name,appPath+L"/"+name);
 		if(ret < 0)
 		{
-			alert(L"鍥剧墖涓嬭浇澶辫触1锛�");
+			alert(L"图片下载失败1！");
 			return L"";
 		}
 
@@ -2296,7 +2296,7 @@
 		//xaserver::DeleteFile(appPath+name);
 		if(ret_1 != 1)
 		{
-			alert(L"涓婁紶缂╃暐鍥惧け璐�!");
+			alert(L"上传缩略图失败!");
 			return L"";
 		}
 		return appPath+L"/"+name;
@@ -2316,7 +2316,7 @@
 		if (ret == -1) return L"";
 		if (ret == 0)
 		{
-			alert(L"鍥剧墖涓婁紶澶辫触锛�");
+			alert(L"图片上传失败！");
 			return L"";
 		}
 
@@ -2325,7 +2325,7 @@
 		ret = xaserver::DownLoadFile(GetServerUrl(), L"/business/products/chanpin/" + str + L"/" + name, name, appPath + L"/" + name);
 		if (ret < 0)
 		{
-			alert(L"鍥剧墖涓嬭浇澶辫触1锛�");
+			alert(L"图片下载失败1！");
 			return L"";
 		}
 
@@ -2335,7 +2335,7 @@
 		//xaserver::DeleteFile(appPath+name);
 		if (ret_1 != 1)
 		{
-			alert(L"涓婁紶缂╃暐鍥惧け璐�!");
+			alert(L"上传缩略图失败!");
 			return L"";
 		}
 		return appPath + L"/" + name;
@@ -2392,8 +2392,8 @@
 			str += tm + L":" + guid + L";";
 		}
 
-		xstring goodno = L"瀹㈡埛鍥剧墖";
-		if (tm == L"supplier-photo") goodno = L"渚涘簲鍟嗗浘鐗�";
+		xstring goodno = L"客户图片";
+		if (tm == L"supplier-photo") goodno = L"供应商图片";
 		xstring picname = path;
 		if (picname == L"") picname = L"/business/products/chanpin/" + guid.left(2) + L"/" + guid + L".jpg";
 		im.AddImages(picname, goodno);
@@ -2429,11 +2429,11 @@
 		int row = dw_cell.GetRow();
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 		int colPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
+		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"工厂图片");
 		if (row < startRow) return  0;
 
 		xstring str = dw_cell.GetItemString(row, 0);
@@ -2547,11 +2547,11 @@
 		int row = dw_cell.GetRow();
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 		int colPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
+		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"工厂图片");
 		int LastRow = dw_cell.GetValidRow();
 		if (row < startRow) return  0;
 
@@ -2590,7 +2590,7 @@
 	int GetOpenFileNames(xarray<xstring>& items, xstring initFileName, xstring filter, xstring ext)
 	{
 		//xstring path = GetOpenFileName(L"",
-		//		"JPEG 鏂囦欢(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0鍏ㄩ儴鏂囦欢(*.*)\0*.*\0",
+		//		"JPEG 文件(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0全部文件(*.*)\0*.*\0",
 		//		"jpg");		
 
 		wchar_t  szFileName[4096];
@@ -2615,7 +2615,7 @@
 		ofn.hwndOwner = 0;
 		ofn.hInstance = 0;
 		ofn.lpstrFilter = filter;
-		//"JPEG 鏂囦欢(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0鍏ㄩ儴鏂囦欢(*.*)\0*.*\0";
+		//"JPEG 文件(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0全部文件(*.*)\0*.*\0";
 		ofn.lpstrCustomFilter = 0;
 		ofn.nMaxCustFilter = 0;
 		ofn.nFilterIndex = nFilterIndex;
@@ -2623,7 +2623,7 @@
 		ofn.nMaxFile = 4096;
 		ofn.lpstrFileTitle = szFileName;
 		ofn.nMaxFileTitle = 4096;
-		ofn.lpstrTitle = L"璇锋寚瀹氭枃浠跺悕";
+		ofn.lpstrTitle = L"请指定文件名";
 		ofn.lpstrDefExt = ext;
 		//"jpg";
 		ofn.lpstrInitialDir = 0;
@@ -2667,18 +2667,18 @@
 		int row = dw_cell.GetRow();
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 		int colPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
+		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"工厂图片");
 		int LastRow = dw_cell.GetValidRow();
 		if (row < startRow) return  0;
 
 		xstring appPath = xutil::GetModuleTmpPath();
 		xarray<xstring> items;
 		GetOpenFileNames(items, L"",
-			L"JPEG 鏂囦欢(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0鍏ㄩ儴鏂囦欢(*.*)\0*.*\0",
+			L"JPEG 文件(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0全部文件(*.*)\0*.*\0",
 			L"jpg");
 		if (items.length() < 1) return 1;
 
@@ -2739,11 +2739,11 @@
 		int row = dw_cell.GetRow();
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 		int colPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
+		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"工厂图片");
 		int LastRow = dw_cell.GetValidRow();
 		if (row < startRow) return  0;
 
@@ -2755,7 +2755,7 @@
 		xstring appPath = xutil::GetModuleTmpPath();
 		xarray<xstring> items;
 		GetOpenFileNames(items, L"",
-			L"JPEG 鏂囦欢(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0鍏ㄩ儴鏂囦欢(*.*)\0*.*\0",
+			L"JPEG 文件(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0全部文件(*.*)\0*.*\0",
 			L"jpg");
 		if (items.length() < 1) return 1;
 
@@ -2817,31 +2817,31 @@
 		if (row < startRow + 1) return 1;
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
-		int colBuyer = getItemCol(dw_cell, startRow - 1, L"閲囪喘浜哄憳");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
+		int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");
 		int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
+		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,包装方式");
 		int colFOBPrice = getItemCol(dw_cell, startRow - 1, L"FOB Price,FOB Price(USD),Fob Price");
-		int colQty = getItemCol(dw_cell, startRow - 1, L"Qty,鏁伴噺");
-		//int colToPODate = getItemCol(dw_cell,startRow - 1,L"涓氬姟鍙戦�侀噰璐椂闂�");
+		int colQty = getItemCol(dw_cell, startRow - 1, L"Qty,数量");
+		//int colToPODate = getItemCol(dw_cell,startRow - 1,L"业务发送采购时间");
 
 
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(dw_cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
-		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�),瑁呯鏁�(澶�/鍐�)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)L");
+		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外),装箱数(外/内)L");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 		int colSKUID = getItemCol(dw_cell, startRow - 1, L"SKUID");
 
-		int colPONote = getItemCol(dw_cell, startRow - 1, L"閲囪喘To涓氬姟澶囨敞");
-		int colPOPhoto = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
-		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�");
-		int colNW = getItemCol(dw_cell, startRow - 1, L"姣涢噸(KG)L");
-		int colGW = getItemCol(dw_cell, startRow - 1, L"鍑�閲�(KG)L");
+		int colPONote = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
+		int colPOPhoto = getItemCol(dw_cell, startRow - 1, L"工厂图片");
+		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
+		int colNW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)L");
+		int colGW = getItemCol(dw_cell, startRow - 1, L"净重(KG)L");
 		int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
 
 		if (col == colFOBPrice)
@@ -2931,7 +2931,7 @@
 
 		if (col == colVolDesc || col == colQtyPerPack)
 		{
-			/*璁＄畻浣撶Н*/
+			/*计算体积*/
 			double v = 0.0;
 			xstring desc = dw_cell.GetItemString(row, colVolDesc);
 			if (desc.find(L"cm") >= 0)
@@ -2977,20 +2977,20 @@
 
 		if (action == L"purch")
 		{
-			int colPrice0 = getItemCol(dw_cell, startRow - 1, L"浠锋牸");
-			int colPrice1 = getItemCol(dw_cell, startRow - 1, L"浠锋牸1");
-			int colPrice2 = getItemCol(dw_cell, startRow - 1, L"浠锋牸2");
-			int colPrice3 = getItemCol(dw_cell, startRow - 1, L"浠锋牸3");
-			int colPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�");
+			int colPrice0 = getItemCol(dw_cell, startRow - 1, L"价格");
+			int colPrice1 = getItemCol(dw_cell, startRow - 1, L"价格1");
+			int colPrice2 = getItemCol(dw_cell, startRow - 1, L"价格2");
+			int colPrice3 = getItemCol(dw_cell, startRow - 1, L"价格3");
+			int colPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
 
-			int colTyp = getItemCol(dw_cell, startRow - 1, L"绫诲瀷");
-			int colTyp1 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷1");
-			int colTyp2 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷2");
-			int colTyp3 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷3");
-			int colSupplier = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�,宸ュ巶");
-			int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�1,宸ュ巶1");
-			int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�2,宸ュ巶2");
-			int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�3,宸ュ巶3");
+			int colTyp = getItemCol(dw_cell, startRow - 1, L"类型");
+			int colTyp1 = getItemCol(dw_cell, startRow - 1, L"类型1");
+			int colTyp2 = getItemCol(dw_cell, startRow - 1, L"类型2");
+			int colTyp3 = getItemCol(dw_cell, startRow - 1, L"类型3");
+			int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商,工厂");
+			int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1,工厂1");
+			int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"供应商2,工厂2");
+			int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"供应商3,工厂3");
 
 			if (colPrice0 == col || colPrice1 == col || colPrice2 == col || colPrice3 == col)
 			{
@@ -3014,7 +3014,7 @@
 						price = price0;
 						if (price.find(L"A") < 1 && price.find(L"B") < 1 && price.find(L"C") < 1 && price.find(L"a") < 1 && price.find(L"b") < 1 && price.find(L"b") < 1)
 						{
-							alert(L"浠锋牸涓病鎸囧畾ABC");
+							alert(L"价格中没指定ABC");
 							if (pricea == L"") pricea = price; else pricea += L"+L" + price;
 						}
 						else if (price.find(L"A") > 0 || price.find(L"a") > 0)
@@ -3029,7 +3029,7 @@
 						price = price1;
 						if (price.find(L"A") < 1 && price.find(L"B") < 1 && price.find(L"C") < 1 && price.find(L"a") < 1 && price.find(L"b") < 1 && price.find(L"b") < 1)
 						{
-							alert(L"浠锋牸涓病鎸囧畾ABC");
+							alert(L"价格中没指定ABC");
 							if (pricea == L"") pricea = price; else pricea += L"+L" + price;
 						}
 						else if (price.find(L"A") > 0 || price.find(L"a") > 0)
@@ -3044,7 +3044,7 @@
 						price = price2;
 						if (price.find(L"A") < 1 && price.find(L"B") < 1 && price.find(L"C") < 1 && price.find(L"a") < 1 && price.find(L"b") < 1 && price.find(L"b") < 1)
 						{
-							alert(L"浠锋牸涓病鎸囧畾ABC");
+							alert(L"价格中没指定ABC");
 							if (pricea == L"") pricea = price; else pricea += L"+L" + price;
 						}
 						else if (price.find(L"A") > 0 || price.find(L"a") > 0)
@@ -3059,7 +3059,7 @@
 						price = price3;
 						if (price.find(L"A") < 1 && price.find(L"B") < 1 && price.find(L"C") < 1 && price.find(L"a") < 1 && price.find(L"b") < 1 && price.find(L"b") < 1)
 						{
-							alert(L"浠锋牸涓病鎸囧畾ABC");
+							alert(L"价格中没指定ABC");
 							if (pricea == L"") pricea = price; else pricea += L"+L" + price;
 						}
 						else if (price.find(L"A") > 0 || price.find(L"a") > 0)
@@ -3114,46 +3114,46 @@
 		if (colname == L"Project")
 		{
 
-			setBaseItem(dw_cell, L"椤圭洰鍚嶇О:", value);
+			setBaseItem(dw_cell, L"项目名称:", value);
 		}
 		return 1;
 	}
 
 	int OnToQuote()
 	{
-		xstring project = getBaseItem(dw_cell, L"椤圭洰鍚嶇О:");
+		xstring project = getBaseItem(dw_cell, L"项目名称:");
 		if (project != L"")dw_base.SetItemString(1, L"Project", project);
 
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
 
-		int colTechNote = getItemCol(dw_cell, startRow - 1, L"涓氬姟閮ㄤ骇鍝佷俊鎭�");
-		int colTechNote1 = getItemCol(dw_cell, startRow - 1, L"閲囪喘閮ㄤ骇鍝佷俊鎭�");
+		int colTechNote = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
+		int colTechNote1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
 
 
 
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
 		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package");
-		int colPurchor = getItemCol(dw_cell, startRow - 1, L"閲囪喘鍛�,閲囪喘浜哄憳");
-		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�)L");
+		int colPurchor = getItemCol(dw_cell, startRow - 1, L"采购员,采购人员");
+		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外)L");
 		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 colQuantity = getItemCol(dw_cell, startRow - 1, L"数量,Qty");
 
-		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)L");
-		int colNWT = getItemCol(dw_cell, startRow - 1, L"鍑�閲�,鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(dw_cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
+		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)L");
+		int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)L");
 		int colHQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 		int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
 
@@ -3368,9 +3368,9 @@
 		startRow++;
 		int row = dw_cell.GetRow();
 
-		int colPurchPrice1 = getItemCol(dw_cell, headrow, L"浠锋牸1");
-		int colPurchPrice2 = getItemCol(dw_cell, headrow, L"浠锋牸2");
-		int colPurchPrice3 = getItemCol(dw_cell, headrow, L"浠锋牸3");
+		int colPurchPrice1 = getItemCol(dw_cell, headrow, L"价格1");
+		int colPurchPrice2 = getItemCol(dw_cell, headrow, L"价格2");
+		int colPurchPrice3 = getItemCol(dw_cell, headrow, L"价格3");
 		if (colPurchPrice3 > 0) return  1;
 
 		if (colPurchPrice2 < 1)
@@ -3384,9 +3384,9 @@
 			SendCtrlCmd(dw_cell, L"xmFormatCellInsertCol");
 			SendCtrlCmd(dw_cell, L"xmFormatCellInsertCol");
 
-			dw_cell.SetItemString(headrow, colPurchPrice1 + 1, L"渚涘簲鍟�2");
-			dw_cell.SetItemString(headrow, colPurchPrice1 + 2, L"绫诲瀷2");
-			dw_cell.SetItemString(headrow, colPurchPrice1 + 3, L"浠锋牸2");
+			dw_cell.SetItemString(headrow, colPurchPrice1 + 1, L"供应商2");
+			dw_cell.SetItemString(headrow, colPurchPrice1 + 2, L"类型2");
+			dw_cell.SetItemString(headrow, colPurchPrice1 + 3, L"价格2");
 		}
 		else
 		{
@@ -3399,14 +3399,14 @@
 			SendCtrlCmd(dw_cell, L"xmFormatCellInsertCol");
 			SendCtrlCmd(dw_cell, L"xmFormatCellInsertCol");
 
-			dw_cell.SetItemString(headrow, colPurchPrice2 + 1, L"渚涘簲鍟�3");
-			dw_cell.SetItemString(headrow, colPurchPrice2 + 2, L"绫诲瀷3");
-			dw_cell.SetItemString(headrow, colPurchPrice2 + 3, L"浠锋牸3");
+			dw_cell.SetItemString(headrow, colPurchPrice2 + 1, L"供应商3");
+			dw_cell.SetItemString(headrow, colPurchPrice2 + 2, L"类型3");
+			dw_cell.SetItemString(headrow, colPurchPrice2 + 3, L"价格3");
 		}
 		return 1;
 	}
 
-	//鍛戒护鍙戝竷鍑芥暟
+	//命令发布函数
 	int OnCmdDispatch(xstring comdid)
 	{
 		if (comdid == L"xmAddBOMItem") return OnAddBOMItem();
@@ -3414,7 +3414,7 @@
 		{
 			if (dw_base.GetItemString(1, L"CustomerID") == L"")
 			{
-				alert(L"瀵煎嚭鍓嶈杈撳叆瀹㈡埛");
+				alert(L"导出前请输入客户");
 				return 1;
 			}
 			return OnPrint();
@@ -3460,7 +3460,7 @@
 		}
 		else if (comdid == L"xmRefreshTask1")
 		{
-			PostMessage(GetFrameWindow().GetHWND(), 0x401, L"xmRefreshTask", 0);
+			PostMessage(GetFrameWindow().GetHWND(), 0x401, (WPARAM)L"xmRefreshTask", 0);
 			return 1;
 		}
 		else if (comdid == L"xmFileOpen" || comdid == L"xmOpen" || comdid == L"xmNew")
@@ -3508,7 +3508,7 @@
 				dw_cell.Redraw();
 				filename = args.GetArgString(L"filename");
 				fileid = args.GetArgString(L"ID");
-				SetWindowText(GetHWND(), L"鎶ヤ环鏂囦欢:" + filename);
+				SetWindowText(GetHWND(), L"报价文件:" + filename);
 			}
 			return 1;
 		}
@@ -3518,7 +3518,7 @@
 			dw_cell.Redraw();
 			filename = L"";
 			fileid = L"";
-			SetWindowText(GetHWND(), L"鎶ヤ环鏂囦欢:[new]");
+			SetWindowText(GetHWND(), L"报价文件:[new]");
 			return 1;
 		}
 		else if (comdid == L"xmFileSave" || comdid == L"xmSave")
@@ -3607,7 +3607,7 @@
 		{
 			xstring QuoteNo = QuoteView::MakeBillNo();
 			dw_base.SetItemString(1, L"QuoteNo", QuoteNo);
-			setBaseItem(dw_cell, L"鎶ヤ环鍗曞彿:", QuoteNo);
+			setBaseItem(dw_cell, L"报价单号:", QuoteNo);
 		}
 		if (dw_base.GetGuid(1) == L"")
 			dw_base.SetGuid(1, entityID);
@@ -3689,14 +3689,14 @@
 			{
 				dw_goods.ResetUpdateStatus();
 				dw_base.ResetUpdateStatus();
-				if (balert)alert(L"淇濆瓨鎴愬姛!");
+				if (balert)alert(L"保存成功!");
 
 				return -1;
 
 			}
 			else
 			{
-				alert(L"淇濆瓨澶辫触!");
+				alert(L"保存失败!");
 				return -1;
 			}
 		}
@@ -3723,7 +3723,7 @@
 
 	int OnInit()
 	{
-		//鍏徃鎶ご銆佹姤浠蜂汉銆佹姤浠锋棩鏈�
+		//公司抬头、报价人、报价日期
 		xstring sdate = publiccode::GetCurrentDate();
 		dw_base.SetItemString(1, L"QuoteDate", sdate);
 		xstring suserid = publiccode::GetUser().id;
@@ -3749,7 +3749,7 @@
 		//dw_base.SetItemString(1,L"ExchangeRate",GetExchangeRate(L"USD"));
 
 		dw_base.SetItemString(1, L"CompanyID", L"E9E3C542-062C-4957-B8F4-9B92C3E351FC");
-		dw_base.SetItemDisplayString(1, L"CompanyID", L"瀹佹尝瀹跺皵浣宠繘鍑哄彛鏈夐檺鍏徃");
+		dw_base.SetItemDisplayString(1, L"CompanyID", L"宁波家尔佳进出口有限公司");
 
 		/*xstring ss = L"select (select EnglishName from Party where PartyID = CompanyID) as 'CompanyID/@_displaystring',CompanyID from HR_Org where OrgID = '{$id}' for xml PATH('root'),ELEMENTS XSINIL";
 		xstring scguid;
@@ -3949,8 +3949,8 @@
 
 		if (tabsheet != L"tab_quote") OnToQuote();
 
-		if (getBaseItem(dw_cell, L"鎶ヤ环鍗曞彿:") == L"")
-			setBaseItem(dw_cell, L"鎶ヤ环鍗曞彿:", dw_base.GetItemString(1, L"QuoteNo"));
+		if (getBaseItem(dw_cell, L"报价单号:") == L"")
+			setBaseItem(dw_cell, L"报价单号:", dw_base.GetItemString(1, L"QuoteNo"));
 
 		OnUpdate();
 		if (action == L"purch") return 1;
@@ -3982,7 +3982,7 @@
 		int ret = xaserver::UploadData(suri, sguid + L".jpg", content);
 		if (ret < 0)
 		{
-			alert(L"涓婁紶鏂囦欢鍑洪敊!");
+			alert(L"上传文件出错!");
 			return 0;
 		}
 
@@ -4000,13 +4000,13 @@
 		if (filename == L"" || saveas) path = L"/sale/data/TDocument3/attachment/add";
 		if (xurl::get(path, args.GetString(), x) != 1)
 		{
-			alert(L"淇濆瓨鍑洪敊浜�!");
+			alert(L"保存出错了!");
 			return 0;
 		}
 		else
 		{
 			filename = sfilename;
-			SetWindowText(GetHWND(), L"鎶ヤ环鏂囦欢:" + filename);
+			SetWindowText(GetHWND(), L"报价文件:" + filename);
 			alert(x.text());
 		}
 
@@ -4015,7 +4015,7 @@
 
 	int SendCtrlCmd(xcontrol xc, xstring cmd)
 	{
-		SendMessage(xc.GetHWND(), 0x401, cmd, 0);
+		SendMessage(xc.GetHWND(), 0x401, (WPARAM)cmd.c_str(), 0);
 		return 1;
 	}
 
@@ -4034,7 +4034,7 @@
 		if (row < startRow)
 		{
 			xstring val = dw_cell.GetItemString(row, col);
-			if (val == L"鎶ヤ环鍗曞彿:" || val == L"鎶ヤ环鎴鏃ユ湡锛�" || val == L"椤圭洰鍚嶇О:")
+			if (val == L"报价单号:" || val == L"报价截止日期：" || val == L"项目名称:")
 			{
 				dwhdr.idFrom = -1;
 				return 1;
@@ -4042,7 +4042,7 @@
 			if (col > 1)
 			{
 				val = dw_cell.GetItemString(row, col - 1);
-				if (val == L"鎶ヤ环鍗曞彿:")
+				if (val == L"报价单号:")
 				{
 					dwhdr.idFrom = -1;
 					return 1;
@@ -4059,47 +4059,47 @@
 
 		trace(xstring(row) + L"---" + xstring(startRow - 1));
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
-		int colBuyer = getItemCol(dw_cell, startRow - 1, L"閲囪喘浜哄憳");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
+		int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");
 		int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
+		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,包装方式");
 		int colFOBPrice = getItemCol(dw_cell, startRow - 1, L"FOB Price,FOB Price(USD),Fob Price");
-		int colQty = getItemCol(dw_cell, startRow - 1, L"Qty,鏁伴噺");
-		//int colToPODate = getItemCol(dw_cell,startRow - 1,L"涓氬姟鍙戦�侀噰璐椂闂�");
+		int colQty = getItemCol(dw_cell, startRow - 1, L"Qty,数量");
+		//int colToPODate = getItemCol(dw_cell,startRow - 1,L"业务发送采购时间");
 
-		int colSaler = getItemCol(dw_cell, startRow - 1, L"涓氬姟鍛�");
+		int colSaler = getItemCol(dw_cell, startRow - 1, L"业务员");
 
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(dw_cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
-		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�),瑁呯鏁�(澶�/鍐�)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)L");
+		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外),装箱数(外/内)L");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 		int colSKUID = getItemCol(dw_cell, startRow - 1, L"SKUID");
 
-		int colPONote = getItemCol(dw_cell, startRow - 1, L"閲囪喘To涓氬姟澶囨敞");
-		int colPONote2 = getItemCol(dw_cell, startRow - 1, L"涓氬姟To閲囪喘澶囨敞");
+		int colPONote = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
+		int colPONote2 = getItemCol(dw_cell, startRow - 1, L"业务To采购备注");
 
-		int colItemNote = getItemCol(dw_cell, startRow - 1, L"浜у搧澶囨敞");
+		int colItemNote = getItemCol(dw_cell, startRow - 1, L"产品备注");
 
-		int colPOPhoto = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
-		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�");
-		int colNW = getItemCol(dw_cell, startRow - 1, L"姣涢噸(KG)L");
-		int colGW = getItemCol(dw_cell, startRow - 1, L"鍑�閲�(KG)L");
+		int colPOPhoto = getItemCol(dw_cell, startRow - 1, L"工厂图片");
+		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
+		int colNW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)L");
+		int colGW = getItemCol(dw_cell, startRow - 1, L"净重(KG)L");
 		int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
 
-		int purchremarkcol = getItemCol(dw_cell, startRow - 1, L"閲囪喘To涓氬姟澶囨敞");
+		int purchremarkcol = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
 		int colRemark = getItemCol(dw_cell, startRow - 1, L"Remarks");
 
-		//int colProductInfo = getItemCol(dw_cell,startRow - 1,L"浜у搧淇℃伅");
-		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"涓氬姟閮ㄤ骇鍝佷俊鎭�");
-		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"閲囪喘閮ㄤ骇鍝佷俊鎭�");
+		//int colProductInfo = getItemCol(dw_cell,startRow - 1,L"产品信息");
+		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
+		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
 
 
-		int colItemPurchDate = getItemCol(dw_cell, startRow - 1, L"涓氬姟鍙戦�侀噰璐椂闂�");
+		int colItemPurchDate = getItemCol(dw_cell, startRow - 1, L"业务发送采购时间");
 
 		dwhdr.idFrom = 0;
 		if (action != L"purch")
@@ -4125,8 +4125,8 @@
 				xstring pitems = L"";
 				for (int i = 0; i < count; i++)
 				{
-					pitems += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;" + items.item(i).selectSingleNode(L"Name").text() + L"&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-						+ items.item(i).selectSingleNode(L"Name").text() + L"&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
+					pitems += (xstring)L"&lt;row&gt;&lt;显示列&gt;" + items.item(i).selectSingleNode(L"Name").text() + L"&lt;/显示列&gt;&lt;数据列&gt;"
+						+ items.item(i).selectSingleNode(L"Name").text() + L"&lt;/数据列&gt;&lt;/row&gt;";
 
 				}
 				xstring prop = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
@@ -4145,8 +4145,8 @@
 				xstring pitems = L"";
 				for(int i=0;i<count;i++)
 				{
-					pitems += L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;"+items.item(i).selectSingleNode(L"Name").text+L"&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-							+items.item(i).selectSingleNode(L"Name").text + L"&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
+					pitems += L"&lt;row&gt;&lt;显示列&gt;"+items.item(i).selectSingleNode(L"Name").text+L"&lt;/显示列&gt;&lt;数据列&gt;"
+							+items.item(i).selectSingleNode(L"Name").text + L"&lt;/数据列&gt;&lt;/row&gt;";
 
 				}
 				xstring prop=L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
@@ -4156,7 +4156,7 @@
 			}*/
 			if (col == colPackage)
 			{
-				xstring proppack = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='淇濇姢' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''><edit edittype='ddlb' ddlbdataurl='xquery:[Convert.quickcode.xq]?id=鍖呰鏂瑰紡1' ddlbxml=''/></cellprop>";
+				xstring proppack = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='保护' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''><edit edittype='ddlb' ddlbdataurl='xquery:[Convert.quickcode.xq]?id=包装方式1' ddlbxml=''/></cellprop>";
 				dw_cell.SetCellProps(row, col, proppack);
 			}
 		}
@@ -4175,20 +4175,20 @@
 
 		if (action == L"purch")
 		{
-			int colPrice0 = getItemCol(dw_cell, startRow - 1, L"浠锋牸");
-			int colPrice1 = getItemCol(dw_cell, startRow - 1, L"浠锋牸1");
-			int colPrice2 = getItemCol(dw_cell, startRow - 1, L"浠锋牸2");
-			int colPrice3 = getItemCol(dw_cell, startRow - 1, L"浠锋牸3");
-			int colPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�");
+			int colPrice0 = getItemCol(dw_cell, startRow - 1, L"价格");
+			int colPrice1 = getItemCol(dw_cell, startRow - 1, L"价格1");
+			int colPrice2 = getItemCol(dw_cell, startRow - 1, L"价格2");
+			int colPrice3 = getItemCol(dw_cell, startRow - 1, L"价格3");
+			int colPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
 
-			int colTyp = getItemCol(dw_cell, startRow - 1, L"绫诲瀷");
-			int colTyp1 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷1");
-			int colTyp2 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷2");
-			int colTyp3 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷3");
-			int colSupplier = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�,宸ュ巶");
-			int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�1,宸ュ巶1");
-			int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�2,宸ュ巶2");
-			int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�3,宸ュ巶3");
+			int colTyp = getItemCol(dw_cell, startRow - 1, L"类型");
+			int colTyp1 = getItemCol(dw_cell, startRow - 1, L"类型1");
+			int colTyp2 = getItemCol(dw_cell, startRow - 1, L"类型2");
+			int colTyp3 = getItemCol(dw_cell, startRow - 1, L"类型3");
+			int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商,工厂");
+			int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1,工厂1");
+			int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"供应商2,工厂2");
+			int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"供应商3,工厂3");
 
 
 			if (col == colSupplier || col == colSupplier1 || col == colSupplier2 || col == colSupplier3)
@@ -4196,7 +4196,7 @@
 				if (dw_cell.GetItemString(row, col) == L"")
 					dw_cell.SetItemString(row, col, L" ");
 				xstring prop2 = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
-					L"<edit edittype='query' dddwxpageurl='' dddwdataurl='xquery:[Convert.quickcode.xq]?id=Supplier' dddwtemplateurl='dev:sheet[Supplier.v3.tpl/List]' dddwdatacolumn='Name' dddwdisplaycolumn='Name' dddwwidth='' dddwheight='' dddwautoselect='N' dddwshowbutton='鍚�' dddwcanedit='鏄�'/>" +
+					L"<edit edittype='query' dddwxpageurl='' dddwdataurl='xquery:[Convert.quickcode.xq]?id=Supplier' dddwtemplateurl='dev:sheet[Supplier.v3.tpl/List]' dddwdatacolumn='Name' dddwdisplaycolumn='Name' dddwwidth='' dddwheight='' dddwautoselect='N' dddwshowbutton='否' dddwcanedit='是'/>" +
 					L"</cellprop>";
 				dw_cell.SetCellProps(row, col, prop2);
 				dw_cell.Redraw();
@@ -4204,12 +4204,12 @@
 			else if (col == colTyp1 || col == colTyp || col == colTyp2 || col == colTyp3)
 			{
 				xstring pitems1 = L"";
-				pitems1 += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;鎴愬搧&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-					+ L"鎴愬搧&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
-				pitems1 += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;鏁ｈ揣&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-					+ L"鏁ｈ揣&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
-				pitems1 += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;鍖呰&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-					+ L"鍖呰&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
+				pitems1 += (xstring)L"&lt;row&gt;&lt;显示列&gt;成品&lt;/显示列&gt;&lt;数据列&gt;"
+					+ L"成品&lt;/数据列&gt;&lt;/row&gt;";
+				pitems1 += (xstring)L"&lt;row&gt;&lt;显示列&gt;散货&lt;/显示列&gt;&lt;数据列&gt;"
+					+ L"散货&lt;/数据列&gt;&lt;/row&gt;";
+				pitems1 += (xstring)L"&lt;row&gt;&lt;显示列&gt;包装&lt;/显示列&gt;&lt;数据列&gt;"
+					+ L"包装&lt;/数据列&gt;&lt;/row&gt;";
 				xstring prop1 = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
 					L"<edit edittype='ddlb' ddlbdataurl='' ddlbxml='&lt;data&gt;" + pitems1 + L"&lt;/data&gt;'/>" +
 					L"</cellprop>";
@@ -4246,31 +4246,31 @@
 
 		trace(xstring(row) + L"---" + xstring(startRow - 1));
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
-		int colBuyer = getItemCol(dw_cell, startRow - 1, L"閲囪喘浜哄憳");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
+		int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");
 		int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
-		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,鍖呰鏂瑰紡");
+		int colPackage = getItemCol(dw_cell, startRow - 1, L"Package,包装方式");
 		int colFOBPrice = getItemCol(dw_cell, startRow - 1, L"FOB Price,FOB Price(USD),Fob Price");
-		int colQty = getItemCol(dw_cell, startRow - 1, L"Qty,鏁伴噺");
-		//int colToPODate = getItemCol(dw_cell,startRow - 1,L"涓氬姟鍙戦�侀噰璐椂闂�");
+		int colQty = getItemCol(dw_cell, startRow - 1, L"Qty,数量");
+		//int colToPODate = getItemCol(dw_cell,startRow - 1,L"业务发送采购时间");
 
 
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(dw_cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
-		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"瑁呯鏁�(鍐�/澶�),瑁呯鏁�(澶�/鍐�)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)L");
+		int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外),装箱数(外/内)L");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
 		int colSKUID = getItemCol(dw_cell, startRow - 1, L"SKUID");
 
-		int colPONote = getItemCol(dw_cell, startRow - 1, L"閲囪喘To涓氬姟澶囨敞");
-		int colPOPhoto = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
-		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�");
-		int colNW = getItemCol(dw_cell, startRow - 1, L"姣涢噸(KG)L");
-		int colGW = getItemCol(dw_cell, startRow - 1, L"鍑�閲�(KG)L");
+		int colPONote = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
+		int colPOPhoto = getItemCol(dw_cell, startRow - 1, L"工厂图片");
+		int colPOPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
+		int colNW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)L");
+		int colGW = getItemCol(dw_cell, startRow - 1, L"净重(KG)L");
 		int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
 
 		dwhdr.idFrom = 0;
@@ -4298,8 +4298,8 @@
 				xstring pitems = L"";
 				for (int i = 0; i < count; i++)
 				{
-					pitems += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;" + items.item(i).selectSingleNode(L"Name").text() + L"&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-						+ items.item(i).selectSingleNode(L"Name").text() + L"&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
+					pitems += (xstring)L"&lt;row&gt;&lt;显示列&gt;" + items.item(i).selectSingleNode(L"Name").text() + L"&lt;/显示列&gt;&lt;数据列&gt;"
+						+ items.item(i).selectSingleNode(L"Name").text() + L"&lt;/数据列&gt;&lt;/row&gt;";
 
 				}
 				xstring prop = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
@@ -4309,7 +4309,7 @@
 			}
 			if (col == colPackage)
 			{
-				xstring proppack = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='淇濇姢' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''><edit edittype='ddlb' ddlbdataurl='xquery:[Convert.quickcode.xq]?id=鍖呰鏂瑰紡1' ddlbxml=''/></cellprop>";
+				xstring proppack = L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='保护' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''><edit edittype='ddlb' ddlbdataurl='xquery:[Convert.quickcode.xq]?id=包装方式1' ddlbxml=''/></cellprop>";
 				dw_cell.SetCellProps(row, col, proppack);
 			}
 		}
@@ -4388,7 +4388,7 @@
 
 		if (((ACol == colVolDesc && (col != colVolDesc || row != ARow)) || (ACol == colQtyPerPack && (col != colQtyPerPack || row != ARow))) && ARow >= startRow)
 		{
-			/*璁＄畻浣撶Н*/
+			/*计算体积*/
 			xstring desc = dw_cell.GetItemString(ARow, colVolDesc);
 			double v = 0.0;
 			if (desc == L"")
@@ -4434,15 +4434,15 @@
 
 		if (action == L"purch")
 		{
-			int colPrice0 = getItemCol(dw_cell, startRow - 1, L"浠锋牸");
-			int colPrice1 = getItemCol(dw_cell, startRow - 1, L"浠锋牸1");
-			int colPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�");
+			int colPrice0 = getItemCol(dw_cell, startRow - 1, L"价格");
+			int colPrice1 = getItemCol(dw_cell, startRow - 1, L"价格1");
+			int colPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
 
-			int colTyp = getItemCol(dw_cell, startRow - 1, L"绫诲瀷");
-			int colTyp1 = getItemCol(dw_cell, startRow - 1, L"绫诲瀷1");
-			int colSupplier = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�,宸ュ巶");
-			int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�1,宸ュ巶1");
-			int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�2,宸ュ巶2");
+			int colTyp = getItemCol(dw_cell, startRow - 1, L"类型");
+			int colTyp1 = getItemCol(dw_cell, startRow - 1, L"类型1");
+			int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商,工厂");
+			int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1,工厂1");
+			int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"供应商2,工厂2");
 
 
 			if (col == colSupplier || col == colSupplier1 || col == colSupplier2)
@@ -4450,7 +4450,7 @@
 				if (dw_cell.GetItemString(row, col) == L"")
 					dw_cell.SetItemString(row, col, L" ");
 				xstring prop2 = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
-					L"<edit edittype='query' dddwxpageurl='' dddwdataurl='xquery:[Convert.quickcode.xq]?id=Supplier' dddwtemplateurl='dev:sheet[Supplier.v3.tpl/List]' dddwdatacolumn='Name' dddwdisplaycolumn='Name' dddwwidth='' dddwheight='' dddwautoselect='N' dddwshowbutton='鍚�' dddwcanedit='鏄�'/>" +
+					L"<edit edittype='query' dddwxpageurl='' dddwdataurl='xquery:[Convert.quickcode.xq]?id=Supplier' dddwtemplateurl='dev:sheet[Supplier.v3.tpl/List]' dddwdatacolumn='Name' dddwdisplaycolumn='Name' dddwwidth='' dddwheight='' dddwautoselect='N' dddwshowbutton='否' dddwcanedit='是'/>" +
 					L"</cellprop>";
 				dw_cell.SetCellProps(row, col, prop2);
 				dw_cell.Redraw();
@@ -4458,12 +4458,12 @@
 			else if (col == colTyp1 || col == colTyp)
 			{
 				xstring pitems1 = L"";
-				pitems1 += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;鎴愬搧&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-					+ L"鎴愬搧&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
-				pitems1 += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;鏁ｈ揣&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-					+ L"鏁ｈ揣&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
-				pitems1 += (xstring)L"&lt;row&gt;&lt;鏄剧ず鍒�&gt;鍖呰&lt;/鏄剧ず鍒�&gt;&lt;鏁版嵁鍒�&gt;"
-					+ L"鍖呰&lt;/鏁版嵁鍒�&gt;&lt;/row&gt;";
+				pitems1 += (xstring)L"&lt;row&gt;&lt;显示列&gt;成品&lt;/显示列&gt;&lt;数据列&gt;"
+					+ L"成品&lt;/数据列&gt;&lt;/row&gt;";
+				pitems1 += (xstring)L"&lt;row&gt;&lt;显示列&gt;散货&lt;/显示列&gt;&lt;数据列&gt;"
+					+ L"散货&lt;/数据列&gt;&lt;/row&gt;";
+				pitems1 += (xstring)L"&lt;row&gt;&lt;显示列&gt;包装&lt;/显示列&gt;&lt;数据列&gt;"
+					+ L"包装&lt;/数据列&gt;&lt;/row&gt;";
 				xstring prop1 = (xstring)L"<cellprop searchcolumn='' celltype='' cellformatex='' cellformat='' cellprotectex='' cellprotect='' cellvisibleex='' cellvisible='' cellneeddata='' cellvalid='' cellinitial='' cellsource='' fontstyle='' windowurl=''>" +
 					L"<edit edittype='ddlb' ddlbdataurl='' ddlbxml='&lt;data&gt;" + pitems1 + L"&lt;/data&gt;'/>" +
 					L"</cellprop>";
@@ -4483,14 +4483,14 @@
 					{
 						if (price0.find(L"A") < 1 && price0.find(L"B") < 1 && price0.find(L"C") < 1 && price0.find(L"a") < 1 && price0.find(L"b") < 1 && price0.find(L"b") < 1)
 						{
-							alert(L"浠锋牸涓病鎸囧畾ABC");
+							alert(L"价格中没指定ABC");
 						}
 					}
 					if (price1 != L"")
 					{
 						if (price1.find(L"A") < 1 && price1.find(L"B") < 1 && price1.find(L"C") < 1 && price1.find(L"a") < 1 && price1.find(L"b") < 1 && price1.find(L"c") < 1)
 						{
-							alert(L"浠锋牸涓病鎸囧畾ABC");
+							alert(L"价格中没指定ABC");
 						}
 						price = price0 + L"+L" + price1;
 					}
@@ -4541,7 +4541,7 @@
 		return 1;
 	}
 
-	//鍛戒护澶勭悊浜嬩欢
+	//命令处理事件
 	int OnXCommand(TEvent * evt, LPARAM param)
 	{
 		return OnCmdDispatch(evt->xcommand.pStrID);
@@ -4549,9 +4549,9 @@
 
 	int OnAttachListon()
 	{
-		//缁戝畾宸ュ叿鏉＄偣鍑讳簨浠�
+		//绑定工具条点击事件
 		AttachEvent(L"WM_XCOMMAND", (FEvent)&QuoteFileView::OnXCommand);
-		//鑾峰彇鐒︾偣浜嬩欢锛岀敤浜庨噸缃伐鍏锋潯
+		//获取焦点事件，用于重置工具条
 		AttachEvent(L"WM_SETFOCUS", (FEvent)&QuoteFileView::OnSetFocus);
 
 		AttachEvent(L"frame:im1", L"IMG_LDBCLICK", (FEvent)&QuoteFileView::OnImgDBClicked);
@@ -4590,30 +4590,30 @@
 	{
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return 0;
 		startRow++;
 
-		int colItemNo = getItemCol(dw_cell, startRow - 1, L"鎴戝徃鍨嬪彿,ItemNo");
-		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"瀹㈡埛鍨嬪彿,Customer ItemNo,Customer Item No");
+		int colItemNo = getItemCol(dw_cell, startRow - 1, L"我司型号,ItemNo");
+		int colCustomerItemNo = getItemCol(dw_cell, startRow - 1, L"客户型号,Customer ItemNo,Customer Item No");
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemCName = getItemCol(dw_cell, startRow - 1, L"涓枃鍝佸悕");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
-		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"閲囪喘浠�,閲囪喘浠锋牸");
-		int colBuyer = getItemCol(dw_cell, startRow - 1, L"閲囪喘浜哄憳");
+		int colItemCName = getItemCol(dw_cell, startRow - 1, L"中文品名");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
+		int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
+		int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");
 
-		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)L");
-		int colNWT = getItemCol(dw_cell, startRow - 1, L"鍑�閲�,鍑�閲�(KG)L");
-		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"浣撶Н鎻忚堪,闀縓瀹絏楂�,闀縓瀹絏楂�(CM)L");
-		int colVol = getItemCol(dw_cell, startRow - 1, L"浣撶Н,浣撶Н(M3)L");
+		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)L");
+		int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)L");
+		int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)L");
+		int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)L");
 		int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)L");
-		int colPurchedDate = getItemCol(dw_cell, startRow - 1, L"閲囪喘鎻愪氦涓氬姟鏃堕棿");
-		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"宸ュ巶鍥剧墖");
-		//int colProductInfo = getItemCol(dw_cell,startRow - 1,L"浜у搧淇℃伅");
-		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"涓氬姟閮ㄤ骇鍝佷俊鎭�");
-		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"閲囪喘閮ㄤ骇鍝佷俊鎭�");
+		int colPurchedDate = getItemCol(dw_cell, startRow - 1, L"采购提交业务时间");
+		int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"工厂图片");
+		//int colProductInfo = getItemCol(dw_cell,startRow - 1,L"产品信息");
+		int colProductInfo = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
+		int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
 
 		int LastRow = dw_cell.GetValidRow();
 		KXMLDOMNodeList items = x.selectNodes(L"//Item");
@@ -4793,7 +4793,7 @@
 
 			dw_cell.openUrl(templateurl);
 			*/
-			//SetWindowText(GetHWND(),L"鎶ヤ环鏂囦欢:[new]");
+			//SetWindowText(GetHWND(),L"报价文件:[new]");
 		}
 
 		ARow = 0;
@@ -4873,17 +4873,17 @@
 	{
 		int startRow = getItemHeadRow(dw_cell);
 
-		//娌℃湁鎵惧埌鍟嗗搧琛岀殑鏍囬
+		//没有找到商品行的标题
 		if (startRow < 1) return L"<data/>";
 		startRow++;
 
 		int colItemName = getItemCol(dw_cell, startRow - 1, L"Product Description,Product Name,Item Name");
-		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,瑙勬牸,浜у搧瑙勬牸");
+		int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
 
-		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�1");
-		int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�2");
-		int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�3");
-		int colSupplier = getItemCol(dw_cell, startRow - 1, L"渚涘簲鍟�");
+		int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1");
+		int colSupplier2 = getItemCol(dw_cell, startRow - 1, L"供应商2");
+		int colSupplier3 = getItemCol(dw_cell, startRow - 1, L"供应商3");
+		int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商");
 
 		int LastRow = dw_cell.GetValidRow();
 		xstring content = L"";
@@ -4986,7 +4986,7 @@
 		xml purcher ;
 		xaserverarg arg ;
 		arg.setNativePointer(xaserverarg::CreateInstance());
-		arg.AddArg(L"id", L"閲囪喘鍛�");
+		arg.AddArg(L"id", L"采购员");
 		if (getUrl(L"/sale/data/Quote/Purcher", arg.GetString(), purcher) != 1)
 		{
 			alert((xstring)L"error:" + purcher.xml());
diff --git a/jrj/project/vindexmenu.cpp b/jrj/project/vindexmenu.cpp
index 0f135ac..6945e29 100644
--- a/jrj/project/vindexmenu.cpp
+++ b/jrj/project/vindexmenu.cpp
@@ -320,9 +320,9 @@
 					str +=  (xstring)L"<vbox><xtree imagelist='0' name='panelTree"+xstring(no)+ L"'/></vbox>";
 					//AttachEvent("panelTree"+no.toString(),"TVN_SELCHANGED",OnTreeSelChanged);
 					xstring panelTree = L"panelTree"+xstring(no);
-					AttachEvent(nstring::clone(panelTree.c_str()),L"TVN_ITEMEXPANDING", (FEvent)&vindexmenu::OnTreeExpanding);
-					AttachEvent(nstring::clone(panelTree.c_str()),L"TVN_RCLICK", (FEvent)&vindexmenu::OnRClicked);
-					AttachEvent(nstring::clone(panelTree.c_str()),L"NM_DBLCLK", (FEvent)&vindexmenu::OnDbClick);
+					AttachEvent(panelTree.c_str(true),L"TVN_ITEMEXPANDING", (FEvent)&vindexmenu::OnTreeExpanding);
+					AttachEvent(panelTree.c_str(true),L"TVN_RCLICK", (FEvent)&vindexmenu::OnRClicked);
+					AttachEvent(panelTree.c_str(true),L"NM_DBLCLK", (FEvent)&vindexmenu::OnDbClick);
 				}
 				toolStr += str;
 			}
diff --git a/jrj/xframe/adt/xarray.hpp b/jrj/xframe/adt/xarray.hpp
index 63346d6..8801eb4 100644
--- a/jrj/xframe/adt/xarray.hpp
+++ b/jrj/xframe/adt/xarray.hpp
@@ -8,10 +8,10 @@
 class xarray : public xobject
 {
 public:
-	xarray(length_(0), capacity_(0),itemms(nullptr){
-	}
+	xarray():length_(0), capacity_(0), items(nullptr) {}
+
 public:
-	xarray*push_back(T t)
+	xarray* push_back(T t)
 	{
 		sure_space();
 
@@ -125,4 +125,5 @@
 	T* items;
 	int length_;
 	int capacity_;
-};
\ No newline at end of file
+
+};
diff --git a/jrj/xframe/system/base.hpp b/jrj/xframe/system/base.hpp
index 37bf966..13c9185 100644
--- a/jrj/xframe/system/base.hpp
+++ b/jrj/xframe/system/base.hpp
@@ -56,12 +56,22 @@
 typedef UINT_PTR            WPARAM;
 typedef LONG_PTR            LPARAM;
 typedef LONG_PTR            LRESULT;
-typedef char	BYTE;
+typedef unsigned char	BYTE;
 
 typedef unsigned short ushort;
 typedef unsigned long       DWORD;
 typedef DWORD   COLORREF;
 
+typedef unsigned short WORD;
+typedef unsigned int UINT;
+typedef char CHAR;
+typedef wchar_t WCHAR;
+typedef void* HANDLE;
+typedef const char* LPCSTR;
+typedef void* LPVOID;
+typedef DWORD* LPDWORD;
+typedef const void* LPCVOID;
+
 struct SYSTEMTIME {  
 		ushort wYear;  
 		ushort wMonth;  
diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
index cb39487..72246ac 100644
--- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -768,7 +768,7 @@
 			KXMLDOMElement e = n;
 			//trace("m_configDoc//list/dwview[@type='dwgrid'][1]="+e.xml);
 			xstring vface = m_configDoc.selectSingleNode(L"//vface[1]").text();
-			xstring dwname = L"";//e.selectsingleNode("@name").text;
+			string dwname = L"";//e.selectsingleNode("@name").text;
 			xstring tpl = GetTemplateUrl();//e.selectsingleNode("@url").text;
 			xstring selectmode = L"4";
 			if (e.selectSingleNode(L"@name")) dwname = e.selectSingleNode(L"@name").text();
diff --git a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
index 6a99b04..ae37a70 100644
--- a/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/maint.vframe.vbusiness.hpp
@@ -488,7 +488,7 @@
 				e = nlist.item(index);
 				//if(!e.selectSingleNode(L"@type")) continue;
 				//alert(e.xml);
-				xstring xdwname = L"";//e.selectsingleNode(L"@name").text();
+				string xdwname = L"";//e.selectsingleNode(L"@name").text();
 				xstring xtpl = L"";//e.selectsingleNode(L"@url").text();
 				xstring xtpy = L"dwgrid";
 				if (e.selectSingleNode(L"@name")) xdwname = e.selectSingleNode(L"@name").text();
diff --git a/jrj/xframe/win32/xfile.hpp b/jrj/xframe/win32/xfile.hpp
index 502e07f..37e1bb1 100644
--- a/jrj/xframe/win32/xfile.hpp
+++ b/jrj/xframe/win32/xfile.hpp
@@ -5,16 +5,6 @@
 
 #define CALLBACK    __stdcall
 #define MAX_PATH    260
-typedef unsigned short WORD;
-typedef unsigned int UINT;
-typedef char CHAR;
-typedef unsigned char BYTE;
-typedef wchar_t WCHAR;
-typedef void* HANDLE;
-typedef const char* LPCSTR;
-typedef void* LPVOID;
-typedef DWORD* LPDWORD;
-typedef const void* LPCVOID;
 
 typedef void* LPSECURITY_ATTRIBUTES;
 typedef UINT_PTR(CALLBACK* LPOFNHOOKPROC) (HWND, UINT, WPARAM, LPARAM);
@@ -81,30 +71,7 @@
 	WCHAR  cAlternateFileName[14];
 } WIN32_FIND_DATAW;
 
-typedef struct _OVERLAPPED {
-	ULONG_PTR Internal;
-	ULONG_PTR InternalHigh;
-	union {
-		struct {
-			DWORD Offset;
-			DWORD OffsetHigh;
-		} DUMMYSTRUCTNAME;
-		LPVOID Pointer;
-	} DUMMYUNIONNAME;
 
-	HANDLE  hEvent;
-} OVERLAPPED, * LPOVERLAPPED;
-
-
-#define OFS_MAXPATHNAME 128
-typedef struct _OFSTRUCT {
-	BYTE cBytes;
-	BYTE fFixedDisk;
-	WORD nErrCode;
-	WORD Reserved1;
-	WORD Reserved2;
-	CHAR szPathName[OFS_MAXPATHNAME];
-} OFSTRUCT;
 
 extern "C"
 {
@@ -124,7 +91,6 @@
 		int  WINAPI WriteFile(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToRead, LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped); //native from "kernel32.dll" alias "ReadFile";
 		int  WINAPI CloseHandle(HANDLE hFile); //native from "kernel32.dll" alias "CloseHandle";
 		int  WINAPI GetFileSize(HANDLE hFile, int lpFileSizeHigh); //native from "kernel32.dll" alias "GetFileSize";
-		int  WINAPI GetKeyState(HANDLE nVirtKey); //native from "user32.dll" alias "GetKeyState";
 	}
 }
 
@@ -182,9 +148,5 @@
 	static int  WINAPI GetFileSize(HANDLE hFile, int lpFileSizeHigh)
 	{
 		return win32::GetFileSize(hFile, lpFileSizeHigh);
-	}
-	static int  WINAPI GetKeyState(HANDLE nVirtKey)
-	{
-		return win32::GetKeyState(nVirtKey);
 	}
 };
diff --git a/jrj/xframe/wobject/xbase.hpp b/jrj/xframe/wobject/xbase.hpp
index 532c6ac..1fc14ab 100644
--- a/jrj/xframe/wobject/xbase.hpp
+++ b/jrj/xframe/wobject/xbase.hpp
@@ -209,24 +209,31 @@
 {
 };
 
-struct OVERLAPPED : public xstruct
-{ 
-	int Internal; 
-	int InternalHigh; 
-	int Offset; 
-	int OffsetHigh; 
-	int hEvent; 
-};
 
-struct OFSTRUCT : public xstruct
-{ 
-	int cBytes; 
-	int fFixedDisk; 
-	int nErrCode; 
-	int Reserved1; 
-	int Reserved2; 
-	string szPathName; 
-};
+typedef struct _OVERLAPPED {
+	ULONG_PTR Internal;
+	ULONG_PTR InternalHigh;
+	union {
+		struct {
+			DWORD Offset;
+			DWORD OffsetHigh;
+		} DUMMYSTRUCTNAME;
+		LPVOID Pointer;
+	} DUMMYUNIONNAME;
+
+	HANDLE  hEvent;
+} OVERLAPPED, * LPOVERLAPPED;
+
+
+#define OFS_MAXPATHNAME 128
+typedef struct _OFSTRUCT {
+	BYTE cBytes;
+	BYTE fFixedDisk;
+	WORD nErrCode;
+	WORD Reserved1;
+	WORD Reserved2;
+	CHAR szPathName[OFS_MAXPATHNAME];
+} OFSTRUCT;
 
 struct 	CELLNMHDR : public NMHDR
 {
diff --git a/jrj/xframe/wobject/xnode.hpp b/jrj/xframe/wobject/xnode.hpp
index 7dc4811..00eda6e 100644
--- a/jrj/xframe/wobject/xnode.hpp
+++ b/jrj/xframe/wobject/xnode.hpp
@@ -18,7 +18,7 @@
 public:
 	knode* getKNode()
 	{
-		(knode*)this->GetNativePtr();
+		return (knode*)this->GetNativePtr();
 	}
 public:
 	LPCWSTR GetNodeName()

--
Gitblit v1.9.3