From c4867cf5e5f78cfb924a3048bd0c4232d4a1e986 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 十二月 2024 08:33:44 +0800
Subject: [PATCH] 新增审批 付款申请 再付款申请中操作其他付款付款 生产管理里边点采购的供应商修改
---
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx.cs
index 776cee6..2760ddc 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,7 +112,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 +120,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 +185,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 +277,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));
}
@@ -339,6 +343,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>
/// 淇濆瓨璁㈠崟
@@ -383,13 +408,21 @@
}
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
@@ -563,13 +596,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
--
Gitblit v1.9.1