Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2025-03-13 cf8dba7748cc9826d744069b5063a14e3fcd2fa8

 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"*********");
         }