From fa8310bfd01c7f3123077d6d2f6a96a92645a034 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 09 四月 2026 08:43:30 +0800
Subject: [PATCH] 板材填了就减少库存   根据  板材规格    数量(张)和  发版套数  算出库存需要减少的量,减少库存  完成

---
 CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs |   62 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
index 82e8df7..5d32352 100644
--- a/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
+++ b/CY_ECommercePlatform/CY.SQLDAL/OA/OA_WageAwardPunishDAL.cs
@@ -47,7 +47,9 @@
                 new SqlParameter("@RecMoney", trueModel.RecMoney) ,            
                 new SqlParameter("@PlanId", trueModel.PlanId) ,            
                 new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
-                new SqlParameter("@Operator", trueModel.Operator)             
+                new SqlParameter("@Operator", trueModel.Operator),
+                new SqlParameter("@LaiyuanType", trueModel.LaiyuanType.HasValue?trueModel.LaiyuanType.Value:0) ,
+                new SqlParameter("@WentiId", trueModel.WentiId.HasValue?trueModel.WentiId.Value:Guid.Empty) ,
             };
             try
             {
@@ -84,7 +86,9 @@
                 new SqlParameter("@RecMoney", trueModel.RecMoney) ,            
                 new SqlParameter("@PlanId", trueModel.PlanId) ,            
                 new SqlParameter("@LastUpdateTime", trueModel.LastUpdateTime) ,            
-                new SqlParameter("@Operator", trueModel.Operator)             
+                new SqlParameter("@Operator", trueModel.Operator),
+               new SqlParameter("@LaiyuanType", trueModel.LaiyuanType.HasValue?trueModel.LaiyuanType.Value:0) ,
+               new SqlParameter("@WentiId", trueModel.WentiId.HasValue?trueModel.WentiId.Value:Guid.Empty) ,
             };
             try
             {
@@ -96,6 +100,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>
         /// 鍒犻櫎
@@ -231,7 +268,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 +282,9 @@
                 if (DepartmentId.HasValue)
                     condition += " and a.DepartmentId = '" + DepartmentId + "' ";
 
+                if (!string.IsNullOrEmpty(selStatus))
+                    condition += " and a.Status = '" + selStatus + "' ";
+
 
                 string condition1 = "";
                 string condition2 = "";
@@ -252,9 +292,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