上海黄海制药
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
chengsc
2025-04-20 8246dd0db17f84a7ab3760670e445eb18756a288 
 Admin.NET/WCS.Application/OpenApi/OpenApi.cs


@@ -568,6 +568,7 @@


                                };


                                _db.Insertable(modTaskMonitor).ExecuteCommand();


                                HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());


                                //写入光幕0


                                Task.Run(() =>


                                {


                                    var modDevice = PLCTaskAction.plcDevices.FirstOrDefault(s => s.PlcId == modPlc.Id && s.Level == DeviceLevelEnum.DB);


@@ -586,6 +587,7 @@


                                    HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());


                                });




                                //向码垛机器人写取托完成信号


                                modDevice = PLCTaskAction.plcDevices.FirstOrDefault(s => s.PlcId == modPlc.Id && s.Level == DeviceLevelEnum.Station);


                                res = modConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.PlcPos, "0");


                                modTaskMonitor = new WcsTaskMonitor()


@@ -600,6 +602,7 @@


                                HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());


                                modConn.Close();


                            }


                            //起始工位是提升机取货工位


                            if (modTask.StartLocate == AGVStaionEnum.A1.ToString())


                            {


                                var modPlc = PLCTaskAction.plcs.FirstOrDefault(s => s.Type == PLCTypeEnum.ConveyorLine);


@@ -607,6 +610,7 @@


                                var modDevice = PLCTaskAction.plcDevices.FirstOrDefault(s => s.PlcId == modPlc.Id && s.Text == "C口");


                                var modPos = PLCTaskAction.plcPositions.FirstOrDefault(s => s.DeviceId == modDevice.Id && s.Text == "取走确认");


                                var res = modConn.SetPlcDBValue(modPos.PosType, modDevice.DbNumber, modPos.PlcPos, "1");


                                Log.Information($"向plc{modDevice.PlcId}写入1-取走确认，结果：{res.ToJson()}");


                                var modTaskMonitor = new WcsTaskMonitor()


                                {


                                    TaskNo = modTask.TaskNo,


@@ -734,7 +738,16 @@


    }








    /// <summary>


    /// 获取原材料仓状态


    /// </summary>


    /// <returns></returns>


    [HttpPost]


    public async Task<bool> HuoQuMateralStatus()


    {


        var data =  await _sysConfigService.GetConfigValue<bool>("cache_Materal");


        return data;


    }


    /// <summary>


    /// 修改原材料仓状态


    /// </summary>