From e4ee60ed94d24e394a7895daa9fb98df813e5953 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 十二月 2025 14:44:24 +0800
Subject: [PATCH] 提交

---
 CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs |  831 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 813 insertions(+), 18 deletions(-)

diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index a7b3395..257421a 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -37,6 +37,8 @@
 using CY.Model;
 using CY.Infrastructure.Query;
 using System.Transactions;
+using CY.Model.Inquiry;
+using CY.Infrastructure.Common;
 
 namespace CY.SQLDAL
 {
@@ -122,6 +124,15 @@
             {
                 unitPricePar = new SqlParameter("@UnitPrice", DBNull.Value);
             }
+            SqlParameter DeliveryTime = null;
+            if (trueModel.DeliveryTime.HasValue)
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", trueModel.DeliveryTime);
+            }
+            else
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", DBNull.Value);
+            }
             IList<SqlParameter> sqlParms = new List<SqlParameter>()
             {
                     new SqlParameter(){ ParameterName ="@Keyid", SqlDbType=System.Data.SqlDbType.Int, DbType=System.Data.DbType.Int32, Direction=ParameterDirection.Output},
@@ -129,7 +140,7 @@
 					new SqlParameter("@OrderTypeId",trueModel.OrderTypeId),
 					new SqlParameter("@PrintTypeId",trueModel.PrintTypeId),
                     new SqlParameter("@DocumentName",trueModel.DocumentName),
-					new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+                    DeliveryTime,//new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
 					new SqlParameter("@SellerId",trueModel.SellerId),
 					new SqlParameter("@BuyerId",trueModel.BuyerId),
                     new SqlParameter("@SellerName",trueModel.SellerName){SqlDbType=SqlDbType.VarChar,Size=200},
@@ -154,6 +165,70 @@
             }
         }
 
+
+        /// <summary>
+        /// 鏂板
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool InserModelsheji(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.EC_OrderBasic trueModel = model as Model.EC_OrderBasic;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            SqlParameter unitPricePar = null;
+            if (trueModel.UnitPrice.HasValue)
+            {
+                unitPricePar = new SqlParameter("@UnitPrice", trueModel.UnitPrice);
+            }
+            else
+            {
+                unitPricePar = new SqlParameter("@UnitPrice", DBNull.Value);
+            }
+            SqlParameter DeliveryTime = null;
+            if (trueModel.DeliveryTime.HasValue)
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", trueModel.DeliveryTime);
+            }
+            else
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", DBNull.Value);
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                    new SqlParameter(){ ParameterName ="@Keyid", SqlDbType=System.Data.SqlDbType.Int, DbType=System.Data.DbType.Int32, Direction=ParameterDirection.Output},
+                    new SqlParameter(){ ParameterName="@SellerOrderId",SqlDbType=System.Data.SqlDbType.VarChar,Size=25,DbType=System.Data.DbType.String, Direction=ParameterDirection.Output},
+                    new SqlParameter("@OrderTypeId",trueModel.OrderTypeId),
+                    new SqlParameter("@PrintTypeId",trueModel.PrintTypeId),
+                    new SqlParameter("@DocumentName",trueModel.DocumentName),
+                    DeliveryTime,//new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+					new SqlParameter("@SellerId",trueModel.SellerId),
+                    new SqlParameter("@BuyerId",trueModel.BuyerId),
+                    new SqlParameter("@SellerName",trueModel.SellerName){SqlDbType=SqlDbType.VarChar,Size=200},
+                    new SqlParameter("@BuyerName",trueModel.BuyerName){SqlDbType=SqlDbType.VarChar,Size=200},
+                    unitPricePar,
+                    new SqlParameter("@SumPrice",trueModel.SumPrice),
+                    new SqlParameter("@Creater",trueModel.Creater),
+                    new SqlParameter("@Operator",trueModel.Operator),
+                    new SqlParameter("@Remark",trueModel.Remark??"") ,
+                    new SqlParameter("@OutId",(trueModel.OutId==null ? "0":trueModel.OutId.ToString()))
+            };
+            try
+            {
+                _dataBase.Query("sp_EC_OrderBasic_Insertsheji", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
+                trueModel.Keyid = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[0].Value);
+                trueModel.SellerOrderId = CY.Infrastructure.Common.MyConvert.ConvertToString(sqlParms[1].Value);
+                return trueModel.Keyid.HasValue;
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
         /// <summary>
         /// 淇敼
         /// </summary>
@@ -176,6 +251,16 @@
             {
                 unitPricePar = new SqlParameter("@UnitPrice", DBNull.Value);
             }
+            SqlParameter DeliveryTime = null;
+            if (trueModel.DeliveryTime.HasValue)
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", trueModel.DeliveryTime);
+            }
+            else
+            {
+                DeliveryTime = new SqlParameter("@DeliveryTime", DBNull.Value);
+            }
+            
 
             IList<SqlParameter> sqlParms = new List<SqlParameter>()
             {
@@ -185,8 +270,8 @@
                     new SqlParameter("@SellerId",trueModel.SellerId),
                     new SqlParameter("@SellerName",trueModel.SellerName),
 					new SqlParameter("@DocumentName",trueModel.DocumentName),
-					new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
-					unitPricePar,
+                    DeliveryTime,//new SqlParameter("@DeliveryTime",trueModel.DeliveryTime),
+                    unitPricePar,
 					new SqlParameter("@SumPrice",trueModel.SumPrice),
 					new SqlParameter("@PayState",trueModel.PayState),
 					new SqlParameter("@Operator",trueModel.Operator),
@@ -249,6 +334,49 @@
             return true;
         }
 
+
+        /// <summary>
+        /// 鍒犻櫎
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public bool DeleteModelsheji(Infrastructure.Domain.IAggregateRoot model)
+        {
+            Model.EC_OrderBasic trueModel = model as Model.EC_OrderBasic;
+            if (trueModel == null)
+            {
+                return false;
+            }
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                new SqlParameter("@Keyid",trueModel.Keyid)
+            };
+            try
+            {
+
+                _eC_OrderOperateDAL = null == _eC_OrderOperateDAL ? new EC_OrderOperateDAL(_dataBase) : _eC_OrderOperateDAL;
+                bool isWin = _eC_OrderOperateDAL.InserModel(new EC_OrderOperate()
+                {
+                    OrderId = trueModel.Keyid,
+                    OperateType = 0,
+                    Remark = "缁堟璁㈠崟",
+                    Operator = trueModel.Operator
+                });
+                if (!isWin)
+                    return false;
+                else
+                    ;
+                _dataBase.Query("sp_EC_OrderBasic_DeleteRowsheji", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+
+
         /// <summary>
         /// 鍒犻櫎澶栧崗璁㈠崟
         /// </summary>
@@ -270,6 +398,31 @@
             }
             return true;
         }
+
+        /// <summary>
+        /// 鍒犻櫎澶栧崗璁㈠崟
+        /// </summary>
+        /// <param name="OrderId"></param>
+        /// <returns></returns>
+        public bool UpdateOldOrderSurplusPrintNum(int OrderId)
+        {
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                new SqlParameter("@Keyid",OrderId)
+            };
+            string sql = " Update [EC_OrderExtend] Set [SurplusPrintNum]=[PrintNum]   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )  ;Update [EC_OrderBasic] Set [OrderState]=2   where [Keyid] = (select [OrderId] from [OA_OrderWorkListRelation] where [RelationTargetId] = @Keyid and [RelationTypeId]=4 )   ";
+
+            try
+            {
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
+        }
+       
 
         /// <summary>
         /// 鍒嗛〉鏌ヨ
@@ -505,6 +658,136 @@
             else
             {
             }
+            StringBuilder ssss = new StringBuilder();
+            if (int.Parse(searchParam[18].ToString()) > 0)
+            {
+                var oA_Staffs = _dataBase.SelectModel<OA_Staff>(" * ", " [OA_Staff] ", "[Keyid]='" + searchParam[20] + "'").FirstOrDefault();
+
+
+                if (!string.IsNullOrEmpty(oA_Staffs.ManageCountry))
+                {
+                    var sys_CitySites = _dataBase.SelectModel<Sys_CitySite>(" * ", " [Sys_CitySite] ").ToList();
+
+
+
+                    var ManageCity = oA_Staffs.ManageCity.Split(',').Where(x => x != "").ToArray();
+
+
+                    var ManageCountry = (oA_Staffs.ManageCountry + "," + oA_Staffs.ManageCountry1).Split(',').Where(x => x != "").ToArray();
+
+                    int[] intManageCity = new int[ManageCity.Length];
+                    for (int i = 0; i < ManageCity.Length; i++)
+                    {
+                        intManageCity[i] = int.Parse(ManageCity[i]);
+                    }
+
+                    int[] intManageCountry = new int[ManageCountry.Length];
+                    for (int i = 0; i < ManageCountry.Length; i++)
+                    {
+                        intManageCountry[i] = int.Parse(ManageCountry[i]);
+                    }
+                    var city = sys_CitySites.Where(x => intManageCity.Contains(x.Keyid)).ToList();
+                    var country = sys_CitySites.Where(x => intManageCountry.Contains(x.Keyid)).ToList();
+
+                    StringBuilder citystring = new StringBuilder();
+                    for (int i = 0; i < city.Count; i++)
+                    {
+                        if (i == city.Count - 1)
+                        {
+                            citystring.Append("'" + city[i].Name.ToString() + "'");
+                        }
+                        else
+                        {
+                            citystring.Append("'" + city[i].Name.ToString() + "',");
+                        }
+
+                    }
+
+                    StringBuilder countrystring = new StringBuilder();
+                    for (int i = 0; i < country.Count; i++)
+                    {
+                        if (i == country.Count - 1)
+                        {
+                            countrystring.Append("'" + country[i].Name.ToString() + "'");
+                        }
+                        else
+                        {
+                            countrystring.Append("'" + country[i].Name.ToString() + "',");
+                        }
+
+                    }
+
+
+
+                    var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid  ", "  axz.FirmId ='" + searchParam[1] + "'and ( ( bxz.City in ( " + citystring.ToString() + ")  and    bxz.County in ( " + countrystring.ToString() + " )   )or axz.AccountManagerId='" + searchParam[20] + "'  or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
+                    //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+                    for (int i = 0; i < resultsss.Count; i++)
+                    {
+                        if (i == resultsss.Count - 1)
+                        {
+                            ssss.Append("'" + resultsss[i].ToString() + "'");
+                        }
+                        else
+                        {
+                            ssss.Append("'" + resultsss[i].ToString() + "',");
+                        }
+
+                    }
+                }
+                else
+                {
+                    var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz join [OA_CustomerCommunications] bxz on axz.Keyid=bxz.Keyid  ", "  axz.FirmId ='" + searchParam[1] + "'and ( axz.AccountManagerId='" + searchParam[20] + "'  or axz.BusinessManagerId='" + searchParam[20] + "')").Select(x => x.Keyid).ToList();
+                    //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+                    for (int i = 0; i < resultsss.Count; i++)
+                    {
+                        if (i == resultsss.Count - 1)
+                        {
+                            ssss.Append("'" + resultsss[i].ToString() + "'");
+                        }
+                        else
+                        {
+                            ssss.Append("'" + resultsss[i].ToString() + "',");
+                        }
+
+                    }
+                }
+
+                if (string.IsNullOrEmpty(ssss.ToString()))
+                {
+                    ssss.Append("'11111111-1111-1111-1111-111111111111'");
+                }
+
+               
+            }
+            else
+            {
+                var resultsss = _dataBase.SelectModel<OA_CorporateClients>(" axz.* ", " [OA_CorporateClients] axz  ", "  axz.FirmId ='" + searchParam[1] + "' ").Select(x => x.Keyid).ToList();
+                //return null == result || result.Count < 1 ? null : result[0];
+
+
+
+                for (int i = 0; i < resultsss.Count; i++)
+                {
+                    if (i == resultsss.Count - 1)
+                    {
+                        ssss.Append("'" + resultsss[i].ToString() + "'");
+                    }
+                    else
+                    {
+                        ssss.Append("'" + resultsss[i].ToString() + "',");
+                    }
+
+                }
+            }
+
+           
+            
 
             IList<SqlParameter> sqlParms = new List<SqlParameter>()
             {
@@ -537,7 +820,10 @@
                      new SqlParameter("@KaipiaoshenqingId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
                      new SqlParameter("@buyerId",DBNull.Value){SqlDbType=SqlDbType.UniqueIdentifier},
                      new SqlParameter("@DocumentName",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=50},
-                     
+                     new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+                       new SqlParameter("@WorkStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+                         new SqlParameter("@DeleverStates",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500},
+
             };
 
             /*
@@ -582,26 +868,48 @@
                 Direction = ParameterDirection.Output
             });
 
+            sqlParms.Add(new SqlParameter()
+            {
+                ParameterName = "@CorporateClientsId",
+                SqlDbType = SqlDbType.VarChar,
+                Size=int.MaxValue,
+                Value = ssss.ToString()
+            });
+
             IList<EC_OrderBasic> result = null;
             //鎵ц鍒嗛〉瀛樺偍
-            using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller", CommandType.StoredProcedure, sqlParms.ToArray()))
+            using (IDataReader reader = _dataBase.QueryDataReader("sp_EC_OrderBasic_Search_Seller_Ceshi", CommandType.StoredProcedure, sqlParms.ToArray()))
             {
                 result = _dataBase.ReadDataToModel<EC_OrderBasic>(reader);
             }
             if (result != null && result.Count > 0)
             {
+                _eC_OrderPrintParameterDAL = new EC_OrderPrintParameterDAL(_dataBase);
                 foreach (EC_OrderBasic ob in result)
                 {
                     if (IsComplainant(ob.Keyid.Value))
                     {
                         ob.IsComplainant = true;
                     }
+
+                    EC_OrderPrintParameter _eC_OrderPrintParameter = _eC_OrderPrintParameterDAL.GetModel(ob.Keyid.Value);
+                    InquiryCommonModel _inquiryCommonModel = null;
+                    if (null == _eC_OrderPrintParameter)
+                    {
+                        _inquiryCommonModel = new InquiryCommonModel();
+                    }
+                    else
+                    {
+                        _inquiryCommonModel = SerializationHelper.DeSerialize(typeof(InquiryCommonModel), _eC_OrderPrintParameter.PrintParameter) as InquiryCommonModel;
+                    }
+
+                    ob.PrintSizeName = _inquiryCommonModel.PrintSizeName;
                 }
             }
             /*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
-            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[31].Value);
+            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[34].Value);
             pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
-            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
+            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[35].Value);
             pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
 
             return result;
@@ -854,7 +1162,9 @@
                 new SqlParameter("@businessManager",DBNull.Value){SqlDbType=SqlDbType.Int},
                 new SqlParameter("@payType",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                 new SqlParameter("@returnvisit",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
-                 new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20}
+                 new SqlParameter("@appraise",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
+                  new SqlParameter("@Orderids",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=500}
+                 
             };
 
             /*
@@ -921,9 +1231,9 @@
                 }
             }
             /*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
-            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[19].Value);
+            int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
             pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
-            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[20].Value);
+            resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[21].Value);
             pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
 
             return result;
@@ -973,7 +1283,7 @@
                 new SqlParameter("@createTimeEnd",DBNull.Value){SqlDbType=SqlDbType.Date},
                 new SqlParameter("@printType",DBNull.Value){SqlDbType=SqlDbType.Int},
                 new SqlParameter("@orderType",DBNull.Value){SqlDbType=SqlDbType.Int},
-                new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.Int},
+                new SqlParameter("@orderState",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                 new SqlParameter("@orderPayState",DBNull.Value){SqlDbType=SqlDbType.Int},
                 new SqlParameter("@creater",DBNull.Value){SqlDbType=SqlDbType.VarChar,Size=20},
                 new SqlParameter("@customerLevel",DBNull.Value){SqlDbType=SqlDbType.Int},
@@ -1129,6 +1439,70 @@
 
         }
 
+
+
+        /// <summary>
+        /// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <param name="pagination"></param>
+        /// <returns></returns>
+        public IEnumerable<EC_OrderBasic> SelectModelPageWorkBook(Infrastructure.Query.Pagination pagination, Guid _MemberID, string txtBeginDate, string txtEndDate, string txtOrderId, string txtSearchyjname, string selCustormerManager, string selBusinessManager, string selOrderStates, string BuyerName)
+        {
+            try
+            {
+                string condition = "  ob.PrintTypeId = 37 ";
+
+                if (_MemberID != Guid.Empty)
+                    condition += " and ob.SellerId = '" + _MemberID + "'";
+
+                if (!string.IsNullOrEmpty(txtBeginDate))
+                    condition += string.Format(" and CAST(ob.CreateTime AS DATE) >='{0}'", txtBeginDate);
+
+                if (!string.IsNullOrEmpty(txtEndDate))
+                {
+                  var EndDate = txtEndDate.ToDateTime2().Value.AddDays(1).ToShortDateString();
+                        condition += string.Format(" and CAST(ob.CreateTime AS DATE) <='{0}'", EndDate);
+                }
+                    
+
+                if (!string.IsNullOrEmpty(txtOrderId))
+                    condition += " and ob.SellerOrderId like '%" + txtOrderId + "%'";
+
+                if (!string.IsNullOrEmpty(txtSearchyjname))
+                    condition += " and ob.DocumentName like '%" + txtSearchyjname + "%'";
+
+                if (!string.IsNullOrEmpty(BuyerName))
+                    condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+
+                if (!string.IsNullOrEmpty(selCustormerManager))
+                    condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";
+
+                if (!string.IsNullOrEmpty(selBusinessManager))
+                    condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
+
+                if (!string.IsNullOrEmpty(selOrderStates))
+                {
+                    if(selOrderStates == "0")
+                    {
+                        condition += " and ob.OrderState  in (1,2,3,4)";
+                    }
+                    else if (selOrderStates == "1")
+                    {
+                        condition += " and ob.OrderState in ( 5,6,-1)";
+                    }
+                }
+                   
+
+ 
+
+                return _dataBase.SelectModelPage<EC_OrderBasic>(pagination, " ob.*,oe.shifouDelivery,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,opy.Name as yssldw ", " EC_OrderBasic as ob Inner Join EC_OrderExtend as oe On(ob.Keyid=oe.Keyid) Left Join Sys_Dictionary as opy On (opy.DicType='鍗板埛鍗曚綅' And  opy.MeanValue = oe.printunit )   ", " ob.Keyid DESC ", " Keyid DESC ", condition);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
         /// <summary>
         /// 鍗曚釜鏌ヨ
         /// </summary>
@@ -1156,16 +1530,30 @@
         }
 
 
+
+        /// <summary>
+        /// 鏍规嵁绫诲瀷鏌ヨ 璁㈠崟
+        /// </summary>
+        /// <param name="orderId">璁㈠崟缂栧彿</param>
+        /// <returns></returns>
+        public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId)
+        {
+            
+            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" PrintTypeId = {0} and OrderState = 4 ", PrintTypeId));
+            return result;
+        }
+
+
         /// <summary>
         /// 鏍规嵁瀹㈡埛ID鍜岃鍗曟敮浠樼姸鎬佽幏鍙栬鍗曞垪琛� 
         /// </summary>
         /// <param name="BuyerId">鍗栧ID</param>
         /// <returns></returns>
-        public IList<EC_OrderBasic> GetOrderById(Guid BuyerId, int PayState)
+        public IList<EC_OrderBasic> GetOrderById(Guid BuyerId, int PayState, Guid SellerId)
         {
             IList<EC_OrderBasic> result = new List<EC_OrderBasic>();
          
-             result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1}", BuyerId,PayState));
+             result = _dataBase.SelectModel<EC_OrderBasic>(" * ", "EC_OrderBasic ", string.Format(" BuyerId = '{0}' and PayState!={1} and  SellerId = '{2}'", BuyerId,PayState, SellerId));
             return result;
         }
         /// <summary>
@@ -1207,6 +1595,53 @@
                 throw ex;
             }
 
+        }
+
+
+
+        /// <summary>
+        /// 閿佸崟璁㈠崟
+        /// </summary>
+        /// <param name="orderId">璁㈠崟缂栧彿</param>
+        /// <param name="operater">鎿嶄綔浜�</param>
+        /// <returns></returns>
+        public bool SuodingOrder(int orderId, string operater)
+        {
+            if (0 >= orderId || 0 >= orderId)
+            {
+                return false;
+            }
+            else
+            {
+            }
+           
+            IList<SqlParameter> sqlParms = new List<SqlParameter>()
+            {
+                  
+                    new SqlParameter("@SuodanState",true),
+                    new SqlParameter("@SuodanTime",DateTime.Now),
+                     new SqlParameter("@SuodanOperator",operater),
+                        new SqlParameter("@Keyid",orderId),
+            };
+            IList<SqlParameter> sqlParms1 = new List<SqlParameter>()
+            {
+                        new SqlParameter("@Keyid",orderId),
+            };
+            try
+            {
+                string sql = "Update EC_OrderBasic Set [SuodanState]=@SuodanState,[SuodanTime]=@SuodanTime,[SuodanOperator]=@SuodanOperator  where [Keyid] =@Keyid ";
+                _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+                
+                string sql1 = "Update CoreCmsPlanOrder Set [status]=2  where [orderkeyid] =@Keyid ";
+                _dataBase.ExecuteSql(sql1, sqlParms1.ToArray<SqlParameter>());
+
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return true;
         }
 
         /// <summary>
@@ -1322,6 +1757,59 @@
             }
 
             return null == result || result.Count == 0 ? null : result[0];
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
+        /// </summary>
+        /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+        /// <returns></returns>
+        public EC_OrderBasic SelectModelByxiadanId(int orderId)
+        {
+            if (0 >= orderId)
+            {
+                return null;
+            }
+            else
+            {
+            }
+            string condition = "  ";
+            if (orderId > 0)
+            {
+                condition = " b.[XiadanKeyid]=" + orderId + "";
+            }
+            else
+            {
+                return null;
+            }
+
+
+            try
+            {
+                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("a.*", " EC_OrderBasic a inner join   [EC_OrderExtend] b on a.[Keyid] = b.[Keyid] ", condition) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+
+                return (null == result || result.Count == 0) ? null : result[0];//杩斿洖缁撴灉
+
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+
+        }
+
+
+        /// <summary>
+        /// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟 
+        /// </summary>
+        /// <param name="orderIds">璁㈠崟缂栧彿</param>
+        /// <returns></returns>
+        public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
+        {
+            //return _eC_OrderBasicDAL.SelectModelById(orderId);
+            IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("  ob.*,ts.OnlineMoney,ts.LineMoney,ts.UsedCredit,ts.PayedMoney ", "EC_OrderBasic as ob Inner Join Pay_TradingSingle as ts On ( ob.Keyid = ts.OrderId ) ", string.Format(" ob.Keyid  in ({0})", orderIds));
+            return null == result || result.Count < 1 ? null : result;
         }
 
         /// <summary>
@@ -1440,6 +1928,44 @@
                     };
                 _dataBase.Query("sp_Order_UpdateOrderState", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
                 return isWin = 1.Equals(sqlParms[2].Value);
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+        }
+
+
+
+
+        /// <summary>
+        /// 淇敼璁㈠崟閫佽揣閲戦
+        /// </summary>
+        /// <param name="orderOperate">璁㈠崟鎿嶄綔</param>
+        /// <returns></returns>
+        internal bool UpdateOrderSonghuoJine(int OrderId,decimal? SonghuoJine)
+        {
+           
+            
+            _eC_OrderOperateDAL = null == _eC_OrderOperateDAL ? new EC_OrderOperateDAL(_dataBase) : _eC_OrderOperateDAL;
+            try
+            {
+
+                bool isWin = false;
+               
+
+                IList<SqlParameter> sqlParms = new List<SqlParameter>()
+                    {
+                            new SqlParameter("@orderId",OrderId),
+                            new SqlParameter("@SonghuoJine",SonghuoJine.HasValue?SonghuoJine.Value:0),
+                            
+                    };
+                string sql = "Update [EC_OrderExtend] Set [SonghuoJine]=@SonghuoJine  where [Keyid] =@orderId ";
+
+               
+                    _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+   
+                return true;
             }
             catch (Exception ex)
             {
@@ -1636,6 +2162,59 @@
 
         }
 
+
+
+        /// <summary>
+        /// 鏀舵(绾夸笅杞处銆佺幇閲�)
+        /// </summary>
+        /// <param name="orderId">璁㈠崟缂栧彿</param>
+        /// <param name="firmAccountRecord">鎿嶄綔璁板綍</param>
+        /// <returns></returns>
+        public bool ReceiveMoneyToQueren(int orderId, OA_FirmAccountRecord firmAccountRecord)
+        {
+            bool isWin = false;
+            if (0 >= orderId  || !firmAccountRecord.Money.HasValue)
+                return false;
+            else
+                ;
+            if ( 0 > firmAccountRecord.Money.Value)
+                return false;
+            else
+                ;
+            try
+            {
+                OA_FirmAccountRecordDAL oA_FirmAccountRecordDAL = new OA_FirmAccountRecordDAL(_dataBase);
+                using (TransactionScope tran = new TransactionScope())
+                {
+                    
+
+                    //鏇存柊璁㈠崟鏀粯閲戦
+                    isWin = this.UpdateOrderPayedMoney(orderId, -1, firmAccountRecord.Money.Value);
+                    if (!isWin)
+                    {
+                        return isWin;
+                    }
+                    else
+                        ;
+                    //鏇存柊璁㈠崟鐘舵��
+                    isWin = this.UpdateOrderPayState(orderId);
+                    if (!isWin)
+                    {
+                        return isWin;
+                    }
+                    else
+                        ;
+                    tran.Complete();
+                }
+            }
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return isWin;
+
+        }
+
         /// <summary>
         /// 鏀舵(澶栧崗棰勪粯娆俱�佸鎴烽浠樻)
         /// </summary>
@@ -1710,7 +2289,7 @@
                 if (string.IsNullOrEmpty(Keyids))
                     return null;//閿欒鏁版嵁杩斾細绌� 
 
-                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0}) and SellerId ='{1}' order by SellerOrderId DESC ", Keyids, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>("*", "EC_OrderBasic", string.Format(" Keyid in ({0})  order by SellerOrderId DESC ", Keyids)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ and SellerId ='{1}' , FirmId
 
                 return result;//杩斿洖缁撴灉
             }
@@ -2259,7 +2838,8 @@
                         new SqlParameter(){ParameterName="@AppointCourierCompany",Value=awbInfo.AppointCourierCompany,SqlDbType=SqlDbType.VarChar,Size=50},
                         new SqlParameter(){ParameterName="@FetchAddress",Value=awbInfo.FetchAddress,SqlDbType=SqlDbType.VarChar,Size=200},
                         new SqlParameter(){ParameterName="@FetchContacts",Value=awbInfo.FetchContacts,SqlDbType=SqlDbType.VarChar,Size=50},
-                        new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20}
+                        new SqlParameter(){ParameterName="@FetchPhoneNum",Value=awbInfo.FetchPhoneNum,SqlDbType=SqlDbType.VarChar,Size=20},
+                         new SqlParameter(){ParameterName="@SonghuoJine",Value=awbInfo.SonghuoJine.HasValue?awbInfo.SonghuoJine.Value:0,SqlDbType=SqlDbType.Money}
                     };
                     _dataBase.Query("sp_EC_AwbInfo_DeliverPresswork", CommandType.StoredProcedure, sqlParms.ToArray<SqlParameter>());
                     isWin = 1.Equals(sqlParms[0].Value);
@@ -2276,6 +2856,17 @@
                         else
                             ;
                         isWin = this.UpdateOrderStateUnit(awbInfo.Operate);//淇敼璁㈠崟鐘舵��
+                        if (!isWin)
+                            return false;
+                        else
+                            ;
+
+                        if(awbInfo.Operate.OperateType == 5)
+                            isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, awbInfo.SonghuoJine);//淇敼璁㈠崟鐘舵��
+                        else
+                        {
+                            isWin = this.UpdateOrderSonghuoJine(awbInfo.Keyid.Value, 0);//淇敼璁㈠崟鐘舵��
+                        }
                         if (!isWin)
                             return false;
                         else
@@ -2461,6 +3052,48 @@
             }
         }
 
+
+        /// <summary>
+        /// 淇敼鎵撳嵃鐘舵��
+        /// </summary>
+        /// <param name="orderId"></param>
+        public bool Updatejinedanjia(int orderId, decimal SumPrice, decimal UnitPrice,int num)
+        {
+            try
+            {
+                string sqlStr = string.Empty;
+                sqlStr = "UPDATE EC_OrderBasic SET SumPrice="+ SumPrice + " ,UnitPrice="+ UnitPrice + " WHERE Keyid=@orderId;UPDATE [EC_OrderExtend] SET [PrintNum]=" + num + "  WHERE Keyid="+ orderId ;
+                SqlParameter par = new SqlParameter("@orderId", orderId);
+                _dataBase.ExecuteSql(sqlStr, par);
+            }
+            catch
+            {
+
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// 淇敼鎵撳嵃鐘舵��
+        /// </summary>
+        /// <param name="orderId"></param>
+        public void UpdatePrintfengqianState(int orderId)
+        {
+            try
+            {
+                string sqlStr = string.Empty;
+                sqlStr = "UPDATE EC_OrderExtend SET IsPrintfengqian='true' WHERE Keyid=@orderId";
+                SqlParameter par = new SqlParameter("@orderId", orderId);
+                _dataBase.ExecuteSql(sqlStr, par);
+            }
+            catch
+            {
+
+            }
+        }
+        
+
         /// <summary>
         /// 淇敼鎵撳嵃鐘舵��
         /// </summary>
@@ -2494,8 +3127,9 @@
         /// <param name="WorkStates"></param>
         /// <param name="OutOrderId"></param>
         /// <param name="RelationType"></param>
+        /// <param name="PayState"></param>
         /// <returns></returns>
-        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
+        public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
         {
             try
             {
@@ -2506,12 +3140,15 @@
 
                 if (RelationType > 0)
                     condition += " and  b.RelationTypeId = '" + RelationType + "' ";
+                if (!string.IsNullOrEmpty(PayState))
+                    condition += " and  a.PayState = " + PayState + " ";
+                
 
                 if (StartCreatTime != null)
                     condition += " and  a.CreateTime >= '" + StartCreatTime.Value + "' ";
 
                 if (EndCreatTime != null)
-                    condition += " and  a.CreateTime =< '" + EndCreatTime.Value.AddDays(1) + "' ";
+                    condition += " and  a.CreateTime <= '" + EndCreatTime.Value.AddDays(1) + "' ";
 
                 if (StartReturnTime != null)
                     condition += " and  d.DeliverTime >= '" + StartReturnTime.Value + "' ";
@@ -2774,7 +3411,7 @@
                 if (deliverorderId==null || deliverorderId.Equals(Guid.Empty))
                     return null;//閿欒鏁版嵁杩斾細绌� 
 
-                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,oe.shifouDelivery,oe.DeliveryOrderId,oe.Kaipiaoshenqing,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,pt.PrintName as PrintTypeName ", "EC_OrderBasic ob   Inner Join EC_OrderExtend as oe On ob.Keyid=oe.Keyid   Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", string.Format(" oe.DeliveryOrderId = '{0}' and ob.SellerId ='{1}' order by SellerOrderId DESC ", deliverorderId, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
+                IList<EC_OrderBasic> result = _dataBase.SelectModel<EC_OrderBasic>(" ob.*,oe.printunit,oe.shifouDelivery,oe.DeliveryOrderId,oe.Kaipiaoshenqing,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,pt.PrintName as PrintTypeName ", "EC_OrderBasic ob   Inner Join EC_OrderExtend as oe On ob.Keyid=oe.Keyid   Left Join SysInquiry_PrintingType as pt On(ob.PrintTypeId=pt.Keyid) ", string.Format(" oe.DeliveryOrderId = '{0}' and ob.SellerId ='{1}' order by SellerOrderId DESC ", deliverorderId, FirmId)) as IList<EC_OrderBasic>;//鎵ц鏌ヨ
 
                 return result;//杩斿洖缁撴灉
             }
@@ -2784,5 +3421,163 @@
             }
         }
 
+
+
+
+        /// <summary>
+        /// 鍒嗛〉鏌ヨ
+        /// </summary>
+        /// <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, string shifoujiesuan)
+        {
+            try
+            {
+                string condition = " 1=1 ";
+                if (MemberId != Guid.Empty)
+                {
+                    var originalGuid = MemberId;
+                    Guid reversedGuid = new Guid(originalGuid.ToByteArray().Reverse().ToArray());
+                    condition += " and ob.SellerId = '" + reversedGuid + "'";
+                }
+                  
+
+
+                if (!string.IsNullOrEmpty(BeginCreateTime))
+                    condition += string.Format(" and CAST(ob.CreateTime AS DATE) >='{0}'", BeginCreateTime);
+
+                if (!string.IsNullOrEmpty(EndCreateTime))
+                    condition += string.Format(" and CAST(ob.CreateTime AS DATE) <='{0}'", EndCreateTime);
+
+                if (!string.IsNullOrEmpty(SellerOrderId))
+                    condition += " and ob.SellerOrderId like '%" + SellerOrderId + "%'";
+
+                if (!string.IsNullOrEmpty(PrintTypeId))
+                {
+                    condition += " and ob.PrintTypeId = " + PrintTypeId + "";
+                }
+                if (!string.IsNullOrEmpty(BusinessManagerId))
+                {
+                    condition += " and oe.BusinessManagerId = " + BusinessManagerId + "";
+                }
+                
+                if (!string.IsNullOrEmpty(BuyerName))
+                    condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+
+                if (!string.IsNullOrEmpty(DocumentName))
+                    condition += " and ob.DocumentName like '%" + DocumentName + "%'";
+
+                if (!string.IsNullOrEmpty(ShejiStatus))
+                {
+                    if(ShejiStatus == "1")
+                    {
+                        condition += " and oe.ShejiStatus = " + ShejiStatus + "";
+                    }
+                    else
+                    {
+                        condition += " and  (oe.ShejiStatus is null or  oe.ShejiStatus != 1) ";
+                    }
+                }
+
+                if (!string.IsNullOrEmpty(shifoujiesuan))
+                {
+                    if (shifoujiesuan == "1")
+                    {
+                        condition += " and oe.shifoujiesuan = " + shifoujiesuan + "";
+                    }
+                    else
+                    {
+                        condition += " and  (oe.shifoujiesuan is null or   oe.shifoujiesuan!= 1 ) ";
+                    }
+                }
+
+                
+
+                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)
+            {
+                throw ex;
+            }
+        }
+
     }
 }

--
Gitblit v1.9.1