From 3501b604e6c756e59dba68a5ed3064e26cfd749f Mon Sep 17 00:00:00 2001
From: hao <1836460075@qq.com>
Date: 星期三, 23 四月 2025 14:13:59 +0800
Subject: [PATCH] 2

---
 StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs b/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs
index c52fcf8..d439b5d 100644
--- a/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs
+++ b/StandardInterface/MES.Service/service/BasicData/Organization/MesPositionManager.cs
@@ -18,11 +18,11 @@
             switch (unit.Type)
             {
                 case "0":
-                    if (UpdatePositionStatus(db, entity.Id, "A")) // 鍚敤宀椾綅
+                    if (UpdatePositionStatus(db, entity.Id, "A", null, "")) // 鍚敤宀椾綅
                         return 1;
                     break;
                 case "1":
-                    if (UpdatePositionStatus(db, entity.Id, "B")) // 绂佺敤宀椾綅
+                    if (UpdatePositionStatus(db, entity.Id, "B", entity.DisabledDate, entity.DisabledBy)) // 绂佺敤宀椾綅
                         return 1;
                     break;
                 //case "2":
@@ -49,10 +49,11 @@
 
     // 鏇存柊宀椾綅鐘舵�佺殑鏂规硶
     private bool UpdatePositionStatus(SqlSugarScope db, decimal positionId,
-        string status)
+        string status, DateTime? jytime, string jyr)
     {
         var result = db.Updateable<MesPosition>()
             .SetColumns(s => s.Fforbidstatus == status)
+            .SetColumns(s => s.DisabledDate == jytime)
             .Where(s => s.Id == positionId).ExecuteCommand();
 
         if (result > 0)
@@ -152,7 +153,8 @@
             DisabledDate = position.FForbidDate != null
                 ? DateTime.ParseExact(position.FForbidDate,
                     "yyyy-MM-dd HH:mm:ss", null)
-                : null
+                : null,
+            Type=position.Type,
         };
     }
 

--
Gitblit v1.9.3