fix

WCS.WorkEngineering/Systems/SrmSystems.cs

@@ -67,7 +67,7 @@ namespace WCS.WorkEngineering.Systems
             if (obj.Data2.TaskFinishiId > 0)
             {
                 WCS_TaskInfo taskInfo = null;
-                var result = SqlSugarHelper.Do(db =>
+                SqlSugarHelper.Do(db =>
                   {
                       //根据DB521任务号获取对应任务
                       var task = db.Default.Queryable<WCS_TaskInfo>().First(v => v.ID == obj.Data2.TaskFinishiId) ?? throw new KnownException($"未找到任务{obj.Data2.TaskFinishiId}", LogLevelEnum.High);
@@ -108,7 +108,7 @@ namespace WCS.WorkEngineering.Systems
 
                       taskInfo = task;
                   });
-                if (!result && taskInfo == null) throw new KnownException("数据库提交事务错误", LogLevelEnum.High);
+                if (taskInfo == null) throw new KnownException("数据库提交事务错误", LogLevelEnum.High);
                 //通知WMS任务完成
                 if (taskInfo.Status == TaskStatus.Finish) WmsApi.CompleteTask(taskInfo.ID);
                 if (taskInfo.Type == TaskType.OutDepot && taskInfo.Status == TaskStatus.ConveyorExecution) WmsApi.SrmPickOutCompleted(taskInfo.ID);
@@ -161,7 +161,7 @@ namespace WCS.WorkEngineering.Systems
             if (isTransfer)
             {
                 WCS_TaskInfo taskInfo = null;
-                var result = SqlSugarHelper.Do(db =>
+                SqlSugarHelper.Do(db =>
                    {
                        //获取一条当前堆垛机优先级最高的新建移库任务
                        var task = db.Default.Queryable<WCS_TaskInfo>().Where(v => v.Device == obj.Entity.Code && v.Type == TaskType.TransferDepot && v.Status == Entity.TaskStatus.NewBuild)
@@ -175,7 +175,7 @@ namespace WCS.WorkEngineering.Systems
                        db.Default.SaveQueues();
                        taskInfo = task;
                    });
-                if (taskInfo == null || !result) throw new KnownException("数据更新错误", LogLevelEnum.High);
+                if (taskInfo == null) throw new KnownException("数据更新错误", LogLevelEnum.High);
                 var addrFrom = taskInfo.AddrFrom.Split("-");
                 var addrTo = taskInfo.AddrTo.Split("-");
                 //下发任务
@@ -214,7 +214,7 @@ namespace WCS.WorkEngineering.Systems
                 if (!arrIn.Any()) throw new KnownException($"[{obj.Entity.Code}]等待入库任务输送到位", LogLevelEnum.Mid);
                 WCS_TaskInfo taskInfo = null;
                 Station station = null;
-                var result = SqlSugarHelper.Do(db =>
+                SqlSugarHelper.Do(db =>
                 {
                     //根据有货设备的任务号获取所有类型为入库状态为输送机执行中的任务
                     var tasks = db.Default.Queryable<WCS_TaskInfo>().Where(v => (v.Type == TaskType.EnterDepot || v.Type == TaskType.EmptyInit)
@@ -236,7 +236,7 @@ namespace WCS.WorkEngineering.Systems
                     taskInfo = task;
                 });
 
-                if (taskInfo == null || !result) throw new KnownException("数据更新错误", LogLevelEnum.High);
+                if (taskInfo == null) throw new KnownException("数据更新错误", LogLevelEnum.High);
                 var addrTo = taskInfo.AddrTo.Split("-");
                 //下发任务
                 obj.Data.TaskNumber = taskInfo.ID;
@@ -274,7 +274,7 @@ namespace WCS.WorkEngineering.Systems
 
                 WCS_TaskInfo taskInfo = null;
 
-                var result = SqlSugarHelper.Do(db =>
+                SqlSugarHelper.Do(db =>
                {
                    var allOutCode = arrOut.Select(v => v.Entity.Code).ToList();
 
@@ -289,7 +289,7 @@ namespace WCS.WorkEngineering.Systems
                    db.Default.SaveQueues();
                });
 
-                if (taskInfo == null || !result) throw new KnownException("数据更新错误", LogLevelEnum.High);
+                if (taskInfo == null) throw new KnownException("数据更新错误", LogLevelEnum.High);
 
                 var addrFrom = taskInfo.AddrFrom.Split("-");
 

WCS.WorkEngineering/Systems/二楼入库工位处理系统.cs

@@ -42,39 +42,39 @@ namespace WCS.WorkEngineering.Systems
             if (obj.Data2.Request != 1) throw new KnownException("没有请求", LogLevelEnum.Low);
 
             WCS_TaskInfo task = null;
-            var result = SqlSugarHelper.Do(db =>
-            {
-                if (obj.Entity.Code == "1025")
-                {
-                    var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.SrmStation == "1025" && v.Device == "SRM3" && v.Type == TaskType.EmptyInit && v.Status == Entity.TaskStatus.WaitingToExecute);
-                    if (taskInfo != null)
-                    {
-                        task = taskInfo;
-                        if (task.Type != TaskType.EmptyInit && task.Status != Entity.TaskStatus.WaitingToExecute) throw new KnownException($"任务:{task.ID}状态不是AGV执行中，请检查异常原因", LogLevelEnum.High);
-                    }
-                }
+            SqlSugarHelper.Do(db =>
+           {
+               if (obj.Entity.Code == "1025")
+               {
+                   var taskInfo = db.Default.Queryable<WCS_TaskInfo>().First(v => v.SrmStation == "1025" && v.Device == "SRM3" && v.Type == TaskType.EmptyInit && v.Status == Entity.TaskStatus.WaitingToExecute);
+                   if (taskInfo != null)
+                   {
+                       task = taskInfo;
+                       if (task.Type != TaskType.EmptyInit && task.Status != Entity.TaskStatus.WaitingToExecute) throw new KnownException($"任务:{task.ID}状态不是AGV执行中，请检查异常原因", LogLevelEnum.High);
+                   }
+               }
 
-                if (task == null)
-                {
-                    //跟据RFID获取对应的任务
-                    task = db.Default.Queryable<WCS_TaskInfo>().First(v => v.BarCode == obj.Entity.Code) ?? throw new KnownException($"未找到任务号:{obj.Entity.Code}对应WCS任务", LogLevelEnum.High);
-                    if (task.Status != Entity.TaskStatus.AGVExecution) throw new KnownException($"任务:{task.ID}状态不是AGV执行中，请检查异常原因", LogLevelEnum.High);
-                }
+               if (task == null)
+               {
+                   //跟据RFID获取对应的任务
+                   task = db.Default.Queryable<WCS_TaskInfo>().First(v => v.BarCode == obj.Entity.Code) ?? throw new KnownException($"未找到任务号:{obj.Entity.Code}对应WCS任务", LogLevelEnum.High);
+                   if (task.Status != Entity.TaskStatus.AGVExecution) throw new KnownException($"任务:{task.ID}状态不是AGV执行中，请检查异常原因", LogLevelEnum.High);
+               }
 
-                if (obj.Entity.Code == "1025")
-                {
-                    //获取称重
-                    var dev91 = Device.All.Where(v => v.Code == obj.Entity.Code).Select(v => new Device<IStation91>(v, this.World)).FirstOrDefault();
-                    task.Weight = dev91.Data.Weight;
-                    WmsApi.WcsUploadInfo(task.ID, (decimal)task.Weight, task.BarCode);
-                }
+               if (obj.Entity.Code == "1025")
+               {
+                   //获取称重
+                   var dev91 = Device.All.Where(v => v.Code == obj.Entity.Code).Select(v => new Device<IStation91>(v, this.World)).FirstOrDefault();
+                   task.Weight = dev91.Data.Weight;
+                   WmsApi.WcsUploadInfo(task.ID, (decimal)task.Weight, task.BarCode);
+               }
 
-                task.Status = Entity.TaskStatus.ConveyorExecution;
-                db.Default.Updateable(task).AddQueue();
-                task.AddWCS_TASK_DTL(db, obj.Entity.Code, "SRM", $"状态更新为{Entity.TaskStatus.ConveyorExecution},等待分配货位后堆垛机进行取货");
-                db.Default.SaveQueues();
-            });
-            if (task == null || !result) throw new KnownException("数据更新错误", LogLevelEnum.High);
+               task.Status = Entity.TaskStatus.ConveyorExecution;
+               db.Default.Updateable(task).AddQueue();
+               task.AddWCS_TASK_DTL(db, obj.Entity.Code, "SRM", $"状态更新为{Entity.TaskStatus.ConveyorExecution},等待分配货位后堆垛机进行取货");
+               db.Default.SaveQueues();
+           });
+            if (task == null) throw new KnownException("数据更新错误", LogLevelEnum.High);
             obj.Data.TaskNumber = task.ID;
         }