From a0b3492010949e0d044892b9bb6456b51ae0d458 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期日, 26 一月 2025 12:14:19 +0800
Subject: [PATCH] 从“专版工单”发起生成的“纸张采购”中增加显示“印件名称”
---
CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs | 27 +++++++++++++++++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs | 3 +++
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs | 4 +++-
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx | 2 +-
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs | 12 ++++++++++++
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx | 10 +++++++++-
6 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
index e028959..0597492 100644
--- a/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
+++ b/CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs
@@ -413,6 +413,23 @@
return _commodityid;
}
}
+
+ /// <summary>
+ /// 璁㈠崟id
+ /// </summary>
+ public int? orderId
+ {
+ get;set;
+ }
+
+ /// <summary>
+ /// 鍗颁欢鍚嶇О
+ /// </summary>
+ public string DocumentName
+ {
+ get; set;
+ }
+
#endregion Model
#region Visiter
@@ -560,6 +577,16 @@
this.Commodityid = isChange ? MyConvert.ConvertToInt32(value) : Commodityid;
theValue = this.Commodityid;
}
+ else if ("orderId".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+ {
+ this.orderId = isChange ? MyConvert.ConvertToInt32(value) : orderId;
+ theValue = this.orderId;
+ }
+ else if ("DocumentName".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 26)
+ {
+ this.DocumentName = isChange ? MyConvert.ConvertToString(value) : DocumentName;
+ theValue = this.DocumentName;
+ }
return theValue;
}
#endregion
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
index 45cc514..da944f6 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs
@@ -66,7 +66,9 @@
new SqlParameter("@PaperWeightId",trueModel.PaperWeightId),
new SqlParameter("@tanPrice",trueModel.TanPrice??0),
new SqlParameter("@ReceiveMoney",decimal.Parse("0")),
- new SqlParameter("@Commodityid",trueModel.Commodityid)
+ new SqlParameter("@Commodityid",trueModel.Commodityid),
+ new SqlParameter("@orderId",trueModel.orderId.HasValue?trueModel.orderId.Value:0),
+ new SqlParameter("@DocumentName",string.IsNullOrEmpty(trueModel.DocumentName)?"":trueModel.DocumentName)
};
try
{
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
index eb93a57..cc42ebc 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx
@@ -1429,7 +1429,7 @@
//绾稿紶閲囪喘
function zhizhangcaigou() {
- top.Dialog.open({ URL: "/Pages/procurement/ProcurementADD.aspx", Title: "绾稿紶閲囪喘", Width: 1100, Height: 700 });
+ top.Dialog.open({ URL: "/Pages/procurement/ProcurementADD.aspx?orderIdstrrrr=<%=orderIdstrrrr %>", Title: "绾稿紶閲囪喘", Width: 1100, Height: 700 });
}
</script>
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
index c09621f..7979ea0 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs
@@ -37,6 +37,8 @@
public string[] Width = new string[7];
public string[] Lenth = new string[7];
public string xialapr = "";
+ public string orderIdstrrrr = "";
+
//鍒濆鍖�
public AgSpecialOrderEdit()
{
@@ -167,6 +169,7 @@
return false;
}
+ orderIdstrrrr = orderIdStr;
EC_OrderPrintParameterBLL _eC_OrderPrintParameterBLL = new EC_OrderPrintParameterBLL();
EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterBLL.GetModel(orderId.Value);
InquiryCommonModel _inquiryCommonModel = null;
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
index ffc989d..087f82e 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs
@@ -10,6 +10,7 @@
using CY.Infrastructure.Common;
using CY.Model;
using CY.BLL.Sys;
+using CY.BLL.EC;
namespace CY.WebForm.Pages.procurement
{
@@ -417,6 +418,17 @@
}
else
{
+ var sss = Request["orderIdstrrrr"];
+ if (!string.IsNullOrEmpty(Request["orderIdstrrrr"]) && Request["orderIdstrrrr"].ToInt32() > 0)
+ {
+ EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
+ EC_OrderBasic _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(Request["orderIdstrrrr"].ToInt32().Value);
+ if (_eC_OrderBasic != null)
+ {
+ procurement.orderId = Request["orderIdstrrrr"].ToInt32();
+ procurement.DocumentName = _eC_OrderBasic.DocumentName;
+ }
+ }
if (_OA_ProcurementBLL.insertModel(procurement))
{
ClearData();
diff --git a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
index d9b1a1f..7c44821 100644
--- a/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
+++ b/CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -208,9 +208,13 @@
<th>
缂栧彿
</th>
- <th>
+ <th>
渚涘簲鍟�
</th>
+ <th>
+ 鍗颁欢鍚嶇О
+ </th>
+
<th>
璐у搧鍚嶇О
</th>
@@ -260,9 +264,13 @@
<td>
<%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
</td>
+
<td>
<%#Eval("SuppliersName")%>
</td>
+ <td>
+ <%#Eval("DocumentName")%>
+ </td>
<td>
<%#Eval("GoodsName")%>
</td>
--
Gitblit v1.9.1