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_CarManageDAL.cs | 79 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 76 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs
index ebaaacc..6d4ae0f 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_CarManageDAL.cs
@@ -36,6 +36,37 @@
{
return false;
}
+ SqlParameter InsuranceEndTime = null;
+ if(trueModel.InsuranceEndTime.HasValue)
+ {
+ InsuranceEndTime = new SqlParameter("@InsuranceEndTime", trueModel.InsuranceEndTime);
+ }
+ else
+ {
+ InsuranceEndTime = new SqlParameter("@InsuranceEndTime", DBNull.Value);
+ }
+
+ SqlParameter MaintenanceNextTime = null;
+ if (trueModel.MaintenanceNextTime.HasValue)
+ {
+ MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", trueModel.MaintenanceNextTime);
+ }
+ else
+ {
+ MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", DBNull.Value);
+ }
+
+ SqlParameter ExaminedNextTime = null;
+ if (trueModel.ExaminedNextTime.HasValue)
+ {
+ ExaminedNextTime = new SqlParameter("@ExaminedNextTime", trueModel.ExaminedNextTime);
+ }
+ else
+ {
+ ExaminedNextTime = new SqlParameter("@ExaminedNextTime", DBNull.Value);
+ }
+
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
new SqlParameter("@MemberID", trueModel.MemberID) ,
@@ -46,7 +77,14 @@
new SqlParameter("@CarCondition", trueModel.CarCondition) ,
new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
new SqlParameter("@Operator", trueModel.Operator) ,
- new SqlParameter("@OrderNum", trueModel.OrderNum)
+ new SqlParameter("@OrderNum", trueModel.OrderNum),
+ new SqlParameter("@StaffID", trueModel.StaffID),
+ new SqlParameter("@InsuranceCompany", trueModel.InsuranceCompany),
+ InsuranceEndTime,
+ MaintenanceNextTime,
+ ExaminedNextTime,
+ new SqlParameter("@InsuranceContent", trueModel.InsuranceContent),
+
};
try
{
@@ -71,6 +109,35 @@
{
return false;
}
+ SqlParameter InsuranceEndTime = null;
+ if (trueModel.InsuranceEndTime.HasValue)
+ {
+ InsuranceEndTime = new SqlParameter("@InsuranceEndTime", trueModel.InsuranceEndTime);
+ }
+ else
+ {
+ InsuranceEndTime = new SqlParameter("@InsuranceEndTime", DBNull.Value);
+ }
+ SqlParameter MaintenanceNextTime = null;
+ if (trueModel.MaintenanceNextTime.HasValue)
+ {
+ MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", trueModel.MaintenanceNextTime);
+ }
+ else
+ {
+ MaintenanceNextTime = new SqlParameter("@MaintenanceNextTime", DBNull.Value);
+ }
+
+ SqlParameter ExaminedNextTime = null;
+ if (trueModel.ExaminedNextTime.HasValue)
+ {
+ ExaminedNextTime = new SqlParameter("@ExaminedNextTime", trueModel.ExaminedNextTime);
+ }
+ else
+ {
+ ExaminedNextTime = new SqlParameter("@ExaminedNextTime", DBNull.Value);
+ }
+
IList<SqlParameter> sqlParms = new List<SqlParameter>()
{
new SqlParameter("@Keyid", trueModel.Keyid) ,
@@ -82,7 +149,13 @@
new SqlParameter("@CarCondition", trueModel.CarCondition) ,
new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,
new SqlParameter("@Operator", trueModel.Operator) ,
- new SqlParameter("@OrderNum", trueModel.OrderNum)
+ new SqlParameter("@OrderNum", trueModel.OrderNum),
+ new SqlParameter("@StaffID", trueModel.StaffID),
+ new SqlParameter("@InsuranceCompany", trueModel.InsuranceCompany),
+ new SqlParameter("@InsuranceContent", trueModel.InsuranceContent),
+ InsuranceEndTime,
+ MaintenanceNextTime,
+ ExaminedNextTime,
};
try
{
@@ -207,7 +280,7 @@
if (_OrderNum.HasValue)
condition += " and a.OrderNum = '" + _OrderNum + "'";
- return _dataBase.SelectModelPage<Model.OA_CarManage>(pagination, " a.*,f.Name as CarConditionName ", " OA_CarManage as a LEFT JOIN dbo.Sys_Dictionary AS f ON a.CarCondition = f.MeanValue AND f.DicType='杞﹁締鐘舵��' ", " a.OrderNum ASC", " OrderNum ASC ", condition);
+ return _dataBase.SelectModelPage<Model.OA_CarManage>(pagination, " a.*,f.Name as CarConditionName,g.Name as StaffName ", " OA_CarManage as a LEFT JOIN dbo.Sys_Dictionary AS f ON a.CarCondition = f.MeanValue AND f.DicType='杞﹁締鐘舵��' LEFT JOIN dbo.[OA_Staff] AS g ON a.StaffID = g.Keyid ", " a.OrderNum ASC", " OrderNum ASC ", condition);
}
catch (Exception ex)
{
--
Gitblit v1.9.1