From 259584df9c06ade70f1f351affb35d4922e1263d Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 07 十一月 2025 16:23:13 +0800
Subject: [PATCH] 这个打印送货单，你们给我做两种，做一张打印没得数量的，做一张打印有数量的。送货单格式就是32开，就哎就是A4排一半。你们打了测试，注意，美观。 把那个把它做出来，下一批就用这个自动打。 不是不是打印的要数量都是有数量，要没得数量都没得数量。就是点打印的时候就两个按钮嘛，一个是有数量打印，或者或者或者空白送货单打印。 现在这个现在的送货单都是没有数量噻。现在那个要的，比如你那里再打你那个打印关闭的按钮，要把搞成两个打印嘛，就是打印空白送货单和打印送货单。 好点打印空白送货单的，就是现在这样子。点打印送货单，打印的就是那个跟有有就是有数据的送货单。作业本送货统计查询，状态查询需要修改逻辑
---
CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 165 insertions(+), 5 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
index 1eb2893..09528d4 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/EC/EC_OrderBasicDAL.cs
@@ -165,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>
@@ -269,6 +333,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>
/// 鍒犻櫎澶栧崗璁㈠崟
@@ -1176,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},
@@ -1339,7 +1446,7 @@
/// </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)
+ 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
{
@@ -1364,6 +1471,9 @@
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 + "'";
@@ -1371,7 +1481,17 @@
condition += " and oe.BusinessManagerId = '" + selBusinessManager + "'";
if (!string.IsNullOrEmpty(selOrderStates))
- condition += " and ob.OrderState = '" + 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)";
+ }
+ }
+
@@ -1415,11 +1535,11 @@
/// </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>
@@ -1627,6 +1747,46 @@
/// <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>
--
Gitblit v1.9.1