From a7711b47c02807531f04313ae829584310f37aba Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 28 十一月 2025 12:17:10 +0800
Subject: [PATCH] 你们明天在那个公文管理公文管理那个操作操作界面增加一个审核， 好点审核呢，实际上是修改这个只有我才有一个权限， 只是只有我一个人，因为现在来看他们。相当于说， 没经过我审核，他们整些你看嘛，发你妈一些公文， 像狗屎一样，格式都不对头，在这儿乱在这儿乱写啊， 必须就是我，我审核，我点审核，你相就是复制一个修改过嘛， 相当于就是。好，必须是我，我点了审核好后头我修改好了， 提交好了才能发布。只要我没在审核里头的话，好，这个就发布不了 。好怀疑着呢，怀疑怀疑着来修改，还是在修改里头整？
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 63 +++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 1f690b4..4d7f30d 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
@@ -59,6 +59,9 @@
Page_Load_Default();
LoadOrderInfo();
return;
+ case "jisuanorderJine":
+ UpdateorderJine2();
+ break;
default:
Page_Load_Default();
return;
@@ -109,15 +112,16 @@
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();
this.txtPrintPackDeliveryRequir.Value = _eC_OrderBasic.PrintPackDeliveryRequir.ToString2();
+ this.txtDuiyinghetongbianhao.Value = _eC_OrderBasic.Duiyinghetongbianhao;
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 +186,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 +278,8 @@
_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;
+ _oA_CustomerCommunications.Note = m_OA_CorporateClients.Note;
Response.Write(null == _oA_CustomerCommunications ? "" : JsonHelper.GetJsonStringByObject(_oA_CustomerCommunications));
}
@@ -339,6 +345,27 @@
}
+ /// <summary>
+ /// 鍔犺浇鍗板埛鐗�
+ /// </summary>
+ private void UpdateorderJine2()
+ {
+ Response.Clear();
+ string result = string.Empty;
+ int orderId = Request["OrderId"].ToString().ToInt32().Value;
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ var sss = _eC_OrderBasicBLL.UpdateorderJine(orderId);
+
+ result = "";//JsonHelper.GetJsonStringByObject(_CorporateClientsPrint);
+ result += "{\"status\":\"" + sss + "\"";
+ result += "}";
+
+
+ Response.Write(result);
+ //Response.End();
+ }
+
+
/// <summary>
/// 淇濆瓨璁㈠崟
@@ -372,24 +399,32 @@
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;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
_inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ 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
@@ -419,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)
@@ -503,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);
@@ -552,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();
@@ -563,13 +601,20 @@
}
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;
_inquiryCommonModel.PrintCount = Request["printCount"].ToString().ToInt32().Value;
_inquiryCommonModel.Unit = MyConvert.ConvertToInt32(Request["ysUnit"]).Value;
- _inquiryCommonModel.PrintDemand = Request["printSizeName"].ToString() + "锛�" + Request["txtPrintDemand"].ToString();
+ 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
@@ -599,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