Merge branch 'master' into liudl

bklLiudl

2024-09-12 810c6d3a204615a12705f27d62cd7f765b4fdfaa

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

@@ -42,6 +42,9 @@
                case PLCTypeEnum.PalletMachine:
                    PalletMachine(mod);
                    break;
                case PLCTypeEnum.StackingRobot:
                    PalletMachine(mod);
                    break;
                default:
                    break;
            }
@@ -902,7 +905,7 @@

                        var djMod = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.EndRoadway
                            && m.DeviceType == DeviceTypeEnum.Business && m.IsDelete == false);
                        var djInfos = PLCTaskAction.plcStation.Where(m => m.IsDelete == false && m.DeviceId == djMod.Id).ToList();
                        var djInfos = PLCTaskAction.plcPositions.Where(m => m.IsDelete == false && m.DeviceId == djMod.Id).ToList();
                        var djInfo = djInfos.First(m => m.Text == "PLC流程字");

                        // 获取跺机当前状态
@@ -1104,6 +1107,25 @@

    }

    /// <summary>
    /// 拆垛机器人业务处理
    /// </summary>
    /// <param name="modDevice"></param>
    private static void StackingRobot(WcsDeviceDto modDevice) 
    {
        var plcConn = modDevice.PLCUtil;
        switch (modDevice.Value.ToString())
        {
            case "0":
                {
                    // 若拆垛工位为空闲，查询任务表是否有未绑定的出库任务，做绑定操作
                }
                break;
            default:
                break;
        }
    }

    private static void Test(WcsDeviceDto modDevice)
    {
        //写死测试读string