fix

业务工程/分拣库/WCS.WorkEngineering/Extensions/TaskExtension.cs

@@ -623,4 +623,4 @@ namespace WCS.WorkEngineering.Extensions
         [SugarColumn(IsNullable = true, ColumnDescription = "是否在桁架进行码垛")]
         public bool IsTruss { get; set; }
     }
-}
+}

业务工程/分拣库/WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -32,7 +32,7 @@ namespace WCS.WorkEngineering.Systems
             {
                 //获取所有的新建任务，组盘任务不需要
                 taskInfos = db.Default.Queryable<WCS_TaskInfo>().ReadPastUpdLock().Where(x => x.Status == 0).ToList()
-                    .Where(x => x.Type != TaskType.SetPlate || (x.Type == TaskType.SetPlate && x.AddrFrom != "Robot") && x.BusType != "人工满托入库").Select(x => x.ID).ToList();
+                    .Where(x => x.Type != TaskType.SetPlate || (x.Type == TaskType.SetPlate && x.AddrFrom != "Robot")).Where(x => x.BusType != "人工满托入库").Select(x => x.ID).ToList();
                 var time = DateTime.Now.AddMinutes(-20);
                 var time1 = DateTime.Now.AddMinutes(-40);
                 var timeOut = db.Default.Queryable<WCS_TaskInfo>().NoLock().Count(x => x.BusType == "车间叫料" && x.Status < TaskStatus.StackerExecution && x.AddTime < time);
@@ -62,6 +62,7 @@ namespace WCS.WorkEngineering.Systems
                     SqlSugarHelper.Do(db =>
                     {
                         var task = db.Default.Queryable<WCS_TaskInfo>().Where(t => t.ID == item).First();
+
                         switch (task.Type)
                         {
                             case TaskType.SetPlate:
@@ -247,6 +248,7 @@ namespace WCS.WorkEngineering.Systems
                 }
                 catch (Exception ex)
                 {
+                    if (ex.Message.Contains("Index")) World.Log($"{ex.Message}:{ex.StackTrace}");
                     if (ex.Message.Contains("SqlTransaction")) World.Log($"{ex.Message}:{ex.StackTrace}");
                     World.Log(ex.Message, LogLevelEnum.Mid);
                 }

业务工程/分拣库/WCS.WorkEngineering/Systems/UpLoadSystems.cs

@@ -68,7 +68,10 @@ namespace WCS.WorkEngineering.Systems
                 var nowTime = DateTime.Now;
                 var db = _db.Default;
                 var taskList = db.Queryable<WCS_TaskOld>().UpdLock()
-                    .Where(x =>((x.Type == TaskType.SetPlate && x.WarehouseCode.Contains("R")) || ((x.Type == TaskType.EnterDepot || x.Type == TaskType.OutDepot) && !x.WarehouseCode.Contains("R"))) && x.Status == TaskStatus.Finish&& x.Uploaded != TaskStatus.Finish).SplitTable(x => x.Take(2)).ToList();
+                    .Where(x =>((x.Type == TaskType.SetPlate && x.WarehouseCode.Contains("R")) 
+                                || ((x.Type == TaskType.EnterDepot || x.Type == TaskType.OutDepot) && !x.WarehouseCode.Contains("R"))) 
+                               && x.Status == TaskStatus.Finish&& x.Uploaded != TaskStatus.Finish)
+                    .SplitTable(x => x.Take(2)).ToList();
                                 
                                 
                                

业务工程/分拣库/WCS.WorkEngineering/Systems/一楼扫码入库.cs

@@ -140,7 +140,7 @@ namespace WCS.WorkEngineering.Systems
                         taskInfo.SrmStation = taskInfo.AddrFrom;
                         taskInfo.LastInteractionPoint = obj.Entity.Code;
                         taskInfo.Tunnel = tunnel.Code;
-                        taskInfo.Height = 2;
+                        taskInfo.Height = 1;
                         taskInfo.Device = obj.Entity.Code switch
                         {
                             "2532" => "SRM1",
@@ -151,7 +151,17 @@ namespace WCS.WorkEngineering.Systems
                             "3532" => "SRM6",
                             _ => taskInfo.Device
                         };
-                        db.UpdateableRowLock(taskInfo).UpdateColumns(x => new { x.Status, x.StartTime, x.SrmStation, x.LastInteractionPoint, x.Tunnel, x.Height, x.Device }).ExecuteCommand();
+                        taskInfo.WarehouseCode = obj.Entity.Code switch
+                        {
+                            "2532" => "1N",
+                            "2732" => "1S",
+                            "2932" => "2N",
+                            "3132" => "2S",
+                            "3332" => "3N",
+                            "3532" => "3S",
+                            _ => taskInfo.Device
+                        };
+                        db.UpdateableRowLock(taskInfo).UpdateColumns(x => new { x.Status, x.StartTime, x.SrmStation, x.LastInteractionPoint, x.Tunnel, x.Height, x.Device, x.WarehouseCode }).ExecuteCommand();
                         taskInfo.AddWCS_TASK_DTL(db, obj.Entity.Code, "开始执行入库任务");
                         task = taskInfo;
                     }