From ae5fd37fc3cfdf60ad385211460e9d39ee53e5ba Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 14 十一月 2024 15:31:50 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Enquiry/Enquiry.maint.cpp | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/jrj/project/business/Enquiry/Enquiry.maint.cpp b/jrj/project/business/Enquiry/Enquiry.maint.cpp
index a0ffc18..d2f3136 100644
--- a/jrj/project/business/Enquiry/Enquiry.maint.cpp
+++ b/jrj/project/business/Enquiry/Enquiry.maint.cpp
@@ -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"*********");
}
--
Gitblit v1.9.3