fix

ServiceCenter/SqlSugars/SqlSugarHelper.cs

@@ -22,6 +22,7 @@ namespace ServiceCenter.SqlSugars
         /// PLC据库连接Key
         /// </summary>
         private static string _PLCEX { get; set; } = "";
+
         /// <summary>
         /// PLC据库连接Key
         /// </summary>
@@ -152,7 +153,7 @@ namespace ServiceCenter.SqlSugars
             var db = new SqlSugarHelper();
             try
             {
-                db.Connect.BeginTran(IsolationLevel.ReadCommitted);//开始事务
+                db.Connect.BeginTran();//开始事务
                 if (_Default != "")
                 {
                     db.Default.Ado.CommandTimeOut = 10;
@@ -163,6 +164,7 @@ namespace ServiceCenter.SqlSugars
             catch (Exception ex)
             {
                 db.Connect.RollbackTran();//回滚事务
+                if (ex.Message.Contains("SqlTransaction")) throw new Exception($"{ex.Message}:{ex.StackTrace}");
                 throw new Exception(ex.Message);
             }
         }
@@ -189,8 +191,9 @@ namespace ServiceCenter.SqlSugars
             catch (Exception ex)
             {
                 db.Connect.RollbackTran();//回滚事务
+                if (ex.Message.Contains("SqlTransaction")) throw new Exception($"{ex.Message}:{ex.StackTrace}");
                 throw new Exception(ex.Message);
             }
         }
     }
-}
+}

业务工程/分拣库/WCS.WorkEngineering/Systems/桁架码垛/桁架.cs

@@ -64,28 +64,21 @@ namespace WCS.WorkEngineering.Systems
                         }
 
                         //先更新对应的位信息
-                        try
+                        var index = 0;
+                        foreach (var loc in row.Locs.Where(x => !x.IsEmpty).OrderBy(x => x.XYNo))
                         {
-                            var index = 0;
-                            foreach (var loc in row.Locs.Where(x => !x.IsEmpty).OrderBy(x => x.XYNo))
+                            if (index < cacheLine.Locations.Count)
                             {
-                                if (index < cacheLine.Locations.Count)
-                                {
-                                    var cacheLoc = cacheLine.Locations[index];
-                                    cacheLoc = db.Queryable<WCS_CacheLineLoc>().Single(x => x.Id == cacheLoc.Id);
-                                    loc.TaskId = cacheLoc.TaskId;
-                                    loc.Finish = true;
-
-                                    upDateableLoc.Add(loc);
-                                    deleteLoc.Add(cacheLoc);
-                                    index++;
-                                }
+                                var cacheLoc = cacheLine.Locations[index];
+                                cacheLoc = db.Queryable<WCS_CacheLineLoc>().Single(x => x.Id == cacheLoc.Id);
+                                loc.TaskId = cacheLoc.TaskId;
+                                loc.Finish = true;
+
+                                upDateableLoc.Add(loc);
+                                deleteLoc.Add(cacheLoc);
+                                index++;
                             }
                         }
-                        catch (Exception a)
-                        {
-                            throw new KnownException(a.Message, LogLevelEnum.High);
-                        }
                         row.Finish = true;
                         upDateableRow.Add(row);
                         deleteCacheLine.Add(cacheLine);