From feccef8c2b99af30b6937c42568f2fb7c82dbae2 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 13 十一月 2024 17:51:49 +0800
Subject: [PATCH] update
---
jrj/project/business/Enquiry/Enquiry.maint.cpp | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/jrj/project/business/Enquiry/Enquiry.maint.cpp b/jrj/project/business/Enquiry/Enquiry.maint.cpp
index ba43fb2..d2f3136 100644
--- a/jrj/project/business/Enquiry/Enquiry.maint.cpp
+++ b/jrj/project/business/Enquiry/Enquiry.maint.cpp
@@ -57,7 +57,7 @@
return 1;
}
- xstring GetEntityData(int pr)
+ xstring GetEntityData(LPARAM pr)
{
dw_base.AcceptText();
dw_goods.AcceptText();
@@ -117,11 +117,7 @@
dw_goods.AcceptText();
if (dw_base.GetItemString(1, L"Remark") != L"保存")
{
- if (dw_base.GetItemString(1, L"EnquiryNo") == L"")
- {
- xstring EnquiryNo = EnquiryView::MakeBillNo();
- dw_base.SetItemString(1, L"EnquiryNo", EnquiryNo);
- }
+
if (dw_base.GetItemString(1, L"ValidDay") == L"")
{
@@ -195,7 +191,7 @@
Packing = dw_goods.GetItemString(i,L"Packing");
if(Packings==L"")
Packings = Packing;
- else if(Packings.find(Packing) < 0) Packings+=L",L"+Packing;
+ else if(Packings.find(Packing) < 0) Packings+=L","+Packing;
}*/
if (dw_goods.GetItemString(i, L"Packing") == L"")
{
@@ -214,6 +210,13 @@
}
}
}
+
+ if (dw_base.GetItemString(1, L"EnquiryNo") == L"")
+ {
+ xstring EnquiryNo = EnquiryView::MakeBillNo();
+ dw_base.SetItemString(1, L"EnquiryNo", EnquiryNo);
+ }
+
trace(L"********" + Packings + L"*********");
}
@@ -389,7 +392,7 @@
Packing = dw_goods.GetItemString(i, L"Packing");
if (Packings == L"")
Packings = Packing;
- else if (Packings.find(Packing) < 0) Packings += L",L" + Packing;
+ else if (Packings.find(Packing) < 0) Packings += L"," + Packing;
}
}
@@ -918,7 +921,7 @@
if (i == 1)
skunos = skuno;
else
- skunos += L",L" + skuno;
+ skunos += L"," + skuno;
}
xaserverarg arg_pic;
@@ -1046,7 +1049,7 @@
if (skunos == L"")
skunos = dw_goods.GetItemString(i, L"SKUNo");
else
- skunos += L",L" + dw_goods.GetItemString(i, L"SKUNo");
+ skunos += L"," + dw_goods.GetItemString(i, L"SKUNo");
}
}
xaserverarg arg ;
@@ -1186,7 +1189,7 @@
return 0;
}
- int OnImgDBClicked(TEvent* evt, int pr)
+ int OnImgDBClicked(TEvent* evt, LPARAM pr)
{
IMGNNMHDR& nmtv = *(IMGNNMHDR*)evt->notify.pnmh;
xstring src = nmtv.path;
--
Gitblit v1.9.3