From 25724888bc329401891bf1600a8a83d8aae338b3 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 27 四月 2024 18:37:37 +0800
Subject: [PATCH] 叠盘入库功能开发,空托入库逻辑优化

---
 代码管理/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/PipelineJob.cs |  536 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 365 insertions(+), 171 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/PipelineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/PipelineJob.cs"
index 045de56..4d9e22e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/PipelineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Jobs/equipment/PipelineJob.cs"
@@ -5,6 +5,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
@@ -68,7 +69,6 @@
                 VOLContext Context = new VOLContext();
                 Idt_plcinfoheadRepository repository = new dt_plcinfoheadRepository(Context);
                 Idt_plcinfodetailRepository plcRepository = new dt_plcinfodetailRepository(Context);
-                Idt_geometry_dataRepository dataRepository = new dt_geometry_dataRepository(Context);
                 Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(Context);
                 var plc = repository.FindFirst(x => x.plcinfo_name == client.PLCName);
                 var Gantry_client = PLCClient.Clients.FirstOrDefault(t => t.PLCName == "妗佹灦");
@@ -77,39 +77,141 @@
                 var Gantryplc = repository.FindFirst(x => x.plcinfo_name == Gantry_client.PLCName);
 
 
-                ///鏌ユ壘涓婃枡鍖虹殑璐т綅
-                var Stations = stationinfoRepository.Find(x => x.area == area_code(number)).OrderBy(x => x.lastUpdateTime);//鏍规嵁鏃堕棿鍏堝悗鎺掑簭
+                #region 涓婃枡瀹屾垚
 
-                var Station = Stations?.Where(x => x.enable && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).OrderBy(x => x.quantity).FirstOrDefault();
-                if (Station != null)
+                var AreaNr = Gantry_client.ReadByOrder<Int16>("W_AreaNr", number);//璇诲彇璐т綅鍙蜂俊鎭�
+                if (AreaNr != 0)
                 {
-                    var SNS = Station.bindSN.Split(",");
-                    List<string> list = new List<string>();
-                    foreach (var SN in SNS)
+                    var station = stationinfoRepository.Find(x => x.area == area_code(number) && x.stationCode.Substring(x.stationCode.Length - 1, 1) == AreaNr.ToString()).FirstOrDefault();
+                    if (station != null)
                     {
-                        if (!string.IsNullOrEmpty(SN))
-                            list.Add(SN);
-                    }
-                    //缂撳瓨鏋朵笂杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�
-                    if (list.Count != Station.quantity)
-                    {
-                        Station.location_state = LocationStateEnum.Abnormal.ToString();
-                        Station.remark = "杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�";
-                        stationinfoRepository.Update(Station, true);
-                        Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                        #region 鏃ュ織璁板綍
-                        WriteDBLog.Error("涓婃枡鍖�", $"鍐欏叆妗佹灦淇℃伅锛歕nW_RequestUnload锛歠alse\n\n{Station.stationCode}杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�", "PCS");
-                        #endregion
-                        return;
-                    }
-                    var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == Station.stationCode).ToList();
-                    var PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
-                    var MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
+                        var bindSNS = station.bindSN.Split(",");
+                        var Gantrydetails = plcRepository.Find(x => x.plcdetail_iotype == Gantryplc.plcinfo_iotyep && x.plcdetail_number == number).ToList();
 
-                    var AreaNr = Gantry_client.ReadByOrder<Int16>("W_AreaNr", number);//璇诲彇璐т綅鍙蜂俊鎭�
-                    if (PalletSignal == 1 && MaterialSignal == 1)
+                        #region 淇℃伅鏌ヨ纭
+                        var QueryDate = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_QueryDate").First(), Gantry_client);//淇℃伅鏌ヨ
+                        if (QueryDate)
+                        {
+                            var Date_Vaild = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Date_Vaild").First(), Gantry_client);//淇℃伅纭
+                            if (!Date_Vaild)//淇℃伅鏈夎锛岃褰曟棩蹇�
+                            {
+                                Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+                                station.location_state = LocationStateEnum.Abnormal.ToString();
+                                station.remark = $"鏈煡璇㈠埌SN鍙凤細{bindSNS[bindSNS.Length - 1]}鐨勮鍗�";
+                                stationinfoRepository.Update(station, true);
+                                WriteDBLog.Error("涓婃枡鍖轰俊鎭煡璇�", $"鍐欏叆妗佹灦淇℃伅锛歕nW_RequestUnload锛歠alse\n\n{station.stationCode}鏈煡璇㈠埌SN鍙凤細{bindSNS[bindSNS.Length - 1]}鐨勮鍗�", "PCS");
+                                return;
+                            }
+                        }
+                        #endregion
+
+                        #region 璐т綅鐘舵�佹洿鏂板浣�
+                        var finished = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Unlod_finished").First(), Gantry_client);//澶瑰彇瀹屾垚
+                        var updatefinished = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "W_Storage_update").First(), Gantry_client);//璐т綅鐘舵�佹洿鏂�
+                        if (!finished && updatefinished)
+                        {
+                            Gantry_client.WriteByOrder("W_Storage_update", false, number);//璐т綅鐘舵�佹洿鏂�
+                            WriteLog.Write_Log(number + "涓婃枡瀹屾垚", number + "璐т綅鐘舵�佹洿鏂颁俊鍙峰浣�", "鎴愬姛锛�",
+                                        $"璇诲彇妗佹灦淇℃伅锛歕n涓婃枡瀹屾垚淇″彿锛歿finished}\n\n鍐欏叆妗佹灦淇℃伅锛歕n璐т綅鐘舵�佹洿鏂颁俊鍙凤細{false}");
+                        }
+                        #endregion
+
+                        if (finished && !updatefinished)
+                        {
+
+                            #region 鍒ゆ柇鍖哄煙鍙锋槸鍚︿竴鑷�
+                            var area = Gantry_client.ReadByOrder<Int16>("place_prog", number);//鏀炬枡瀹屾垚鐨勫尯鍩熷彿
+
+                            WriteLog.Write_Log(number + "鍙栨枡瀹屾垚鍑洪敊", bindSNS[bindSNS.Length - 1], "鍒ゆ柇鍖哄煙鍙锋槸鍚︿竴鑷�", $"PCS鍖哄煙鍙凤細{AreaNr}锛沑n妗佹灦鍖哄煙鍙凤細{area}\n閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒");
+                            //if (AreaNr != area)
+                            //{
+                            //    client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//鎶ヨ
+                            //    //WriteDBLog.Error(name + "鎶ヨ", $"PCS鍖哄煙鍙凤細{AreaNr}锛涙鏋跺尯鍩熷彿锛歿area}閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒", "PCS");
+                            //    WriteLog.Write_Log(number + "鍙栨枡瀹屾垚鍑洪敊", bindSNS[bindSNS.Length - 1], "鍒ゆ柇鍖哄煙鍙锋槸鍚︿竴鑷�", $"PCS鍖哄煙鍙凤細{AreaNr}锛沑n妗佹灦鍖哄煙鍙凤細{area}\n閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒");
+                            //    return;
+                            //}
+                            #endregion
+
+                            #region 鍒ゆ柇杞﹁疆鏁伴噺鏄惁涓�鑷�
+                            var quantity = Gantry_client.ReadByOrder<Int16>("pos_prog", number);//妗佹灦璁板綍鐨勮溅杞暟閲�
+
+                            WriteLog.Write_Log(number + "鍙栨枡瀹屾垚鍑洪敊", bindSNS[bindSNS.Length - 1], "鍒ゆ柇杞﹁疆鏁伴噺鏄惁涓�鑷�", $"鍖哄煙鍙凤細{AreaNr}锛沑n妗佹灦杞﹁疆鏁帮細{quantity}\nPCS杞﹁疆鏁帮細{station.quantity}\n閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒");
+                            //if (quantity != station.quantity)
+                            //{
+                            //    client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//鎶ヨ
+                            //    WriteLog.Write_Log(number + "鍙栨枡瀹屾垚鍑洪敊", bindSNS[bindSNS.Length - 1], "鍒ゆ柇杞﹁疆鏁伴噺鏄惁涓�鑷�", $"鍖哄煙鍙凤細{AreaNr}锛沑n妗佹灦杞﹁疆鏁帮細{quantity}\nPCS杞﹁疆鏁帮細{station.quantity}\n閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒");
+                            //    return;
+                            //}
+                            #endregion
+
+                            Updatemes(bindSNS[bindSNS.Length - 1]);
+                            station.quantity = station.quantity - 1;
+                            station.bindSN = OperStr(bindSNS);
+                            if (station.quantity <= 0)
+                            {
+                                station.stationType = string.Empty;
+                                station.Number = string.Empty;
+                                station.heatNumber = string.Empty;
+                                station.tray_status = "EmptyTray";
+                            }
+                            var count = stationinfoRepository.Update(station, true);
+                            if (count < 1)
+                            {
+                                WriteDBLog.Error("鍙栨枡瀹屾垚", $"涓婃枡浣嶄俊鎭洿鏂板け璐ワ紒涓婃枡浣嶇紪鍙凤細{station.stationCode}", "PCS");
+                                return;
+                            }
+
+                            Gantry_client.WriteByOrder("W_Storage_update", true, number);//璐т綅鐘舵�佹洿鏂�
+                            Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+
+                            #region 娓呯┖淇℃伅
+                            Gantry_client.WriteByOrder("W_AreaNr", (Int16)0, number);//鍖哄煙璐т綅鍙�
+                            Gantry_client.WriteByOrder("W_IndexNr", (Int16)0, number);//鎵樼洏涓婄殑绗嚑涓溅杞�
+                            Gantry_client.WriteByOrder("W_Storage_Type", (Int16)0, number); //鎵樼洏绫诲瀷1-妯斁;2-绔栨斁
+                            Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)0, number);//杞﹁疆绫诲瀷
+                            #endregion
+
+                            #region 鏃ュ織璁板綍
+                            WriteDBLog.Success("鍙栨枡瀹屾垚", $"鍐欏叆妗佹灦淇℃伅锛歕n璐т綅鐘舵�佹洿鏂帮細{true}\nW_RequestUnload锛歿false}", "PCS");
+                            #endregion
+                        }
+                    }
+                }
+
+                #endregion
+
+                #region 鐢宠涓婃枡
+
+                if (!Gantry_client.ReadByOrder<bool>("W_RequestUnload", number))
+                {
+                    var Station = stationinfoRepository.Find(x => x.area == area_code(number) && x.enable && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).OrderBy(x => x.lastUpdateTime).FirstOrDefault();
+                    if (Station != null)
                     {
-                        if (AreaNr == 0)
+                        var SNS = Station.bindSN.Split(",");
+                        List<string> list = new List<string>();
+                        foreach (var SN in SNS)
+                        {
+                            if (!string.IsNullOrEmpty(SN))
+                                list.Add(SN);
+                        }
+                        //缂撳瓨鏋朵笂杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�
+                        if (list.Count != Station.quantity)
+                        {
+                            Station.location_state = LocationStateEnum.Abnormal.ToString();
+                            Station.remark = "杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�";
+                            stationinfoRepository.Update(Station, true);
+                            Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+                            #region 鏃ュ織璁板綍
+                            WriteDBLog.Error("涓婃枡鍖�", $"鍐欏叆妗佹灦淇℃伅锛歕nW_RequestUnload锛歠alse\n\n{Station.stationCode}杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�", "PCS");
+                            #endregion
+                            return;
+                        }
+
+                        var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == Station.stationCode).ToList();
+                        var PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
+                        var MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
+
+                        if (PalletSignal == 1 && MaterialSignal == 1)
                         {
                             Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)Convert.ToInt16(QueryMateriel(Station.stationType) == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId), number);//杞﹁疆绫诲瀷
                             var area = Convert.ToInt16(Station.stationCode.Substring(Station.stationCode.Length - 1, 1));
@@ -120,91 +222,171 @@
                             Gantry_client.WriteByOrder("W_RequestUnload", true, number);
                             #region 鏃ュ織璁板綍
                             WriteDBLog.Success("涓婃枡鍖虹敵璇�", $"璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}\n璇诲彇绗竴涓溅杞厜鐢典俊鍙凤細{MaterialSignal}\n\n" +
-                                $"鍐欏叆妗佹灦淇℃伅锛歕n鍖哄煙璐т綅鍙凤細{area}\n鎵樼洏涓婄殑绗嚑涓溅杞細{SNS.Length}\n鎵樼洏绫诲瀷锛歿1}\n杞﹁疆绫诲瀷锛歿(QueryMateriel(Station.stationType).TypeId == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId)}" +
+                                $"鍐欏叆妗佹灦淇℃伅锛歕n鍖哄煙璐т綅鍙凤細{area}\n鎵樼洏涓婄殑绗嚑涓溅杞細{SNS.Length}\n鎵樼洏绫诲瀷锛歿1}\n杞﹁疆绫诲瀷锛歿(QueryMateriel(Station.stationType) == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId)}" +
                                 $"\n杞﹁疆SN鍙凤細{SNS[SNS.Length - 1]}\nW_RequestUnload锛歵rue", "PCS");
                             #endregion
                         }
-                    }
-                    else
-                    {
-                        Gantry_client.WriteByOrder("W_RequestUnload", false, number);
-                    }
-
-                    var Gantrydetails = plcRepository.Find(x => x.plcdetail_iotype == Gantryplc.plcinfo_iotyep && x.plcdetail_number == number).ToList();
-                    var Gantry_Out_of_Area = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Gantry_Out_of_Area").First(), Gantry_client);//妗佹灦鏄惁鍦ㄥ尯鍩熷唴
-
-                    var QueryDate = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_QueryDate").First(), Gantry_client);//淇℃伅鏌ヨ
-                    if (QueryDate)
-                    {
-                        var Date_Vaild = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Date_Vaild").First(), Gantry_client);//淇℃伅纭
-                        if (!Date_Vaild)//淇℃伅鏈夎锛岃褰曟棩蹇�
+                        else
                         {
-                            Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                            Station.location_state = LocationStateEnum.Abnormal.ToString();
-                            Station.remark = $"鏈煡璇㈠埌SN鍙凤細{SNS[SNS.Length - 1]}鐨勮鍗�";
-                            stationinfoRepository.Update(Station, true);
-                            WriteDBLog.Error("涓婃枡鍖轰俊鎭煡璇�", $"鍐欏叆妗佹灦淇℃伅锛歕nW_RequestUnload锛歠alse\n\n{Station.stationCode}鏈煡璇㈠埌SN鍙凤細{SNS[SNS.Length - 1]}鐨勮鍗�", "PCS");
-                            return;
-                        }
-                    }
-                    var finished = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Unlod_finished").First(), Gantry_client);//澶瑰彇瀹屾垚
-                    var updatefinished = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "W_Storage_update").First(), Gantry_client);//璐т綅鐘舵�佹洿鏂�
-                    if (!finished && updatefinished)
-                        Gantry_client.WriteByOrder("W_Storage_update", false, number);//璐т綅鐘舵�佹洿鏂�
-                    if (finished && !updatefinished)
-                    {
-                        Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                        Updatemes(SNS[SNS.Length - 1]);
-                        Station.quantity = Station.quantity - 1;
-                        Station.bindSN = OperStr(SNS);
-                        if (Station.quantity <= 0)
-                        {
-                            Station.stationType = string.Empty;
-                            Station.Number = string.Empty;
-                            Station.heatNumber = string.Empty;
-                            Station.tray_status = "EmptyTray";
-                        }
-                        var count = stationinfoRepository.Update(Station, true);
-                        if (count < 1)
-                        {
-                            WriteDBLog.Error("鍙栨枡瀹屾垚", $"涓婃枡浣嶄俊鎭洿鏂板け璐ワ紒涓婃枡浣嶇紪鍙凤細{Station.stationCode}", "PCS");
-                            return;
+                            Gantry_client.WriteByOrder("W_RequestUnload", false, number);
                         }
 
-                        #region 娓呯┖淇℃伅
-                        Gantry_client.WriteByOrder("W_AreaNr", (Int16)0, number);//鍖哄煙璐т綅鍙�
-                        Gantry_client.WriteByOrder("W_IndexNr", (Int16)0, number);//鎵樼洏涓婄殑绗嚑涓溅杞�
-                        Gantry_client.WriteByOrder("W_Storage_Type", (Int16)0, number); //鎵樼洏绫诲瀷1-妯斁;2-绔栨斁
-                        Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)0, number);//杞﹁疆绫诲瀷
+                        #region 鏇存柊涓�涓娴嬩笂鏂欎换鍔�
+                        Idt_agvtaskRepository agvtaskService = new dt_agvtaskRepository(Context);
+                        if (!agvtaskService.Find(x => x.agv_toaddress == Station.stationCode).Any())
+                        {
+                            var task = agvtaskService.Find(x => x.agv_taskstate == "Queue" && (x.agv_tasktype == "TaskType_OutsourceOutbound" || x.agv_tasktype == "TaskType_Outbound") && x.agv_toaddress == "").OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
+                            if (task != null)
+                            {
+                                task.agv_taskstate = "Create";
+                                task.agv_toaddress = Station.stationCode;
+                                agvtaskService.Update(task, true);
+                                WriteDBLog.Success("鏇存柊涓�涓娴嬩笂鏂欎换鍔�", $"浠诲姟缂栧彿锛歿task.agv_tasknum}", "PCS");
+                            }
+                        }
                         #endregion
-
-                        Gantry_client.WriteByOrder("W_Storage_update", true, number);//璐т綅鐘舵�佹洿鏂�
-                        #region 鏃ュ織璁板綍
-                        WriteDBLog.Success("鍙栨枡瀹屾垚", $"鍐欏叆妗佹灦淇℃伅锛歕n璐т綅鐘舵�佹洿鏂帮細{true}\nW_RequestUnload锛歿false}", "PCS");
-                        #endregion
-
-                        PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
-                        MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
-                        if (Station.quantity > 0 && (PalletSignal != 1 || MaterialSignal != 1))
-                        {
-                            Station.location_state = LocationStateEnum.Abnormal.ToString();
-                            Station.remark = "杞﹁疆鏁伴噺澶т簬0锛屽厜鐢垫娴嬫棤鎵樼洏鎴栨棤杞﹁疆";
-                            stationinfoRepository.Update(Station, true);
-                            client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//鎶ヨ
-                            WriteDBLog.Error(number + "鎶ヨ", $"璐т綅缂栧彿锛歿Station.stationCode}锛涢敊璇俊鎭細{Station.remark}", "PCS");
-                        }
-                        else if (Station.quantity < 1 && MaterialSignal == 1)
-                        {
-                            Station.location_state = LocationStateEnum.Abnormal.ToString();
-                            Station.remark = "杞﹁疆鏁伴噺灏忎簬0锛屽厜鐢垫娴嬫湁杞﹁疆";
-                            stationinfoRepository.Update(Station, true);
-                            client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//鎶ヨ
-                            WriteDBLog.Error(number + "鎶ヨ", $"璐т綅缂栧彿锛歿Station.stationCode}锛涢敊璇俊鎭細{Station.remark}", "PCS");
-                        }
                     }
                 }
-                else
-                    Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+
+                #endregion
+
+
+                #region MyRegion
+
+                /////鏌ユ壘涓婃枡鍖虹殑璐т綅
+                //var Stations = stationinfoRepository.Find(x => x.area == area_code(number)).OrderBy(x => x.lastUpdateTime);//鏍规嵁鏃堕棿鍏堝悗鎺掑簭
+                //                                                                                                           //闇�娴嬭瘯涓�涓�
+                //var Station = Stations?.Where(x => x.enable && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).OrderBy(x => x.quantity).FirstOrDefault();
+
+                //if (Station != null)
+                //{
+                //    var SNS = Station.bindSN.Split(",");
+                //    List<string> list = new List<string>();
+                //    foreach (var SN in SNS)
+                //    {
+                //        if (!string.IsNullOrEmpty(SN))
+                //            list.Add(SN);
+                //    }
+                //    //缂撳瓨鏋朵笂杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�
+                //    if (list.Count != Station.quantity)
+                //    {
+                //        Station.location_state = LocationStateEnum.Abnormal.ToString();
+                //        Station.remark = "杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�";
+                //        stationinfoRepository.Update(Station, true);
+                //        Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+                //        #region 鏃ュ織璁板綍
+                //        WriteDBLog.Error("涓婃枡鍖�", $"鍐欏叆妗佹灦淇℃伅锛歕nW_RequestUnload锛歠alse\n\n{Station.stationCode}杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�", "PCS");
+                //        #endregion
+                //        return;
+                //    }
+                //    var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == Station.stationCode).ToList();
+                //    var PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
+                //    var MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
+
+                //    var AreaNr = Gantry_client.ReadByOrder<Int16>("W_AreaNr", number);//璇诲彇璐т綅鍙蜂俊鎭�
+                //    if (PalletSignal == 1 && MaterialSignal == 1)
+                //    {
+                //        if (AreaNr == 0)
+                //        {
+                //            Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)Convert.ToInt16(QueryMateriel(Station.stationType) == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId), number);//杞﹁疆绫诲瀷
+                //            var area = Convert.ToInt16(Station.stationCode.Substring(Station.stationCode.Length - 1, 1));
+                //            Gantry_client.WriteByOrder("W_AreaNr", (Int16)area, number);//鍖哄煙璐т綅鍙�
+                //            Gantry_client.WriteByOrder("W_IndexNr", (Int16)SNS.Length, number);//鎵樼洏涓婄殑绗嚑涓溅杞�
+                //            Gantry_client.WriteByOrder("W_Storage_Type", (Int16)1, number); //鎵樼洏绫诲瀷1-妯斁;2-绔栨斁
+                //            Gantry_client.WriteByOrder("W_Wheel_id", SNS[SNS.Length - 1], number);//杞﹁疆SN鍙�
+                //            Gantry_client.WriteByOrder("W_RequestUnload", true, number);
+                //            #region 鏃ュ織璁板綍
+                //            WriteDBLog.Success("涓婃枡鍖虹敵璇�", $"璇诲彇鎵樼洏鍏夌數淇″彿锛歿PalletSignal}\n璇诲彇绗竴涓溅杞厜鐢典俊鍙凤細{MaterialSignal}\n\n" +
+                //                $"鍐欏叆妗佹灦淇℃伅锛歕n鍖哄煙璐т綅鍙凤細{area}\n鎵樼洏涓婄殑绗嚑涓溅杞細{SNS.Length}\n鎵樼洏绫诲瀷锛歿1}\n杞﹁疆绫诲瀷锛歿(QueryMateriel(Station.stationType).TypeId == null ? QueryMateriel1(Station.stationType).TypeId : QueryMateriel(Station.stationType).TypeId)}" +
+                //                $"\n杞﹁疆SN鍙凤細{SNS[SNS.Length - 1]}\nW_RequestUnload锛歵rue", "PCS");
+                //            #endregion
+                //        }
+                //    }
+                //    else
+                //    {
+                //        Gantry_client.WriteByOrder("W_RequestUnload", false, number);
+                //    }
+
+                //    var Gantrydetails = plcRepository.Find(x => x.plcdetail_iotype == Gantryplc.plcinfo_iotyep && x.plcdetail_number == number).ToList();
+                //    var Gantry_Out_of_Area = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Gantry_Out_of_Area").First(), Gantry_client);//妗佹灦鏄惁鍦ㄥ尯鍩熷唴
+
+                //    var QueryDate = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_QueryDate").First(), Gantry_client);//淇℃伅鏌ヨ
+                //    if (QueryDate)
+                //    {
+                //        var Date_Vaild = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Date_Vaild").First(), Gantry_client);//淇℃伅纭
+                //        if (!Date_Vaild)//淇℃伅鏈夎锛岃褰曟棩蹇�
+                //        {
+                //            Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+                //            Station.location_state = LocationStateEnum.Abnormal.ToString();
+                //            Station.remark = $"鏈煡璇㈠埌SN鍙凤細{SNS[SNS.Length - 1]}鐨勮鍗�";
+                //            stationinfoRepository.Update(Station, true);
+                //            WriteDBLog.Error("涓婃枡鍖轰俊鎭煡璇�", $"鍐欏叆妗佹灦淇℃伅锛歕nW_RequestUnload锛歠alse\n\n{Station.stationCode}鏈煡璇㈠埌SN鍙凤細{SNS[SNS.Length - 1]}鐨勮鍗�", "PCS");
+                //            return;
+                //        }
+                //    }
+                //    var finished = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "R_Unlod_finished").First(), Gantry_client);//澶瑰彇瀹屾垚
+                //    var updatefinished = (bool)DBExtension.Read(Gantrydetails.Where(x => x.plcdetail_name == "W_Storage_update").First(), Gantry_client);//璐т綅鐘舵�佹洿鏂�
+                //    if (!finished && updatefinished)
+                //        Gantry_client.WriteByOrder("W_Storage_update", false, number);//璐т綅鐘舵�佹洿鏂�
+                //    if (finished && !updatefinished)
+                //    {
+                //        Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+                //        Updatemes(SNS[SNS.Length - 1]);
+                //        Station.quantity = Station.quantity - 1;
+                //        Station.bindSN = OperStr(SNS);
+                //        if (Station.quantity <= 0)
+                //        {
+                //            Station.stationType = string.Empty;
+                //            Station.Number = string.Empty;
+                //            Station.heatNumber = string.Empty;
+                //            Station.tray_status = "EmptyTray";
+                //        }
+                //        var count = stationinfoRepository.Update(Station, true);
+                //        if (count < 1)
+                //        {
+                //            WriteDBLog.Error("鍙栨枡瀹屾垚", $"涓婃枡浣嶄俊鎭洿鏂板け璐ワ紒涓婃枡浣嶇紪鍙凤細{Station.stationCode}", "PCS");
+                //            return;
+                //        }
+
+                //        #region 娓呯┖淇℃伅
+                //        Gantry_client.WriteByOrder("W_AreaNr", (Int16)0, number);//鍖哄煙璐т綅鍙�
+                //        Gantry_client.WriteByOrder("W_IndexNr", (Int16)0, number);//鎵樼洏涓婄殑绗嚑涓溅杞�
+                //        Gantry_client.WriteByOrder("W_Storage_Type", (Int16)0, number); //鎵樼洏绫诲瀷1-妯斁;2-绔栨斁
+                //        Gantry_client.WriteByOrder("W_Wheel_Type", (Int16)0, number);//杞﹁疆绫诲瀷
+                //        #endregion
+
+                //        Gantry_client.WriteByOrder("W_Storage_update", true, number);//璐т綅鐘舵�佹洿鏂�
+                //        #region 鏃ュ織璁板綍
+                //        WriteDBLog.Success("鍙栨枡瀹屾垚", $"鍐欏叆妗佹灦淇℃伅锛歕n璐т綅鐘舵�佹洿鏂帮細{true}\nW_RequestUnload锛歿false}", "PCS");
+                //        #endregion
+
+                //        #region 鎶ヨ
+                //        PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
+                //        MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
+                //        if (Station.quantity > 0 && (PalletSignal != 1 || MaterialSignal != 1))
+                //        {
+                //            Station.location_state = LocationStateEnum.Abnormal.ToString();
+                //            Station.remark = "杞﹁疆鏁伴噺澶т簬0锛屽厜鐢垫娴嬫棤鎵樼洏鎴栨棤杞﹁疆";
+                //            stationinfoRepository.Update(Station, true);
+                //            client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//鎶ヨ
+                //            WriteDBLog.Error(number + "鎶ヨ", $"璐т綅缂栧彿锛歿Station.stationCode}锛涢敊璇俊鎭細{Station.remark}", "PCS");
+                //        }
+                //        else if (Station.quantity < 1 && MaterialSignal == 1)
+                //        {
+                //            Station.location_state = LocationStateEnum.Abnormal.ToString();
+                //            Station.remark = "杞﹁疆鏁伴噺灏忎簬0锛屽厜鐢垫娴嬫湁杞﹁疆";
+                //            stationinfoRepository.Update(Station, true);
+                //            client.WriteByOrder("W_AlarmSignal", (Int16)2, number);//鎶ヨ
+                //            WriteDBLog.Error(number + "鎶ヨ", $"璐т綅缂栧彿锛歿Station.stationCode}锛涢敊璇俊鎭細{Station.remark}", "PCS");
+                //        }
+                //        #endregion
+
+
+                //    }
+                //}
+                //else
+                //    Gantry_client.WriteByOrder("W_RequestUnload", false, number);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆 
+                #endregion
             }
             catch (Exception ex)
             {
@@ -226,76 +408,88 @@
                 Idt_stationinfoRepository stationinfoRepository = new dt_stationinfoRepository(Context);
                 var plc = repository.FindFirst(x => x.plcinfo_name == client.PLCName);
                 List<string> stationCodes = new List<string>() { "S01001001", "S01001002", "W01001001", "W01001002", "W01001003" };
+                string remark = "";
                 foreach (var stationCode in stationCodes)
                 {
-                    if (agvtaskService.Find(x => x.agv_fromaddress == stationCode /*|| x.agv_toaddress == stationCode*/).Any())
-                        continue;
-                    var station = stationinfoRepository.Find(x => x.stationCode == stationCode && x.enable).FirstOrDefault();
-                    if (station == null) continue;
-                    var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == stationCode).ToList();
-                    var PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
-                    var MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
-                    if (PalletSignal == 1 && MaterialSignal == 2 && (station.stationCode.Contains("S0100100") ? station.tray_status == "EmptyTray" : true))
+                    try
                     {
-                        var area = station.tray_type == "SmallTray" ? "11" : "10";
-                        var task = agvtaskService.Find(x => (x.agv_toaddress.Contains("W") || x.agv_toaddress.Contains("X")) && x.agv_taskstate == "Queue" /*&& x.agv_tasktype == "TaskType_EmptyPallet" */ && x.agv_Traytype == station.tray_type).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
-                        if (task != null)
-                        {
-                            task.agv_fromaddress = station.stationCode;
-                            task.StarQuantity = 0;
-                            task.agv_taskstate = "Create";
-                            if (station.stationCode.Contains("S0100100"))
-                                task.agv_grade = 3;
-                            agvtaskService.Update(task, true);
-                            station.location_state = LocationStateEnum.Busy.ToString();
-                            stationinfoRepository.Update(station, true);
+                        remark = "鏌ヨ绔欏彴";
+                        var station = stationinfoRepository.Find(x => x.stationCode == stationCode && x.enable).FirstOrDefault();
+                        if (station == null) continue;
+                        remark = "鏌ヨ璧风偣鏄惁瀛樺湪浠诲姟";
+                        if (agvtaskService.Find(x => x.agv_fromaddress == stationCode /*|| x.agv_toaddress == stationCode*/).Any())
                             continue;
-
-                        }
-
-                        #region 绌烘墭鍙犵洏
-                        var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("DD") && x.quantity < 5 && x.enable).ToList();
-                        var EmptyStation = EmptyStations.Where(x => x.tray_type == station.tray_type && x.location_state == LocationStateEnum.Stroge.ToString()).FirstOrDefault();
-                        if (EmptyStation == null)
-                            EmptyStation = EmptyStations.Where(x => x.location_state == LocationStateEnum.Empty.ToString()).FirstOrDefault();
-                        #endregion
-
-                        if (EmptyStation == null)//鏌ユ壘搴撳唴绌烘墭鐩�
-                            EmptyStation = GetStation.EmptyPalletStation(area);
-
-
-                        if (EmptyStation != null)
+                        remark = "璇诲彇鍏夌數淇″彿";
+                        var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == stationCode).ToList();
+                        var PalletSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
+                        var MaterialSignal = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
+                        if (PalletSignal == 1 && MaterialSignal == 2 && (station.stationCode.Contains("S0100100") ? station.tray_status == "EmptyTray" : true))
                         {
-                            #region 鍚屼竴涓┖鎵樹綅鍙兘鍚屾椂鐢熸垚涓�涓┖鎵樹换鍔�
-                            if (agvtaskService.Find(x => x.agv_fromaddress == EmptyStation.stationCode || x.agv_toaddress == EmptyStation.stationCode).Any())
-                                return;
-                            #endregion
-                            dt_agvtask agvtask = new dt_agvtask()
+                            var area = station.tray_type == "SmallTray" ? "11" : "10";
+                            remark = "鏌ヨ鏄惁瀛樺湪琛ョ┖鎵橀槦鍒椾换鍔�";
+                            var task = agvtaskService.Find(x => (x.agv_toaddress.Contains("W") || x.agv_toaddress.Contains("X")) && x.agv_taskstate == "Queue" && x.agv_tasktype == "TaskType_EmptyPallet" && x.agv_Traytype == station.tray_type).OrderByDescending(x => x.agv_grade).ThenBy(x => x.agv_createtime).FirstOrDefault();
+                            if (task != null)
                             {
-                                agv_fromaddress = station.stationCode,
-                                agv_id = Guid.NewGuid(),
-                                agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
-                                agv_grade = station.stationCode.Contains("S0100100") ? 3 : 1,
-                                agv_createtime = DateTime.Now,
-                                agv_taskstate = "Create",
-                                //agv_materielid = station.stationType,
-                                agv_qty = 1,
-                                StarQuantity = 0,
-                                EndQuantity = EmptyStation.quantity,
-                                agv_tasktype = "TaskType_EmptyPallet",
-                                agv_toaddress = EmptyStation.stationCode,
-                                agv_userid = "绯荤粺",
-                                agv_TrayStatus = "EmptyTray",//station.tray_status,
-                                agv_Traytype = station.tray_type,
-                            };
-                            agvtaskService.Add(agvtask, true);
-                            station.location_state = LocationStateEnum.Busy.ToString();
-                            stationinfoRepository.Update(station, true);
-                            EmptyStation.location_state = LocationStateEnum.Busy.ToString();
-                            stationinfoRepository.Update(EmptyStation, true);
-                            WriteDBLog.Success("鍒涘缓鑷姩鍙栫┖鎵樹换鍔�", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}", "PCS");
-                            return;
+                                task.agv_fromaddress = station.stationCode;
+                                task.StarQuantity = 0;
+                                task.agv_taskstate = "Create";
+                                if (station.stationCode.Contains("S0100100"))
+                                    task.agv_grade = 3;
+                                agvtaskService.Update(task, true);
+                                station.location_state = LocationStateEnum.Busy.ToString();
+                                stationinfoRepository.Update(station, true);
+                                WriteDBLog.Success("鏇存柊绌烘墭闃熷垪浠诲姟", $"浠诲姟缂栧彿锛歿task.agv_tasknum}锛屾墭鐩樹俊鍙�:{PalletSignal},璐х墿淇″彿:{MaterialSignal}", "PCS");
+                                continue;
+                            }
+                            remark = "鏌ヨ绌烘墭鍙犵洏浣�";
+                            #region 绌烘墭鍙犵洏
+                            var EmptyStations = stationinfoRepository.Find(x => x.stationCode.Contains("DD") && x.quantity < 5 && x.enable).ToList();
+                            var EmptyStation = EmptyStations.Where(x => x.tray_type == station.tray_type && x.location_state == LocationStateEnum.Stroge.ToString()).FirstOrDefault();
+                            if (EmptyStation == null)
+                                EmptyStation = EmptyStations.Where(x => x.location_state == LocationStateEnum.Empty.ToString() && x.quantity == 0).FirstOrDefault();
+                            #endregion
+                            remark = "鏌ユ壘搴撳唴绌烘墭浣�";
+                            if (EmptyStation == null)//鏌ユ壘搴撳唴绌烘墭鐩�
+                                EmptyStation = GetStation.EmptyPalletStation(area);
+
+
+                            if (EmptyStation != null)
+                            {
+                                #region 鍚屼竴涓┖鎵樹綅鍙兘鍚屾椂鐢熸垚涓�涓┖鎵樹换鍔�
+                                remark = "鏌ヨ绌烘墭浣嶆槸鍚﹀瓨鍦ㄤ换鍔�";
+                                if (agvtaskService.Find(x => x.agv_fromaddress == EmptyStation.stationCode || x.agv_toaddress == EmptyStation.stationCode).Any())
+                                    return;
+                                #endregion
+                                dt_agvtask agvtask = new dt_agvtask()
+                                {
+                                    agv_fromaddress = station.stationCode,
+                                    agv_id = Guid.NewGuid(),
+                                    agv_tasknum = IdenxManager.GetTaskNo("KH-", "WMS"),
+                                    agv_grade = station.stationCode.Contains("S0100100") ? 3 : 1,
+                                    agv_createtime = DateTime.Now,
+                                    agv_taskstate = "Create",
+                                    //agv_materielid = station.stationType,
+                                    agv_qty = 1,
+                                    StarQuantity = 0,
+                                    EndQuantity = EmptyStation.quantity,
+                                    agv_tasktype = "TaskType_EmptyPallet",
+                                    agv_toaddress = EmptyStation.stationCode,
+                                    agv_userid = "绯荤粺",
+                                    agv_TrayStatus = "EmptyTray",//station.tray_status,
+                                    agv_Traytype = station.tray_type,
+                                };
+                                agvtaskService.Add(agvtask, true);
+                                station.location_state = LocationStateEnum.Busy.ToString();
+                                stationinfoRepository.Update(station, true);
+                                EmptyStation.location_state = LocationStateEnum.Busy.ToString();
+                                stationinfoRepository.Update(EmptyStation, true);
+                                WriteDBLog.Success("鍒涘缓鑷姩鍙栫┖鎵樹换鍔�", $"浠诲姟缂栧彿锛歿agvtask.agv_tasknum}锛屾墭鐩樹俊鍙�:{PalletSignal},璐х墿淇″彿:{MaterialSignal}", "PCS");
+                            }
                         }
+                    }
+                    catch (Exception ex)
+                    {
+                        WriteDBLog.Error("鍒涘缓鑷姩鍙栫┖鎵樹换鍔�", $"{stationCode}锛歿remark}閿欒淇℃伅锛歿ex.Message}", "PCS");
                     }
                 }
             }
@@ -326,7 +520,7 @@
                         if (Station.quantity > 0 && (PalletSignal != 1 || MaterialSignal != 1))//绯荤粺璐т綅鏈夎溅杞紝鍏夌數妫�娴嬫棤杞﹁疆
                         {
                             Station.location_state = LocationStateEnum.Abnormal.ToString();
-                            Station.remark = "杞﹁疆鏁伴噺澶т簬0锛屽厜鐢垫娴嬫棤鎵樼洏鎴栨棤杞﹁疆";
+                            Station.remark = $"杞﹁疆鏁伴噺澶т簬0锛屾墭鐩樺厜鐢典俊鍙蜂负锛歿PalletSignal}锛岃揣鐗╁厜鐢典俊鍙蜂负锛歿MaterialSignal}";
                             stationinfoRepository.Update(Station, true);
                             client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
                             WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Station.stationCode}锛涢敊璇俊鎭細{Station.remark}", "PCS");
@@ -335,7 +529,7 @@
                         if (Station.location_state == LocationStateEnum.Stroge.ToString() && PalletSignal != 1)
                         {
                             Station.location_state = LocationStateEnum.Abnormal.ToString();
-                            Station.remark = "鍏夌數妫�娴嬫棤鎵樼洏";
+                            Station.remark = $"璐т綅鐘舵�佷负鏈夎揣锛屾墭鐩樺厜鐢典俊鍙蜂负锛歿PalletSignal}锛岃揣鐗╁厜鐢典俊鍙蜂负锛歿MaterialSignal}";
                             stationinfoRepository.Update(Station, true);
                             client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
                             WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Station.stationCode}锛涢敊璇俊鎭細{Station.remark}", "PCS");
@@ -344,7 +538,7 @@
                         if (Station.location_state == LocationStateEnum.Empty.ToString() && (PalletSignal == 1 || MaterialSignal == 1))//绯荤粺璐т綅涓虹┖锛屽厜鐢垫娴嬫湁鏂�
                         {
                             Station.location_state = LocationStateEnum.Abnormal.ToString();
-                            Station.remark = "鍏夌數妫�娴嬫湁鏂�";
+                            Station.remark = $"璐т綅鐘舵�佷负绌鸿揣浣嶏紝鎵樼洏鍏夌數淇″彿涓猴細{PalletSignal}锛岃揣鐗╁厜鐢典俊鍙蜂负锛歿MaterialSignal}";
                             stationinfoRepository.Update(Station, true);
                             client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
                             WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Station.stationCode}锛涢敊璇俊鎭細{Station.remark}", "PCS");

--
Gitblit v1.9.3