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/Quote3.list3.cpp | 0
jrj/project/business/GDN3.list.cpp | 2
jrj/project/business/BasicCode/SKUItem.select.cpp | 6
jrj/project/business/VATNotify/VATInvoiceNew.cpp | 4
jrj/project/business/GDN/list.SOTrace3.cpp | 0
jrj/project/vindexform.cpp | 2
jrj/project/business/Enquiry.list.cpp | 2
jrj/project/business/BasicCode/SKUTemplate.select.cpp | 6
jrj/project/business/BasicCode/QuickCode_Tree.cpp | 6
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/project/business/QuoteFile.cpp | 140 +++++++++++++++++-----------------
jrj/project/business/AR/ExchageFile.cpp | 2
jrj/project/business/BasicCode/QuickCode.cpp | 6
jrj/project/business/GDN/AdvanceChargeList.cpp | 0
jrj/project/business/SO3.list.cpp | 2
jrj/project/business/GDN3.maint.cpp | 6
16 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/jrj/project/business/AR/ExchageFile.cpp b/jrj/project/business/AR/ExchageFile.cpp
index 3576655..3e154ce 100644
--- a/jrj/project/business/AR/ExchageFile.cpp
+++ b/jrj/project/business/AR/ExchageFile.cpp
@@ -127,7 +127,7 @@
val = dw_exchangefile.GetItemString(1, col);
val = val.trim();
if (val == L"")continue;
- if (val.find(L"(L") >= 0) val = val.left(val.find(L"(L"));
+ if (val.find(L"(") >= 0) val = val.left(val.find(L"("));
if (val.find(L"（") >= 0) val = val.left(val.find(L"（"));
if (val.find(L"[") >= 0) val = val.left(val.find(L"["));
if (val.find(L"【") >= 0) val = val.left(val.find(L"【"));
diff --git a/jrj/project/business/BasicCode/QuickCode.cpp b/jrj/project/business/BasicCode/QuickCode.cpp
index 8fc01e6..ac65947 100644
--- a/jrj/project/business/BasicCode/QuickCode.cpp
+++ b/jrj/project/business/BasicCode/QuickCode.cpp
@@ -401,10 +401,10 @@
{
p += L"&";
int i = 1;
- while (p.find(L"=L", 0) > 0)
+ while (p.find(L"=", 0) > 0)
{
- xstring name = p.mid(0, p.find(L"=L", 0));
- xstring value = p.mid(p.find(L"=L", 0) + 1, p.find(L"&", 0) - p.find(L"=L", 0) - 1);
+ xstring name = p.mid(0, p.find(L"=", 0));
+ xstring value = p.mid(p.find(L"=", 0) + 1, p.find(L"&", 0) - p.find(L"=", 0) - 1);
if (name == n) return L"" + value;
i += 1;
p = p.mid(p.find(L"&", 0) + 1, p.length());
diff --git a/jrj/project/business/BasicCode/QuickCode_Tree.cpp b/jrj/project/business/BasicCode/QuickCode_Tree.cpp
index 334fe69..53bcb77 100644
--- a/jrj/project/business/BasicCode/QuickCode_Tree.cpp
+++ b/jrj/project/business/BasicCode/QuickCode_Tree.cpp
@@ -556,10 +556,10 @@
{
p += L"&";
int i = 1;
- while (p.find(L"=L", 0) > 0)
+ while (p.find(L"=", 0) > 0)
{
- xstring name = p.mid(0, p.find(L"=L", 0));
- xstring value = p.mid(p.find(L"=L", 0) + 1, p.find(L"&", 0) - p.find(L"=L", 0) - 1);
+ xstring name = p.mid(0, p.find(L"=", 0));
+ xstring value = p.mid(p.find(L"=", 0) + 1, p.find(L"&", 0) - p.find(L"=", 0) - 1);
if (name == n) return L"" + value;
i += 1;
p = p.mid(p.find(L"&", 0) + 1, p.length());
diff --git a/jrj/project/business/BasicCode/SKUItem.select.cpp b/jrj/project/business/BasicCode/SKUItem.select.cpp
index 82f820b..0388d00 100644
--- a/jrj/project/business/BasicCode/SKUItem.select.cpp
+++ b/jrj/project/business/BasicCode/SKUItem.select.cpp
@@ -18,10 +18,10 @@
{
int i = 1;
- while (p.find(L"=L",0)>0)
+ while (p.find(L"=",0)>0)
{
- xstring name = p.mid(0, p.find(L"=L",0));
- xstring value = p.mid(p.find(L"=L",0) + 1, p.find(L"=L",0) - 1);
+ xstring name = p.mid(0, p.find(L"=",0));
+ xstring value = p.mid(p.find(L"=",0) + 1, p.find(L"=",0) - 1);
return ""+value;
i += 1;
}
diff --git a/jrj/project/business/BasicCode/SKUTemplate.select.cpp b/jrj/project/business/BasicCode/SKUTemplate.select.cpp
index 383fed1..e526dda 100644
--- a/jrj/project/business/BasicCode/SKUTemplate.select.cpp
+++ b/jrj/project/business/BasicCode/SKUTemplate.select.cpp
@@ -18,10 +18,10 @@
{
int i = 1;
- while (p.find(L"=L",0)>0)
+ while (p.find(L"=",0)>0)
{
- xstring name = p.mid(0, p.find(L"=L",0));
- xstring value = p.mid(p.find(L"=L",0) + 1, p.find(L"=L",0) - 1);
+ xstring name = p.mid(0, p.find(L"=",0));
+ xstring value = p.mid(p.find(L"=",0) + 1, p.find(L"=",0) - 1);
return ""+value;
i += 1;
}
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index 96fc311..091b778 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -1670,7 +1670,7 @@
{
arg.AddArg(L"CustomerID",e.getAttribute(L"id"));
xstring name = e.getAttribute(L"name");
- if(name.find(L"(L")>=0) name = name.left(name.find(L"(L"));
+ if(name.find(L"(")>=0) name = name.left(name.find(L"("));
arg.AddArg(L"CustomerName",name);
}
}
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
index b9fb741..41e722c 100644
--- a/jrj/project/business/EnquiryEx3.list.cpp
+++ b/jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/AdvanceChargeList.cpp b/jrj/project/business/GDN/AdvanceChargeList.cpp
index 4b70e11..19f5634 100644
--- a/jrj/project/business/GDN/AdvanceChargeList.cpp
+++ b/jrj/project/business/GDN/AdvanceChargeList.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/list.SOTrace3.cpp b/jrj/project/business/GDN/list.SOTrace3.cpp
index 08ed75b..27e5226 100644
--- a/jrj/project/business/GDN/list.SOTrace3.cpp
+++ b/jrj/project/business/GDN/list.SOTrace3.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.list.cpp b/jrj/project/business/GDN3.list.cpp
index 6f6e3dc..deff810 100644
--- a/jrj/project/business/GDN3.list.cpp
+++ b/jrj/project/business/GDN3.list.cpp
@@ -718,7 +718,7 @@
{
arg.AddArg(L"CustomerID", e.getAttribute(L"id"));
xstring name = e.getAttribute(L"name");
- if (name.find(L"(L") >= 0) name = name.left(name.find(L"(L"));
+ if (name.find(L"(") >= 0) name = name.left(name.find(L"("));
arg.AddArg(L"CustomerName", name);
}
return 1;
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index 7f288df..d261656 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -505,7 +505,7 @@
//if(dw_base.GetItemString(1,L"GoodsSource") == L"")
//{
- // alert(L"请选择货物产地(货物产地:开票工厂金额最大的工厂所属地)L");
+ // alert(L"请选择货物产地(货物产地:开票工厂金额最大的工厂所属地)");
// return 0;
// }
@@ -869,7 +869,7 @@
xstring ClassifyID = dw_custom.GetItemString(k, L"ClassifyID");
xstring ClassifyName = dw_custom.GetItemString(k, L"CustName");
xstring GroupNo = dw_custom.GetItemString(k, L"GroupNo");
- if (GroupNo != L"") ClassifyName += ClassifyName + L"(L" + GroupNo + L")L";
+ if (GroupNo != L"") ClassifyName += ClassifyName + L"(" + GroupNo + L")";
double LegalQty = dw_custom.GetItemDouble(k, L"LegalQty");
@@ -913,7 +913,7 @@
xstring ClassifyID = dw_custom.GetItemString(k, L"ClassifyID");
xstring ClassifyName = dw_custom.GetItemString(k, L"CustName");
xstring GroupNo = dw_custom.GetItemString(k, L"GroupNo");
- if (GroupNo != L"") ClassifyName += ClassifyName + L"(L" + GroupNo + L")L";
+ if (GroupNo != L"") ClassifyName += ClassifyName + L"(" + GroupNo + L")";
double VQuantity = dw_custom.GetItemDouble(k, L"Quantity");
double VAmount = dw_custom.GetItemDouble(k, L"Amount");
double qty = 0.0;
diff --git a/jrj/project/business/Quote3.list3.cpp b/jrj/project/business/Quote3.list3.cpp
index 991587b..6827413 100644
--- a/jrj/project/business/Quote3.list3.cpp
+++ b/jrj/project/business/Quote3.list3.cpp
Binary files differ
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"产品信息");
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index 37f3286..f9a8259 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -505,7 +505,7 @@
{
arg.AddArg(L"CustomerID", e.getAttribute(L"id"));
xstring name = e.getAttribute(L"name");
- if (name.find(L"(L") >= 0) name = name.left(name.find(L"(L"));
+ if (name.find(L"(") >= 0) name = name.left(name.find(L"("));
arg.AddArg(L"CustomerName", name);
}
return 1;
diff --git a/jrj/project/business/VATNotify/VATInvoiceNew.cpp b/jrj/project/business/VATNotify/VATInvoiceNew.cpp
index 8ad5141..91fef26 100644
--- a/jrj/project/business/VATNotify/VATInvoiceNew.cpp
+++ b/jrj/project/business/VATNotify/VATInvoiceNew.cpp
@@ -392,9 +392,9 @@
end if
if ls_comName <> '产品部' then
- this.setitem(row,'billamt',dec(this.Describe(L"evaluate('notifybuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")L")))
+ this.setitem(row,'billamt',dec(this.Describe(L"evaluate('notifybuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")")))
else
- this.setitem(row,'billamt',dec(this.Describe(L"evaluate('prd_nbuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")L")))
+ this.setitem(row,'billamt',dec(this.Describe(L"evaluate('prd_nbuyamt - if(isnull(kkamt),0,kkamt) + if(isnull(dkamt),0,dkamt)',L"+xstring(row)+L")")))
end if
ll_decrate = this.getitemdecimal(row,'retax')
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index b8bf763..0d9f49d 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -65,7 +65,7 @@
x.load(L"cache\\config.xml");
if (x.xml() == L"")
{
- //alert(L"<config><home "+att+L"=L"+value+L"/></config>");
+ //alert(L"<config><home "+att+L"="+value+L"/></config>");
x.loadXML(L"<config><home " + att + L"='" + value + L"'/></config>");
}
else
--
Gitblit v1.9.3