From 374ce108d737c1e4d6608989090195a7346d10ad Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 26 二月 2026 08:47:21 +0800
Subject: [PATCH] 优化格式美观度。 完成 (1)“印刷、打包、送货要求”放在右边的格子里面;右边格子拉通 (2)“单价”和“总价”的格子比例要调整适中 (3)把“印件名称”放在第一格 (1)操作中增加“问题处理”,进行处理操作 完成 (2)问题反馈除了生成在这个列表中,还要自动推送给对应订单的下单人或者送货安排(发起工作安排)的安排人,显示在他们的“工作提醒”中,处理完了就在列表中变成已完成问题处理,显示“√”,点“√”进去就显示谁处理的、什么时候处理的。 完成 生产施工单中,选“轮转印刷机”的,删除“纸张数量(张)”和“开料规格” 完成
---
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