username@email.com
2025-08-12 4142cf95cc3d543a3273d96b87fa041310cfff3a
设计订单其他要加上

设计费加一个格子,手填设计费 完成

黑白硬件 单双面不同 设计费乘2 完成

书刊 每一个内页增加都要对应一个寄件,最多三个内页三个寄件
11个文件已修改
852 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs 211 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs 208 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx 100 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs 167 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.designer.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -648,6 +648,119 @@
        public int? Shejicountneiye { get; set; }
        /// <summary>
        /// 设计单价内页
        /// </summary>
        public decimal? ShejiUnitPriceneiye1 { get; set; }
        /// <summary>
        /// 设计金额内页
        /// </summary>
        public decimal? ShejiSumPriceneiye1 { get; set; }
        /// <summary>
        /// 设计数量内页
        /// </summary>
        public int? Shejicountneiye1 { get; set; }
        /// <summary>
        /// 设计单价内页
        /// </summary>
        public decimal? ShejiUnitPriceneiye2 { get; set; }
        /// <summary>
        /// 设计金额内页
        /// </summary>
        public decimal? ShejiSumPriceneiye2 { get; set; }
        /// <summary>
        /// 设计数量内页
        /// </summary>
        public int? Shejicountneiye2 { get; set; }
        /// <summary>
        /// 设计人员
        /// </summary>
        public int? Shejirenyuanneiye1
        {
            get;
            set;
        }
        /// <summary>
        /// 设计人员
        /// </summary>
        public string ShejirenyuanNameneiye1 { get; set; }
        /// <summary>
        /// 设计类型
        /// </summary>
        public int? Shejileixingneiye1
        {
            get;
            set;
        }
        /// <summary>
        /// 设计类型
        /// </summary>
        public string ShejileixingNameneiye1 { get; set; }
        /// <summary>
        /// 单双面
        /// </summary>
        public string Danshuangmianneiye1 { get; set; }
        /// <summary>
        /// 设计要求
        /// </summary>
        public string Shejiyaoqiuneiye1 { get; set; }
        /// <summary>
        /// 设计人员
        /// </summary>
        public int? Shejirenyuanneiye2
        {
            get;
            set;
        }
        /// <summary>
        /// 设计人员
        /// </summary>
        public string ShejirenyuanNameneiye2 { get; set; }
        /// <summary>
        /// 设计类型
        /// </summary>
        public int? Shejileixingneiye2
        {
            get;
            set;
        }
        /// <summary>
        /// 设计类型
        /// </summary>
        public string ShejileixingNameneiye2 { get; set; }
        /// <summary>
        /// 单双面
        /// </summary>
        public string Danshuangmianneiye2 { get; set; }
        /// <summary>
        /// 设计要求
        /// </summary>
        public string Shejiyaoqiuneiye2 { get; set; }
        /// <summary>
        /// 设计数量内页
        /// </summary>
        public string Shejicountneiyename { get; set; }
@@ -1200,7 +1313,103 @@
                this.SonghuoJine = isChange ? MyConvert.ConvertToDecimal(value) : this.SonghuoJine;
                theValue = this.SonghuoJine;
            }
            else if ("ShejiUnitPriceneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 123)
            {
                this.ShejiUnitPriceneiye1 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPriceneiye1;
                theValue = this.ShejiUnitPriceneiye1;
            }
            else if ("ShejiSumPriceneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 124)
            {
                this.ShejiSumPriceneiye1 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPriceneiye1;
                theValue = this.ShejiSumPriceneiye1;
            }
            else if ("Shejicountneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 125)
            {
                this.Shejicountneiye1 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye1;
                theValue = this.Shejicountneiye1;
            }
            else if ("ShejiUnitPriceneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 126)
            {
                this.ShejiUnitPriceneiye2 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPriceneiye2;
                theValue = this.ShejiUnitPriceneiye2;
            }
            else if ("ShejiSumPriceneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 127)
            {
                this.ShejiSumPriceneiye2 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPriceneiye2;
                theValue = this.ShejiSumPriceneiye2;
            }
            else if ("Shejicountneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 128)
            {
                this.Shejicountneiye2 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye2;
                theValue = this.Shejicountneiye2;
            }
            else if ("Shejirenyuanneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 129)
            {
                this.Shejirenyuanneiye1 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuanneiye1;
                theValue = this.Shejirenyuanneiye1;
            }
            else if ("ShejirenyuanNameneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 130)
            {
                this.ShejirenyuanNameneiye1 = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanNameneiye1;
                theValue = this.ShejirenyuanNameneiye1;
            }
            else if ("Shejileixingneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 131)
            {
                this.Shejileixingneiye1 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixingneiye1;
                theValue = this.Shejileixingneiye1;
            }
            else if ("ShejileixingNameneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 132)
            {
                this.ShejileixingNameneiye1 = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingNameneiye1;
                theValue = this.ShejileixingNameneiye1;
            }
            else if ("Danshuangmianneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 133)
            {
                this.Danshuangmianneiye1 = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmianneiye1;
                theValue = this.Danshuangmianneiye1;
            }
            else if ("Shejiyaoqiuneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 134)
            {
                this.Shejiyaoqiuneiye1 = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye1;
                theValue = this.Shejiyaoqiuneiye1;
            }
            else if ("Shejirenyuanneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 135)
            {
                this.Shejirenyuanneiye2 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuanneiye2;
                theValue = this.Shejirenyuanneiye2;
            }
            else if ("ShejirenyuanNameneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 136)
            {
                this.ShejirenyuanNameneiye2 = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanNameneiye2;
                theValue = this.ShejirenyuanNameneiye2;
            }
            else if ("Shejileixingneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 137)
            {
                this.Shejileixingneiye2 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixingneiye2;
                theValue = this.Shejileixingneiye2;
            }
            else if ("ShejileixingNameneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 138)
            {
                this.ShejileixingNameneiye2 = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingNameneiye2;
                theValue = this.ShejileixingNameneiye2;
            }
            else if ("Danshuangmianneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 139)
            {
                this.Danshuangmianneiye2 = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmianneiye2;
                theValue = this.Danshuangmianneiye2;
            }
            else if ("Shejiyaoqiuneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 140)
            {
                this.Shejiyaoqiuneiye2 = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye2;
                theValue = this.Shejiyaoqiuneiye2;
            }
            #endregion
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
@@ -367,6 +367,117 @@
        /// </summary>
        public int? Shejicountneiye { get; set; }
        /// <summary>
        /// 设计单价内页
        /// </summary>
        public decimal? ShejiUnitPriceneiye1 { get; set; }
        /// <summary>
        /// 设计金额内页
        /// </summary>
        public decimal? ShejiSumPriceneiye1 { get; set; }
        /// <summary>
        /// 设计数量内页
        /// </summary>
        public int? Shejicountneiye1 { get; set; }
        /// <summary>
        /// 设计单价内页
        /// </summary>
        public decimal? ShejiUnitPriceneiye2 { get; set; }
        /// <summary>
        /// 设计金额内页
        /// </summary>
        public decimal? ShejiSumPriceneiye2 { get; set; }
        /// <summary>
        /// 设计数量内页
        /// </summary>
        public int? Shejicountneiye2 { get; set; }
        /// <summary>
        /// 设计人员
        /// </summary>
        public int? Shejirenyuanneiye1
        {
            get;
            set;
        }
        /// <summary>
        /// 设计人员
        /// </summary>
        public string ShejirenyuanNameneiye1 { get; set; }
        /// <summary>
        /// 设计类型
        /// </summary>
        public int? Shejileixingneiye1
        {
            get;
            set;
        }
        /// <summary>
        /// 设计类型
        /// </summary>
        public string ShejileixingNameneiye1 { get; set; }
        /// <summary>
        /// 单双面
        /// </summary>
        public string Danshuangmianneiye1 { get; set; }
        /// <summary>
        /// 设计要求
        /// </summary>
        public string Shejiyaoqiuneiye1 { get; set; }
        /// <summary>
        /// 设计人员
        /// </summary>
        public int? Shejirenyuanneiye2
        {
            get;
            set;
        }
        /// <summary>
        /// 设计人员
        /// </summary>
        public string ShejirenyuanNameneiye2 { get; set; }
        /// <summary>
        /// 设计类型
        /// </summary>
        public int? Shejileixingneiye2
        {
            get;
            set;
        }
        /// <summary>
        /// 设计类型
        /// </summary>
        public string ShejileixingNameneiye2 { get; set; }
        /// <summary>
        /// 单双面
        /// </summary>
        public string Danshuangmianneiye2 { get; set; }
        /// <summary>
        /// 设计要求
        /// </summary>
        public string Shejiyaoqiuneiye2 { get; set; }
@@ -727,7 +838,102 @@
                this.printunit = isChange ? MyConvert.ConvertToInt32(value).Value : this.printunit;
                theValue = this.printunit;
            }
            else if ("ShejiUnitPriceneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 75)
            {
                this.ShejiUnitPriceneiye1 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPriceneiye1;
                theValue = this.ShejiUnitPriceneiye1;
            }
            else if ("ShejiSumPriceneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 76)
            {
                this.ShejiSumPriceneiye1 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPriceneiye1;
                theValue = this.ShejiSumPriceneiye1;
            }
            else if ("Shejicountneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 77)
            {
                this.Shejicountneiye1 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye1;
                theValue = this.Shejicountneiye1;
            }
            else if ("ShejiUnitPriceneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 78)
            {
                this.ShejiUnitPriceneiye2 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiUnitPriceneiye2;
                theValue = this.ShejiUnitPriceneiye2;
            }
            else if ("ShejiSumPriceneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 79)
            {
                this.ShejiSumPriceneiye2 = isChange ? MyConvert.ConvertToDecimal(value) : this.ShejiSumPriceneiye2;
                theValue = this.ShejiSumPriceneiye2;
            }
            else if ("Shejicountneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 80)
            {
                this.Shejicountneiye2 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejicountneiye2;
                theValue = this.Shejicountneiye2;
            }
            else if ("Shejirenyuanneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 81)
            {
                this.Shejirenyuanneiye1 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuanneiye1;
                theValue = this.Shejirenyuanneiye1;
            }
            else if ("ShejirenyuanNameneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 82)
            {
                this.ShejirenyuanNameneiye1 = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanNameneiye1;
                theValue = this.ShejirenyuanNameneiye1;
            }
            else if ("Shejileixingneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 83)
            {
                this.Shejileixingneiye1 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixingneiye1;
                theValue = this.Shejileixingneiye1;
            }
            else if ("ShejileixingNameneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 84)
            {
                this.ShejileixingNameneiye1 = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingNameneiye1;
                theValue = this.ShejileixingNameneiye1;
            }
            else if ("Danshuangmianneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 85)
            {
                this.Danshuangmianneiye1 = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmianneiye1;
                theValue = this.Danshuangmianneiye1;
            }
            else if ("Shejiyaoqiuneiye1".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 86)
            {
                this.Shejiyaoqiuneiye1 = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye1;
                theValue = this.Shejiyaoqiuneiye1;
            }
            else if ("Shejirenyuanneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 87)
            {
                this.Shejirenyuanneiye2 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejirenyuanneiye2;
                theValue = this.Shejirenyuanneiye2;
            }
            else if ("ShejirenyuanNameneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 88)
            {
                this.ShejirenyuanNameneiye2 = isChange ? MyConvert.ConvertToString(value) : this.ShejirenyuanNameneiye2;
                theValue = this.ShejirenyuanNameneiye2;
            }
            else if ("Shejileixingneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 89)
            {
                this.Shejileixingneiye2 = isChange ? MyConvert.ConvertToInt32(value) : this.Shejileixingneiye2;
                theValue = this.Shejileixingneiye2;
            }
            else if ("ShejileixingNameneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 90)
            {
                this.ShejileixingNameneiye2 = isChange ? MyConvert.ConvertToString(value) : this.ShejileixingNameneiye2;
                theValue = this.ShejileixingNameneiye2;
            }
            else if ("Danshuangmianneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 91)
            {
                this.Danshuangmianneiye2 = isChange ? MyConvert.ConvertToString(value) : this.Danshuangmianneiye2;
                theValue = this.Danshuangmianneiye2;
            }
            else if ("Shejiyaoqiuneiye2".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 92)
            {
                this.Shejiyaoqiuneiye2 = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye2;
                theValue = this.Shejiyaoqiuneiye2;
            }
            #endregion
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -3316,16 +3316,16 @@
                " where  " + condition;
                var ssss = _dataBase.SelectModel<Model.EC_OrderBasic>("  sum(oe.[ShejiSumPrice]) as ShejiSumPrice,sum(oe.ShejiSumPriceneiye) as ShejiSumPriceneiye  ", fromss);
                var ssss = _dataBase.SelectModel<Model.EC_OrderBasic>("  sum(oe.[ShejiSumPrice]) as ShejiSumPrice,sum(oe.ShejiSumPriceneiye) as ShejiSumPriceneiye ,sum(oe.ShejiSumPriceneiye1) as ShejiSumPriceneiye1,sum(oe.ShejiSumPriceneiye2) as ShejiSumPriceneiye2 ", fromss);
                if (ssss.Count > 0)
                {
                    var aaaaa = ssss.First();
                    pagination.heji1 = (aaaaa.ShejiSumPrice + aaaaa.ShejiSumPriceneiye)??0;
                    pagination.heji1 = (aaaaa.ShejiSumPrice + aaaaa.ShejiSumPriceneiye + (aaaaa.ShejiSumPriceneiye1.HasValue? aaaaa.ShejiSumPriceneiye1.Value:0) + (aaaaa.ShejiSumPriceneiye2.HasValue ? aaaaa.ShejiSumPriceneiye2.Value : 0) ) ??0;
                    
                }
                return _dataBase.SelectModelPage<Model.EC_OrderBasic>(pagination, " ob.*,oe.BusinessManagerId,oe.shifouDelivery,oe.IsPrintfengqian,oe.DeliveryOrderId,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime  ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,oe.Duiyinghetongbianhao,oe.[Shejirenyuan],oe.[Shejileixing] ,oe.[Danshuangmian],oe.[Shejirenyuanneiye],oe.[Shejileixingneiye],oe.[Danshuangmianneiye],oe.[Shejiyaoqiu],oe.[Shejiyaoqiuneiye],oe.[ShejirenyuanName],oe.[ShejirenyuanNameneiye],oe.[ShejiStatus],oe.[ShejileixingName],oe.[ShejileixingNameneiye],oe.[ShejiUnitPrice] ,oe.[ShejiSumPrice],oe.[ShejiUnitPriceneiye],oe.[ShejiSumPriceneiye] ,oe.[Shejicount],oe.[Shejicountneiye] ,pt.PrintName as PrintTypeName ", "  EC_OrderBasic as ob Inner Join [EC_OrderExtend]  as oe On ob.Keyid=oe.Keyid   Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", " ob.CreateTime desc", " CreateTime desc ", condition);
                return _dataBase.SelectModelPage<Model.EC_OrderBasic>(pagination, " ob.*,oe.BusinessManagerId,oe.shifouDelivery,oe.IsPrintfengqian,oe.DeliveryOrderId,oe.KaipiaoshenqingCreater,oe.KaipiaoshenqingTime,oe.KaipiaoquerenCreater,oe.KaipiaoquerenTime,oe.Kehuqianshou,oe.KehuqianshouCreater,oe.KehuqianshouTime  ,oe.Quchudingdan,oe.QuchudingdanCreater,oe.QuchudingdanTime,oe.PrintPackDeliveryRequir,oe.PrintNum,oe.ExigencyCaseId,oe.Duiyinghetongbianhao,oe.[Shejirenyuan],oe.[Shejileixing] ,oe.[Danshuangmian],oe.[Shejirenyuanneiye],oe.[Shejileixingneiye],oe.[Danshuangmianneiye],oe.[Shejiyaoqiu],oe.[Shejiyaoqiuneiye],oe.[ShejirenyuanName],oe.[ShejirenyuanNameneiye],oe.[ShejiStatus],oe.[ShejileixingName],oe.[ShejileixingNameneiye],oe.[ShejiUnitPrice] ,oe.[ShejiSumPrice],oe.[ShejiUnitPriceneiye],oe.[ShejiSumPriceneiye] ,oe.[Shejicount],oe.[Shejicountneiye],oe.[ShejiUnitPriceneiye1]  ,oe.[ShejiSumPriceneiye1] ,oe.[Shejicountneiye1]  ,oe.[ShejiUnitPriceneiye2]  ,oe.[ShejiSumPriceneiye2] ,oe.[Shejicountneiye2] ,oe.[Shejirenyuanneiye1] ,oe.[ShejirenyuanNameneiye1] ,oe.[Shejileixingneiye1] ,oe.[ShejileixingNameneiye1] ,oe.[Danshuangmianneiye1] ,oe.[Shejiyaoqiuneiye1],oe.[Shejirenyuanneiye2],oe.[ShejirenyuanNameneiye2],oe.[Shejileixingneiye2] ,oe.[ShejileixingNameneiye2],oe.[Danshuangmianneiye2],oe.[Shejiyaoqiuneiye2] ,pt.PrintName as PrintTypeName ", "  EC_OrderBasic as ob Inner Join [EC_OrderExtend]  as oe On ob.Keyid=oe.Keyid   Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", " ob.CreateTime desc", " CreateTime desc ", condition);
            }
            catch (Exception ex)
            {
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -119,6 +119,28 @@
                                                                            new SqlParameter("@ShejiSumPriceneiye",trueModel.ShejiSumPriceneiye.HasValue?trueModel.ShejiSumPriceneiye.Value:0),
                                                                              new SqlParameter("@Shejicount",trueModel.Shejicount.HasValue?trueModel.Shejicount.Value:0),
                                                                            new SqlParameter("@Shejicountneiye",trueModel.Shejicountneiye.HasValue?trueModel.Shejicountneiye.Value:0),
                                                                             new SqlParameter("@ShejiUnitPriceneiye1",trueModel.ShejiUnitPriceneiye1.HasValue?trueModel.ShejiUnitPriceneiye1.Value:0),
                                                                            new SqlParameter("@ShejiSumPriceneiye1",trueModel.ShejiSumPriceneiye1.HasValue?trueModel.ShejiSumPriceneiye1.Value:0),
                                                                            new SqlParameter("@Shejicountneiye1",trueModel.Shejicountneiye1.HasValue?trueModel.Shejicountneiye1.Value:0),
                                                                              new SqlParameter("@ShejiUnitPriceneiye2",trueModel.ShejiUnitPriceneiye2.HasValue?trueModel.ShejiUnitPriceneiye2.Value:0),
                                                                            new SqlParameter("@ShejiSumPriceneiye2",trueModel.ShejiSumPriceneiye2.HasValue?trueModel.ShejiSumPriceneiye2.Value:0),
                                                                            new SqlParameter("@Shejicountneiye2",trueModel.Shejicountneiye2.HasValue?trueModel.Shejicountneiye2.Value:0),
                                                                               new SqlParameter("@Shejirenyuanneiye1",trueModel.Shejirenyuanneiye1.HasValue?trueModel.Shejirenyuanneiye1.Value:0),
                                                 new SqlParameter("@ShejirenyuanNameneiye1",string.IsNullOrEmpty(trueModel.ShejirenyuanNameneiye1)?"":trueModel.ShejirenyuanNameneiye1),
                                                    new SqlParameter("@Shejileixingneiye1",trueModel.Shejileixingneiye1.HasValue?trueModel.Shejileixingneiye1.Value:0),
                                                       new SqlParameter("@ShejileixingNameneiye1",string.IsNullOrEmpty(trueModel.ShejileixingNameneiye1)?"":trueModel.ShejileixingNameneiye1),
                                                          new SqlParameter("@Danshuangmianneiye1",string.IsNullOrEmpty(trueModel.Danshuangmianneiye1)?"":trueModel.Danshuangmianneiye1),
                                                            new SqlParameter("@Shejiyaoqiuneiye1",string.IsNullOrEmpty(trueModel.Shejiyaoqiuneiye1)?"":trueModel.Shejiyaoqiuneiye1),
                                                                new SqlParameter("@Shejirenyuanneiye2",trueModel.Shejirenyuanneiye2.HasValue?trueModel.Shejirenyuanneiye2.Value:0),
                                                 new SqlParameter("@ShejirenyuanNameneiye2",string.IsNullOrEmpty(trueModel.ShejirenyuanNameneiye2)?"":trueModel.ShejirenyuanNameneiye2),
                                                    new SqlParameter("@Shejileixingneiye2",trueModel.Shejileixingneiye2.HasValue?trueModel.Shejileixingneiye2.Value:0),
                                                       new SqlParameter("@ShejileixingNameneiye2",string.IsNullOrEmpty(trueModel.ShejileixingNameneiye2)?"":trueModel.ShejileixingNameneiye2),
                                                          new SqlParameter("@Danshuangmianneiye2",string.IsNullOrEmpty(trueModel.Danshuangmianneiye2)?"":trueModel.Danshuangmianneiye2),
                                                            new SqlParameter("@Shejiyaoqiuneiye2",string.IsNullOrEmpty(trueModel.Shejiyaoqiuneiye2)?"":trueModel.Shejiyaoqiuneiye2),
            };
            int i = -1;
@@ -201,6 +223,29 @@
                                                                            new SqlParameter("@ShejiSumPriceneiye",trueModel.ShejiSumPriceneiye.HasValue?trueModel.ShejiSumPriceneiye.Value:0),
                                                                              new SqlParameter("@Shejicount",trueModel.Shejicount.HasValue?trueModel.Shejicount.Value:0),
                                                                            new SqlParameter("@Shejicountneiye",trueModel.Shejicountneiye.HasValue?trueModel.Shejicountneiye.Value:0),
                                                                             new SqlParameter("@ShejiUnitPriceneiye1",trueModel.ShejiUnitPriceneiye1.HasValue?trueModel.ShejiUnitPriceneiye1.Value:0),
                                                                            new SqlParameter("@ShejiSumPriceneiye1",trueModel.ShejiSumPriceneiye1.HasValue?trueModel.ShejiSumPriceneiye1.Value:0),
                                                                            new SqlParameter("@Shejicountneiye1",trueModel.Shejicountneiye1.HasValue?trueModel.Shejicountneiye1.Value:0),
                                                                              new SqlParameter("@ShejiUnitPriceneiye2",trueModel.ShejiUnitPriceneiye2.HasValue?trueModel.ShejiUnitPriceneiye2.Value:0),
                                                                            new SqlParameter("@ShejiSumPriceneiye2",trueModel.ShejiSumPriceneiye2.HasValue?trueModel.ShejiSumPriceneiye2.Value:0),
                                                                            new SqlParameter("@Shejicountneiye2",trueModel.Shejicountneiye2.HasValue?trueModel.Shejicountneiye2.Value:0),
                                                                             new SqlParameter("@Shejirenyuanneiye1",trueModel.Shejirenyuanneiye1.HasValue?trueModel.Shejirenyuanneiye1.Value:0),
                                                 new SqlParameter("@ShejirenyuanNameneiye1",string.IsNullOrEmpty(trueModel.ShejirenyuanNameneiye1)?"":trueModel.ShejirenyuanNameneiye1),
                                                    new SqlParameter("@Shejileixingneiye1",trueModel.Shejileixingneiye1.HasValue?trueModel.Shejileixingneiye1.Value:0),
                                                       new SqlParameter("@ShejileixingNameneiye1",string.IsNullOrEmpty(trueModel.ShejileixingNameneiye1)?"":trueModel.ShejileixingNameneiye1),
                                                          new SqlParameter("@Danshuangmianneiye1",string.IsNullOrEmpty(trueModel.Danshuangmianneiye1)?"":trueModel.Danshuangmianneiye1),
                                                            new SqlParameter("@Shejiyaoqiuneiye1",string.IsNullOrEmpty(trueModel.Shejiyaoqiuneiye1)?"":trueModel.Shejiyaoqiuneiye1),
                                                                new SqlParameter("@Shejirenyuanneiye2",trueModel.Shejirenyuanneiye2.HasValue?trueModel.Shejirenyuanneiye2.Value:0),
                                                 new SqlParameter("@ShejirenyuanNameneiye2",string.IsNullOrEmpty(trueModel.ShejirenyuanNameneiye2)?"":trueModel.ShejirenyuanNameneiye2),
                                                    new SqlParameter("@Shejileixingneiye2",trueModel.Shejileixingneiye2.HasValue?trueModel.Shejileixingneiye2.Value:0),
                                                       new SqlParameter("@ShejileixingNameneiye2",string.IsNullOrEmpty(trueModel.ShejileixingNameneiye2)?"":trueModel.ShejileixingNameneiye2),
                                                          new SqlParameter("@Danshuangmianneiye2",string.IsNullOrEmpty(trueModel.Danshuangmianneiye2)?"":trueModel.Danshuangmianneiye2),
                                                            new SqlParameter("@Shejiyaoqiuneiye2",string.IsNullOrEmpty(trueModel.Shejiyaoqiuneiye2)?"":trueModel.Shejiyaoqiuneiye2),
            };
            try
            {
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderEdit.aspx
@@ -9,7 +9,7 @@
    <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <script src="../../js/Inquiry/Inquiry.js?v=200" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=203" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=51" type="text/javascript"></script>
    <!--前台页面end-->
    <script type="text/javascript" language="javascript">
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx
@@ -9,7 +9,7 @@
    <link rel="stylesheet" type="text/css" href="../../Styles/base.css" />
    <link href="../../Styles/changes.css" rel="stylesheet" type="text/css" />
    <link href="../../Styles/ParticularWQJ.css" rel="stylesheet" type="text/css" />
    <script src="../../js/Inquiry/Inquiry.js?v=200" type="text/javascript"></script>
    <script src="../../js/Inquiry/Inquiry.js?v=203" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=51" type="text/javascript"></script>
    <!--前台页面end-->
    <script type="text/javascript" language="javascript">
@@ -161,12 +161,12 @@
        }
        function changeShejileixingneiye6() {
        function changeShejileixingneiye6(obj) {
            if ($("#SelShejileixingneiye6").val() == "8") {
                $(".Shejirenyuanneiye6").hide();
            if ($("#SelShejileixingneiye6" + obj).val() == "8") {
                $(".Shejirenyuanneiye6" + obj).hide();
            } else {
                $(".Shejirenyuanneiye6").show();
                $(".Shejirenyuanneiye6" + obj).show();
            }
        }
@@ -532,10 +532,10 @@
              <tr   style=" height:11px;">
               
                 <td style="width: 100px;text-align:right;">
                   设计类型:
                   设计类型1:
                </td>
                <td   style="text-align:left;" >
                          <select id='SelShejileixingneiye6' runat="server" keepdefaultstyle='true' onchange="changeShejileixingneiye6()"  >
                          <select id='SelShejileixingneiye6' runat="server" keepdefaultstyle='true' onchange="changeShejileixingneiye6('')"  >
                             <option  value="1">文字照排</option>
                             <option  value="2">整页表格</option>
                             <option  value="3">半文半表</option>
@@ -546,7 +546,7 @@
                </select>
                </td>
                  <td style="width: 100px;text-align:right;">
                 <span class="Shejirenyuanneiye6" > 内页设计:</span>
                 <span class="Shejirenyuanneiye6" > 内页设计1:</span>
                </td>
                <td   style="text-align:left;"  colspan="3"  >
                          <select id='SelShejirenyuanneiye6' class="Shejirenyuanneiye6" runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
@@ -555,10 +555,78 @@
            </tr>
                <tr>
                <td style="width: 100px; text-align:right;">
                    设计要求:
                    设计要求1:
                </td>
                <td style=" text-align:left;" colspan="5">
                    <textarea   maxlength="500"  id="txtShejiyaoqiuneiye6" name="txtShejiyaoqiuneiye6" runat="server" style="width: 692px; height: 30px;"></textarea>
                </td>
            </tr>
                <tr   style=" height:11px;display:none;" id="neiyesheji21">
                 <td style="width: 100px;text-align:right;">
                   设计类型2:
                </td>
                <td   style="text-align:left;" >
                          <select id='SelShejileixingneiye61' runat="server" keepdefaultstyle='true' onchange="changeShejileixingneiye6('1')"  >
                             <option  value="1">文字照排</option>
                             <option  value="2">整页表格</option>
                             <option  value="3">半文半表</option>
                             <option  value="4">扫描照做</option>
                             <option  value="5">文件修改</option>
                                <option  value="8">客供文件</option>
                </select>
                </td>
                  <td style="width: 100px;text-align:right;">
                 <span class="Shejirenyuanneiye61" > 内页设计2:</span>
                </td>
                <td   style="text-align:left;"  colspan="3"  >
                          <select id='SelShejirenyuanneiye61' class="Shejirenyuanneiye61" runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
                </select>
                </td>
            </tr>
                <tr  style="display:none;"   id="neiyesheji22" >
                <td style="width: 100px; text-align:right;">
                    设计要求2:
                </td>
                <td style=" text-align:left;" colspan="5">
                    <textarea   maxlength="500"  id="txtShejiyaoqiuneiye61" name="txtShejiyaoqiuneiye61" runat="server" style="width: 692px; height: 30px;"></textarea>
                </td>
            </tr>
                <tr   style=" height:11px;;display:none;" id="neiyesheji31" >
                 <td style="width: 100px;text-align:right;">
                   设计类型3:
                </td>
                <td   style="text-align:left;" >
                          <select id='SelShejileixingneiye62' runat="server" keepdefaultstyle='true' onchange="changeShejileixingneiye6('2')"  >
                             <option  value="1">文字照排</option>
                             <option  value="2">整页表格</option>
                             <option  value="3">半文半表</option>
                             <option  value="4">扫描照做</option>
                             <option  value="5">文件修改</option>
                                <option  value="8">客供文件</option>
                </select>
                </td>
                  <td style="width: 100px;text-align:right;">
                 <span class="Shejirenyuanneiye62" > 内页设计3:</span>
                </td>
                <td   style="text-align:left;"  colspan="3"  >
                          <select id='SelShejirenyuanneiye62' class="Shejirenyuanneiye62" runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
                </select>
                </td>
            </tr>
                <tr style="display:none;"   id="neiyesheji32" >
                <td style="width: 100px; text-align:right;">
                    设计要求3:
                </td>
                <td style=" text-align:left;" colspan="5">
                    <textarea   maxlength="500"  id="txtShejiyaoqiuneiye62" name="txtShejiyaoqiuneiye6" runat="server" style="width: 692px; height: 30px;"></textarea>
                </td>
            </tr>
        </table>
@@ -1143,11 +1211,17 @@
                <td style="width: 100px;text-align:right;">
                   设计人员:
                </td>
                <td   style="text-align:left;" colspan="5"  >
                <td   style="text-align:left;"  >
                          <select id='SelShejirenyuan1111' runat="server" keepdefaultstyle='true' datavaluefield="Keyid" datatextfield='Name'>
                </select>
                </td>
                 <td  style="width: 100px;text-align:right;">
                设计费用:
            </td>
            <td align="left">
                <input id='txtShejiSumPrice1111' runat="server" maxlength='16' value='0' class="req float" min="0"  />
            </td>
                  
            </tr>
                <tr>
@@ -2162,6 +2236,8 @@
                    return;
                }
                $("#InsidePage" + newValue + "").show();
                $("#neiyesheji" + newValue + "1").show();
                $("#neiyesheji" + newValue + "2").show();
                $("#hidInsidePageNum").val(newValue);
                if (newValue != maxValue) {
                    var value = newValue + 1;
@@ -2181,6 +2257,8 @@
                    return;
                }
                $("#InsidePage" + hidValue + "").hide();
                $("#neiyesheji" + hidValue + "1").hide();
                $("#neiyesheji" + hidValue + "2").hide();
                $("[name='pageNum" + hidValue + "']").val("");
                $("#hidInsidePageNum").val(newValue);
                if (parseInt(hidValue) != minValue) {
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.cs
@@ -171,6 +171,16 @@
                this.SelShejirenyuanneiye6.Value = _eC_OrderBasic.Shejirenyuanneiye.HasValue ? _eC_OrderBasic.Shejirenyuanneiye.Value.ToString() : "";
                this.SelShejileixingneiye6.Value = _eC_OrderBasic.Shejileixingneiye.HasValue ? _eC_OrderBasic.Shejileixingneiye.Value.ToString() : "";
                this.txtShejiyaoqiuneiye6.Value = _eC_OrderBasic.Shejiyaoqiuneiye;
                this.SelShejirenyuanneiye61.Value = _eC_OrderBasic.Shejirenyuanneiye1.HasValue ? _eC_OrderBasic.Shejirenyuanneiye1.Value.ToString() : "";
                this.SelShejileixingneiye61.Value = _eC_OrderBasic.Shejileixingneiye1.HasValue ? _eC_OrderBasic.Shejileixingneiye1.Value.ToString() : "";
                this.txtShejiyaoqiuneiye61.Value = _eC_OrderBasic.Shejiyaoqiuneiye1;
                this.SelShejirenyuanneiye62.Value = _eC_OrderBasic.Shejirenyuanneiye2.HasValue ? _eC_OrderBasic.Shejirenyuanneiye2.Value.ToString() : "";
                this.SelShejileixingneiye62.Value = _eC_OrderBasic.Shejileixingneiye2.HasValue ? _eC_OrderBasic.Shejileixingneiye2.Value.ToString() : "";
                this.txtShejiyaoqiuneiye62.Value = _eC_OrderBasic.Shejiyaoqiuneiye2;
            }
            else if(_eC_OrderBasic.PrintTypeId == 15)
            {
@@ -265,6 +275,7 @@
            {
                this.SelShejirenyuan1111.Value = _eC_OrderBasic.Shejirenyuan.HasValue ? _eC_OrderBasic.Shejirenyuan.Value.ToString() : "";
                this.txtShejiyaoqiu1111.Value = _eC_OrderBasic.Shejiyaoqiu;
                this.txtShejiSumPrice1111.Value = _eC_OrderBasic.ShejiSumPrice.HasValue ? _eC_OrderBasic.ShejiSumPrice.Value.ToString("F2") : "";
            }
            #endregion
@@ -307,7 +318,7 @@
                this.selPrintTypes.DataSource = _sysInquiry_PrintingTypeBLL.SelectUsedModlesByFirm(CurrentUser.MemberId).Where(x=> x.KeyId != 37 && x.KeyId != 31).OrderBy(x=>x.orderNumHome);
                this.selPrintTypes.DataBind();
                this.selPrintTypes.Items.Insert(0, new ListItem("请选择", ""));
                //this.selPrintTypes.Items.Add(new ListItem("其他", "-1"));
                this.selPrintTypes.Items.Add(new ListItem("其他", "-1"));
                this.selExigencyDegree.DataSource = _sys_DictionaryBLL.GetDataByType("OA_紧急程度");
                this.selExigencyDegree.DataBind();
@@ -354,6 +365,25 @@
                {
                    var StaffId = CurrentUser.StaffId;
                    this.SelShejirenyuanneiye6.Value = StaffId.ToString();
                }
                this.SelShejirenyuanneiye61.DataSource = oA_Staffs;
                this.SelShejirenyuanneiye61.DataBind();
                if (string.IsNullOrEmpty(ToUpSetData))
                {
                    var StaffId = CurrentUser.StaffId;
                    this.SelShejirenyuanneiye61.Value = StaffId.ToString();
                }
                this.SelShejirenyuanneiye62.DataSource = oA_Staffs;
                this.SelShejirenyuanneiye62.DataBind();
                if (string.IsNullOrEmpty(ToUpSetData))
                {
                    var StaffId = CurrentUser.StaffId;
                    this.SelShejirenyuanneiye62.Value = StaffId.ToString();
                }
                this.SelShejirenyuan15.DataSource = oA_Staffs;
@@ -483,7 +513,6 @@
                    var StaffId = CurrentUser.StaffId;
                    this.SelShejirenyuan1111.Value = StaffId.ToString();
                }
            }
        }
@@ -786,7 +815,7 @@
                    decimal bakai = 370 * 260;
                    decimal sanshierkai = 130 * 185;
                    decimal dasanshierkai = 140 * 210;
                    var txtFirstSize = Request["txtFirstSize"].ToDecimal2()??0;
                    var txtSecondSize = Request["txtSecondSize"].ToDecimal2() ?? 0;
@@ -799,7 +828,7 @@
                    {
                        gongjia = new decimal(1.3);
                    }
                    else if (chicun == sanshierkai)
                    else if (chicun >= sanshierkai && chicun <= dasanshierkai)
                    {
                        gongjia = new decimal(0.7);
                    }
@@ -833,7 +862,15 @@
                var shejijijian  =  bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(),"", eC_OrderExtend.Shejileixing.ToString(),null).FirstOrDefault();
                if (shejijijian != null)
                {
                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney * gongjia;
                    if(eC_OrderExtend.Danshuangmian == "双面不同")
                    {
                        eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney * gongjia * 2;
                    }
                    else
                    {
                        eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney * gongjia;
                    }
                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
                    {
                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
@@ -883,15 +920,11 @@
                int insidePageNum = 1;
                if (Request["hidInsidePageNum"] != null)
                    insidePageNum = Request["hidInsidePageNum"].ToString().ToInt32().Value;
                int PageNumneiye = 0;
                for (int i = 1; i <= insidePageNum; i++)
                {
                    if (Request["pageNum" + i] != null)
                        PageNumneiye += Request["pageNum" + i].ToInt32().HasValue ? Request["pageNum" + i].ToInt32().Value : 0;
                }
                int PageNumneiye = Request["pageNum" + 1].ToInt32().HasValue ? Request["pageNum" + 1].ToInt32().Value : 0;
                eC_OrderExtend.Shejicountneiye = PageNumneiye;// Request["printCount"].ToString().ToInt32();
                eC_OrderExtend.Shejileixingneiye = this.SelShejileixingneiye6.Value.ToInt32();
                if (eC_OrderExtend.Shejileixingneiye != 8)
@@ -926,7 +959,95 @@
                eC_OrderExtend.ShejileixingNameneiye = this.shejileixing(eC_OrderExtend.Shejileixingneiye.Value.ToString());
                eC_OrderExtend.Shejiyaoqiuneiye = this.txtShejiyaoqiuneiye6.Value;
                if (insidePageNum > 1)
                {
                    PageNumneiye = Request["pageNum" + 2].ToInt32().HasValue ? Request["pageNum" + 2].ToInt32().Value : 0;
                    eC_OrderExtend.Shejicountneiye1 = PageNumneiye;// Request["printCount"].ToString().ToInt32();
                    eC_OrderExtend.Shejileixingneiye1 = this.SelShejileixingneiye61.Value.ToInt32();
                    if (eC_OrderExtend.Shejileixingneiye1 != 8)
                    {
                        eC_OrderExtend.Shejirenyuanneiye1 = this.SelShejirenyuanneiye61.Value.ToInt32();
                        var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye1);
                        if (oA_Staff1 != null)
                        {
                            eC_OrderExtend.ShejirenyuanNameneiye1 = oA_Staff1.Name;
                        }
                        var shejijijian1 = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "2", eC_OrderExtend.Shejileixingneiye1.ToString(), null).FirstOrDefault();
                        if (shejijijian1 != null)
                        {
                            eC_OrderExtend.ShejiUnitPriceneiye1 = shejijijian1.Shejilemoney * gongjia;
                            if (eC_OrderExtend.ShejiUnitPriceneiye1.HasValue)
                            {
                                eC_OrderExtend.ShejiSumPriceneiye1 = eC_OrderExtend.ShejiUnitPriceneiye1 * eC_OrderExtend.Shejicountneiye1;
                            }
                        }
                    }
                    else
                    {
                        eC_OrderExtend.Shejirenyuanneiye1 = 0;
                        eC_OrderExtend.ShejirenyuanNameneiye1 = "";
                        eC_OrderExtend.ShejiUnitPriceneiye1 = 0;
                        eC_OrderExtend.ShejiSumPriceneiye1 = 0;
                    }
                    eC_OrderExtend.ShejileixingNameneiye1 = this.shejileixing(eC_OrderExtend.Shejileixingneiye1.Value.ToString());
                    eC_OrderExtend.Shejiyaoqiuneiye1 = this.txtShejiyaoqiuneiye61.Value;
                }
                if (insidePageNum > 2)
                {
                    PageNumneiye = Request["pageNum" + 3].ToInt32().HasValue ? Request["pageNum" + 3].ToInt32().Value : 0;
                    eC_OrderExtend.Shejicountneiye2 = PageNumneiye;// Request["printCount"].ToString().ToInt32();
                    eC_OrderExtend.Shejileixingneiye2 = this.SelShejileixingneiye62.Value.ToInt32();
                    if (eC_OrderExtend.Shejileixingneiye2 != 8)
                    {
                        eC_OrderExtend.Shejirenyuanneiye2 = this.SelShejirenyuanneiye62.Value.ToInt32();
                        var oA_Staff1 = oA_StaffBLL.GetModelByKeyid(eC_OrderExtend.Shejirenyuanneiye2);
                        if (oA_Staff1 != null)
                        {
                            eC_OrderExtend.ShejirenyuanNameneiye2 = oA_Staff1.Name;
                        }
                        var shejijijian1 = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "2", eC_OrderExtend.Shejileixingneiye2.ToString(), null).FirstOrDefault();
                        if (shejijijian1 != null)
                        {
                            eC_OrderExtend.ShejiUnitPriceneiye2 = shejijijian1.Shejilemoney * gongjia;
                            if (eC_OrderExtend.ShejiUnitPriceneiye2.HasValue)
                            {
                                eC_OrderExtend.ShejiSumPriceneiye2 = eC_OrderExtend.ShejiUnitPriceneiye2 * eC_OrderExtend.Shejicountneiye2;
                            }
                        }
                    }
                    else
                    {
                        eC_OrderExtend.Shejirenyuanneiye2 = 0;
                        eC_OrderExtend.ShejirenyuanNameneiye2 = "";
                        eC_OrderExtend.ShejiUnitPriceneiye2 = 0;
                        eC_OrderExtend.ShejiSumPriceneiye2 = 0;
                    }
                    eC_OrderExtend.ShejileixingNameneiye2 = this.shejileixing(eC_OrderExtend.Shejileixingneiye2.Value.ToString());
                    eC_OrderExtend.Shejiyaoqiuneiye2 = this.txtShejiyaoqiuneiye62.Value;
                }
            }
            else if (PrintTypeId == 15)
            {
@@ -1334,15 +1455,19 @@
                eC_OrderExtend.Shejiyaoqiu = this.txtShejiyaoqiu1111.Value;
                eC_OrderExtend.ShejiStatus = 2;
                var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", "", null).FirstOrDefault();
                if (shejijijian != null)
                {
                    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
                    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
                    {
                        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
                    }
                }
                //var shejijijian = bll_OA_ShejijijianBLLBLL.GetModelByformid(CurrentUser.MemberId, PrintTypeId.ToString(), "", "", null).FirstOrDefault();
                //if (shejijijian != null)
                //{
                //    eC_OrderExtend.ShejiUnitPrice = shejijijian.Shejilemoney;
                //    if (eC_OrderExtend.ShejiUnitPrice.HasValue)
                //    {
                //        eC_OrderExtend.ShejiSumPrice = eC_OrderExtend.ShejiUnitPrice * eC_OrderExtend.Shejicount;
                //    }
                //}
               var sss = this.txtShejiSumPrice1111.Value.ToDecimal2();
                eC_OrderExtend.ShejiSumPrice = sss.HasValue?sss.Value:0;
                eC_OrderExtend.ShejiUnitPrice = eC_OrderExtend.ShejiSumPrice;
            }
            #endregion
CY_ECommercePlatform/CY.WebForm/Pages/business/SHejiOrderEdit.aspx.designer.cs
@@ -348,6 +348,60 @@
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiuneiye6;
        /// <summary>
        /// SelShejileixingneiye61 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixingneiye61;
        /// <summary>
        /// SelShejirenyuanneiye61 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuanneiye61;
        /// <summary>
        /// txtShejiyaoqiuneiye61 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiuneiye61;
        /// <summary>
        /// SelShejileixingneiye62 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejileixingneiye62;
        /// <summary>
        /// SelShejirenyuanneiye62 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuanneiye62;
        /// <summary>
        /// txtShejiyaoqiuneiye62 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlTextArea txtShejiyaoqiuneiye62;
        /// <summary>
        /// SelShejileixing15 控件。
        /// </summary>
        /// <remarks>
@@ -771,6 +825,15 @@
        protected global::System.Web.UI.HtmlControls.HtmlSelect SelShejirenyuan1111;
        /// <summary>
        /// txtShejiSumPrice1111 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlInputText txtShejiSumPrice1111;
        /// <summary>
        /// txtShejiyaoqiu1111 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs
@@ -545,9 +545,13 @@
            decimal PageAllMoney = 0;
            var ssss = result.Sum(x => x.ShejiSumPrice);
            var ssssaa = result.Sum(x => x.ShejiSumPriceneiye);
            var ssssaaa = result.Sum(x => x.ShejiSumPriceneiye1);
            var ssssaaaa = result.Sum(x => x.ShejiSumPriceneiye2);
            var sssssssss = ssss.HasValue ? ssss.Value : 0;
            var sssssssssaa = ssssaa.HasValue ? ssssaa.Value : 0;
            PageAllMoney = sssssssss + sssssssssaa;
            var sssssssssaaa = ssssaaa.HasValue ? ssssaaa.Value : 0;
            var sssssssssaaaaa = ssssaaaa.HasValue ? ssssaaaa.Value : 0;
            PageAllMoney = sssssssss + sssssssssaa + sssssssssaaa + sssssssssaaaaa;
            foreach (var eC_OrderBasic in result)
            {
                if(eC_OrderBasic.BusinessManagerId.HasValue && eC_OrderBasic.BusinessManagerId.Value > 0)
@@ -560,11 +564,41 @@
                }
               // PageAllMoney +=( eC_OrderBasic.ShejiSumPrice.Value + eC_OrderBasic.ShejiSumPriceneiye.Value);
                eC_OrderBasic.Shejiticheng = eC_OrderBasic.ShejirenyuanName + eC_OrderBasic.Shejicount + "*" + (eC_OrderBasic.ShejiUnitPrice.HasValue? eC_OrderBasic.ShejiUnitPrice.Value.ToString("G29"):"0") + "=" + (eC_OrderBasic.ShejiSumPrice.HasValue ? eC_OrderBasic.ShejiSumPrice.Value.ToString("G29") : "0");
                if (eC_OrderBasic.PrintTypeId == 6 || eC_OrderBasic.PrintTypeId == 15 || eC_OrderBasic.PrintTypeId == 38)
                if ( eC_OrderBasic.PrintTypeId == 15 || eC_OrderBasic.PrintTypeId == 38)
                {
                    eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye + eC_OrderBasic.Shejicountneiye + "*" + (eC_OrderBasic.ShejiUnitPriceneiye.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye.HasValue ? eC_OrderBasic.ShejiSumPriceneiye.Value.ToString("G29") : "0");
                }
                eC_OrderBasic.Shejicountneiyename = (eC_OrderBasic.Shejicountneiye.HasValue && eC_OrderBasic.Shejicountneiye.Value > 0) ? eC_OrderBasic.Shejicountneiye.Value.ToString() : "";
                if (eC_OrderBasic.PrintTypeId == 6)
                {
                    eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye + eC_OrderBasic.Shejicountneiye + "*" + (eC_OrderBasic.ShejiUnitPriceneiye.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye.HasValue ? eC_OrderBasic.ShejiSumPriceneiye.Value.ToString("G29") : "0");
                    if (!string.IsNullOrEmpty(eC_OrderBasic.ShejileixingNameneiye1))
                    {
                        eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye1 + eC_OrderBasic.Shejicountneiye1 + "*" + (eC_OrderBasic.ShejiUnitPriceneiye1.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye1.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye1.HasValue ? eC_OrderBasic.ShejiSumPriceneiye1.Value.ToString("G29") : "0");
                    }
                    if (!string.IsNullOrEmpty(eC_OrderBasic.ShejileixingNameneiye2))
                    {
                        eC_OrderBasic.Shejiticheng += "<br/> " + eC_OrderBasic.ShejirenyuanNameneiye2 + eC_OrderBasic.Shejicountneiye2 + "*" + (eC_OrderBasic.ShejiUnitPriceneiye2.HasValue ? eC_OrderBasic.ShejiUnitPriceneiye2.Value.ToString("G29") : "0") + "=" + (eC_OrderBasic.ShejiSumPriceneiye2.HasValue ? eC_OrderBasic.ShejiSumPriceneiye2.Value.ToString("G29") : "0");
                    }
                    int Shejicountneiyecount = 0;
                    if (eC_OrderBasic.Shejicountneiye.HasValue )
                    {
                        Shejicountneiyecount += eC_OrderBasic.Shejicountneiye.Value;
                    }
                    if (eC_OrderBasic.Shejicountneiye1.HasValue)
                    {
                        Shejicountneiyecount += eC_OrderBasic.Shejicountneiye1.Value;
                    }
                    if (eC_OrderBasic.Shejicountneiye2.HasValue)
                    {
                        Shejicountneiyecount += eC_OrderBasic.Shejicountneiye2.Value;
                    }
                    eC_OrderBasic.Shejicountneiyename = Shejicountneiyecount.ToString();
                }
            }
            this.NowPageAllMoney.InnerText = PageAllMoney.ToString("0.00");
            this.AllMoney.InnerText = pagination.heji1.Value.ToString("0.00");
CY_ECommercePlatform/CY.WebForm/Pages/front/Book.aspx
@@ -764,7 +764,7 @@
                <input type="button" id="InsidePageAdd" value="内页2" class="Btn add nadd" /></label>
            <label class="Btnb">
                <input type="button" value="删除" id="InsidePageDel" class="Btn add" /></label>
            <input type="hidden" id="hidInsidePageNum" name="hidInsidePageNum" value="1" maxValue="5" minValue="1"/>
            <input type="hidden" id="hidInsidePageNum" name="hidInsidePageNum" value="1" maxValue="3" minValue="1"/>
        </td>
    </tr>
</table>
CY_ECommercePlatform/CY.WebForm/js/Inquiry/Inquiry.js
@@ -2422,7 +2422,9 @@
                            alertMsg("内页新增不能超过5个!");
                            return;
                        }
                        $("#InsidePage" + newValue + "").show();
            $("#InsidePage" + newValue + "").show();
            $("#neiyesheji" + newValue + "1").show();
            $("#neiyesheji" + newValue + "2").show();
                        $("#hidInsidePageNum").val(newValue);
                        if (newValue != maxValue) {
                            var value = newValue + 1;
@@ -2441,7 +2443,9 @@
                            alertMsg("内页不能少于1!");
                            return;
                        }
                        $("#InsidePage" + hidValue + "").hide();
            $("#InsidePage" + hidValue + "").hide();
            $("#neiyesheji" + hidValue + "1").hide();
            $("#neiyesheji" + hidValue + "2").hide();
                        $("[name='pageNum" + hidValue + "']").val("");
                        $("#hidInsidePageNum").val(newValue);
                        if (parseInt(hidValue) != minValue) {
@@ -2946,6 +2950,8 @@
                var index = insideArry[j].InsideIndex;
                if (parseInt(index) > 1 ) {
                    $("#InsidePage" + index + "").show();
                    $("#neiyesheji" + index + "1").show();
                    $("#neiyesheji" + index + "2").show();
                    $("#hidInsidePageNum").val(index);
                    var indexValue = parseInt(index);
                    if (indexValue != 5) {