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_WageAwardPunishDAL.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
index 82e8df7..81f6763 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
@@ -97,6 +97,39 @@
return true;
}
+
+ /// <summary>
+ /// 淇敼
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public bool UpdateShifoushensu(Model.OA_WageAwardPunish model)
+ {
+ if (model == null)
+ {
+ return false;
+ }
+ IList<SqlParameter> sqlParms = new List<SqlParameter>()
+ {
+ new SqlParameter("@Keyid", model.Keyid) ,
+
+ new SqlParameter("@Shifoushensu", model.Shifoushensu.HasValue?model.Shifoushensu.Value:0) ,
+
+ };
+ string sql = "Update OA_WageAwardPunish Set [Shifoushensu]=@Shifoushensu where [Keyid] =@Keyid ";
+
+ try
+ {
+ _dataBase.ExecuteSql(sql, sqlParms.ToArray<SqlParameter>());
+ }
+ catch (Exception ex)
+ {
+ throw ex;
+ }
+ return true;
+ }
+
+
/// <summary>
/// 鍒犻櫎
/// </summary>
@@ -231,7 +264,7 @@
/// <param name="PlanPeople"></param>
/// <param name="StatisticsTime"></param>
/// <returns></returns>
- public IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime)
+ public IEnumerable<Model.OA_WageAwardPunish> SelectModelPageByWage(Infrastructure.Query.Pagination pagination, Guid MemberId, int? DepartmentId, string PlanPeople, string StatisticsTime, string EndisticsTime, string selStatus = "")
{
try
{
@@ -245,6 +278,9 @@
if (DepartmentId.HasValue)
condition += " and a.DepartmentId = '" + DepartmentId + "' ";
+ if (!string.IsNullOrEmpty(selStatus))
+ condition += " and a.Status = '" + selStatus + "' ";
+
string condition1 = "";
string condition2 = "";
@@ -252,9 +288,19 @@
{
StatisticsTime = StatisticsTime.Replace("骞�", "-").Replace("鏈�", "-") + "1";
DateTime Time1 = DateTime.Parse(StatisticsTime);
- DateTime Time2 = DateTime.Parse(StatisticsTime).AddMonths(1);
- condition1 += " and ((b.RecTime >= '" + Time1 + "' and b.RecTime < '" + Time2 + "') or b.RecTime is null)";
- condition2 += " and ((c.RecTime >= '" + Time1 + "' and c.RecTime < '" + Time2 + "') or c.RecTime is null)";
+ //DateTime Time2 = DateTime.Parse(StatisticsTime).AddMonths(1);
+ condition1 += " and ((b.RecTime >= '" + Time1 + "' ) or b.RecTime is null)";//and b.RecTime < '" + Time2 + "'
+ condition2 += " and ((c.RecTime >= '" + Time1 + "' ) or c.RecTime is null)";// and c.RecTime < '" + Time2 + "'
+ }
+
+
+ if (!string.IsNullOrEmpty(EndisticsTime))
+ {
+ EndisticsTime = EndisticsTime.Replace("骞�", "-").Replace("鏈�", "-") + "1";
+ //DateTime Time1 = DateTime.Parse(StatisticsTime);
+ DateTime Time2 = DateTime.Parse(EndisticsTime).AddMonths(1);
+ condition1 += " and (( b.RecTime < '" + Time2 + "') or b.RecTime is null)";//b.RecTime >= '" + Time1 + "' and
+ condition2 += " and (( c.RecTime < '" + Time2 + "') or c.RecTime is null)";//c.RecTime >= '" + Time1 + "' and
}
//condition += string.Format(" and ( a.Status='鍦ㄨ亴' OR ( a.Status ='绂昏亴' AND CAST(a.SM_EndWorkTime AS DATE) >'{0}' )) ", DateTime.Now);
--
Gitblit v1.9.1