分支自 SuZhouGuanHong/TaiYuanTaiZhong
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
dengjunjie
2024-06-20 58bd958f1fa8a85d0a3ac33a1ab1e2cab5d63dd2 
 ´úÂë¹ÜÀí/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs


@@ -75,7 +75,7 @@


                            }


                        }




                        var Mes_Work = workinfoRepository.Find(x => x.SN == wp_id && x.processCode == (name != "辊道上料查询车轮" ? "17" : "28")).FirstOrDefault();


                        var Mes_Work = workinfoRepository.Find(x => x.SN == wp_id && x.processCode == (name != "辊道上料查询车轮" ? "17" : "28")).OrderByDescending(x => x.CreateTime).FirstOrDefault();


                        if (Mes_Work == null)


                        {


                            client.WriteByOrder("W_i_status", (byte)2, name);


@@ -173,7 +173,7 @@


                        }


                        var wp_type = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_o_wp_type").First(), client);




                        var Mes_Work = workinfoRepository.Find(x => x.SN == wp_id && x.processCode == (name != "辊道上料查询订单" ? "17" : "28")).FirstOrDefault();


                        var Mes_Work = workinfoRepository.Find(x => x.SN == wp_id && x.processCode == (name != "辊道上料查询订单" ? "17" : "28")).OrderByDescending(x => x.CreateTime).FirstOrDefault();


                        if (Mes_Work == null)


                        {


                            client.WriteByOrder("W_i_status", (byte)2, name);


@@ -299,7 +299,7 @@


                            }




                            //var Wheel_id = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_id").First(), client).ToString();


                            var Mes_Work = workinfoRepository.Find(x => x.SN == Wheel_SN && x.processCode == "17").FirstOrDefault();


                            var Mes_Work = workinfoRepository.Find(x => x.SN == Wheel_SN && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();


                            if (Mes_Work == null)


                            {


                                #region æ—¥å¿—记录


@@ -429,7 +429,7 @@


                            WriteLog.Write_Log(name + "申请放料异常", "车轮SN号为空", "", $"读取桁架信息：\n车轮SN号：{Wheel_id}为空");


                            continue;


                        }


                        var Work = workinfoRepository.Find(x => x.SN == Wheel_id && x.processCode == "17").FirstOrDefault();


                        var Work = workinfoRepository.Find(x => x.SN == Wheel_id && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();


                        if (Work == null)


                        {


                            client.WriteByOrder("W_Enabl_Load", false, name);//信号为false桁架停止进入


@@ -463,7 +463,8 @@


                        #endregion




                        #region æ‰˜ç›˜ç±»åž‹ä¸ä¸€è‡´éœ€æ›´æ¢æ‰˜ç›˜


                        foreach (var Stationinfo in Stations)


                        stations = Stations.Where(x => x.enable).ToList();


                        foreach (var Stationinfo in stations)


                        {


                            if (Stationinfo.tray_type != "LargeTray" && /*(wheel == null ? wheel1.e :)*/ wheel.e > 1100)


                            {


@@ -717,7 +718,7 @@


                                    //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车轮SN：{Wheel_id}\n轮型ID：{Wheel_Type}\n车轮状态：不合格" +


                                        $"\n读取托盘光电信号：{PalletSignal}" +


                                        $"\n\n写入桁架信息：\n下料位号：{area}\n第几个车轮：{(Stationinfo.quantity + 1)}\n托盘类型：1\n是否允许下料：true");


                                    #endregion


@@ -748,7 +749,7 @@


            VOLContext Context = new VOLContext();


            Idt_agvtaskRepository agvtaskRepository = new dt_agvtaskRepository(Context);


            IVV_Mes_WorkinfoRepository workinfoRepository = new VV_Mes_WorkinfoRepository(Context);


            Work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.processCode == "17").FirstOrDefault();


            Work = workinfoRepository.Find(x => x.workOrder == stationinfo.Number && x.processCode == "17").OrderByDescending(x => x.CreateTime).FirstOrDefault();


            var task = agvtaskRepository.Find(x => x.agv_fromaddress == stationinfo.stationCode).FirstOrDefault();


            if (task != null) return;


            if (!string.IsNullOrEmpty(Work.area))