From 28b19397534f1ad6eabfc1e7bfaf46a2ce6df39e Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 17 十二月 2024 12:42:52 +0800
Subject: [PATCH] update

---
 jrj/project/business/Enquiry/Enquiry.maint.cpp |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/jrj/project/business/Enquiry/Enquiry.maint.cpp b/jrj/project/business/Enquiry/Enquiry.maint.cpp
index 659422b..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"")
 				{
@@ -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"*********");
 			}
 
@@ -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