设计人员查询的时候,也过滤设计提成里边的设计人员    增加结算状态。  批量结算按钮完成

送货 的延期直接修改送货日期 完成

销售绩效 具实结算 不显示未下单金额 完成

ALTER TABLE [dbo].[EC_OrderExtend] ADD [shifoujiesuan] [int] NULL;
GO
19个文件已修改
3个文件已添加
511 ■■■■■ 已修改文件
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs 110 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderDAL.cs 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.designer.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderjiesuan.aspx 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderjiesuan.aspx.cs 89 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderjiesuan.aspx.designer.cs 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.WebForm/js/business/Order.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBLL.cs
@@ -272,6 +272,17 @@
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateDeliveryTimeTime(EC_OrderExtend model)
        {
            return _iEC_OrderDAL.UpdateDeliveryTimeTime(model);
        }
        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool OldUpdateProductionprogress(EC_OrderExtend model)
        {
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -81,9 +81,9 @@
        /// <param name="pagination"></param>
        /// <param name="MemberId"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus)
        public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus, string shifoujiesuan)
        {
            return _eC_OrderBasicDAL.SelectModelPageSheji(pagination, MemberId,  BeginCreateTime,  EndCreateTime,  SellerOrderId,  PrintTypeId,  BusinessManagerId,  Shejirenyuan,  BuyerName,  DocumentName,  ShejiStatus);
            return _eC_OrderBasicDAL.SelectModelPageSheji(pagination, MemberId,  BeginCreateTime,  EndCreateTime,  SellerOrderId,  PrintTypeId,  BusinessManagerId,  Shejirenyuan,  BuyerName,  DocumentName,  ShejiStatus, shifoujiesuan);
        }
@@ -575,6 +575,16 @@
        }
        /// <summary>
        /// 判断某订单是否是另一订单的自动外协订单
        /// </summary>
        /// <param name="orderId"></param>
        /// <returns></returns>
        public bool UpShejijiesuanStatus(int Keyid, int ShejiStatus, string Operator)
        {
            return _eC_OrderExtendDAL.UpShejijiesuanStatus(Keyid, ShejiStatus, Operator);
        }
        /// <summary>
        /// WEB服务自动完成订单
        /// </summary>
        public void AutoCompleteOrderByWebService()
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderBasicDAL.cs
@@ -439,7 +439,7 @@
        /// <param name="pagination"></param>
        /// <param name="MemberId"></param>
        /// <returns></returns>
        IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId,string PrintTypeId,string BusinessManagerId,string Shejirenyuan,string BuyerName,string DocumentName,string ShejiStatus);
        IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId,string PrintTypeId,string BusinessManagerId,string Shejirenyuan,string BuyerName,string DocumentName,string ShejiStatus, string shifoujiesuan);
    }
}
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderDAL.cs
@@ -181,6 +181,8 @@
        bool OldUpdateDelayTime(EC_OrderExtend model);
        bool UpdateDeliveryTimeTime(EC_OrderExtend model);
        bool OldUpdateProductionprogress(EC_OrderExtend model);
        bool OldUpdateKaipiaoshenqing(EC_OrderExtend model);
CY_ECommercePlatform/CY.IDAL/EC/IEC_OrderExtendDAL.cs
@@ -54,6 +54,16 @@
        /// <param name="SurplusPrintNum"></param>
        /// <param name="Operator"></param>
        /// <returns></returns>
        bool UpShejijiesuanStatus(int Keyid, int ShejiStatus, string Operator);
        /// <summary>
        /// 更新订单扩展表剩余印刷数量
        /// </summary>
        /// <param name="Keyid"></param>
        /// <param name="SurplusPrintNum"></param>
        /// <param name="Operator"></param>
        /// <returns></returns>
        bool UpSurplusPrintNumsql(int? Keyid, int? SurplusPrintNum, string Operator);
        /// <summary>
CY_ECommercePlatform/CY.Model/EC/EC_OrderBasicExtend.cs
@@ -542,6 +542,15 @@
        }
        /// <summary>
        /// 是否结算 `1是2否
        /// </summary>
        public int? shifoujiesuan
        {
            get;
            set;
        }
        /// <summary>
        /// 设计人员
        /// </summary>
        public int? Shejirenyuan
@@ -1409,7 +1418,11 @@
                this.Shejiyaoqiuneiye2 = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye2;
                theValue = this.Shejiyaoqiuneiye2;
            }
            else if ("shifoujiesuan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 141)
            {
                this.shifoujiesuan = isChange ? MyConvert.ConvertToInt32(value) : this.shifoujiesuan;
                theValue = this.shifoujiesuan;
            }
            #endregion
CY_ECommercePlatform/CY.Model/EC/EC_OrderExtendExtend.cs
@@ -261,6 +261,15 @@
        }
        /// <summary>
        /// 是否结算 `1是2否
        /// </summary>
        public int? shifoujiesuan
        {
            get;
            set;
        }
        /// <summary>
        /// 设计人员
        /// </summary>
        public int? Shejirenyuan
@@ -934,6 +943,11 @@
                this.Shejiyaoqiuneiye2 = isChange ? MyConvert.ConvertToString(value) : this.Shejiyaoqiuneiye2;
                theValue = this.Shejiyaoqiuneiye2;
            }
            else if ("shifoujiesuan".Equals(name, StringComparison.CurrentCultureIgnoreCase) || index == 93)
            {
                this.shifoujiesuan = isChange ? MyConvert.ConvertToInt32(value) : this.shifoujiesuan;
                theValue = this.shifoujiesuan;
            }
            #endregion
CY_ECommercePlatform/CY.Model/OA/OA_DeliverPlan.cs
@@ -361,11 +361,22 @@
        /// <summary>
        /// 未付款
        /// </summary>
        public decimal UnorderMoney
        public decimal? UnorderMoney
        {
            get
            {
                return SumPrice.HasValue && Contractmoney.HasValue ? (Contractmoney - SumPrice).Value : 0;
                var aaaa = SumPrice.HasValue ? SumPrice.Value : 0;
                if (   Contractmoney.HasValue)
                {
                    var sss = Contractmoney.Value - aaaa;
                    if (sss < 0)
                    {
                        return null;
                    }
                    return sss;
                }
                return null;
            }
        }
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -3256,7 +3256,7 @@
        /// <param name="pagination"></param>
        /// <param name="MemberId"></param>
        /// <returns></returns>
        public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus)
        public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus, string shifoujiesuan)
        {
            try
            {
@@ -3287,10 +3287,7 @@
                {
                    condition += " and oe.BusinessManagerId = " + BusinessManagerId + "";
                }
                if (!string.IsNullOrEmpty(Shejirenyuan))
                {
                    condition += " and ( oe.Shejirenyuan = " + Shejirenyuan + " or oe.Shejirenyuanneiye = " + Shejirenyuan + " )";
                }
                if (!string.IsNullOrEmpty(BuyerName))
                    condition += " and ob.BuyerName like '%" + BuyerName + "%'";
@@ -3305,27 +3302,102 @@
                    }
                    else
                    {
                        condition += " and oe.ShejiStatus != 1 ";
                        condition += " and  (oe.ShejiStatus is null or  oe.ShejiStatus != 1) ";
                    }
                }
                /// <summary>
                /// 查询来源
                /// </summary>
                string fromss = "  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) " +
                " where  " + condition;
                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)
                if (!string.IsNullOrEmpty(shifoujiesuan))
                {
                    var aaaaa = ssss.First();
                    pagination.heji1 = (aaaaa.ShejiSumPrice + aaaaa.ShejiSumPriceneiye + (aaaaa.ShejiSumPriceneiye1.HasValue? aaaaa.ShejiSumPriceneiye1.Value:0) + (aaaaa.ShejiSumPriceneiye2.HasValue ? aaaaa.ShejiSumPriceneiye2.Value : 0) ) ??0;
                    if (shifoujiesuan == "1")
                    {
                        condition += " and oe.shifoujiesuan = " + shifoujiesuan + "";
                    }
                    else
                    {
                        condition += " and  (oe.shifoujiesuan is null or   oe.shifoujiesuan!= 1 ) ";
                    }
                }
                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);
                if (string.IsNullOrEmpty(Shejirenyuan))
                {
                    string fromss = "  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) " +
               " where  " + condition;
                    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.HasValue ? aaaaa.ShejiSumPrice.Value : 0)  + (aaaaa.ShejiSumPriceneiye.HasValue ? aaaaa.ShejiSumPriceneiye.Value : 0) + (aaaaa.ShejiSumPriceneiye1.HasValue ? aaaaa.ShejiSumPriceneiye1.Value : 0) + (aaaaa.ShejiSumPriceneiye2.HasValue ? aaaaa.ShejiSumPriceneiye2.Value : 0);
                    }
                }
                else
                {
                    decimal heji1 = 0;
                  var   condition1 = " and  oe.Shejirenyuan = " + Shejirenyuan + "  ";
                    string fromss = "  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) " +
             " where  " + condition + condition1;
                    var ssss = _dataBase.SelectModel<Model.EC_OrderBasic>("  sum(oe.[ShejiSumPrice]) as ShejiSumPrice ", fromss);
                    if (ssss.Count > 0)
                    {
                        var aaaaa = ssss.First();
                        heji1 += (aaaaa.ShejiSumPrice.HasValue ? aaaaa.ShejiSumPrice.Value : 0);
                    }
                     condition1 = " and  oe.Shejirenyuanneiye = " + Shejirenyuan + "  ";
                     fromss = "  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) " +
             " where  " + condition + condition1;
                     ssss = _dataBase.SelectModel<Model.EC_OrderBasic>(" sum(oe.ShejiSumPriceneiye) as ShejiSumPriceneiye  ", fromss);
                    if (ssss.Count > 0)
                    {
                        var aaaaa = ssss.First();
                        heji1 += (aaaaa.ShejiSumPriceneiye.HasValue ? aaaaa.ShejiSumPriceneiye.Value : 0);
                    }
                    condition1 = " and   oe.Shejirenyuanneiye1 = " + Shejirenyuan + "  ";
                    fromss = "  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) " +
            " where  " + condition + condition1;
                    ssss = _dataBase.SelectModel<Model.EC_OrderBasic>("    sum(oe.ShejiSumPriceneiye1) as ShejiSumPriceneiye1  ", fromss);
                    if (ssss.Count > 0)
                    {
                        var aaaaa = ssss.First();
                        heji1 += (  aaaaa.ShejiSumPriceneiye1.HasValue ? aaaaa.ShejiSumPriceneiye1.Value : 0);
                    }
                    condition1 = " and   oe.Shejirenyuanneiye2 = " + Shejirenyuan + "  ";
                    fromss = "  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) " +
            " where  " + condition + condition1;
                    ssss = _dataBase.SelectModel<Model.EC_OrderBasic>("  sum(oe.ShejiSumPriceneiye2) as ShejiSumPriceneiye2 ", fromss);
                    if (ssss.Count > 0)
                    {
                        var aaaaa = ssss.First();
                        heji1 +=  (aaaaa.ShejiSumPriceneiye2.HasValue ? aaaaa.ShejiSumPriceneiye2.Value : 0) ;
                    }
                    pagination.heji1 = heji1;
                }
                if (!string.IsNullOrEmpty(Shejirenyuan))
                {
                    condition += " and ( oe.Shejirenyuan = " + Shejirenyuan + " or oe.Shejirenyuanneiye = " + Shejirenyuan + " or oe.Shejirenyuanneiye1 = " + Shejirenyuan + " or oe.Shejirenyuanneiye2 = " + Shejirenyuan + "  )";
                }
                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.[shifoujiesuan],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_OrderDAL.cs
@@ -867,6 +867,44 @@
            return true;
        }
        /// <summary>
        /// 修改
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        public bool UpdateDeliveryTimeTime(EC_OrderExtend model)
        {
            Model.EC_OrderExtend trueModel = model;
            if (trueModel == null)
            {
                return false;
            }
            IList<SqlParameter> sqlParms = new List<SqlParameter>()
            {
                 new SqlParameter("@Keyid",trueModel.Keyid),
                                  new SqlParameter("@DelayTime",trueModel.DelayTime),
            };
            string sql = " Update EC_OrderBasic Set [DeliveryTime]=@DelayTime where  [Keyid]=@Keyid ;  Update [EC_OrderExtend] Set [DelayTime]=@DelayTime where  [Keyid] = @Keyid ;";
            try
            {
                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
            }
            catch (Exception ex)
            {
                throw ex;
            }
            return true;
        }
        /// <summary>
        /// 修改
        /// </summary>
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderExtendDAL.cs
@@ -493,6 +493,32 @@
            }
        }
        /// <summary>
        /// 更新订单扩展表剩余印刷数量
        /// </summary>
        /// <param name="Keyid"></param>
        /// <param name="SurplusPrintNum"></param>
        /// <param name="Operator"></param>
        /// <returns></returns>
        public bool UpShejijiesuanStatus(int Keyid, int ShejiStatus, string Operator)
        {
            try
            {
                var sqlStr = "UPDATE [EC_OrderExtend] SET [shifoujiesuan]=" + ShejiStatus + "  WHERE Keyid=@Keyid ";
                SqlParameter par = new SqlParameter("@Keyid", Keyid);
                _dataBase.ExecuteSql(sqlStr, par);
                return true;
            }
            catch (Exception ex)
            {
                throw ex;
            }
        }
        public bool UpdateModel(Infrastructure.Domain.IAggregateRoot model)
        {
            throw new NotImplementedException();
CY_ECommercePlatform/CY.WebForm/CY.WebForm.csproj
@@ -1908,6 +1908,7 @@
    <Content Include="Pages\business\SHejiOrderEdit.aspx" />
    <Content Include="Pages\business\ShejijijianEdit.aspx" />
    <Content Include="Pages\business\ShejijijianList.aspx" />
    <Content Include="Pages\business\ShejiOrderjiesuan.aspx" />
    <Content Include="Pages\business\ShiJuanBiaoQianPrint.aspx" />
    <Content Include="Pages\business\OrderSonghuoanchiList.aspx" />
    <Content Include="Pages\business\OrderUpLoadLiuyang.aspx" />
@@ -3528,6 +3529,13 @@
    <Compile Include="Pages\business\ShejijijianList.aspx.designer.cs">
      <DependentUpon>ShejijijianList.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\business\ShejiOrderjiesuan.aspx.cs">
      <DependentUpon>ShejiOrderjiesuan.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
    </Compile>
    <Compile Include="Pages\business\ShejiOrderjiesuan.aspx.designer.cs">
      <DependentUpon>ShejiOrderjiesuan.aspx</DependentUpon>
    </Compile>
    <Compile Include="Pages\business\ShiJuanBiaoQianPrint.aspx.cs">
      <DependentUpon>ShiJuanBiaoQianPrint.aspx</DependentUpon>
      <SubType>ASPXCodeBehind</SubType>
CY_ECommercePlatform/CY.WebForm/Pages/business/AgOutsourcSingleAllList.aspx
@@ -231,7 +231,7 @@
                //            html += '</p>';
                //            html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="受 理" onclick="DoAcceptAll(\'' + ids + '\')"/>&nbsp;&nbsp;<input type="button" class="button" value="取 消" onclick="parent.dialog.close()"/></span></div>';
                //            dialog.open({ InnerHtml: html, Title: '批量确认受理', Width: 400, Height: 100, Modal: false });
                var msg = '确认批量受理所选' + orderShowIds + '订单?';
                var msg = '确认批量受理所选订单?';
                top.Dialog.confirm(msg, function () {
                    DoAcceptAllwaixie(ids);
                });
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderDelayTimeEdit.aspx.cs
@@ -76,7 +76,7 @@
                bool result = eC_OrderBLL.OldUpdateDelayTime(eC_OrderExtend);
                bool result = eC_OrderBLL.UpdateDeliveryTimeTime(eC_OrderExtend);
                if (result)
                    JavaScript.MessageBox("更新成功", this, true, true);
CY_ECommercePlatform/CY.WebForm/Pages/business/OrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
    <title>订单列表</title>
    <uc:cmshead id="CMSHead1" runat="server" />
    <script src="../../js/business/Order.js?v=11" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=13" type="text/javascript"></script>
    <script type="text/javascript">
        //订单评价
        function evaluationModel(orderid) {
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx
@@ -5,7 +5,7 @@
<head id="Head1" runat="server">
    <title>订单列表</title>
    <uc:cmshead id="CMSHead1" runat="server" />
    <script src="../../js/business/Order.js?v=8" type="text/javascript"></script>
    <script src="../../js/business/Order.js?v=10" type="text/javascript"></script>
    <script type="text/javascript">
        //订单评价
        function evaluationModel(orderid) {
@@ -38,6 +38,46 @@
            });
          
        }
        function ToBatchjieusan() {
            var jsonObj = undefined;
            var ids = '';
            var cks = $("input[name='ckId']:checked");
            if (cks.length == 0) { alertMsg('只有未结算的订单可结算,未选中!'); return; } else { }
            cks.each(function (d) {
                try {
                    jsonObj = eval('[' + this.value + ']')[0];
                } catch (ex) {
                    global.DealDataException(ex); return;
                }
                ids += ',' + jsonObj.id;
            });
            window.dialog.confirm('是否确认当前操作?', function () {
                {
                    var url = "/Pages/business/ShejiOrderjiesuan.aspx?Keyid=" + ids;
                    top.Dialog.open({ URL: url, Title: "结算", Height: 600, Width: 800 });
                }
            });
        }
        function ToBatchxiadan() {
@@ -384,7 +424,17 @@
                            <asp:listitem value="2">否</asp:listitem>
                        </asp:dropdownlist>
                    </td>
                          <td colspan="4">
                    <td class="ali03">
                        是否结算:
                    </td>
                    <td>
                        <asp:dropdownlist keepdefaultstyle='true' id="selshifoujiesuan" runat="server">
                            <asp:listitem value="">全部</asp:listitem>
                            <asp:listitem value="1">是</asp:listitem>
                            <asp:listitem value="2">否</asp:listitem>
                        </asp:dropdownlist>
                    </td>
                          <td colspan="2">
                        <asp:button id="btn_Search" text="查询" runat="server" />&nbsp;<input type="button" value='重置' onclick='document.body.innerHTML="";window.location=window.location;' />
                           <asp:Button ID="Button1" Text="导出" OnClientClick="showProgress();return true;" runat="server" OnClick="btn_Daochu_Click" />
@@ -409,7 +459,9 @@
                            <div class="box_tool_line">
                            </div>
                             <a href="javascript:;"   menu_member_case_id="case_xiadanOrderList" menu_member_case_name="批量下单" onclick="ToBatchxiadan();"><span class="icon_edit">批量下单</span></a>
                             <div class="box_tool_line">
                            </div>
                             <a href="javascript:;"   menu_member_case_id="case_jiesuanOrderList" menu_member_case_name="批量结算" onclick="ToBatchjieusan();"><span class="icon_edit">批量结算</span></a>
                            <div class="clear">
                            </div>
                        </div>
@@ -470,6 +522,9 @@
                      
                         <th width="26"  menu_member_case_id="case_Xiadan" menu_member_case_name="下单">
                            下单
                        </th>
                        <th width="26"   >
                            是否结算
                        </th>
                         <th width="26" menu_member_case_id="case_PrintOrder" menu_member_case_name="打印">
                            打印
@@ -543,6 +598,12 @@
                                       <span class="edit <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"":"a_under" %>" <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"title=''":"title='点击下单' onclick=\"toXiadan( '"+ Eval("Keyid") +"')\"" %> >
                                         <%#(Eval("ShejiStatus")!=null && Eval("ShejiStatus").ToString() == "1" )?"√":"下单" %> </span> 
                                </td>
                                 <td>
                                         <%#(Eval("shifoujiesuan")!=null && Eval("shifoujiesuan").ToString() == "1" )?"√":"X" %>
                                </td>
                               
                                <td class="td_hide" menu_member_case_id="case_PrintOrder" menu_member_case_name="打印">
                                    <%-- <span class="hand look" title="查看或打印" onclick='ShowOrder(<%#Eval("Keyid") %>)'>打印</span>--%>
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.cs
@@ -541,12 +541,20 @@
                PageIndex = UCPager1.AspNetPager.CurrentPageIndex
            };
            IEnumerable<EC_OrderBasic> result = _eC_OrderBasicBLL.SelectModelPageSheji(pagination, CurrentUser.MemberId,this.txtBeginData.Value,this.txtEndDate.Value,this.txtOrderId.Value
                ,this.selPrintTypes.Value,this.selBusinessManager.Value,this.selShejirenyuan.Value,this.txtBuyerName.Value,this.txtDocumentName.Value,this.selShejiStatus.SelectedValue);
                ,this.selPrintTypes.Value,this.selBusinessManager.Value,this.selShejirenyuan.Value,this.txtBuyerName.Value,this.txtDocumentName.Value,this.selShejiStatus.SelectedValue,this.selshifoujiesuan.SelectedValue);
            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);
            if(!string.IsNullOrEmpty(this.selShejirenyuan.Value))
            {
                 ssss = result.Where(x=>x.Shejirenyuan == this.selShejirenyuan.Value.ToInt32()).Sum(x => x.ShejiSumPrice);
                 ssssaa = result.Where(x => x.Shejirenyuanneiye == this.selShejirenyuan.Value.ToInt32()).Sum(x => x.ShejiSumPriceneiye);
                 ssssaaa = result.Where(x => x.Shejirenyuanneiye1 == this.selShejirenyuan.Value.ToInt32()).Sum(x => x.ShejiSumPriceneiye1);
                 ssssaaaa = result.Where(x => x.Shejirenyuanneiye2 == this.selShejirenyuan.Value.ToInt32()).Sum(x => x.ShejiSumPriceneiye2);
            }
            var sssssssss = ssss.HasValue ? ssss.Value : 0;
            var sssssssssaa = ssssaa.HasValue ? ssssaa.Value : 0;
            var sssssssssaaa = ssssaaa.HasValue ? ssssaaa.Value : 0;
@@ -645,7 +653,7 @@
              
                var  result = _eC_OrderBasicBLL.SelectModelPageSheji(pa, CurrentUser.MemberId, this.txtBeginData.Value, this.txtEndDate.Value, this.txtOrderId.Value
                , this.selPrintTypes.Value, this.selBusinessManager.Value, this.selShejirenyuan.Value, this.txtBuyerName.Value, this.txtDocumentName.Value, this.selShejiStatus.SelectedValue);
                , this.selPrintTypes.Value, this.selBusinessManager.Value, this.selShejirenyuan.Value, this.txtBuyerName.Value, this.txtDocumentName.Value, this.selShejiStatus.SelectedValue, this.selshifoujiesuan.SelectedValue);
                foreach (var eC_OrderBasic in result)
                {
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderList.aspx.designer.cs
@@ -123,6 +123,15 @@
        protected global::System.Web.UI.WebControls.DropDownList selShejiStatus;
        /// <summary>
        /// selshifoujiesuan 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.WebControls.DropDownList selshifoujiesuan;
        /// <summary>
        /// btn_Search 控件。
        /// </summary>
        /// <remarks>
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderjiesuan.aspx
New file
@@ -0,0 +1,17 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ShejiOrderjiesuan.aspx.cs" Inherits="CY.WebForm.Pages.business.ShejiOrderjiesuan" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head id="Head1" runat="server">
    <title>下单</title>
    <uc:CMSHead ID="CMSHead1" runat="server" />
     <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" />
</head>
<body>
    <form id="form1" runat="server">
      </form>
</body>
</html>
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderjiesuan.aspx.cs
New file
@@ -0,0 +1,89 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using CY.BLL.Sys;
using CY.BLL;
using CY.Model;
using CY.Infrastructure.Common;
using CY.WebForm.Pages.common;
using CY.BLL.EC;
using CY.Model.Inquiry;
using System.Transactions;
namespace CY.WebForm.Pages.business
{
    public partial class ShejiOrderjiesuan : BasePage
    {
        protected void Page_Load(object sender, EventArgs e)
        {
            if (!IsPostBack)
            {
                string Keyid = Request["Keyid"].ToString();
               var orderids = Keyid.Trim(',').Split(',');
                if(orderids == null || orderids.Length == 0)
                {
                    JavaScript.MessageBox("未传递参数!", this, true, false);
                    return;
                }
                EC_OrderBasicBLL _eC_OrderBasicBLL = new EC_OrderBasicBLL();
                EC_AcceptWayByOrderBLL _AcceptWayByOrderBLL = new EC_AcceptWayByOrderBLL();
                EC_OrderBLL eC_OrderBLL = new EC_OrderBLL();//实例化订单业务操作对象
                var eC_OrderBasics = new List<EC_OrderBasic>();
                foreach (var orderid in orderids)
                {
                    var _eC_OrderBasic = _eC_OrderBasicBLL.SelectModelById(orderid.ToInt32().Value);
                    if(_eC_OrderBasic.shifoujiesuan == 1)
                    {
                        JavaScript.MessageBox(_eC_OrderBasic.SellerOrderId + "已结算的订单不能重复结算!", this,true, false);
                        return;
                    }
                    eC_OrderBasics.Add(_eC_OrderBasic);
                }
                using (TransactionScope scope = new TransactionScope(TransactionScopeOption.Required,
   new TransactionOptions
   {
       IsolationLevel = System.Transactions.IsolationLevel.ReadCommitted,
       Timeout = TransactionManager.MaximumTimeout
   }
   )
            )
                {
                    try
                    {
                        //开始下单
                        foreach (var eC_OrderBasic in eC_OrderBasics)
                        {
                            var resul = _eC_OrderBasicBLL.UpShejijiesuanStatus(eC_OrderBasic.Keyid.Value, 1, CurrentUser.ShortName);
                        }
                        scope.Complete();
                        JavaScript.MessageBox("操作成功", this, true, true);
                    }
                    catch (Exception ex)
                    {
                        PAGEHandleException(ex);
                        JavaScript.MessageBox("操作失败", this, true, false);
                    }
                    finally
                    {
                        // 释放资源
                        scope.Dispose();
                    }
                }
            }
        }
    }
}
CY_ECommercePlatform/CY.WebForm/Pages/business/ShejiOrderjiesuan.aspx.designer.cs
New file
@@ -0,0 +1,44 @@
//------------------------------------------------------------------------------
// <自动生成>
//     此代码由工具生成。
//
//     对此文件的更改可能导致不正确的行为,如果
//     重新生成代码,则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace CY.WebForm.Pages.business
{
    public partial class ShejiOrderjiesuan
    {
        /// <summary>
        /// Head1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlHead Head1;
        /// <summary>
        /// CMSHead1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::CY.WebForm.Pages.common.CMSHead CMSHead1;
        /// <summary>
        /// form1 控件。
        /// </summary>
        /// <remarks>
        /// 自动生成的字段。
        /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。
        /// </remarks>
        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
    }
}
CY_ECommercePlatform/CY.WebForm/js/business/Order.js
@@ -115,7 +115,7 @@
//            html += '</p>';
//            html += '<br/><div style=\'text-align:right;\' ><input type="button" class="button" value="受 理" onclick="DoAcceptAll(\'' + ids + '\')"/>&nbsp;&nbsp;<input type="button" class="button" value="取 消" onclick="parent.dialog.close()"/></span></div>';
            //            dialog.open({ InnerHtml: html, Title: '批量确认受理', Width: 400, Height: 100, Modal: false });
            var msg = !needPrice ? ('确认批量受理所选' + orderShowIds + '订单?') : ('受理所选线上订单需要支付¥' + Float2(price) + '服务费,是否确认批量受理' + orderShowIds + '订单?');
            var msg = !needPrice ? ('确认批量受理所选订单?') : ('受理所选线上订单需要支付¥' + Float2(price) + '服务费,是否确认批量受理订单?');
            top.Dialog.confirm(msg, function () {
                DoAcceptAll(ids);
            });