From 7ac57009ceb55a1d5968f14b5da52dfa4d03e89f Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期五, 18 十月 2024 13:55:22 +0800
Subject: [PATCH] update
---
jrj/project/business/QuoteFile.cpp | 142 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 41 deletions(-)
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index 5e89e8b..2cb1b73 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -275,6 +275,7 @@
int colSKUID = getItemCol(cell, startRow - 1, L"SKUID");
int colSaleRemark = getItemCol(cell, startRow - 1, L"业务To采购备注");
+ int colBuyerMOQ = getItemCol(cell, startRow - 1, L"MOQ");
int colBuyerRemark = getItemCol(cell, startRow - 1, L"采购To业务备注");
int colFactoryImage = getItemCol(cell, startRow - 1, L"工厂图片");
int colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)");
@@ -326,6 +327,7 @@
itemStr += L"<BuyerPrice>" + cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
itemStr += L"<SaleRemark>" + cell.GetItemString(row, colSaleRemark) + L"</SaleRemark>";
+ itemStr += L"<BuyerMOQ>" + cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
itemStr += L"<BuyerRemark>" + cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
itemStr += L"<FactoryImage>" + cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
itemStr += L"<GWT>" + cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -375,6 +377,7 @@
int colSKUID = getItemCol(cell, startRow - 1, L"SKUID");
int colSaleRemark = getItemCol(cell, startRow - 1, L"业务To采购备注");
+ int colBuyerMOQ = getItemCol(cell, startRow - 1, L"MOQ");
int colBuyerRemark = getItemCol(cell, startRow - 1, L"采购To业务备注");
int colFactoryImage = getItemCol(cell, startRow - 1, L"工厂图片");
int colGWT = getItemCol(cell, startRow - 1, L"毛重,毛重(KG)");
@@ -432,6 +435,7 @@
itemStr += L"<BuyerPrice>" + cell.GetItemString(row, colBuyerPrice) + L"</BuyerPrice>";
itemStr += L"<SaleRemark>" + cell.GetItemString(row, colSaleRemark) + L"</SaleRemark>";
+ itemStr += L"<BuyerMOQ>" + cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
itemStr += L"<BuyerRemark>" + cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
itemStr += L"<FactoryImage>" + cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
itemStr += L"<GWT>" + cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -827,6 +831,7 @@
int colItemSpec = getItemCol(dw_cell, startRow - 1, L"Specifications,规格,产品规格");
int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
+ int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -879,6 +884,7 @@
{
if (dw_cell.GetItemString(row, colPOPrice1) == L"") return L"采购价格1没有录入";
}
+ itemStr += L"<BuyerMOQ>" + dw_cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
itemStr += L"<BuyerRemark>" + dw_cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
itemStr += L"<FactoryImage>" + dw_cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
itemStr += L"<GWT>" + dw_cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -1218,6 +1224,7 @@
int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
int colPurchor = getItemCol(dw_cell, startRow - 1, L"采购员,采购人员");
+ int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -1430,6 +1437,7 @@
if(dw_cell.GetItemString(row, colVolDesc)==L"") return L"体积信息没有录入";
}
*/
+ itemStr += L"<BuyerMOQ>" + dw_cell.GetItemString(row, colBuyerMOQ) + L"</BuyerMOQ>";
itemStr += L"<BuyerRemark>" + dw_cell.GetItemString(row, colBuyerRemark) + L"</BuyerRemark>";
itemStr += L"<FactoryImage>" + dw_cell.GetItemString(row, colFactoryImage) + L"</FactoryImage>";
itemStr += L"<GWT>" + dw_cell.GetItemString(row, colGWT) + L"</GWT>";
@@ -2217,6 +2225,7 @@
xml sheet ;
sheet.setNativePointer(x.CreateInstance());
sheet.loadXML(x.selectSingleNode(L"data/*").xml);
+ wangushendi xiuluowushen taigukuangmo
*/
//trace(x.xml());
@@ -2933,44 +2942,50 @@
/*计算体积*/
double v = 0.0;
xstring desc = dw_cell.GetItemString(row, colVolDesc);
- if (desc.find(L"cm") >= 0)
+ if(desc!=L"")
{
- desc = desc.replace(L"cm", L"");
- dw_cell.SetItemString(row, colVolDesc, desc);
- }
- if (desc.find(L"CM") >= 0)
- {
- desc = desc.replace(L"CM", L"");
- dw_cell.SetItemString(row, colVolDesc, desc);
- }
- if (desc == L"")
- dw_cell.SetItemString(row, colVol, L"");
- else
- {
- v = calcVol(desc) / 1000000.00;
- xstring str = xstring(v);
- if (str.find(L".") >= 0) str = str.left(str.find(L".") + 5);
- dw_cell.SetItemString(row, colVol, str);
- dw_cell.Redraw();
- }
-
- xstring qtyperPack = dw_cell.GetItemString(row, colQtyPerPack);
- if (qtyperPack != L"")
- {
- xstring qty1 = qtyperPack;
- xstring qty2 = L"";
- double qty = 0.00;
- int pos2 = qtyperPack.find(L"/");
- if (pos2 >= 0)
+ if (desc.find(L"cm") >= 0)
{
- qty1 = qtyperPack.left(qtyperPack.find(L"/"));
- qty2 = qtyperPack.mid(qtyperPack.find(L"/") + 1, 9999);
+ desc = desc.replace(L"cm", L"");
+ dw_cell.SetItemString(row, colVolDesc, desc);
}
- //if(qty1 !=L"") qty = qty1.toDouble();
- //if(qty2 !=L"") qty = qty*qty2.toDouble();
- qty = qty2.toDouble();
- double ttl = 65.0 * qty / v;
- dw_cell.SetItemString(row, col40HQ, xstring((int)ttl));
+ if (desc.find(L"CM") >= 0)
+ {
+ desc = desc.replace(L"CM", L"");
+ dw_cell.SetItemString(row, colVolDesc, desc);
+ }
+ if (desc == L"")
+ dw_cell.SetItemString(row, colVol, L"");
+ else
+ {
+ v = calcVol(desc) / 1000000.00;
+ xstring str = xstring(v);
+ if (str.find(L".") >= 0) str = str.left(str.find(L".") + 5);
+ dw_cell.SetItemString(row, colVol, str);
+ dw_cell.Redraw();
+ }
+
+ xstring qtyperPack = dw_cell.GetItemString(row, colQtyPerPack);
+ if (qtyperPack != L"")
+ {
+ xstring qty1 = qtyperPack;
+ xstring qty2 = L"";
+ double qty = 0.00;
+ int pos2 = qtyperPack.find(L"/");
+ if (pos2 >= 0)
+ {
+ qty1 = qtyperPack.left(qtyperPack.find(L"/"));
+ qty2 = qtyperPack.mid(qtyperPack.find(L"/") + 1, 9999);
+ }
+ //if(qty1 !=L"") qty = qty1.toDouble();
+ //if(qty2 !=L"") qty = qty*qty2.toDouble();
+ if (qty2 != L"")
+ {
+ qty = qty2.toDouble();
+ double ttl = 65.0 * qty / v;
+ dw_cell.SetItemString(row, col40HQ, xstring((int)ttl));
+ }
+ }
}
}
@@ -3147,6 +3162,7 @@
int colFOBPrice = getItemCol(dw_cell, startRow - 1, L"FOB Price,FOB Price(USD),Fob Price");
int colQuantity = getItemCol(dw_cell, startRow - 1, L"数量,Qty");
+ int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -3445,6 +3461,10 @@
//if(makeMessage(L"/task/quote/purchar/backtosaler")==-1) return 1;
return OnSaleBack();
}
+ else if (comdid == L"xmPurch2")
+ {
+ return OnPurch2();
+ }
else if (comdid == L"xmPurch")
{
return OnPurch();
@@ -3554,10 +3574,10 @@
if (action == L"purch")
{
int crow = dw_cell.GetRow();
- xstring cmd = comdid.mid(3, comdid.length());
- if (getRowID(dw_cell, crow) == L"") SendCtrlCmd(dw_cell, cmd);
+ if (getRowID(dw_cell, crow) == L"") SendCtrlCmd(dw_cell, comdid);
return 1;
}
+ return 1;
}
return 0;
}
@@ -3588,6 +3608,19 @@
xstring error = x.text();
alert(error);
return -1;
+ }
+ return 1;
+ }
+
+ int OnPurch2()
+ {
+ xaserverarg arg;
+ arg.AddArg(L"EntityID", entityID);
+ OpenWindow(L"dev:xpage[QuoteFilePurch2Select.vx]", arg);
+ xstring taskID = arg.GetArgString(L"TaskID");
+ if (taskID != L"")
+ {
+ ProcessSendMessage(L"/task/quote/repurch", taskID, L"", L"", true);
}
return 1;
}
@@ -4203,6 +4236,8 @@
else if (col == colTyp1 || col == colTyp || col == colTyp2 || col == colTyp3)
{
xstring pitems1 = L"";
+ pitems1 += (xstring)L"<row><显示列></显示列><数据列>"
+ + L"</数据列></row>";
pitems1 += (xstring)L"<row><显示列>成品</显示列><数据列>"
+ L"成品</数据列></row>";
pitems1 += (xstring)L"<row><显示列>散货</显示列><数据列>"
@@ -4457,6 +4492,8 @@
else if (col == colTyp1 || col == colTyp)
{
xstring pitems1 = L"";
+ pitems1 += (xstring)L"<row><显示列></显示列><数据列>"
+ + L"</数据列></row>";
pitems1 += (xstring)L"<row><显示列>成品</显示列><数据列>"
+ L"成品</数据列></row>";
pitems1 += (xstring)L"<row><显示列>散货</显示列><数据列>"
@@ -4601,6 +4638,7 @@
int colBuyerPrice = getItemCol(dw_cell, startRow - 1, L"采购价,采购价格");
int colBuyer = getItemCol(dw_cell, startRow - 1, L"采购人员");
+ int colBuyerMOQ = getItemCol(dw_cell, startRow - 1, L"MOQ");
int colBuyerRemark = getItemCol(dw_cell, startRow - 1, L"采购To业务备注");
int colFactoryImage = getItemCol(dw_cell, startRow - 1, L"工厂图片");
int colGWT = getItemCol(dw_cell, startRow - 1, L"毛重,毛重(KG)");
@@ -4622,6 +4660,7 @@
KXMLDOMElement ele = items.item(i);
xstring rowid = ele.selectSingleNode(L"RowID").text();
xstring BuyerPrice = ele.selectSingleNode(L"BuyerPrice").text();
+ xstring BuyerMOQ = L"";
xstring BuyerRemark = L"";
xstring FactoryImage = L"";
xstring GWT = L"";
@@ -4636,6 +4675,7 @@
xstring EnquiryLineID = L"";
xstring Buyer = L"";
+ if (ele.selectSingleNode(L"BuyerMOQ")) BuyerMOQ = ele.selectSingleNode(L"BuyerMOQ").text();
if (ele.selectSingleNode(L"BuyerRemark")) BuyerRemark = ele.selectSingleNode(L"BuyerRemark").text();
if (ele.selectSingleNode(L"FactoryImage"))FactoryImage = ele.selectSingleNode(L"FactoryImage").text();
if (ele.selectSingleNode(L"GWT")) GWT = ele.selectSingleNode(L"GWT").text();
@@ -4644,7 +4684,7 @@
if (ele.selectSingleNode(L"Vol")) Vol = ele.selectSingleNode(L"Vol").text();
if (ele.selectSingleNode(L"F40HQ")) F40HQ = ele.selectSingleNode(L"F40HQ").text();
if (ele.selectSingleNode(L"PurchedDate")) PurchedDate = ele.selectSingleNode(L"PurchedDate").text();
- trace(L"\r\n******" + PurchedDate);
+ //trace(L"\r\n******" + PurchedDate);
if (ele.selectSingleNode(L"supplier-photo")) supplierphoto = ele.selectSingleNode(L"supplier-photo").text();
if (ele.selectSingleNode(L"ProductInfo")) productInfo = ele.selectSingleNode(L"ProductInfo").text();
if (ele.selectSingleNode(L"ProductInfo1")) productInfo1 = ele.selectSingleNode(L"ProductInfo1").text();
@@ -4659,6 +4699,7 @@
if (getRowID(dw_cell, row) == rowid)
{
dw_cell.SetItemString(row, colBuyerPrice, BuyerPrice);
+ dw_cell.SetItemString(row, colBuyerMOQ, BuyerMOQ);
dw_cell.SetItemString(row, colBuyerRemark, BuyerRemark);
dw_cell.SetItemString(row, colFactoryImage, FactoryImage);
dw_cell.SetItemString(row, colGWT, GWT);
@@ -4723,6 +4764,21 @@
return 1;
}
+ xstring GetTryFirstAttr(xstring str, xstring term)
+ {
+ xstring foundStr = L" " + term + L"=";
+ wchar quote = L'"';
+ int pos = str.find(foundStr);
+ if (pos < 0) return L"";
+ pos += foundStr.length();
+ while (str.at(pos) == L' ')pos++;
+ if (str.at(pos) == L'\'')quote = L'\'';
+ int epos = ++pos;
+ while (str.at(epos) && str.at(epos) != quote)epos++;
+ if (!str.at(epos))return L"";
+ return str.mid(pos, epos - pos);
+ }
+
int onload()
{
SetArg();
@@ -4754,7 +4810,11 @@
x.loadXML(templ);
*/
action = L"purch";
-
+ action = GetTryFirstAttr(templ, L"action");
+ if (action == L"") action = L"purch";
+ entityItemID = GetTryFirstAttr(templ, L"TemplateItemID");
+ if (entityItemID == L"")entityItemID = GetTryFirstAttr(templ, L"ItemID");
+#if 0
if (templ.find(L"action=\"") >= 0)
{
action = templ.mid(templ.find(L"action=\"") + 8, templ.find(L"\"", templ.find(L"action=\"") + 8) - (templ.find(L"action=\"") + 8));
@@ -4771,7 +4831,7 @@
entityItemID = templ.mid(templ.find(L" ItemID=\"") + 9, templ.find(L"\"", templ.find(L" ItemID=\"") + 9) - (templ.find(L" ItemID=\"") + 9));
}
}
-
+#endif
/*action = x.documentElement.getAttribute(L"action");
if(action==L"") action=L"purch";
entityItemID = x.documentElement.getAttribute(L"TemplateItemID");
@@ -4862,7 +4922,7 @@
dw_cell.SetColumnCount(dw_cell.GetValidCol() + 6);
}
else
- dw_cell.SetColumnCount(dw_cell.GetValidCol());
+ dw_cell.SetColumnCount(dw_cell.GetValidCol()+3);
//OnRetrieve();
--
Gitblit v1.9.3