From 951c28cff46688878894b2c965136f8df8884f81 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 13 九月 2024 11:08:58 +0800
Subject: [PATCH] update
---
jrj/project/business/QuoteFile.cpp | 140 +++++++++++++++++++++++-----------------------
1 files changed, 70 insertions(+), 70 deletions(-)
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index d2a5bce..56de5c5 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -277,18 +277,18 @@
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 colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)");
+ int colNWT = getItemCol(cell, startRow - 1, L"净重,净重(KG)");
+ int colVolDesc = getItemCol(cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(cell, startRow - 1, L"体积,体积(M3)");
+ int col40HQ = getItemCol(cell, startRow - 1, L"40HQ,QTY(40HQ)");
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 colInnerOuter = getItemCol(cell, startRow - 1, L"装箱数(内/外)");
int colItemQty = getItemCol(cell, startRow - 1, L"数量,Qty");
int colPackage = getItemCol(cell, startRow - 1, L"Package,包装方式");
int colBuyer = getItemCol(cell, startRow - 1, L"采购人员");
@@ -377,11 +377,11 @@
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 colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)");
+ int colNWT = getItemCol(cell, startRow - 1, L"净重,净重(KG)");
+ int colVolDesc = getItemCol(cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(cell, startRow - 1, L"体积,体积(M3)");
+ int col40HQ = getItemCol(cell, startRow - 1, L"40HQ,QTY(40HQ)");
int colPOPrice = getItemCol(cell, startRow - 1, L"价格");
int colSupplier = getItemCol(cell, startRow - 1, L"供应商");
@@ -396,7 +396,7 @@
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 colInnerOuter = getItemCol(cell, startRow - 1, L"装箱数(内/外)");
int colItemQty = getItemCol(cell, startRow - 1, L"数量,Qty");
int colPackage = getItemCol(cell, startRow - 1, L"Package,包装方式");
int colBuyer = getItemCol(cell, startRow - 1, L"采购人员");
@@ -830,11 +830,11 @@
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 colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
+ int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)");
+ int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)");
+ int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
int colSupplier = getItemCol(dw_cell, startRow - 1, L"供应商");
int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1");
@@ -1022,11 +1022,11 @@
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 col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
- 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 colGW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)");
+ int colNW = getItemCol(dw_cell, startRow - 1, L"净重(KG)");
+ int colVolDesc = getItemCol(dw_cell, startRow - 1, L"长X宽X高(CM)");
int colPrice = getItemCol(dw_cell, startRow - 1, L"采购价");
@@ -1096,11 +1096,11 @@
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 col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
- 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 colGW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)");
+ int colNW = getItemCol(dw_cell, startRow - 1, L"净重(KG)");
+ int colVolDesc = getItemCol(dw_cell, startRow - 1, L"长X宽X高(CM)");
int colProductInfo = getItemCol(dw_cell, startRow - 1, L"业务部产品信息");
int colProductInfo1 = getItemCol(dw_cell, startRow - 1, L"采购部产品信息");
@@ -1156,7 +1156,7 @@
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 col40HQ= getItemCol(dw_cell,startRow - 1,L"40HQ,QTY(40HQ)");
int colBuyer = getItemCol(dw_cell,startRow - 1,L"采购人员");
xstring items=L"<data>";
@@ -1221,11 +1221,11 @@
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 colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
+ int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)");
+ int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)");
+ int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
int colSupplier1 = getItemCol(dw_cell, startRow - 1, L"供应商1");
int colPOPrice1 = getItemCol(dw_cell, startRow - 1, L"价格1");
@@ -1320,7 +1320,7 @@
{
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"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)") pricecol = col;
if (head == L"采购To业务备注") purchremarkcol = col;
if (head == L"采购人员") purchercol = col;
}
@@ -1507,8 +1507,8 @@
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 col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
+ int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外)");
int col = 0;
int namecol = 0;
int pricecol = 0;
@@ -1520,7 +1520,7 @@
{
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"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)") pricecol = col;
if (head == L"采购To业务备注") purchremarkcol = col;
if (head == L"采购人员") purchercol = col;
}
@@ -1573,8 +1573,8 @@
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 col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
+ int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外)");
int colSalebackDate = getItemCol(dw_cell, startRow - 1, L"采购提交业务时间");
int col = 0;
@@ -1588,7 +1588,7 @@
{
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"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)") pricecol = col;
if (head == L"采购To业务备注") purchremarkcol = col;
if (head == L"采购人员") purchercol = col;
}
@@ -1932,8 +1932,8 @@
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 col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
+ int colInnerOuter = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外)");
int col = 0;
int namecol = 0;
@@ -1946,7 +1946,7 @@
{
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"FOB Price" || head == L"Fob Price" || head == L"FOB Price(USD)") pricecol = col;
if (head == L"采购To业务备注") purchremarkcol = col;
if (head == L"采购人员") purchercol = col;
}
@@ -2831,17 +2831,17 @@
//int colToPODate = getItemCol(dw_cell,startRow - 1,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 colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)");
+ int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外),装箱数(外/内)");
+ int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
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 colNW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)");
+ int colGW = getItemCol(dw_cell, startRow - 1, L"净重(KG)");
int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
if (col == colFOBPrice)
@@ -3144,17 +3144,17 @@
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 colQtyPerPack = getItemCol(dw_cell, startRow - 1, 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 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 colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
+ int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)");
+ int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)");
+ int colHQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
@@ -4074,10 +4074,10 @@
int colSaler = getItemCol(dw_cell, startRow - 1, 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 colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)");
+ int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外),装箱数(外/内)");
+ int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
int colSKUID = getItemCol(dw_cell, startRow - 1, L"SKUID");
int colPONote = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
@@ -4087,8 +4087,8 @@
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 colNW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)");
+ int colGW = getItemCol(dw_cell, startRow - 1, L"净重(KG)");
int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
int purchremarkcol = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
@@ -4260,17 +4260,17 @@
//int colToPODate = getItemCol(dw_cell,startRow - 1,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 colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)");
+ int colQtyPerPack = getItemCol(dw_cell, startRow - 1, L"装箱数(内/外),装箱数(外/内)");
+ int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
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 colNW = getItemCol(dw_cell, startRow - 1, L"毛重(KG)");
+ int colGW = getItemCol(dw_cell, startRow - 1, L"净重(KG)");
int colSKUNo = getItemCol(dw_cell, startRow - 1, L"SKUID,SKUNo");
dwhdr.idFrom = 0;
@@ -4604,11 +4604,11 @@
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 colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
+ int colNWT = getItemCol(dw_cell, startRow - 1, L"净重,净重(KG)");
+ int colVolDesc = getItemCol(dw_cell, startRow - 1, L"体积描述,长X宽X高,长X宽X高(CM)");
+ int colVol = getItemCol(dw_cell, startRow - 1, L"体积,体积(M3)");
+ int col40HQ = getItemCol(dw_cell, startRow - 1, L"40HQ,QTY(40HQ)");
int colPurchedDate = getItemCol(dw_cell, startRow - 1, L"采购提交业务时间");
int colPhoto1 = getItemCol(dw_cell, startRow - 1, L"工厂图片");
//int colProductInfo = getItemCol(dw_cell,startRow - 1,L"产品信息");
--
Gitblit v1.9.3