From a6cad2fe831204993e4615c58d17d1a8fb689725 Mon Sep 17 00:00:00 2001 From: cnf <3200815559@qq.com> Date: 星期一, 15 九月 2025 17:07:51 +0800 Subject: [PATCH] 委外工单修改 --- MES.Service/service/BasicData/MesPositionManager.cs | 71 +++++++++++++---------------------- 1 files changed, 26 insertions(+), 45 deletions(-) diff --git a/MES.Service/service/BasicData/MesPositionManager.cs b/MES.Service/service/BasicData/MesPositionManager.cs index 03a25e3..8b1950d 100644 --- a/MES.Service/service/BasicData/MesPositionManager.cs +++ b/MES.Service/service/BasicData/MesPositionManager.cs @@ -35,8 +35,7 @@ return 1; break; default: - throw new ArgumentNullException( - $"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�"); + throw new ArgumentNullException($"type娌℃湁{unit.Type}杩欎釜绫诲瀷鐨勫弬鏁�"); } throw new NotImplementedException("鎿嶄綔澶辫触"); @@ -44,24 +43,21 @@ } // 鏇存柊宀椾綅鐘舵�佺殑鏂规硶 - private bool UpdatePositionStatus(SqlSugarScope db, decimal positionId, - string status) + private bool UpdatePositionStatus(SqlSugarScope db, decimal positionId,string status) { - var result = db.Updateable<MesPosition>() - .SetColumns(s => s.Fforbidstatus == status) - .Where(s => s.Id == positionId).ExecuteCommand(); + var result = db.Updateable<MesPosition>().SetColumns(s => s.Fforbidstatus == status).Where(s => s.Id == positionId).ExecuteCommand(); if (result > 0) + { return true; - + } throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触"); } // 鎻掑叆鎴栨洿鏂板矖浣嶇殑鏂规硶 private bool InsertOrUpdatePosition(SqlSugarScope db, MesPosition entity) { - db.Deleteable<MesPosition>() - .Where(s => s.Id == entity.Id).ExecuteCommand(); + db.Deleteable<MesPosition>().Where(s => s.Id == entity.Id).ExecuteCommand(); var insert = db.Insertable(entity).ExecuteCommand(); return insert > 0; } @@ -69,11 +65,11 @@ // 鍒犻櫎宀椾綅鐨勬柟娉� private bool DeletePosition(SqlSugarScope db, decimal positionId) { - var deleteById = db.Deleteable<MesPosition>() - .Where(s => s.Id == positionId).ExecuteCommand(); + var deleteById = db.Deleteable<MesPosition>().Where(s => s.Id == positionId).ExecuteCommand(); if (deleteById > 0) + { return true; - + } throw new NotImplementedException("鍒犻櫎澶辫触"); } @@ -90,15 +86,9 @@ Fforbidstatus = position.FForbidStatus, FUseOrgId = position.FUseOrgId, FCreateOrgId = position.FCreateOrgId, - CreationDate = position.FCreateDate != null - ? DateTime.ParseExact(position.FCreateDate, - "yyyy-MM-dd HH:mm:ss", null) - : null, + CreationDate = position.FCreateDate != null ? DateTime.ParseExact(position.FCreateDate, "yyyy-MM-dd HH:mm:ss", null) : null, DisabledBy = position.FForbidderId, - DisabledDate = position.FForbidDate != null - ? DateTime.ParseExact(position.FForbidDate, - "yyyy-MM-dd HH:mm:ss", null) - : null, + DisabledDate = position.FForbidDate != null ? DateTime.ParseExact(position.FForbidDate, "yyyy-MM-dd HH:mm:ss", null) : null, FDocumentStatus = position.FDocumentStatus }; } @@ -114,37 +104,31 @@ list.Add(entity); }); - var groupBy = list.GroupBy(s => s.Type) - .ToDictionary(g => g.Key, g => g.ToList()); + var groupBy = list.GroupBy(s => s.Type).ToDictionary(g => g.Key, g => g.ToList()); return UseTransaction(db => { foreach (var positionGroup in groupBy) switch (positionGroup.Key) { case "0": - if (!UpdatePositionStatusBatch(db, positionGroup.Value, - "A")) // 鎵归噺鍚敤宀椾綅 + if (!UpdatePositionStatusBatch(db, positionGroup.Value, "A")) // 鎵归噺鍚敤宀椾綅 throw new NotImplementedException("鍚敤澶辫触"); break; case "1": - if (!UpdatePositionStatusBatch(db, positionGroup.Value, - "B")) // 鎵归噺绂佺敤宀椾綅 + if (!UpdatePositionStatusBatch(db, positionGroup.Value, "B")) // 鎵归噺绂佺敤宀椾綅 throw new NotImplementedException("绂佺敤澶辫触"); break; case "3": - if (!DeletePositionBatch(db, - positionGroup.Value)) // 鎵归噺鍒犻櫎宀椾綅 + if (!DeletePositionBatch(db, positionGroup.Value)) // 鎵归噺鍒犻櫎宀椾綅 throw new NotImplementedException("鍒犻櫎澶辫触"); break; case "2": case "4": - if (!InsertOrUpdatePositionBatch(db, - positionGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板矖浣� + if (!InsertOrUpdatePositionBatch(db, positionGroup.Value)) // 鎵归噺鎻掑叆鎴栨洿鏂板矖浣� throw new NotImplementedException("鍚屾澶辫触"); break; default: - throw new ArgumentNullException( - $"type娌℃湁{positionGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�"); + throw new ArgumentNullException( $"type娌℃湁{positionGroup.Key}杩欎釜绫诲瀷鐨勫弬鏁�"); } return 1; @@ -152,17 +136,15 @@ } // 鎵归噺鏇存柊宀椾綅鐘舵�佺殑鏂规硶 - private bool UpdatePositionStatusBatch(SqlSugarScope db, - List<MesPosition> positionList, string status) + private bool UpdatePositionStatusBatch(SqlSugarScope db, List<MesPosition> positionList, string status) { var ids = positionList.Select(it => it.Id).ToArray(); - var result = db.Updateable<MesPosition>() - .SetColumns(s => s.Fforbidstatus == status) - .Where(s => ids.Contains(s.Id)).ExecuteCommand(); + var result = db.Updateable<MesPosition>().SetColumns(s => s.Fforbidstatus == status).Where(s => ids.Contains(s.Id)).ExecuteCommand(); if (result > 0) + { return true; - + } throw new NotImplementedException(status == "A" ? "鍚敤澶辫触" : "绂佺敤澶辫触"); } @@ -178,23 +160,22 @@ } // 鎵归噺鍒犻櫎宀椾綅鐨勬柟娉� - private bool DeletePositionBatch(SqlSugarScope db, - List<MesPosition> positionList) + private bool DeletePositionBatch(SqlSugarScope db,List<MesPosition> positionList) { var ids = positionList.Select(it => it.Id).ToArray(); - var deleteByIds = db.Deleteable<MesPosition>() - .Where(s => ids.Contains(s.Id)).ExecuteCommand(); + var deleteByIds = db.Deleteable<MesPosition>().Where(s => ids.Contains(s.Id)).ExecuteCommand(); if (deleteByIds > 0) + { return true; + } throw new NotImplementedException("鍒犻櫎澶辫触"); } // 鎵归噺鎻掑叆鎴栨洿鏂板矖浣嶇殑鏂规硶 - private bool InsertOrUpdatePositionBatch(SqlSugarScope db, - List<MesPosition> positionList) + private bool InsertOrUpdatePositionBatch(SqlSugarScope db,List<MesPosition> positionList) { return positionList.All(entity => InsertOrUpdatePosition(db, entity)); } -- Gitblit v1.9.3