From b9518767a995feb7533bb4a03a67ae1911976904 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 25 二月 2025 15:47:25 +0800
Subject: [PATCH] update
---
jrj/project/business/QuoteFile.cpp | 12 ++++++------
jrj/project/business/Quote/list.EnquiryQuote3.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj.filters | 3 +++
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 0cb927e..538b3d1 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/jrj/ext-jrj/ext-jrj.vcxproj.filters
@@ -1598,6 +1598,9 @@
<ClCompile Include="..\project\business\Expense\RmbRegister.cpp">
<Filter>project\business\Expense</Filter>
</ClCompile>
+ <ClCompile Include="..\project\business\Quote\list.EnquiryQuote3.cpp">
+ <Filter>project\business</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="ext-jrj.def">
diff --git a/jrj/project/business/Quote/list.EnquiryQuote3.cpp b/jrj/project/business/Quote/list.EnquiryQuote3.cpp
index b9a0807..43f644f 100644
--- a/jrj/project/business/Quote/list.EnquiryQuote3.cpp
+++ b/jrj/project/business/Quote/list.EnquiryQuote3.cpp
Binary files differ
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index bb78ecd..7131f1e 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -1858,7 +1858,7 @@
}
dw_cell.SetRowColumn(lastrow, 1);
dw_cell.SetAnchorRowColumn(lastrow, 1);
- //SendCtrlCmd(dw_cell, L"xmFormatCellDeleteRow");
+ //SendCtrlCmd(dw_cell, L"xmFormatCellDeleteRow"); //now not direct delete purch next
drow++;
}
}
@@ -1867,12 +1867,16 @@
}
xstring finished = L"1";
+ PUser& user = publiccode::GetUser();
+ xstring myname = user.name;
for (row = startRow; row <= rowCount; row++)
{
if (getRowID(dw_cell, row) == L"") continue;
if (dw_cell.GetItemString(row, colItemName) == L"")continue;
if (dw_cell.GetItemString(row, colSalebackDate) == L"")
{
+ xstring purchor = dw_cell.GetItemString(row, purchercol);
+ if (purchor != L"" && purchor != myname) continue; //purchnext
finished = L"0";
break;
}
@@ -1881,11 +1885,7 @@
if (0 == 1)OnUpdateEntityFile();
OnUpdate();
- if (finished == L"1")
- {
- OnUpdateProcessed();
- alert(L"xxxxx");
- }
+ if (finished == L"1")OnUpdateProcessed();
//OnSaveEx(true);
//alert(L"询价信息已发送给:"+purchors);
--
Gitblit v1.9.3