修改下料日志记录

dengjunjie

2024-04-23 ed35b39f2e26903511da197ecfe7c239755c5ef0

修改下料日志记录

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Comm/LogInfo/WriteLog.cs

@@ -34,7 +34,7 @@
            }
            try
            {
                FileStream fs = new FileStream(basePath + "/" + logName + $"{DateTime.Now.ToString("yyyy_MM_dd")}_Log.txt", FileMode.Append);
                FileStream fs = new FileStream(basePath + "/" + logName + $"_{DateTime.Now.ToString("yyyy_MM_dd")}_Log.txt", FileMode.Append);
                StreamWriter strwriter = new StreamWriter(fs);
                try
                {
@@ -43,7 +43,8 @@
                    strwriter.WriteLine(content);
                    if (data != null)
                    {
                        strwriter.WriteLine(JsonConvert.SerializeObject(data));
                        //strwriter.WriteLine(JsonConvert.SerializeObject(data));
                        strwriter.WriteLine(data);
                    }
                    strwriter.WriteLine("-------------------------------");
                    strwriter.WriteLine();

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_Core/WIDESEA_Core.csproj

@@ -33,6 +33,9 @@
        <None Remove="Services\API\**" />
        <None Remove="Services\Base\**" />
    </ItemGroup>
    <ItemGroup>
      <None Include="..\.editorconfig" Link=".editorconfig" />
    </ItemGroup>

    <ItemGroup>
        <PackageReference Include="Autofac" Version="6.0.0" />

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs

@@ -1,4 +1,5 @@
using FreeSql.Internal.Model;
using Newtonsoft.Json;
using StackExchange.Redis;
using System;
using System.Collections.Generic;
@@ -434,7 +435,8 @@
                            var Wheel_SN = client.ReadByOrder<string>("R_Wheel_id", name);//车轮SN号
                            if (string.IsNullOrEmpty(Wheel_SN))
                            {
                                WriteDBLog.Error(name + "放料完成", $"读取桁架信息：\n车轮SN号为空", "PCS");
                                //WriteDBLog.Error(name + "放料完成", $"读取桁架信息：\n车轮SN号为空", "PCS");
                                WriteLog.Write_Log(name + "放料完成出错", "车轮SN号为空", "读取桁架信息：", $"车轮SN号：{Wheel_SN}为空");
                                continue;
                            }

@@ -443,7 +445,8 @@
                            if (Mes_Work == null)
                            {
                                #region æ—¥å¿—记录
                                WriteDBLog.Error(name, $"读取桁架信息：\n车轮SN号：{Wheel_SN}\n\n未查询到工单详情", "PCS");
                                //WriteDBLog.Error(name, $"读取桁架信息：\n车轮SN号：{Wheel_SN}\n\n未查询到工单详情", "PCS");
                                WriteLog.Write_Log(name + "放料完成出错", Wheel_SN, "读取桁架信息：", $"车轮SN号：{Wheel_SN}未查询到工单信息");
                                #endregion
                                continue;
                            }
@@ -511,10 +514,14 @@
                            client.WriteByOrder("W_IndexNr", (Int16)0, name);//托盘上的第几个车轮
                            client.WriteByOrder("W_Storage_Type", (Int16)0, name);//托盘类型1-横放;2-竖放(暂时只有横放托盘)
                            client.WriteByOrder("W_Storage_update", true, name);//货位状态更新
                            WriteDBLog.Success(name + "桁架下料完成",
                                $"读取桁架信息：\nR_load_finished：{finished}\n车轮SN：{Wheel_SN}\n轮型ID：{WheelType}\n下料位号：{AreaNr}\n\n" +
                                $"处理写入桁架信息：\nW_AreaNr：{0}\nW_IndexNr：{0}\nW_Storage_Type：{0}\n\n" +
                                $"写入桁架信息：\nW_Storage_update：{true}\nW_Enabl_Load：{false}", "PCS");
                            WriteLog.Write_Log(name + "放料完成", Wheel_SN, "成功！",
                                $"读取桁架信息：\n放料完成信号：{finished}\n车轮SN：{Wheel_SN}\n轮型ID：{WheelType}\n下料位号：{AreaNr}\n\n" +
                                $"处理写入桁架信息：\n区域货位号：{0}\n托盘上的第几个车轮：{0}\n托盘类型：{0}\n\n" +
                                $"写入桁架信息：\n货位状态更新信号：{true}\n是否允许下料：{false}");
                            //WriteDBLog.Success(name + "桁架下料完成",
                            //    $"读取桁架信息：\nR_load_finished：{finished}\n车轮SN：{Wheel_SN}\n轮型ID：{WheelType}\n下料位号：{AreaNr}\n\n" +
                            //    $"处理写入桁架信息：\nW_AreaNr：{0}\nW_IndexNr：{0}\nW_Storage_Type：{0}\n\n" +
                            //    $"写入桁架信息：\nW_Storage_update：{true}\nW_Enabl_Load：{false}", "PCS");
                            #endregion


@@ -547,7 +554,9 @@
                        {
                            client.WriteByOrder("W_Storage_update", false, name);//货位状态更新
                            #region æ—¥å¿—记录
                            WriteDBLog.Success(name + "货位状态更新复位", $"读取桁架信息：\nR_load_finished：{finished}\n\n写入桁架信息：\nW_Storage_update：{false}", "PCS");
                            //WriteDBLog.Success(name + "货位状态更新复位", $"读取桁架信息：\nR_load_finished：{finished}\n\n写入桁架信息：\nW_Storage_update：{false}", "PCS");
                            WriteLog.Write_Log(name + "放料完成", name + "货位状态更新信号复位", "成功！",
                                $"读取桁架信息：\n放料完成信号：{finished}\n\n写入桁架信息：\n货位状态更新信号：{false}");
                            #endregion
                        }
                        #endregion
@@ -561,13 +570,19 @@
                        #region è¯»å–桁架信息
                        var Wheel_Type = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_Type").First(), client);//车轮类型
                        var Wheel_id = client.ReadByOrder<string>("R_Wheel_id", name);//车轮SN号
                        if (string.IsNullOrEmpty(Wheel_id)) continue;
                        if (string.IsNullOrEmpty(Wheel_id))
                        {
                            WriteLog.Write_Log(name + "申请放料异常", "车轮SN号为空", "", $"读取桁架信息：\n车轮SN号：{Wheel_id}为空");
                            continue;
                        }


                        var Work = workinfoRepository.Find(x => x.SN == Wheel_id && x.processCode == "17").FirstOrDefault();
                        if (Work == null)
                        {
                            client.WriteByOrder("W_Enabl_Load", false, name);//信号为false桁架停止进入
                            WriteDBLog.Error(name, $"读取桁架信息：\n车轮SN：{Wheel_id}\n\n未查询到工单信息", "PCS");
                            //WriteDBLog.Error(name, $"读取桁架信息：\n车轮SN：{Wheel_id}\n\n未查询到工单信息", "PCS");
                            WriteLog.Write_Log(name + "申请放料异常", Wheel_id, "查询机加工工单", $"读取桁架信息：\n车轮SN号：{Wheel_id}未查询到工单信息\n写入桁架信息：\n是否允许下料：{false}");
                        }

                        #region MyRegion
@@ -619,7 +634,8 @@
                        {
                            #region æ—¥å¿—记录
                            client.WriteByOrder("W_Enabl_Load", false, name);//信号为false桁架停止进入
                            WriteDBLog.Error(name, $"未查询到车轮信息！", "PCS");
                            //WriteDBLog.Error(name, $"未查询到车轮信息！", "PCS");
                            WriteLog.Write_Log(name + "申请放料异常", Wheel_id, $"查询{Work.drawingNo}车轮参数", $"读取桁架信息：\n车轮SN号：{Wheel_id}未查询到工单信息\n写入桁架信息：\n是否允许下料：{false}");
                            #endregion
                            continue;
                        }
@@ -628,7 +644,8 @@

                        var load_zone = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_load_zone").First(), client);
                        #region æ—¥å¿—记录
                        WriteDBLog.Success(name + "申请放料", $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：{PartStatus}\n是否进入下料区：{load_zone}", "PCS");
                        //WriteDBLog.Success(name + "申请放料", $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：{PartStatus}\n是否进入下料区：{load_zone}", "PCS");
                        WriteLog.Write_Log(name + "申请放料", Wheel_id, "申请放料", $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：{PartStatus}\n是否进入下料区：{load_zone}");
                        if (load_zone) continue;
                        #endregion
                        if ((Int16)PartStatus == 1)
@@ -784,9 +801,12 @@
                                    client.WriteByOrder("W_Storage_Type", (Int16)1, name);//托盘类型1-横放;2-竖放(暂时只有横放托盘)
                                    client.WriteByOrder("W_Enabl_Load", true, name);//是否允许
                                    #region æ—¥å¿—记录
                                    WriteDBLog.Success(name + "允许放料", $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：OK" +
                                    //WriteDBLog.Success(name + "允许放料", $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：OK" +$"\n读取托盘光电信号：{PalletSignal}" +
                                    //    $"\n\n写入桁架信息：\n下料位号：{area}\n第几个车轮：{(Stationinfo.quantity + 1)}\n托盘类型：1\nW_Enabl_Load：true", "PCS");
                                    WriteLog.Write_Log(name + "申请放料", Wheel_id, "允许放料",
                                        $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：合格" +
                                        $"\n读取托盘光电信号：{PalletSignal}" +
                                        $"\n\n写入桁架信息：\n下料位号：{area}\n第几个车轮：{(Stationinfo.quantity + 1)}\n托盘类型：1\nW_Enabl_Load：true", "PCS");
                                        $"\n\n写入桁架信息：\n下料位号：{area}\n第几个车轮：{(Stationinfo.quantity + 1)}\n托盘类型：1\n是否允许下料：true");
                                    #endregion
                                    continue;
                                }
@@ -794,11 +814,17 @@
                            else
                            {
                                #region æ²¡æ‰˜ç›˜å¯ç”¨,触发入库任务
                                var stationinfos = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).ToList();
                                foreach (var stationinfo in stationinfos)
                                if (!Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state != LocationStateEnum.Stroge.ToString()).Any())
                                {
                                    agvtask(stationinfoRepository, stationinfo, Work, name == "3单元下料区" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
                                    var station = Stations.Where(x => x.enable && x.stationCode != NGStation).OrderBy(x => x.lastUpdateTime).FirstOrDefault();
                                    agvtask(stationinfoRepository, station, Work, name == "3单元下料区" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
                                }

                                //var stationinfos = Stations.Where(x => x.enable && x.Number != Work.workOrder && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).ToList();
                                //foreach (var stationinfo in stationinfos)
                                //{
                                //    agvtask(stationinfoRepository, stationinfo, Work, name == "3单元下料区" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
                                //}
                                #endregion
                            }

@@ -888,6 +914,7 @@
                                        Stationinfo.remark = "车轮数量与光电不匹配";
                                        stationinfoRepository.Update(Stationinfo, true);
                                        WriteDBLog.Error(name + "报警", $"货位编号：{Stationinfo.stationCode}；错误信息：{Stationinfo.remark}", "PCS");

                                        //WriteDBLog.Error(name+"申请下料",$"{Stationinfo.stationCode}的货位","PCS");
                                    }
                                    else if (list.Count < 1 && MaterialSignal == 1)
@@ -917,9 +944,12 @@
                                    client.WriteByOrder("W_Storage_Type", (Int16)1, name);//托盘类型1-横放;2-竖放(暂时只有横放托盘)
                                    client.WriteByOrder("W_Enabl_Load", true, name);//是否允许
                                    #region æ—¥å¿—记录
                                    WriteDBLog.Success(name + "允许放料", $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：NG" +
                                    //WriteDBLog.Success(name + "允许放料", $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：NG" +$"\n读取托盘光电信号：{PalletSignal}" +
                                    //    $"\n\n写入桁架信息：\n下料位号：{area}\n第几个车轮：{(Stationinfo.quantity + 1)}\n托盘类型：1\nW_Enabl_Load：true", "PCS");
                                    WriteLog.Write_Log(name + "申请放料", Wheel_id, "允许放料",
                                        $"读取桁架信息：\n车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：合格" +
                                        $"\n读取托盘光电信号：{PalletSignal}" +
                                        $"\n\n写入桁架信息：\n下料位号：{area}\n第几个车轮：{(Stationinfo.quantity + 1)}\n托盘类型：1\nW_Enabl_Load：true", "PCS");
                                        $"\n\n写入桁架信息：\n下料位号：{area}\n第几个车轮：{(Stationinfo.quantity + 1)}\n托盘类型：1\n是否允许下料：true");
                                    #endregion
                                    continue;
                                }

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/JobsPart/Common/ÐÂÎļþ¼Ð/GetLocation.cs

@@ -66,7 +66,7 @@
                            var TargetLocations1 = stationinfoRepository.Find(x => x.location_state == LocationStateEnum.Empty.ToString() && x.enable && x.area == area1).OrderBy(x => x.line).ThenBy(x => x.column).ToList();
                            foreach (var Location in TargetLocations1)
                            {
                                if (stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.stationType == stationinfo.stationType && x.location_state != LocationStateEnum.OutBusy.ToString()).Any()) return Location;
                                if (!stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.stationType == stationinfo.stationType && x.location_state == LocationStateEnum.OutBusy.ToString()).Any()) return Location;
                            }
                            #endregion

@@ -130,7 +130,7 @@
                        }
                        else
                        {
                            if (stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.stationType == stationinfo.stationType && x.location_state != LocationStateEnum.OutBusy.ToString()).Any()) return Location;
                            if (!stationinfoRepository.Find(x => x.line == Location.line && x.area == Location.area && x.stationType == stationinfo.stationType && x.location_state == LocationStateEnum.OutBusy.ToString()).Any()) return Location;
                        }
                    }
                    #endregion

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/WCSClient/Siemens/SiemensPLCClient.cs

@@ -192,7 +192,7 @@
            else if (typeof(DataType) == typeof(string))//字符串
            {
                var str = GetContent(siemensPLCClient.ReadString(item.dbAddress, (ushort)item.dataLen), item).ToString();
                str = str.Replace("\0", "")?.Replace("\\", "")?.Replace("\u0014", "")?.Replace("?\u0006", "")?.Replace("\n","")?.Trim();
                str = str.Replace("\0", "")?.Replace("\\", "")?.Replace("\u0014", "")?.Replace("?\u0006", "")?.Replace("\n","")?.Replace("?", "")?.Trim();
                return (DataType)(str as object);
            }
            else

 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCSServe.sln

@@ -17,6 +17,11 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_Comm", "WIDESEA_Comm\WIDESEA_Comm.csproj", "{B5AE809E-0154-492F-A55C-238BCDAEFD43}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{89EE1DDB-6360-4325-9BBF-00E783572932}"
    ProjectSection(SolutionItems) = preProject
        .editorconfig = .editorconfig
    EndProjectSection
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
        Debug|Any CPU = Debug|Any CPU