修改问题

IPC-610

2024-10-21 f040136ab8029cc207a8111d21c78bbf315a6dbd

修改问题

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

@@ -1,4 +1,5 @@
using Elastic.Clients.Elasticsearch.Tasks;
using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
using RazorEngine.Compilation.ImpromptuInterface.Dynamic;
using System;
@@ -812,11 +813,11 @@


    /// <summary>
    /// 根据储位排获取跺机对应的地址排
    /// 根据储位排获取跺机对应的地址排03010302
    /// </summary>
    /// <param name="road">排</param>
    /// <param name="pai">排</param>
    /// <param name="dept">深度</param>
    /// <param name="road">排02</param>
    /// <param name="pai">排03</param>
    /// <param name="dept">深度02</param>
    /// <returns></returns>
    public static int GetDjAdress(string road, string pai, string dept)
    {
@@ -844,11 +845,11 @@
            {
                if (deptNum == 1)
                {
                    paiVal = 1;
                    paiVal = 2;
                }
                else
                {
                    paiVal = 2;
                    paiVal = 1;
                }
            }

@@ -883,6 +884,7 @@
        }
        if (paiVal == 0)
        {
            Log.Error("排转换失败!");
            throw new Exception("排转换失败");
        }
        return paiVal;

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

@@ -1,6 +1,7 @@

using Dm.filter;
using DocumentFormat.OpenXml.Bibliography;
using DocumentFormat.OpenXml.Drawing.Charts;
using Elastic.Clients.Elasticsearch.Tasks;
using Furion.Logging;
using IoTClient;
@@ -13,10 +14,13 @@
using System.Reflection.Emit;
using WCS.Application.Entity;
using WCS.Application.Util;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinExpressIntracityUpdateStoreRequest.Types;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.NontaxInsertBillRequest.Types.CardExtra.Types.BillCard.Types;

namespace WCS.Application;
public static class PLCService
{

    private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);

    public static void OnChangeEvent(object sender, EventArgs e)
@@ -58,6 +62,7 @@
    private static void StackingMachine(WcsDeviceDto modDevice)
    {
        var plcConn = modDevice.PLCUtil;
        string ledText = "";
        switch (modDevice.Value.ToString())
        {
            case "820":
@@ -203,8 +208,15 @@
                        _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
                        //下发任务日志
                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());

                        //修改led屏信息
                        //LedDisplay(modDevice.LedIP, "工位:" + modTask.EndLocate, "出库中 " + $"储位地址：{modTask.StartLocate}", "托盘号:" + modTask.PalletNo);
                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == taskInfo.EndStation && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
                        ledText += $"任务类型:{modTask.TaskType.GetDescription()}\n\n";
                        ledText += $"任务号:{modTask.TaskNo}\n";
                        ledText += $"托盘号:{modTask.PalletNo}\n\n";
                        ledText += $"起始位:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
                        ledText += $"目标位:{modTask.EndRoadway + " " + modTask.EndLocate}";
                        LedDisplay(ledDevice.LedIP, ledText);
                    }
                }
                break;
@@ -356,8 +368,6 @@
                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        }

                        //修改led屏信息
                        //LedDisplay(modDevice.LedIP, "工位:" + modTask.EndLocate, "出库中 " + $"储位地址：{modTask.StartLocate}", "托盘号:" + modTask.PalletNo);
                    }
                }
                break;
@@ -371,7 +381,7 @@
                    {
                        string tasknoVal = val.ToString();
                        var modTask = _db.Queryable<WcsTask>().First(m => m.Status == TaskStatusEnum.Doing && m.TaskNo == tasknoVal && m.IsDelete == false);
                        if (modTask == null)
                        if (modTask == null)  
                        {
                            Log.Error(string.Format("跺机控制字860:未找到对应的任务。"));
                            break;
@@ -434,8 +444,16 @@
                                    HubUtil.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());

                                    // led显示内容
                                    LedDisplay(modDevice.LedIP, "工位:" + modTask.StartLocate, "入库完成 " + $"任务完成:{modTask.TaskNo}", "托盘号:" + modTask.PalletNo);
                                    var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modTask.StartLocate && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
                                    ledText += $"入库完成\n\n";

                                    ledText += $"任务号:{modTask.TaskNo}\n";
                                    ledText += $"托盘号:{modTask.PalletNo}\n\n";

                                    ledText += $"起始位:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
                                    ledText += $"目标位:{modTask.EndRoadway + " " + modTask.EndLocate}";

                                    LedDisplay(ledDevice.LedIP, ledText);
                                    // 此处添加不空跑业务
                                }
                                break;
@@ -500,13 +518,6 @@
                                                    _db.Insertable(modcTaskMonitor).ExecuteCommand();
                                                    //下发任务日志
                                                    HubUtil.PublicTaskMonitor(modcTaskMonitor.Adapt<WcsTaskMonitorOutput>());

                                                    // 根据任务号获取起始工位地址，根据起始工位地址获取LEDIP 推送到LED屏幕。
                                                    var taskModel = _db.Queryable<WcsTask>().First(w => w.TaskNo == modTask.TaskNo);
                                                    modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskModel.EndLocate).Select(s => s.LedIP).First();

                                                    // led显示内容
                                                    LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "出库中 ", "托盘号:" + modTask.PalletNo);

                                                    break;
                                                }
@@ -890,6 +901,7 @@
        {
            return;
        }
        var ledText = "";
        switch (modDevice.Value.ToString())
        {
            case "320":
@@ -914,7 +926,10 @@
                        var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
                        if (res350.IsSucceed && palletVal350 != "350") 
                        {
                            LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "申请入库 " + $"入库任务已锁定，请解锁后重试", "托盘号:" + palletVal);
                            ledText += $"申请入库失败\n\n";
                            ledText += $"托盘号:{palletVal}\n";
                            ledText += $"入库任务已锁定，请解锁后重试!\n";
                            LedDisplay(modDevice.LedIP, ledText);
                        }

                        // 写入输送线退回指令
@@ -932,7 +947,10 @@
                        var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
                        if (res350.IsSucceed && palletVal350 != "350")
                        {
                            LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "申请入库 " + $"扫描托盘号失败!", "托盘号:" + palletVal);
                            ledText += $"申请入库失败\n\n";
                            ledText += $"托盘号:{palletVal}\n";
                            ledText += $"扫描托盘号失败!\n";
                            LedDisplay(modDevice.LedIP, ledText);
                        }

                        // 写入输送线退回指令
@@ -981,7 +999,15 @@
                            // led显示内容
                            try
                            {
                                LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "申请入库 " + $"目标巷道：{taskInfo.EndRoadway}取货工位：{EndLocate}", "托盘号:" + palletVal);
                                ledText += $"任务类型:{taskInfo.TaskType.GetDescription()}\n\n";

                                ledText += $"任务号:{taskInfo.TaskNo}\n";
                                ledText += $"托盘号:{taskInfo.PalletNo}\n\n";

                                ledText += $"起始位:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
                                ledText += $"目标位:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
                                LedDisplay(modDevice.LedIP, ledText);
                                
                            }
                            catch (Exception ex)
                            {
@@ -996,7 +1022,10 @@
                        var (res350, palletVal350) = plcConn.GetPlcDBValue(PLCDataTypeEnum.String, modDevice.DbNumber, modPosPallet.PlcPos);
                        if (res350.IsSucceed && palletVal350 != "350")
                        {
                            LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "申请入库 " + $"申请巷道失败：{strMsg}", "托盘号:" + palletVal);
                            ledText += $"申请入库失败\n\n";
                            ledText += $"托盘号:{palletVal}\n";
                            ledText += $"{strMsg}\n";
                            LedDisplay(modDevice.LedIP, ledText);
                        }

                        // 写入输送线退回指令
@@ -1005,9 +1034,6 @@
                        {
                            plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "350");
                        }

                        // 申请巷道失败！
                        Log.Error(string.Format($"申请巷道失败:{strMsg},读写plc错误"));
                    }
                }
                break;
@@ -1090,8 +1116,6 @@
                            // 通知任务界面任务已存在更新 请更新界面
                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());

                            // led显示内容
                            LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "申请入库 " + $"目标巷道：{modTask.EndRoadway}取货工位：{endLocatVlue}", "托盘号:" + palletVal);
                        }
                    }

@@ -1156,14 +1180,25 @@

                            // 通知任务界面任务已存在更新 请更新界面
                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                            // led显示内容
                            LedDisplay(modDevice.LedIP, "工位:" + modDevice.StationNum, "入库中 " + $"申请储位地址:{strMsg}", "托盘号:" + palletVal);
                            
                            var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
                            ledText += $"任务类型:{taskInfo.TaskType.GetDescription()}\n\n";
                            ledText += $"任务号:{taskInfo.TaskNo}\n";
                            ledText += $"托盘号:{taskInfo.PalletNo}\n\n";
                            ledText += $"起始位:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
                            ledText += $"目标位:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
                            LedDisplay(modDevice.LedIP, ledText);
                        }
                    }
                    else
                    {
                        // 申请储位失败！LED显示
                        Log.Error(string.Format($"申请储位失败:{strMsg},读写plc错误"));
                        // led显示内容
                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business);
                        ledText += $"申请入库失败\n\n";
                        ledText += $"{strMsg}\n";
                        LedDisplay(modDevice.LedIP, ledText);
                    }

                }
@@ -1211,7 +1246,7 @@
                            break;
                        }

                        // 转换目标工位排列层 
                        // 转换目标工位排列层 03010301
                        var paiVal = PLCCommon.GetDjAdress(modTask.EndRoadway.Substring(1, 2), endLocate.Substring(0, 2), endLocate.Substring(6, 2));
                        string pai = paiVal.ToString();
                        string lie = int.Parse(endLocate.Substring(2, 2)).ToString();
@@ -1350,7 +1385,15 @@
                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == taskInfo.EndLocate).Select(s => s.LedIP).First();

                        // led显示内容
                        LedDisplay(modDevice.LedIP, "到达工位:" + modDevice.StationNum, "出库完成 " + $"储位地址：{modInsertTaskMonitor.StartLocat}", "托盘号:" + palletVal);
                        // 根据目标工位号获取对应的LEDIP地址
                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId == modDevice.PlcId);
                        
                        ledText += $"出库完成\n\n";
                        ledText += $"任务号:{taskInfo.TaskNo}\n";
                        ledText += $"托盘号:{taskInfo.PalletNo}\n\n";
                        ledText += $"起始位:{taskInfo.StartRoadway + " " + taskInfo.StartLocate}\n";
                        ledText += $"目标位:{taskInfo.EndRoadway + " " + taskInfo.EndLocate}";
                        LedDisplay(ledDevice.LedIP, ledText);
                    }
                    // 反馈WMS出库完成
                    //TaskReques taskReques = new TaskReques();
@@ -1428,8 +1471,14 @@
                        // 通知任务界面任务已存在更新 请更新界面
                        HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
                        // led显示内容
                        modDevice.LedIP = _db.Queryable<WcsDevice>().Where(w => w.StationNum == modTask.EndLocate).Select(s => s.LedIP).First();
                        LedDisplay(modDevice.LedIP, "工位:" + modTask.StartLocate, $"拣选完成，托盘离开工位", "托盘号:" + modTask.PalletNo);
                        var ledDevice = PLCTaskAction.plcDevices.First(m => m.StationNum == modDevice.StationNum && m.IsDelete == false && m.DeviceType == DeviceTypeEnum.Business && m.PlcId == modDevice.PlcId);
                        
                        ledText += $"拣选完成，托盘离开工位\n\n";
                        ledText += $"任务号:{modTask.TaskNo}\n";
                        ledText += $"托盘号:{modTask.PalletNo}\n\n";
                        ledText += $"起始位:{modTask.StartRoadway + " " + modTask.StartLocate}\n";
                        ledText += $"目标位:{modTask.EndRoadway + " " + modTask.EndLocate}";
                        LedDisplay(ledDevice.LedIP, ledText);
                    }
                    #endregion
                }
@@ -2026,6 +2075,21 @@
        }
    }

    private static void LedDisplay(string ip,string text) 
    {
        try
        {
            LedDll Led = new LedDll();
            Led.ConsoleLeds(ip, text);
            // 设置实例
            //Led.ConsoleLeds("10.18.51.238", $"任务类型:{TaskTypeEnum.Move.GetDescription()}\n\n任务号:TK2024102100001\n托盘号:LN000145\n\n起始位:033\n目标位:R01-02010102");
        }
        catch (Exception ex)
        {
            Log.Error(ex.Message);
        }
    }

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

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

@@ -2,7 +2,9 @@
using DocumentFormat.OpenXml.Drawing;
using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System;
//using WCS.Application.Util;

namespace WCS.Application;
public static class PLCTaskAction
@@ -428,7 +430,7 @@
                                    {
                                        var bl = false;
                                        int value = Convert.ToInt32(item.Value);
                                        if (value == 0)
                                        if (value <= 30)
                                        {
                                            bl = false;
                                        }
@@ -444,16 +446,6 @@
                                            HubUtil.PublicPosition(modInfo);
                                            UpdatePosition(modInfo);
                                        }
                                        // liudl 注释：和电气工程师确认页面展示交互字后启用。
                                        //var value = Convert.ToBoolean(item.Value);
                                        //if (!value == modDevice.BoHaveItem)
                                        //{
                                        //    modDevice.BoHaveItem = value;
                                        //    //下发状态
                                        //    var modInfo = new PlcPositionInfo() { Type = modPlc.Type, StationNum = modDevice.StationNum.PadLeft(3,'0'), BoHaveItem = value };
                                        //    HubUtil.PublicPosition(modInfo);
                                        //    UpdatePosition(modInfo);
                                        //}
                                    }
                                    break;
                                default:

 Admin.NET/WCS.Application/Util/HttpService.cs

@@ -60,6 +60,7 @@
                    StartLocate = startLocat,
                    PalletNo = palletNo,
                    TaskNo = result.TaskList.TaskNo,
                    Levels = 999,
                    EndLocate = result.TaskList.EndLocate,
                    EndRoadway = result.TaskList.EndRoadway
                };

 Admin.NET/WCS.Application/Util/LedDll.cs

@@ -1030,25 +1030,28 @@
            AreaRect.left = 0;
            AreaRect.top = 0;
            AreaRect.width = m_ledWidth;
            AreaRect.height = 106;
            AreaRect.height = m_ledHeight;
            
            LedDll.LV_AddImageTextArea(hProgram, 0, 2, ref AreaRect, 1);

            // 区域字体变量 参数设定
            LedDll.FONTPROP FontProp = new LedDll.FONTPROP();//文字属性
            FontProp.FontName = "宋体";
            FontProp.FontSize = 20;
            FontProp.FontSize = 16;
            FontProp.FontColor = LedDll.COLOR_RED;
            FontProp.FontBold = 1;
            

            // 区域字体运行速度 带入方式
            LedDll.PLAYPROP PlayProp = new LedDll.PLAYPROP();
            PlayProp.InStyle = 0;
            PlayProp.DelayTime = 3;
            PlayProp.Speed = 2;
            


            // 多文本区域 用于显示托盘信息
            nResult = LedDll.LV_AddMultiLineTextToImageTextArea(hProgram, 0, 2, LedDll.ADDTYPE_STRING, m_text, ref FontProp, ref PlayProp, 0, 0);
            nResult = LedDll.LV_AddMultiLineTextToImageTextArea(hProgram, 0, 2, LedDll.ADDTYPE_STRING, m_text, ref FontProp, ref PlayProp, 0, 1);

            // 发送到LED屏幕
            nResult = LedDll.LV_Send(ref CommunicationInfo, hProgram);