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/OA/OA_DeliverPlanPaicheDAL.cs | 86 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 83 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
index 4f0a1a3..492fcd3 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanPaicheDAL.cs
@@ -39,6 +39,28 @@
/// 鍒嗛〉榛樿鎺掑簭瀛楁
/// </summary>
const string ORDERBY = " case when Sort is null then 1 else 0 end asc,Sort asc ";
+
+
+ /// <summary>
+ /// 鏌ヨ鐩爣
+ /// </summary>
+ const string SELECTTARGET1 = " t.* ";
+ /// <summary>
+ /// 鏌ヨ鏉ユ簮
+ /// </summary>
+ const string FROMSOUCEBEFORE1 = " ( select od.*, " +
+ " oss.Name as DriverName, os.Name as ZerenrenName " +
+ " from [OA_DeliverPlanPaiche] od " +
+ " left join [OA_Staff] os on od.Zerenren = os.Keyid " +
+ " left join [OA_Staff] oss on od.[DriverId] = oss.Keyid " +
+
+ " where 0=0 ";
+ const string FROMSOUCEEND1 = ") as t ";
+ /// <summary>
+ /// 鍒嗛〉榛樿鎺掑簭瀛楁
+ /// </summary>
+ const string ORDERBY1 = " DeliveredTime desc ";
+
#endregion
public OA_DeliverPlanPaicheDAL()
{
@@ -111,9 +133,10 @@
new SqlParameter("@Deliveredstatus",trueModel.Deliveredstatus.HasValue?trueModel.Deliveredstatus.Value:0),
new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
+ new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0),
};
- string sql = "Insert Into [OA_DeliverPlanPaiche] ([Keyid],[FirmId],[BuyerId],[DeliveredTime],[Zhuyishixiang],[Gongzuokaoping], [CarId], [DriverId],[Transferstatus], [TransfersTime], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Sort],DeliverTime,wentifankui,Yichangchuli,Xingzhengzhuize,SellerOrderId,Dianhua,Dizhi,Remark,BusinessManagerId,Biddingcompany,shifouDelivery,Lianxiren,CompanyName,Deliveredstatus,TransferType,TransferName)"
- + " Values ( @Keyid,@FirmId,@BuyerId,@DeliveredTime, @Zhuyishixiang,@Gongzuokaoping, @CarId, @DriverId, @Transferstatus, @TransfersTime, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Sort,@DeliverTime,@wentifankui,@Yichangchuli,@Xingzhengzhuize,@SellerOrderId,@Dianhua,@Dizhi,@Remark,@BusinessManagerId,@Biddingcompany,@shifouDelivery,@Lianxiren,@CompanyName,@Deliveredstatus,@TransferType,@TransferName )";
+ string sql = "Insert Into [OA_DeliverPlanPaiche] ([Keyid],[FirmId],[BuyerId],[DeliveredTime],[Zhuyishixiang],[Gongzuokaoping], [CarId], [DriverId],[Transferstatus], [TransfersTime], [Creater],[CreateTime],[Updater],[LastUpdateTime],[Sort],DeliverTime,wentifankui,Yichangchuli,Xingzhengzhuize,SellerOrderId,Dianhua,Dizhi,Remark,BusinessManagerId,Biddingcompany,shifouDelivery,Lianxiren,CompanyName,Deliveredstatus,TransferType,TransferName,Zerenren)"
+ + " Values ( @Keyid,@FirmId,@BuyerId,@DeliveredTime, @Zhuyishixiang,@Gongzuokaoping, @CarId, @DriverId, @Transferstatus, @TransfersTime, @Creater,@CreateTime,@Updater,@LastUpdateTime,@Sort,@DeliverTime,@wentifankui,@Yichangchuli,@Xingzhengzhuize,@SellerOrderId,@Dianhua,@Dizhi,@Remark,@BusinessManagerId,@Biddingcompany,@shifouDelivery,@Lianxiren,@CompanyName,@Deliveredstatus,@TransferType,@TransferName,@Zerenren )";
try
{
_dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
@@ -167,6 +190,25 @@
LastUpdateTime = new SqlParameter("@LastUpdateTime", DBNull.Value);
}
+ SqlParameter WanjieTime = null;
+ if (trueModel.WanjieTime.HasValue)
+ {
+ WanjieTime = new SqlParameter("@WanjieTime", trueModel.WanjieTime.Value);
+ }
+ else
+ {
+ WanjieTime = new SqlParameter("@WanjieTime", DBNull.Value);
+ }
+ SqlParameter ZerenTime = null;
+ if (trueModel.ZerenTime.HasValue)
+ {
+ ZerenTime = new SqlParameter("@ZerenTime", trueModel.ZerenTime.Value);
+ }
+ else
+ {
+ ZerenTime = new SqlParameter("@ZerenTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -202,8 +244,18 @@
new SqlParameter("@TransferType",trueModel.TransferType.HasValue?trueModel.TransferType.Value:0),
new SqlParameter("@TransferName",string.IsNullOrEmpty(trueModel.TransferName)?"":trueModel.TransferName),
+ new SqlParameter("@Wanjiestatus",trueModel.Wanjiestatus.HasValue?trueModel.Wanjiestatus.Value:0),
+ WanjieTime,
+ new SqlParameter("@Wanjieren",string.IsNullOrEmpty(trueModel.Wanjieren)?"":trueModel.Wanjieren),
+ new SqlParameter("@Zerenren",trueModel.Zerenren.HasValue?trueModel.Zerenren.Value:0),
+ new SqlParameter("@Fakuan",trueModel.Fakuan.HasValue?trueModel.Fakuan.Value:0),
+ ZerenTime,
+ new SqlParameter("@Zerenoperater",string.IsNullOrEmpty(trueModel.Zerenoperater)?"":trueModel.Zerenoperater),
+
+
+
};
- string sql = "Update OA_DeliverPlanPaiche Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[DeliveredTime]=@DeliveredTime,[Zhuyishixiang]=@Zhuyishixiang,Gongzuokaoping=@Gongzuokaoping, [CarId]=@CarId, [DriverId]=@DriverId,[Transferstatus]=@Transferstatus, [TransfersTime]=@TransfersTime, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Sort=@Sort,DeliverTime=@DeliverTime,wentifankui=@wentifankui,Yichangchuli=@Yichangchuli,Xingzhengzhuize=@Xingzhengzhuize,SellerOrderId=@SellerOrderId,Dianhua=@Dianhua,Dizhi=@Dizhi,Remark=@Remark,BusinessManagerId=@BusinessManagerId,Biddingcompany=@Biddingcompany,shifouDelivery=@shifouDelivery,Lianxiren=@Lianxiren,CompanyName=@CompanyName,Deliveredstatus=@Deliveredstatus,TransferType=@TransferType,TransferName=@TransferName where [Keyid] =@Keyid ";
+ string sql = "Update OA_DeliverPlanPaiche Set [FirmId]=@FirmId,[BuyerId]=@BuyerId,[DeliveredTime]=@DeliveredTime,[Zhuyishixiang]=@Zhuyishixiang,Gongzuokaoping=@Gongzuokaoping, [CarId]=@CarId, [DriverId]=@DriverId,[Transferstatus]=@Transferstatus, [TransfersTime]=@TransfersTime, [Creater]=@Creater,[CreateTime]=@CreateTime,[Updater]=@Updater,[LastUpdateTime]=@LastUpdateTime,Sort=@Sort,DeliverTime=@DeliverTime,wentifankui=@wentifankui,Yichangchuli=@Yichangchuli,Xingzhengzhuize=@Xingzhengzhuize,SellerOrderId=@SellerOrderId,Dianhua=@Dianhua,Dizhi=@Dizhi,Remark=@Remark,BusinessManagerId=@BusinessManagerId,Biddingcompany=@Biddingcompany,shifouDelivery=@shifouDelivery,Lianxiren=@Lianxiren,CompanyName=@CompanyName,Deliveredstatus=@Deliveredstatus,TransferType=@TransferType,TransferName=@TransferName,Wanjiestatus=@Wanjiestatus,WanjieTime=@WanjieTime,Wanjieren=@Wanjieren,Zerenren=@Zerenren,Fakuan=@Fakuan,ZerenTime=@ZerenTime,Zerenoperater=@Zerenoperater where [Keyid] =@Keyid ";
try
{
@@ -304,6 +356,34 @@
return _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, SELECTTARGET, fromSouce, orderbys[0], resultOrderBy);
}
+
+
+ /// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="pagination"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> SelectModelPageWenti(Infrastructure.Query.Query query, Infrastructure.Query.Pagination pagination)
+ {
+ if (null == pagination || null == query || null == query.Criteria || 1 > query.Criteria.Count)
+ return null;
+ //query.Criteria 棣栦釜鍏冪礌蹇呴』鏄帓搴忓瓧娈碉紝鍏跺�间负缁撴灉鎺掑簭瀛楁
+
+ int maxParamIndex = query.Criteria.Count - 1;//鏈�澶х储寮�
+
+ string[] orderbys = new string[] { ORDERBY1 };
+ string resultOrderBy = "";//缁撴灉闆嗘帓搴忔柟寮�
+
+ if ("@orderBy".Equals(query.Criteria[maxParamIndex].PropertyName))
+ {
+ orderbys = string.Format("{0}", query.Criteria[maxParamIndex].Value).Split(',');
+ resultOrderBy = query.Criteria[maxParamIndex].Value.ToString();//= 1 == orderbys.Length ? resultOrderBy : orderbys[1];
+ }
+ string fromSouce = string.Format("{0}{1}{2}", FROMSOUCEBEFORE1, query.Criteria[0].Value, FROMSOUCEEND1);//鎷艰鏉′欢
+ return _dataBase.SelectModelPage<Model.OA_DeliverPlan>(pagination, SELECTTARGET1, fromSouce, orderbys[0], resultOrderBy);
+ }
+
/// <summary>
/// 鍒犻櫎
/// </summary>
--
Gitblit v1.9.1