username@email.com
2025-01-26 a0b3492010949e0d044892b9bb6456b51ae0d458
从“专版工单”发起生成的“纸张采购”中增加显示“印件名称”

在纸张采购的操作界面和“采购管理”的类别中都要显示、“印件名称”
6个文件已修改
56 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.Model/OA/OA_Procurement.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/OA/OA_ProcurementDAL.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgSpecialOrderEdit.aspx.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementADD.aspx.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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
            {
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>
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;
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();
CY_ECommercePlatform/CY.WebForm/Pages/procurement/ProcurementList.aspx
@@ -212,6 +212,10 @@
                                供应商
                            </th>
                            <th>
                                印件名称
                            </th>
                            <th>
                                货品名称
                            </th>
                            <th>
@@ -260,10 +264,14 @@
                        <td>
                            <%#Container.ItemIndex + 1+ this.UCPager1.PageSize * (this.UCPager1.PageIndex - 1)%>
                        </td>
                        <td>
                            <%#Eval("SuppliersName")%>
                        </td>
                        <td>
                            <%#Eval("DocumentName")%>
                        </td>
                        <td>
                            <%#Eval("GoodsName")%>
                        </td>
                        <td>