From 22a7922be8d234c04bdf894b48d9f57fe97c857f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 十月 2024 15:55:30 +0800
Subject: [PATCH] 作业本显示修改
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index ff9a6b9..b2ad99c 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -109,7 +109,7 @@
this.txtCompanyName.Value = MyConvert.ConvertToString(_eC_OrderBasic.BuyerName);
this.selPrintTypes.Value = _eC_OrderBasic.PrintTypeId.HasValue ? _eC_OrderBasic.PrintTypeId.Value.ToString() : "";
this.txtPrintTypes.Value = MyConvert.ConvertToString(_eC_OrderBasic.PrintType.PrintName);
- this.txtDeliveryTime.Value = _eC_OrderBasic.DeliveryTime.Value.ToString(FixedInfo.DATEFORMAT);
+ this.txtDeliveryTime.Value = _eC_OrderBasic.DeliveryTime.HasValue? _eC_OrderBasic.DeliveryTime.Value.ToString(FixedInfo.DATEFORMAT):"";
this.txtDocumentName.Value = MyConvert.ConvertToString(_eC_OrderBasic.DocumentName);
this.hidOrderTypeId.Value = _eC_OrderBasic.OrderTypeId.ToString();
this.txtRemark.Value = _eC_OrderBasic.Remark.ToString2();
@@ -117,7 +117,7 @@
if (_eC_OrderBasic.UnitPrice.HasValue)
{
- this.txtUnitPrice.Value = _eC_OrderBasic.UnitPrice.Value.ToString("0.00");
+ this.txtUnitPrice.Value = _eC_OrderBasic.UnitPrice.Value.ToString("0.0000");
}
if (_eC_OrderBasic.SumPrice.HasValue)
{
@@ -182,7 +182,7 @@
//this.rptCustormer.DataSource = corporateClients;
//this.rptCustormer.DataBind();
- this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId);
+ this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId).OrderBy(x=>x.orderNumHome);
this.selPrintTypes.DataBind();
this.selPrintTypes.Items.Insert(0, new ListItem("璇烽�夋嫨", ""));
this.selPrintTypes.Items.Add(new ListItem("鍏朵粬", "-1"));
@@ -274,6 +274,7 @@
_oA_CustomerCommunications.DegreeImportanId = m_OA_CorporateClients.DegreeImportanId;
_oA_CustomerCommunications.AccountManagerId = m_OA_CorporateClients.AccountManagerId;
_oA_CustomerCommunications.BusinessManagerId = m_OA_CorporateClients.BusinessManagerId;
+ _oA_CustomerCommunications.CompanyName = m_OA_CorporateClients.CompanyName;
Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
}
@@ -371,6 +372,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
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();
@@ -387,7 +389,16 @@
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+ if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+ {
+ _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+ }
+ else
+ {
+ _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ }
+
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
@@ -549,6 +560,7 @@
eC_OrderExtend.CustomerLevelId = MyConvert.ConvertToInt32(Request["selCustormerLevel"]);
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();
@@ -565,7 +577,15 @@
_inquiryCommonModel = new InquiryCommonModel();
_inquiryCommonModel.PrintTypeId = -1;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ _inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
+ if (Request["txtPrintDemand"].ToString().IndexOf(Request["printSizeName"].ToString()) >= 0)
+ {
+ _inquiryCommonModel.PrintDemand = Request["txtPrintDemand"].ToString();
+ }
+ else
+ {
+ _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ }
_inquiryCommonModel.PrintSizeName = Request["printSizeName"].ToString();
}
else
--
Gitblit v1.9.1