Merge branch 'csc'

chengsc

2 天以前 969aafa8bd335025da4caf5939a1626bad4f4236

 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs

@@ -385,7 +385,7 @@
                    
                    if (waitTask.TaskType == TaskTypeEnum.In )
                    {
                        //入库任务起始巷道就是起始工位
                        //入库任务起始巷道就是四向车取货工位
                        if (string.IsNullOrWhiteSpace(waitTask.StartRoadway) || string.IsNullOrWhiteSpace(waitTask.EndLocate))
                        {
                            continue;
@@ -397,6 +397,7 @@
                    }
                    else if (waitTask.TaskType == TaskTypeEnum.Out)
                    {
                        //出库任务目标巷道就是四向车放货工位
                        taskceng = int.Parse(waitTask.StartLocate.Substring(4, 2));
                        starLocate = waitTask.StartLocate;
                        endLocate = waitTask.EndRoadway;
@@ -497,7 +498,13 @@
                                }
                                var modCarPall = plcPosition.FirstOrDefault(s => s.Text == "托盘检测");
                                var (resultPall, valuePall) = modbusUtil.GetDBValue(modCarPall.PosType, modCarPall.PlcPos);
                                if (resultPall.IsSucceed && valuePall  == 1)  //1有托盘 2无托盘
                                //var modCarju = plcPosition.FirstOrDefault(s => s.Text == "举升位置");
                                //var (resultju, valueju) = modbusUtil.GetDBValue(modCarju.PosType, modCarju.PlcPos);
                                //if (resultPall.IsSucceed && valuePall == 1  && resultPall.IsSucceed && valuePall != 1)  //1顶货 2子通道  3主通道
                                //{
                                //    break; //暂缓分配 
                                //}
                                if (resultPall.IsSucceed && valuePall == 1)  //1有托盘 2无托盘
                                {
                                    break; //暂缓分配 
                                }