From a980cd04341d71216e0f59bd4b7327fe9fc50032 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 21 五月 2025 11:41:46 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 00a5e3e..4d7f30d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -117,6 +117,7 @@
this.hidOrderTypeId.Value = _eC_OrderBasic.OrderTypeId.ToString();
this.txtRemark.Value = _eC_OrderBasic.Remark.ToString2();
this.txtPrintPackDeliveryRequir.Value = _eC_OrderBasic.PrintPackDeliveryRequir.ToString2();
+ this.txtDuiyinghetongbianhao.Value = _eC_OrderBasic.Duiyinghetongbianhao;
if (_eC_OrderBasic.UnitPrice.HasValue)
{
@@ -278,6 +279,7 @@
_oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
_oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
_oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
+ _oA_CustomerCommunications.Note = m_OA_CorporateClients.Note;
Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
}
@@ -397,18 +399,18 @@
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
eC_OrderExtend.printunit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
eC_OrderBasic.Operator = eC_OrderBasic.Creater = eC_OrderExtend.Operate;
-
if (Request["txtUnitPrice"] != null && !string.IsNullOrEmpty(Request["txtUnitPrice"]))
{
eC_OrderBasic.UnitPrice = MyConvert.ConvertToDecimal(Request["txtUnitPrice"]);
}
eC_OrderBasic.SumPrice = MyConvert.ConvertToDecimal(Request["txtSumPrice"]);
//eC_OrderExtend.SurplusPrintNum = MyConvert.ConvertToInt32(txtSurplusPrintNum.Value);
- if (Request["hidPrintTypeId"].ToString().ToInt32() == -1)
+ if (Request["hidPrintTypeId"].ToString().ToInt32() == -1 )
{
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
@@ -452,6 +454,7 @@
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
+ eC_OrderExtend.Duiyinghetongbianhao = MyConvert.ConvertToString(Request["txtDuiyinghetongbianhao"]).Trim();
///鏄慨鏀规椂鍙繚瀛樻墿灞曚俊鎭�
if (eC_OrderExtend.Keyid.HasValue && 0 < eC_OrderExtend.Keyid.Value)
@@ -536,6 +539,7 @@
eC_OrderExtend.BookPrice = MyConvert.ConvertToString(Request["txtBookPrice"]).Trim();
eC_OrderExtend.NumPerBag = MyConvert.ConvertToString(Request["txtNumberPerBag"]).Trim();
eC_OrderExtend.BagNum = MyConvert.ConvertToString(Request["txtBagNum"]).Trim();
+ eC_OrderExtend.Duiyinghetongbianhao = MyConvert.ConvertToString(Request["txtDuiyinghetongbianhao"]).Trim();
if (!eC_OrderBasic.Keyid.HasValue || 0 == eC_OrderBasic.Keyid.Value)
{
isWin = null != PayAbout.NewOrder(eC_OrderBasic, eC_OrderExtend, _inquiryCommonModel);
@@ -585,6 +589,7 @@
eC_OrderExtend.Contacts = MyConvert.ConvertToString(Request["txtContact"]).Trim();
eC_OrderExtend.ContactPhone = MyConvert.ConvertToString(Request["txtPhone"]).Trim();
eC_OrderExtend.printunit= MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+
eC_OrderBasic.Remark = eC_OrderExtend.Remark;
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]).Trim();
@@ -596,7 +601,7 @@
}
eC_OrderBasic.SumPrice = MyConvert.ConvertToDecimal(Request["txtSumPrice"]);
//eC_OrderExtend.SurplusPrintNum = MyConvert.ConvertToInt32(txtSurplusPrintNum.Value);
- if (Request["hidPrintTypeId"].ToString().ToInt32() == -1)
+ if (Request["hidPrintTypeId"].ToString().ToInt32() == -1 || Request["hidPrintTypeId"].ToString().ToInt32() == 38 || Request["hidPrintTypeId"].ToString().ToInt32() == 39)
{
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
@@ -639,7 +644,7 @@
eC_OrderBasic.DocumentName = MyConvert.ConvertToString(Request["txtDocumentName"]);
eC_OrderBasic.DeliveryTime = MyConvert.ConvertToDateTime(Request["txtDeliveryTime"]);
-
+ eC_OrderExtend.Duiyinghetongbianhao = MyConvert.ConvertToString(Request["txtDuiyinghetongbianhao"]).Trim();
///鏄慨鏀规椂鍙繚瀛樻墿灞曚俊鎭�
if (eC_OrderExtend.Keyid.HasValue && 0 < eC_OrderExtend.Keyid.Value)
{
--
Gitblit v1.9.1