From 2fee7b9b90c1acf7a17aef84ee22c2a31b801fe2 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 三月 2025 08:34:42 +0800
Subject: [PATCH] 送货管理 增加查询 业务经理 客户名称 完成 查询送货安排的历史 完成
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 161 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index fb2a15a..469bf31 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -293,6 +293,31 @@
}
/// <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>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="query">鏌ヨ瀵硅薄</param>
@@ -688,7 +713,8 @@
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},
+
};
/*
@@ -772,9 +798,9 @@
}
}
/*鑾峰彇椤垫暟涓庤繑鍥炴暟鎹潯鏁�*/
- int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[31].Value);
+ int? resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
pagination.PageCount = resultValue.HasValue ? resultValue.Value : 0;
- resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[32].Value);
+ resultValue = CY.Infrastructure.Common.MyConvert.ConvertToInt32(sqlParms[33].Value);
pagination.RecordCount = resultValue.HasValue ? resultValue.Value : 0;
return result;
@@ -1027,7 +1053,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}
+
};
/*
@@ -1094,9 +1122,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;
@@ -1300,6 +1328,57 @@
return result;
+ }
+
+
+
+ /// <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)
+ {
+ 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(selCustormerManager))
+ condition += " and oe.CustomerManagerId = '" + selCustormerManager + "'";
+
+ if (!string.IsNullOrEmpty(selBusinessManager))
+ condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
+
+ if (!string.IsNullOrEmpty(selOrderStates))
+ condition += " and ob.OrderState = '" + selOrderStates + "'";
+
+
+
+ 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>
@@ -1841,6 +1920,59 @@
else
;
}
+
+ //鏇存柊璁㈠崟鏀粯閲戦
+ 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>
+ /// <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);
@@ -2694,6 +2826,28 @@
}
}
+
+ /// <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>
@@ -3027,7 +3181,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;//杩斿洖缁撴灉
}
--
Gitblit v1.9.1