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_DeliverPlanDAL.cs | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
index 3ec8a47..2d6b62d 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_DeliverPlanDAL.cs
@@ -155,6 +155,16 @@
TransfersTime = new SqlParameter("@TransfersTime", DBNull.Value);
}
+ SqlParameter LastUpdateTime = null;
+ if (trueModel.LastUpdateTime.HasValue)
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime.Value);
+ }
+ else
+ {
+ LastUpdateTime = new SqlParameter("@LastUpdateTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
@@ -162,8 +172,8 @@
new SqlParameter("@FirmId",trueModel.FirmId),
new SqlParameter("@BuyerId",trueModel.BuyerId),
DeliveredTime,
- new SqlParameter("@Zhuyishixiang",trueModel.Zhuyishixiang),
- new SqlParameter("@Gongzuokaoping",trueModel.Gongzuokaoping),
+ new SqlParameter("@Zhuyishixiang",string.IsNullOrEmpty(trueModel.Zhuyishixiang)?"":trueModel.Zhuyishixiang ),
+ new SqlParameter("@Gongzuokaoping",string.IsNullOrEmpty(trueModel.Gongzuokaoping)?"":trueModel.Gongzuokaoping ),
new SqlParameter("@CarId",trueModel.CarId),
new SqlParameter("@DriverId",trueModel.DriverId),
new SqlParameter("@Transferstatus",trueModel.Transferstatus),
@@ -171,24 +181,26 @@
new SqlParameter("@Creater",trueModel.Creater),
new SqlParameter("@CreateTime",trueModel.CreateTime),
new SqlParameter("@Updater",trueModel.Updater.HasValue?trueModel.Updater.Value:Guid.Empty),
- new SqlParameter("@LastUpdateTime",trueModel.LastUpdateTime.HasValue?trueModel.LastUpdateTime.Value:DateTime.MinValue),
+ LastUpdateTime,
new SqlParameter("@Sort",trueModel.Sort),
new SqlParameter("@DeliverTime",trueModel.DeliverTime),
- new SqlParameter("@wentifankui",trueModel.wentifankui),
- new SqlParameter("@Yichangchuli",trueModel.Yichangchuli),
- new SqlParameter("@Xingzhengzhuize",trueModel.Xingzhengzhuize),
+ new SqlParameter("@wentifankui",string.IsNullOrEmpty(trueModel.wentifankui)?"":trueModel.wentifankui),
+ new SqlParameter("@Yichangchuli",string.IsNullOrEmpty(trueModel.Yichangchuli)?"":trueModel.Yichangchuli),
+ new SqlParameter("@Xingzhengzhuize",string.IsNullOrEmpty(trueModel.Xingzhengzhuize)?"":trueModel.Xingzhengzhuize),
new SqlParameter("@SellerOrderId",trueModel.SellerOrderId),
new SqlParameter("@Dianhua",trueModel.Dianhua),
new SqlParameter("@Dizhi",trueModel.Dizhi),
new SqlParameter("@Remark",trueModel.Remark),
new SqlParameter("@BusinessManagerId",trueModel.BusinessManagerId),
- new SqlParameter("@Biddingcompany",trueModel.Biddingcompany),
+ new SqlParameter("@Biddingcompany",trueModel.Biddingcompany.HasValue?trueModel.Biddingcompany.Value:0),
new SqlParameter("@shifouDelivery",trueModel.shifouDelivery),
new SqlParameter("@Lianxiren",trueModel.Lianxiren),
new SqlParameter("@CompanyName",string.IsNullOrEmpty(trueModel.CompanyName)?"":trueModel.CompanyName),
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("@DeliverPlanPaicheid", trueModel.DeliverPlanPaicheid.HasValue?trueModel.DeliverPlanPaicheid:Guid.Empty),
+
};
try
{
@@ -251,6 +263,16 @@
/// <summary>
+ /// 鍏ㄩ儴鏌ヨ
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.OA_DeliverPlan> GetModelByDeliverPlanPaicheid(Guid deliverPlanPaicheid)
+ {
+ return _dataBase.SelectModel<Model.OA_DeliverPlan>(" * ", " OA_DeliverPlan ", " DeliverPlanPaicheid = '" + deliverPlanPaicheid + "'") as IList<Model.OA_DeliverPlan>;//鎵ц鏌ヨ
+ }
+
+ /// <summary>
/// 鍒嗛〉鏌ヨ
/// </summary>
/// <param name="query"></param>
--
Gitblit v1.9.1