From fa2de0461cb79df0ba5e736b4aea8bff1056688a Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期五, 13 九月 2024 10:07:40 +0800
Subject: [PATCH] update
---
jrj/project/business/QuoteFile.cpp | 120 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index cabdba0..d2a5bce 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -166,10 +166,10 @@
while (true)
{
xstring guid = guids;
- if (guids.find(L",L") >= 0)
+ if (guids.find(L",") >= 0)
{
- guid = guids.left(guids.find(L",L"));
- guids = guids.mid(guids.find(L",L") + 1, 99999);
+ guid = guids.left(guids.find(L","));
+ guids = guids.mid(guids.find(L",") + 1, 99999);
}
else
{
@@ -201,10 +201,10 @@
while (true)
{
xstring guid = guids;
- if (guids.find(L",L") >= 0)
+ if (guids.find(L",") >= 0)
{
- guid = guids.left(guids.find(L",L"));
- guids = guids.mid(guids.find(L",L") + 1, 99999);
+ guid = guids.left(guids.find(L","));
+ guids = guids.mid(guids.find(L",") + 1, 99999);
}
else
{
@@ -231,7 +231,7 @@
xstring fstr = L"";
while (strs != L"")
{
- int pos = strs.find(L",L");
+ int pos = strs.find(L",");
if (pos < 0)
{
str = strs;
@@ -245,7 +245,7 @@
if (fstr == L"")
fstr = GetImageUrl(str);
else
- fstr += L",L" + GetImageUrl(str);
+ fstr += L"," + GetImageUrl(str);
}
return fstr;
}
@@ -612,12 +612,12 @@
int getItemCol(xcell dw_obj, int row, xstring head)
{
- xstring fullhead = L",L" + head + L",L";
+ xstring fullhead = L"," + head + L",";
int headRow = row;
int colCount = dw_obj.GetValidCol(headRow);
for (int col = 1; col <= colCount; col++)
{
- if (fullhead.find(L",L" + dw_obj.GetItemString(headRow, col) + L",L") >= 0) return col;
+ if (fullhead.find(L"," + dw_obj.GetItemString(headRow, col) + L",") >= 0) return col;
}
return -1;
}
@@ -645,8 +645,8 @@
xstring left = str.left(str.find(prop + L":") + prop.length() + 1);
if (str.find(L";") >= 0)
right = str.mid(str.find(L";") + 1, 9999);
- else if (str.find(L",L") >= 0)
- right = str.mid(str.find(L",L") + 1, 9999);
+ else if (str.find(L",") >= 0)
+ right = str.mid(str.find(L",") + 1, 9999);
str = left + val + L";" + right;
//alert(str);
dw_obj.SetItemString(row, 0, str);
@@ -664,8 +664,8 @@
str = str.mid(str.find(prop + L":") + prop.length() + 1, 9999);
if (str.find(L";") >= 0)
str = str.left(str.find(L";"));
- else if (str.find(L",L") >= 0)
- str = str.left(str.find(L",L"));
+ else if (str.find(L",") >= 0)
+ str = str.left(str.find(L","));
return str;
}
return L"";
@@ -749,8 +749,8 @@
str = str.mid(str.find(L"rowid:") + 6, 99999);
if (str.find(L";") >= 0)
str = str.left(str.find(L";"));
- else if (str.find(L",L") >= 0)
- str = str.left(str.find(L",L"));
+ else if (str.find(L",") >= 0)
+ str = str.left(str.find(L","));
return str;
}
return L"";
@@ -1598,7 +1598,7 @@
return 1;
}
- xstring strs = L",L";
+ xstring strs = L",";
row++;
int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
@@ -1610,11 +1610,11 @@
if (str == L"")break;
//ensureRowID(dw_cell,row);
- if (strs.find(L",L" + str + L",L") < 0)
+ if (strs.find(L"," + str + L",") < 0)
{
if (purcher.selectSingleNode(L"//Name[.='" + str + L"']"))
{
- strs += str + L",L";
+ strs += str + L",";
}
else
{
@@ -1624,7 +1624,7 @@
}
row++;
}
- if (strs == L",L")
+ if (strs == L",")
{
alert(L"请指定采购人员!");
return 1;
@@ -1666,11 +1666,11 @@
str = dw_cell.GetItemString(row, purchercol);
if (str == L"")break;
- if (strs.find(L",L" + str + L",L") < 0)
+ if (strs.find(L"," + str + L",") < 0)
{
if (purcher.selectSingleNode(L"//Name[.='" + str + L"']"))
{
- strs += str + L",L";
+ strs += str + L",";
}
else
{
@@ -1687,16 +1687,16 @@
xml x ;
- if (strs.left(1) == L",L") strs = strs.mid(1, 9999);
- if (strs.right(1) == L",L") strs = strs.left(strs.length() - 1);
+ if (strs.left(1) == L",") strs = strs.mid(1, 9999);
+ if (strs.right(1) == L",") strs = strs.left(strs.length() - 1);
xstring purchors = strs;
xstring supplier;
- if (strs.find(L",L", 0) > 0)
+ if (strs.find(L",", 0) > 0)
{
- supplier = strs.left(strs.find(L",L", 0));
- strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
+ supplier = strs.left(strs.find(L",", 0));
+ strs = strs.mid(strs.find(L",", 0) + 1, 9999);
}
else
{
@@ -1713,10 +1713,10 @@
if (supplier == username) len = 0;
if (len < 1)
{
- if (strs.find(L",L", 0) > 0)
+ if (strs.find(L",", 0) > 0)
{
- supplier = strs.left(strs.find(L",L", 0));
- strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
+ supplier = strs.left(strs.find(L",", 0));
+ strs = strs.mid(strs.find(L",", 0) + 1, 9999);
}
else
{
@@ -1768,10 +1768,10 @@
if (SendToPurcher(supplier, cell1.GetData()) == -1) return 1;
- if (strs.find(L",L", 0) > 0)
+ if (strs.find(L",", 0) > 0)
{
- supplier = strs.left(strs.find(L",L", 0));
- strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
+ supplier = strs.left(strs.find(L",", 0));
+ strs = strs.mid(strs.find(L",", 0) + 1, 9999);
}
else
{
@@ -1956,7 +1956,7 @@
return 1;
}
- xstring strs = L",L";
+ xstring strs = L",";
row++;
int colCustomerPhoto = getItemCol(dw_cell, startRow - 1, L"Photo,Customer Photo");
@@ -2005,11 +2005,11 @@
}*/
ensureRowID(dw_cell, row);
- if (strs.find(L",L" + str + L",L") < 0)
+ if (strs.find(L"," + str + L",") < 0)
{
if (purcher.selectSingleNode(L"//Name[.='" + str + L"']"))
{
- strs += str + L",L";
+ strs += str + L",";
}
else
{
@@ -2019,7 +2019,7 @@
}
row++;
}
- if (strs == L",L")
+ if (strs == L",")
{
alert(L"找不到采购人员数据!");
return 1;
@@ -2039,16 +2039,16 @@
xml x ;
- if (strs.left(1) == L",L") strs = strs.mid(1, 9999);
- if (strs.right(1) == L",L") strs = strs.left(strs.length() - 1);
+ if (strs.left(1) == L",") strs = strs.mid(1, 9999);
+ if (strs.right(1) == L",") strs = strs.left(strs.length() - 1);
xstring purchors = strs;
xstring supplier;
- if (strs.find(L",L", 0) > 0)
+ if (strs.find(L",", 0) > 0)
{
- supplier = strs.left(strs.find(L",L", 0));
- strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
+ supplier = strs.left(strs.find(L",", 0));
+ strs = strs.mid(strs.find(L",", 0) + 1, 9999);
}
else
{
@@ -2065,10 +2065,10 @@
int len = ts.length();
if (len < 1)
{
- if (strs.find(L",L", 0) > 0)
+ if (strs.find(L",", 0) > 0)
{
- supplier = strs.left(strs.find(L",L", 0));
- strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
+ supplier = strs.left(strs.find(L",", 0));
+ strs = strs.mid(strs.find(L",", 0) + 1, 9999);
}
else
{
@@ -2169,10 +2169,10 @@
}
if (SendToPurcher(supplier, cell1.GetData()) == -1) return 1;
- if (strs.find(L",L", 0) > 0)
+ if (strs.find(L",", 0) > 0)
{
- supplier = strs.left(strs.find(L",L", 0));
- strs = strs.mid(strs.find(L",L", 0) + 1, 9999);
+ supplier = strs.left(strs.find(L",", 0));
+ strs = strs.mid(strs.find(L",", 0) + 1, 9999);
}
else
{
@@ -2363,7 +2363,7 @@
{
int pos = str.find(L";", str.find(tm + L":") + 1);
if (pos < 0) return 1;
- str = str.left(pos) + L",L" + guid + str.mid(pos, 99999);
+ str = str.left(pos) + L"," + guid + str.mid(pos, 99999);
}
else
{
@@ -2385,7 +2385,7 @@
if (pos > 0 && str.mid(pos - 1, 1) == L":")
str = str.left(pos) + guid + str.mid(pos, 99999);
else
- str = str.left(pos) + L",L" + guid + str.mid(pos, 99999);
+ str = str.left(pos) + L"," + guid + str.mid(pos, 99999);
}
else
{
@@ -2417,7 +2417,7 @@
while (true)
{
count++;
- spos = images.find(L",L", spos + 1);
+ spos = images.find(L",", spos + 1);
if (spos < 0) break;
}
trace(L" count:" + xstring(count));
@@ -2485,11 +2485,11 @@
while (true)
{
if (i == index) break;
- spos = images.find(L",L", spos + 1);
+ spos = images.find(L",", spos + 1);
if (spos < 0) break;
i++;
}
- int epos = images.find(L",L", spos + 1);
+ int epos = images.find(L",", spos + 1);
if (spos >= 0)
{
if (epos < 0)
@@ -2511,8 +2511,8 @@
if (im.GetImageCount() - sindex >= 1)
{
- if (images.find(L",L") == 0) images = images.mid(1, 9999);
- int pos1 = images.find(L",L");
+ if (images.find(L",") == 0) images = images.mid(1, 9999);
+ int pos1 = images.find(L",");
if (pos1 < 0) pos1 = images.find(L";");
xstring id = images;
if (pos1 >= 0) id = images.left(pos1);
@@ -2587,7 +2587,7 @@
return 1;
}
- int GetOpenFileNames(xarray<xstring>& items, xstring initFileName, xstring filter, xstring ext)
+ int GetOpenFileNames(xarray<xstring>& items, xstring initFileName, const string filter, xstring ext)
{
//xstring path = GetOpenFileName(L"",
// "JPEG 文件(*.jpg)\0*.jpg;*.jpeg;*.png;*.gif;*.bmp\0全部文件(*.*)\0*.*\0",
@@ -2611,7 +2611,7 @@
int nFilterIndex = 1;
OPENFILENAMEW ofn;
- ofn.lStructSize = 88;//sizeof(ofn);
+ ofn.lStructSize = sizeof(ofn);
ofn.hwndOwner = 0;
ofn.hInstance = 0;
ofn.lpstrFilter = filter;
@@ -2648,13 +2648,13 @@
else
{
wchar_t* start = szPath;
- start += pos * 2;
+ start += pos;;
xstring str = start;
while (true)
{
if (str == L"")break;
items.push_back(path + L"/" + str);
- start += (str.length() + 1) * 2;
+ start += (str.length() + 1) ;
str = start;
}
}
@@ -4984,7 +4984,7 @@
int LoadPurcher()
{
- xml purcher ;
+ //xml purcher ;
xaserverarg arg ;
arg.AddArg(L"id", L"采购员");
--
Gitblit v1.9.3