From 46f7bf1ee45c97b688a370bbe45d149efb403cc1 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 07 五月 2024 17:26:18 +0800
Subject: [PATCH] 检测上料逻辑修改,无有料货位时写入不允许桁架进入信号

---
 代码管理/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs |  525 ++++++++++++++++++++++-----------------------------------
 1 files changed, 204 insertions(+), 321 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
index ae19956..e5df10a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_WCS/Common/Gantry.cs"
@@ -34,6 +34,7 @@
         /// <param name="client"></param>
         public void QueryWheeldata(PLCClient client)
         {
+            string namea = "";
             try
             {
                 VOLContext Context = new VOLContext();
@@ -48,6 +49,7 @@
                 List<string> names = new List<string>() { "1鍗曞厓杈婇亾涓嬫枡鏌ヨ杞﹁疆", "2鍗曞厓杈婇亾涓嬫枡鏌ヨ杞﹁疆", "3鍗曞厓杈婇亾涓嬫枡鏌ヨ杞﹁疆", "杈婇亾涓婃枡鏌ヨ杞﹁疆" };
                 foreach (string name in names)
                 {
+                    namea = name;
                     var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == name).ToList();
                     var on = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_oi_on").First(), client);
                     if ((byte)on == 1)
@@ -66,7 +68,8 @@
                             client.WriteByOrder("W_i_status", (byte)2, name);
                             client.WriteByOrder("R_oi_on", (byte)0, name);
                             #region 鏃ュ織璁板綍
-                            WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟淇℃伅", "PCS");
+                            //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟淇℃伅", "PCS");
+                            WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟淇℃伅");
                             #endregion
                             continue;
                         }
@@ -107,7 +110,8 @@
                                 client.WriteByOrder("W_i_status", (byte)2, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌鏈哄姞宸ヨ溅杞俊鎭�", "PCS");
+                                //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌鏈哄姞宸ヨ溅杞俊鎭�", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌鏈哄姞宸ヨ溅杞俊鎭�");
                                 #endregion
                             }
                             else
@@ -124,7 +128,17 @@
                                 client.WriteByOrder("W_i_parameter_h", geometry == null ? (float)geometry1.h : (float)geometry.h, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\n" +
+                                //WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\n" +
+                                //    $"a锛歿(geometry == null ? (float)geometry1.a : (float)geometry.a)}\n" +
+                                //    $"b锛歿(geometry == null ? (float)geometry1.b : (float)geometry.b)}\n" +
+                                //    $"c锛歿(geometry == null ? (float)geometry1.c : (float)geometry.c)}\n" +
+                                //    $"d锛歿(geometry == null ? (float)geometry1.d : (float)geometry.d)}\n" +
+                                //    $"e锛歿(geometry == null ? (float)geometry1.e : (float)geometry.e)}\n" +
+                                //    $"f锛歿(geometry == null ? (float)geometry1.f : (float)geometry.f)}\n" +
+                                //    $"g锛歿(geometry == null ? (float)geometry1.g : (float)geometry.g)}\n" +
+                                //    $"h锛歿(geometry == null ? (float)geometry1.h : (float)geometry.h)}\n" +
+                                //    $"R_oi_on锛�0", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "鍐欏叆淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\n" +
                                     $"a锛歿(geometry == null ? (float)geometry1.a : (float)geometry.a)}\n" +
                                     $"b锛歿(geometry == null ? (float)geometry1.b : (float)geometry.b)}\n" +
                                     $"c锛歿(geometry == null ? (float)geometry1.c : (float)geometry.c)}\n" +
@@ -133,7 +147,7 @@
                                     $"f锛歿(geometry == null ? (float)geometry1.f : (float)geometry.f)}\n" +
                                     $"g锛歿(geometry == null ? (float)geometry1.g : (float)geometry.g)}\n" +
                                     $"h锛歿(geometry == null ? (float)geometry1.h : (float)geometry.h)}\n" +
-                                    $"R_oi_on锛�0", "PCS");
+                                    $"R_oi_on锛�0");
                                 #endregion
                             }
                         }
@@ -146,7 +160,8 @@
                                 client.WriteByOrder("W_i_status", (byte)2, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌妫�娴嬬嚎杞﹁疆淇℃伅", "PCS");
+                                //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌妫�娴嬬嚎杞﹁疆淇℃伅", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌妫�娴嬬嚎杞﹁疆淇℃伅");
                                 #endregion
                             }
                             else
@@ -162,7 +177,17 @@
                                 client.WriteByOrder("W_i_parameter_h", geometry == null ? (float)geometry1.h : (float)geometry.h, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\n" +
+                                //WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\n" +
+                                //    $"a锛歿(geometry == null ? (float)geometry1.a : (float)geometry.a)}\n" +
+                                //    $"b锛歿(geometry == null ? (float)geometry1.b : (float)geometry.b)}\n" +
+                                //    $"c锛歿(geometry == null ? (float)geometry1.c : (float)geometry.c)}\n" +
+                                //    $"d锛歿(geometry == null ? (float)geometry1.d : (float)geometry.d)}\n" +
+                                //    $"e锛歿(geometry == null ? (float)geometry1.e : (float)geometry.e)}\n" +
+                                //    $"f锛歿(geometry == null ? (float)geometry1.f : (float)geometry.f)}\n" +
+                                //    $"g锛歿(geometry == null ? (float)geometry1.g : (float)geometry.g)}\n" +
+                                //    $"h锛歿(geometry == null ? (float)geometry1.h : (float)geometry.h)}\n" +
+                                //    $"R_oi_on锛�0", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "鍐欏叆淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\n" +
                                     $"a锛歿(geometry == null ? (float)geometry1.a : (float)geometry.a)}\n" +
                                     $"b锛歿(geometry == null ? (float)geometry1.b : (float)geometry.b)}\n" +
                                     $"c锛歿(geometry == null ? (float)geometry1.c : (float)geometry.c)}\n" +
@@ -171,7 +196,7 @@
                                     $"f锛歿(geometry == null ? (float)geometry1.f : (float)geometry.f)}\n" +
                                     $"g锛歿(geometry == null ? (float)geometry1.g : (float)geometry.g)}\n" +
                                     $"h锛歿(geometry == null ? (float)geometry1.h : (float)geometry.h)}\n" +
-                                    $"R_oi_on锛�0", "PCS");
+                                    $"R_oi_on锛�0");
                                 #endregion
                             }
                         }
@@ -181,7 +206,8 @@
             }
             catch (Exception ex)
             {
-                WriteDBLog.Error("鏌ヨ杞﹁疆鏁版嵁", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                //WriteDBLog.Error("鏌ヨ杞﹁疆鏁版嵁", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                WriteLog.Write_Log("鎶ラ敊鏃ュ織", namea, "閿欒淇℃伅锛�", $"閿欒淇℃伅锛歿ex.Message}");
             }
         }
         #endregion
@@ -193,6 +219,7 @@
         /// <param name="client"></param>
         public void QueryOrder(PLCClient client)
         {
+            string namea = "";
             try
             {
                 VOLContext Context = new VOLContext();
@@ -208,6 +235,7 @@
                 List<string> names = new List<string>() { "1鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟", "2鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟", "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟", "杈婇亾涓婃枡鏌ヨ璁㈠崟" };
                 foreach (string name in names)
                 {
+                    namea = name;
                     var details = plcRepository.Find(x => x.plcdetail_iotype == plc.plcinfo_iotyep && x.plcdetail_number == name).ToList();
                     var on = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_oi_on").First(), client);
                     //var on = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_oi_on" && x.plcdetail_number == name).First(), client);
@@ -217,10 +245,11 @@
                         var wp_id = client.ReadByOrder<string>("R_o_wp_id", name);
                         if (string.IsNullOrEmpty(wp_id))
                         {
-                            #region 鏃ュ織璁板綍
                             client.WriteByOrder("W_i_status", (byte)2, name);
                             client.WriteByOrder("R_oi_on", (byte)0, name);
-                            WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n杞﹁疆SN鍙蜂负绌�", "PCS");
+                            #region 鏃ュ織璁板綍
+                            //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n杞﹁疆SN鍙蜂负绌�", "PCS");
+                            WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n杞﹁疆SN鍙蜂负绌�");
                             #endregion
                             continue;
                         }
@@ -232,7 +261,8 @@
                             client.WriteByOrder("W_i_status", (byte)2, name);
                             client.WriteByOrder("R_oi_on", (byte)0, name);
                             #region 鏃ュ織璁板綍
-                            WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
+                            //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
+                            WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌宸ュ崟璇︽儏");
                             #endregion
                             continue;
                         }
@@ -270,7 +300,8 @@
                                 client.WriteByOrder("W_i_status", (byte)4, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�4\nR_oi_on锛�0\n\n鎵嬪姩鍏ュ簱妯″紡鏈�夋嫨搴撳尯", "PCS");
+                                //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�4\nR_oi_on锛�0\n\n鎵嬪姩鍏ュ簱妯″紡鏈�夋嫨搴撳尯", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�4\nR_oi_on锛�0\n\n鎵嬪姩鍏ュ簱妯″紡鏈�夋嫨搴撳尯");
                                 #endregion
                                 continue;
                             }
@@ -283,7 +314,8 @@
                                 client.WriteByOrder("W_i_status", (byte)2, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌鏈哄姞宸ヨ溅杞俊鎭�", "PCS");
+                                //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌鏈哄姞宸ヨ溅杞俊鎭�", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌鏈哄姞宸ヨ溅杞俊鎭�");
                                 #endregion
                                 continue;
                             }
@@ -306,10 +338,14 @@
                                 //}
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" +
+                                WriteLog.Write_Log(name, wp_id, "鍐欏叆淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" +
                                     $"\nW_i_job_id锛歿Mes_Work.jobID}\nW_i_drawing_id锛歿Mes_Work.drawingNo}\nW_i_heat_id锛歿Mes_Work.heatID}\nW_i_batch_id锛歿Mes_Work.heatBatchID}" +
                                     $"\nW_i_skip_op_SJ1锛歿(name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟" ? true : mes_Head.skip_op_1)}\nW_i_skip_op_SJ2锛歿(name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟" ? true : mes_Head.skip_op_2)}" +
-                                    $"\nW_i_skip_op_LT锛歿mes_Head.skip_op_3}\nR_oi_on锛�0", "PCS");
+                                    $"\nW_i_skip_op_LT锛歿mes_Head.skip_op_3}\nR_oi_on锛�0");
+                                //WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" +
+                                //    $"\nW_i_job_id锛歿Mes_Work.jobID}\nW_i_drawing_id锛歿Mes_Work.drawingNo}\nW_i_heat_id锛歿Mes_Work.heatID}\nW_i_batch_id锛歿Mes_Work.heatBatchID}" +
+                                //    $"\nW_i_skip_op_SJ1锛歿(name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟" ? true : mes_Head.skip_op_1)}\nW_i_skip_op_SJ2锛歿(name == "3鍗曞厓杈婇亾涓嬫枡鏌ヨ璁㈠崟" ? true : mes_Head.skip_op_2)}" +
+                                //    $"\nW_i_skip_op_LT锛歿mes_Head.skip_op_3}\nR_oi_on锛�0", "PCS");
                                 #endregion
                             }
                         }
@@ -323,7 +359,8 @@
                                 client.WriteByOrder("W_i_status", (byte)2, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌妫�娴嬬嚎杞﹁疆淇℃伅", "PCS");
+                                //WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌妫�娴嬬嚎杞﹁疆淇℃伅", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "閿欒淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�2\nR_oi_on锛�0\n\n鏈煡璇㈠埌妫�娴嬬嚎杞﹁疆淇℃伅");
                                 #endregion
                                 continue;
                             }
@@ -338,8 +375,10 @@
                                 client.WriteByOrder("W_i_batch_id", Mes_Work.heatBatchID, name);
                                 client.WriteByOrder("R_oi_on", (byte)0, name);
                                 #region 鏃ュ織璁板綍
-                                WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\nW_i_job_id锛歿Mes_Work.jobID}" +
-                                    $"\nW_i_drawing_id锛歿mes_Head.drawingNo}\nW_i_heat_id锛歿Mes_Work.heatID}\nW_i_batch_id锛歿Mes_Work.heatBatchID}\nR_oi_on锛�0", "PCS");
+                                WriteLog.Write_Log(name, wp_id, "鍐欏叆淇℃伅锛�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\nW_i_job_id锛歿Mes_Work.jobID}" +
+                                    $"\nW_i_drawing_id锛歿mes_Head.drawingNo}\nW_i_heat_id锛歿Mes_Work.heatID}\nW_i_batch_id锛歿Mes_Work.heatBatchID}\nR_oi_on锛�0");
+                                //WriteDBLog.Success(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿wp_id}\n杞瀷ID锛歿wp_type}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_i_status锛�1" + $"\nW_i_job_id锛歿Mes_Work.jobID}" +
+                                //    $"\nW_i_drawing_id锛歿mes_Head.drawingNo}\nW_i_heat_id锛歿Mes_Work.heatID}\nW_i_batch_id锛歿Mes_Work.heatBatchID}\nR_oi_on锛�0", "PCS");
                                 #endregion
                             }
                         }
@@ -348,7 +387,8 @@
             }
             catch (Exception ex)
             {
-                WriteDBLog.Error("鏌ヨ杞﹁疆璁㈠崟", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                //WriteDBLog.Error("鏌ヨ杞﹁疆璁㈠崟", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                WriteLog.Write_Log("鎶ラ敊鏃ュ織", namea, "閿欒淇℃伅锛�", $"閿欒淇℃伅锛歿ex.Message}");
             }
         }
         #endregion
@@ -388,43 +428,30 @@
                         var NGStation = "X01001003";
                         if (name == "2鍗曞厓涓嬫枡鍖�") NGStation = "X02001003";
                         if (name == "3鍗曞厓涓嬫枡鍖�") NGStation = "X03001002";
-                        #region MyRegion
-                        //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;
-                        ////var Wheel_id = DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Wheel_id").First(), client).ToString();
-
-                        //var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == Wheel_id);
-                        //if (mes_Detail == null)
-                        //{
-                        //    #region 鏃ュ織璁板綍
-                        //    WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
-                        //    #endregion
-                        //    continue;
-                        //}
-                        //var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
-                        //if (mes_Head == null)
-                        //{
-                        //    #region 鏃ュ織璁板綍
-                        //    WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
-                        //    #endregion
-                        //    continue;
-                        //}
-                        #endregion
 
                         var finished = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_load_finished").First(), client);//鏀炬枡瀹屾垚
                         var updatefinished = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "W_Storage_update").First(), client);//璐т綅鐘舵�佹洿鏂�
 
                         #region 璐т綅鐘舵�佹洿鏂板浣�
-                        //if (!finished && updatefinished)
-                        //{
-                        //    client.WriteByOrder("W_Storage_update", false, name);//璐т綅鐘舵�佹洿鏂�
-                        //    #region 鏃ュ織璁板綍
-                        //    WriteDBLog.Success(name + "璐т綅鐘舵�佹洿鏂板浣�", $"璇诲彇妗佹灦淇℃伅锛歕nR_load_finished锛歿finished}\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_Storage_update锛歠alse", "PCS");
-                        //    #endregion
-                        //}
+                        if (!finished && updatefinished)
+                        {
+                            client.WriteByOrder("W_Storage_update", false, name);//璐т綅鐘舵�佹洿鏂�
+                            #region 鏃ュ織璁板綍
+                            //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
 
+                        var Stations = stationinfoRepository.Find(x => x.area == Pipeline.area_code(name)).OrderBy(x => x.lastUpdateTime).ToList();
+
+                        #region 涓嬫枡浣嶆槸鍚︿负绌虹姸鎬佸悓姝ョ粰妗佹灦
+                        foreach (var station in Stations)
+                        {
+                            client.WriteByOrder(station.stationCode, station.location_state != LocationStateEnum.Stroge.ToString(), name);
+                        }
+                        #endregion
 
                         if (finished && !updatefinished)
                         {
@@ -450,24 +477,6 @@
                                 #endregion
                                 continue;
                             }
-                            #region MyRegion
-                            //var Detail = mes_DetailRepository.FindFirst(x => x.SN == Wheel_SN);
-                            //if (Detail == null)
-                            //{
-                            //    #region 鏃ュ織璁板綍
-                            //    WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_SN}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
-                            //    #endregion
-                            //    continue;
-                            //}
-                            //var Head = mes_HeadRepository.FindFirst(x => x.jobID == Detail.jobID && x.processCode == "17");
-                            //if (Head == null)
-                            //{
-                            //    #region 鏃ュ織璁板綍
-                            //    WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_SN}\n\n鏈煡璇㈠埌宸ュ崟澶磋〃{Detail.jobID}", "PCS");
-                            //    #endregion
-                            //    continue;
-                            //}
-                            #endregion
 
                             #endregion
 
@@ -478,88 +487,90 @@
                                 continue;
                             }
 
+                            #region 鍒ゆ柇鍖哄煙鍙锋槸鍚︿竴鑷�
+                            var area = client.ReadByOrder<Int16>("place_prog", name);//鏀炬枡瀹屾垚鐨勫尯鍩熷彿
 
-                            var areaCode = PipelineJob.area_code(name);   //鏍规嵁涓嬫枡鍙e崟鍏冨悕鑾峰彇鍖哄煙浠g爜
-                            var station = stationinfoRepository.FindFirst(x => x.area == areaCode && x.stationCode.Substring(x.stationCode.Length - 1, 1) == AreaNr.ToString());
-                            if (station.quantity >= 5)
-                                throw new Exception($"涓嬫枡浣嶄俊鎭洿鏂板け璐ワ紒涓嬫枡浣嶈溅杞暟閲忓ぇ浜�5锛歿station.stationCode}");
-                            //station.bindSN = station.bindSN == string.Empty ? Wheel_id : station.bindSN + "," + Wheel_id;
-                            if (!string.IsNullOrEmpty(station.bindSN))
+                            if (AreaNr != area)
                             {
-                                if (station.bindSN.Contains(Wheel_SN))
-                                    throw new Exception($"{station.stationCode}宸插瓨鍦ㄨ溅杞甋N鍙凤細{Wheel_SN}");
+                                Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+                                //WriteDBLog.Error(name + "鎶ヨ", $"PCS鍖哄煙鍙凤細{AreaNr}锛涙鏋跺尯鍩熷彿锛歿area}閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒", "PCS");
+                                WriteLog.Write_Log(name + "鏀炬枡瀹屾垚鍑洪敊", Wheel_SN, "鍒ゆ柇鍖哄煙鍙锋槸鍚︿竴鑷�", $"PCS鍖哄煙鍙凤細{AreaNr}锛沑n妗佹灦鍖哄煙鍙凤細{area}\n閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒");
+                                continue;
                             }
+                            #endregion
 
-                            station.bindSN = string.IsNullOrEmpty(station.bindSN) ? Wheel_SN : station.bindSN + "," + Wheel_SN;
-                            station.billetID = string.IsNullOrEmpty(station.billetID) ? Mes_Work.billetID.ToString() : station.billetID + "," + Mes_Work.billetID;
-                            station.quantity++;
-                            if (station.quantity == 1)
+                            var areaCode = Pipeline.area_code(name);   //鏍规嵁涓嬫枡鍙e崟鍏冨悕鑾峰彇鍖哄煙浠g爜
+                            var station = stationinfoRepository.Find(x => x.area == areaCode && x.stationCode.Substring(x.stationCode.Length - 1, 1) == AreaNr.ToString()).FirstOrDefault();
+                            if (station != null)
                             {
-                                station.stationType = Mes_Work.drawingNo;
-                                station.Number = Mes_Work.workOrder;
-                                station.heatNumber = Mes_Work.heatID;
-                                station.tray_status = "StrogeTray";
+                                if (station.quantity >= 5)
+                                {
+                                    Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+                                    WriteLog.Write_Log(name + "鏀炬枡瀹屾垚鍑洪敊", Wheel_SN, "杞﹁疆鏁伴噺宸叉弧锛�", $"鍖哄煙鍙凤細{AreaNr}锛沑n杞﹁疆鏁帮細{station.quantity}\n閿欒淇℃伅锛氬尯鍩熷彿杞﹁疆鏁伴噺宸叉弧锛�");
+                                }
+
+                                #region 鍒ゆ柇杞﹁疆鏁伴噺鏄惁涓�鑷�
+                                var quantity = client.ReadByOrder<Int16>("pos_prog", name);//妗佹灦璁板綍鐨勮溅杞暟閲�
+
+                                if (quantity != station.quantity + 1)
+                                {
+                                    Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+                                    WriteLog.Write_Log(name + "鏀炬枡瀹屾垚鍑洪敊", Wheel_SN, "鍒ゆ柇杞﹁疆鏁伴噺鏄惁涓�鑷�", $"鍖哄煙鍙凤細{AreaNr}锛沑n妗佹灦杞﹁疆鏁帮細{quantity}\nPCS杞﹁疆鏁帮細{station.quantity + 1}\n閿欒淇℃伅锛歅CS鍖哄煙鍙蜂笌妗佹灦鍖哄煙鍙蜂笉涓�鑷达紒");
+                                    continue;
+                                }
+                                #endregion
+
+                                if (!string.IsNullOrEmpty(station.bindSN))
+                                {
+                                    if (station.bindSN.Contains(Wheel_SN))
+                                        throw new Exception($"{station.stationCode}宸插瓨鍦ㄨ溅杞甋N鍙凤細{Wheel_SN}");
+                                }
+
+                                station.bindSN = string.IsNullOrEmpty(station.bindSN) ? Wheel_SN : station.bindSN + "," + Wheel_SN;
+                                station.billetID = string.IsNullOrEmpty(station.billetID) ? Mes_Work.billetID.ToString() : station.billetID + "," + Mes_Work.billetID;
+                                station.quantity++;
+                                if (station.quantity == 1)
+                                {
+                                    station.stationType = Mes_Work.drawingNo;
+                                    station.Number = Mes_Work.workOrder;
+                                    station.heatNumber = Mes_Work.heatID;
+                                    station.tray_status = "StrogeTray";
+                                }
+
+                                var count = stationinfoRepository.Update(station, true);
+                                if (count < 1)
+                                    throw new Exception($"涓嬫枡浣嶄俊鎭洿鏂板け璐ワ紒涓嬫枡浣嶇紪鍙凤細{station.stationCode}");
+
+                                #region 娓呯┖缁欐鏋剁殑涓嬫枡淇℃伅
+                                client.WriteByOrder("W_IndexNr", (Int16)0, name);//鎵樼洏涓婄殑绗嚑涓溅杞�
+                                client.WriteByOrder("W_Storage_Type", (Int16)0, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
+                                client.WriteByOrder("W_AreaNr", (Int16)0, name);//鍖哄煙璐т綅鍙�
+                                client.WriteByOrder("W_Storage_update", true, name);//璐т綅鐘舵�佹洿鏂�
+                                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
+
+                                #region 淇敼宸ュ崟鐘舵��
+                                var Detail = mes_DetailRepository.FindFirst(x => x.jobID == Mes_Work.jobID && x.SN == Mes_Work.SN);
+                                Detail.Status = "涓嬬嚎";
+                                Detail.FinishTime = DateTime.Now;
+                                count = mes_DetailRepository.Update(Detail, true);
+                                if (count < 1)
+                                    throw new Exception($"宸ュ崟瀛愯〃淇℃伅鏇存柊澶辫触锛佽溅杞甋N鍙凤細{Detail.SN}");
+                                var Head = mes_HeadRepository.FindFirst(x => x.jobID == Detail.jobID);
+                                Head.finishNum = Head.finishNum + 1;
+                                count = mes_HeadRepository.Update(Head, true);
+                                if (count < 1)
+                                    throw new Exception($"宸ュ崟澶磋〃淇℃伅鏇存柊澶辫触锛佸伐鍗曞彿锛歿Head.jobID}");
+                                #endregion
                             }
-                            //else if (station.stationCode == NGStation)
-                            //{
-                            //    station.heatNumber = string.IsNullOrEmpty(station.heatNumber) ? Mes_Work.heatID : station.heatNumber + "," + Mes_Work.heatID;
-                            //}
-
-                            var count = stationinfoRepository.Update(station, true);
-                            if (count < 1)
-                                throw new Exception($"涓嬫枡浣嶄俊鎭洿鏂板け璐ワ紒涓嬫枡浣嶇紪鍙凤細{station.stationCode}");
-
-                            #region 娓呯┖缁欐鏋剁殑涓嬫枡淇℃伅
-                            client.WriteByOrder("W_AreaNr", (Int16)0, name);//鍖哄煙璐т綅鍙�
-                            client.WriteByOrder("W_IndexNr", (Int16)0, name);//鎵樼洏涓婄殑绗嚑涓溅杞�
-                            client.WriteByOrder("W_Storage_Type", (Int16)0, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
-                            client.WriteByOrder("W_Storage_update", true, name);//璐т綅鐘舵�佹洿鏂�
-                            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
-
-
-                            //client.WriteByOrder("W_Enabl_Load", false, name);//鏄惁鍏佽
-
-                            #region 淇敼宸ュ崟鐘舵��
-                            var Detail = mes_DetailRepository.FindFirst(x => x.jobID == Mes_Work.jobID && x.SN == Mes_Work.SN);
-                            Detail.Status = "涓嬬嚎";
-                            Detail.FinishTime = DateTime.Now;
-                            count = mes_DetailRepository.Update(Detail, true);
-                            if (count < 1)
-                                throw new Exception($"宸ュ崟瀛愯〃淇℃伅鏇存柊澶辫触锛佽溅杞甋N鍙凤細{Detail.SN}");
-                            var Head = mes_HeadRepository.FindFirst(x => x.jobID == Detail.jobID);
-                            Head.finishNum = Head.finishNum + 1;
-                            count = mes_HeadRepository.Update(Head, true);
-                            if (count < 1)
-                                throw new Exception($"宸ュ崟澶磋〃淇℃伅鏇存柊澶辫触锛佸伐鍗曞彿锛歿Head.jobID}");
-                            #endregion
-
-                            #region 鏃ュ織璁板綍
-                            //WriteDBLog.Success(name + "鏀炬枡瀹屾垚", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n涓嬫枡浣嶅彿锛歿AreaNr}" +
-                            //    $"\n\n鍐欏叆妗佹灦淇℃伅锛歕nW_Storage_update锛歵rue" + $"\nW_Enabl_Load锛歠alse", "PCS");
-                            #endregion
                         }
-
-                        #region 璐т綅鐘舵�佹洿鏂板浣�
-                        finished = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_load_finished").First(), client);//鏀炬枡瀹屾垚
-                        updatefinished = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "W_Storage_update").First(), client);//璐т綅鐘舵�佹洿鏂�
-                        if (!finished && updatefinished)
-                        {
-                            client.WriteByOrder("W_Storage_update", false, name);//璐т綅鐘舵�佹洿鏂�
-                            #region 鏃ュ織璁板綍
-                            //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
 
                         var Request = (bool)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_Request_Load").First(), client);
                         if (!Request) continue;
@@ -585,39 +596,10 @@
                             WriteLog.Write_Log(name + "鐢宠鏀炬枡寮傚父", Wheel_id, "鏌ヨ鏈哄姞宸ュ伐鍗�", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN鍙凤細{Wheel_id}鏈煡璇㈠埌宸ュ崟淇℃伅\n鍐欏叆妗佹灦淇℃伅锛歕n鏄惁鍏佽涓嬫枡锛歿false}");
                         }
 
-                        #region MyRegion
-                        //var mes_Detail = mes_DetailRepository.FindFirst(x => x.SN == Wheel_id);
-                        //if (mes_Detail == null)
-                        //{
-                        //    #region 鏃ュ織璁板綍
-                        //    client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                        //    WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟璇︽儏", "PCS");
-                        //    #endregion
-                        //    continue;
-                        //}
-                        //var mes_Head = mes_HeadRepository.FindFirst(x => x.jobID == mes_Detail.jobID);
-                        //if (mes_Head == null)
-                        //{
-                        //    #region 鏃ュ織璁板綍
-                        //    client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                        //    WriteDBLog.Error(name, $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n\n鏈煡璇㈠埌宸ュ崟澶磋〃", "PCS");
-                        //    #endregion
-                        //    continue;
-                        //}
-                        #endregion
 
                         #endregion
 
 
-                        var Stations = stationinfoRepository.Find(x => x.area == PipelineJob.area_code(name)).OrderBy(x => x.lastUpdateTime).ToList();
-
-
-
-                        //foreach (var station in Stations)     //浠讳綍涓�涓笅鏂欎綅涓虹┖鎴栫鐢ㄦ椂,閮戒細鍋滄妗佹灦
-                        //{
-                        //    if (!station.enable || station.location_state == LocationStateEnum.Empty.ToString())
-                        //        client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                        //}
 
                         #region MyRegion
                         //var currentAreaNr = (Int16)DBExtension.Read(details.Where(x => x.plcdetail_name == "W_Are00aNr").First(), client);
@@ -628,8 +610,8 @@
                         #endregion
 
 
-                        var wheel = PipelineJob.QueryMateriel(Work.drawingNo);
-                        var wheel1 = PipelineJob.QueryMateriel1(Work.drawingNo);
+                        var wheel = Pipeline.QueryMateriel(Work.drawingNo);
+                        var wheel1 = Pipeline.QueryMateriel1(Work.drawingNo);
                         if (wheel == null && wheel1 == null)
                         {
                             #region 鏃ュ織璁板綍
@@ -648,6 +630,8 @@
                         WriteLog.Write_Log(name + "鐢宠鏀炬枡", Wheel_id, "鐢宠鏀炬枡", $"璇诲彇妗佹灦淇℃伅锛歕n杞﹁疆SN锛歿Wheel_id}\n杞瀷ID锛歿Wheel_Type}\n杞﹁疆鐘舵�侊細{PartStatus}\n鏄惁杩涘叆涓嬫枡鍖猴細{load_zone}");
                         if (load_zone) continue;
                         #endregion
+
+                        #region 鍚堟牸
                         if ((Int16)PartStatus == 1)
                         {
                             dt_stationinfo Stationinfo = null;
@@ -659,7 +643,6 @@
                            && x.location_state == LocationStateEnum.Stroge.ToString()
                            && x.quantity < 5
                            && x.stationType == Work.drawingNo
-                           //&& x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
                            && x.Number == Work.workOrder
                            && x.heatNumber == Work.heatID)
                            .OrderByDescending(x => x.quantity)
@@ -673,7 +656,6 @@
                            && x.location_state == LocationStateEnum.Stroge.ToString()
                            && x.quantity < 5
                            && x.stationType == Work.drawingNo
-                           //&& x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
                            && x.Number == Work.workOrder)
                            .OrderByDescending(x => x.quantity)
                            .FirstOrDefault();
@@ -681,16 +663,6 @@
 
                             if (Stationinfo == null)
                             {
-
-                                #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)
-                                //{
-                                //    agvtask(stationinfoRepository, stationinfo, (wheel == null ? wheel1.e : wheel.e), name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
-                                //}
-                                #endregion
-
-
                                 #region 瑙﹀彂NG浠诲姟
                                 var NG = Stations.Where(x => x.enable && x.stationCode == NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
                                 if (NG != null)
@@ -702,13 +674,6 @@
 
                                 Stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity == 0).FirstOrDefault();
 
-                                #region MyRegion
-                                //var stationinfo = Stations.Where(x => x.enable && x.stationCode != NGStation && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity > 0).FirstOrDefault();
-                                //if (stationinfo != null)
-                                //{
-                                //    agvtask(stationinfoRepository, mes_Head, stationinfo, (wheel == null ? wheel1.e : wheel.e), name == "3鍗曞厓涓嬫枡鍖�" ? "TaskType_OutsourceInbound" : "TaskType_Inbound");
-                                //}
-                                #endregion
                             }
 
                             if (Stationinfo != null)
@@ -731,7 +696,6 @@
                                 #endregion
 
                                 #region 鎵樼洏绫诲瀷涓嶄竴鑷撮渶鏇存崲鎵樼洏
-                                //if (Stationinfo.tray_type != ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray"))
                                 if (Stationinfo.tray_type != "LargeTray" && (wheel == null ? wheel1.e : wheel.e) > 1100)
                                 {
                                     client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
@@ -748,7 +712,6 @@
 
                                 var MaterialSignal = (Int16)DBExtension.Read(Pipelinedetails.Where(x => x.plcdetail_name == "R_MaterialSignal").First(), Pipeline_client);//璇诲彇璐х墿淇″彿:1:鏈�,2鏃�
 
-                                //var Wheel_id = client.ReadByOrder<string>("R_Wheel_id", name);
                                 if (PalletSignal == 1)
                                 {
                                     List<string> list = new List<string>();
@@ -763,25 +726,26 @@
                                     }
 
                                     #region 璐т綅鏁伴噺涓庡厜鐢典笉鍖归厤锛屾姤璀�
-                                    if (list.Count > 0 && MaterialSignal != 1)
-                                    {
-                                        client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                                        Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
-                                        Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
-                                        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)
-                                    {
-                                        client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                                        Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
-                                        Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
-                                        Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
-                                        stationinfoRepository.Update(Stationinfo, true);
-                                        WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
-                                    }
+                                    //if (list.Count > 0 && MaterialSignal != 1)
+                                    //{
+                                    //    client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+                                    //    Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+                                    //    Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+                                    //    Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+                                    //    stationinfoRepository.Update(Stationinfo, true);
+                                    //    WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+                                    //    continue;
+                                    //}
+                                    //else if (list.Count < 1 && MaterialSignal == 1)
+                                    //{
+                                    //    client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
+                                    //    Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+                                    //    Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+                                    //    Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+                                    //    stationinfoRepository.Update(Stationinfo, true);
+                                    //    WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+                                    //    continue;
+                                    //}
 
                                     #endregion
 
@@ -819,44 +783,20 @@
                                     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
                             }
 
                         }
+                        #endregion
+
+                        #region 涓嶅悎鏍�
                         else if ((Int16)PartStatus == 2)
                         {
-                            dt_stationinfo Stationinfo = null;
-                            //if (mes_Detail.heatID != null)
-                            //{
-                            //    Stationinfo = Stations
-                            //.Where(x => x.enable
-                            //&& x.stationCode == NGStation
-                            //&& x.location_state == LocationStateEnum.Stroge.ToString()
-                            //&& x.quantity < 5
-                            //&& x.stationType == mes_Head.drawingNo
-                            //&& x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
-                            //&& x.Number == mes_Detail.jobID
-                            //&& x.heatNumber == mes_Detail.heatID).FirstOrDefault();
-                            //}
-                            //else
-                            //{
-                            //var tray_type = "SmallTray";
-                            //if ((wheel == null ? wheel1.e : wheel.e) > 1100) tray_type = "LargeTray";
-                            Stationinfo = Stations
-                        .Where(x => x.enable
-                        && x.stationCode == NGStation
-                        && x.location_state == LocationStateEnum.Stroge.ToString()
-                        && x.quantity < 5
-                        && x.stationType == Work.drawingNo
-                        //&& x.tray_type == ((wheel == null ? wheel1.e : wheel.e) < 1100 ? "SmallTray" : "LargeTray")
-                        /*&& x.Number == mes_Detail.jobID*/).FirstOrDefault();
-                            //}
+                            dt_stationinfo Stationinfo = Stations.Where(x => x.enable
+                            && x.stationCode == NGStation
+                            && x.location_state == LocationStateEnum.Stroge.ToString()
+                            && x.quantity < 5
+                            && x.stationType == Work.drawingNo).FirstOrDefault();
 
                             if (Stationinfo == null)
                             {
@@ -901,31 +841,25 @@
                                     }
 
                                     #region 璐т綅鏁伴噺涓庡厜鐢典笉鍖归厤锛屾姤璀�
+
                                     //if (list.Count > 0 && MaterialSignal != 1)
+                                    //{
+                                    //    client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
                                     //    Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
+                                    //    Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+                                    //    Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+                                    //    stationinfoRepository.Update(Stationinfo, true);
+                                    //    WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+                                    //}
                                     //else if (list.Count < 1 && MaterialSignal == 1)
+                                    //{
+                                    //    client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
                                     //    Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
-
-                                    if (list.Count > 0 && MaterialSignal != 1)
-                                    {
-                                        client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                                        Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
-                                        Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
-                                        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)
-                                    {
-                                        client.WriteByOrder("W_Enabl_Load", false, name);//淇″彿涓篺alse妗佹灦鍋滄杩涘叆
-                                        Pipeline_client.WriteByOrder("W_AlarmSignal", (Int16)2, name);//鎶ヨ
-                                        Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
-                                        Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
-                                        stationinfoRepository.Update(Stationinfo, true);
-                                        WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
-                                    }
+                                    //    Stationinfo.location_state = LocationStateEnum.Abnormal.ToString();
+                                    //    Stationinfo.remark = "杞﹁疆鏁伴噺涓庡厜鐢典笉鍖归厤";
+                                    //    stationinfoRepository.Update(Stationinfo, true);
+                                    //    WriteDBLog.Error(name + "鎶ヨ", $"璐т綅缂栧彿锛歿Stationinfo.stationCode}锛涢敊璇俊鎭細{Stationinfo.remark}", "PCS");
+                                    //}
                                     #endregion
 
                                     //缂撳瓨鏋朵笂杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�
@@ -935,8 +869,6 @@
                                         Stationinfo.remark = "杞﹁疆鏁伴噺涓嶴N鍙锋暟閲忎笉涓�鑷�";
                                         stationinfoRepository.Update(Stationinfo, true);
                                         continue;
-                                        //鍐欏叆妗佹灦鎶ヨ淇″彿
-                                        //throw new Exception("涓嬫枡浣嶈溅杞暟閲忎笌SN鍙锋暟閲忎笉涓�鑷达紝涓嬫枡浣嶇紪鍙凤細" + Stationinfo.stationCode);
                                     }
                                     var area = Convert.ToInt16(Stationinfo.stationCode.Substring(Stationinfo.stationCode.Length - 1, 1));
                                     client.WriteByOrder("W_AreaNr", (Int16)area, name);//鍖哄煙璐т綅鍙�
@@ -955,69 +887,20 @@
                                 }
                             }
                         }
-                        #region
-                        //var Stationinfo = Stations
-                        //    .Where(x => x.enable
-                        //    && x.location_state == LocationStateEnum.Stroge.ToString()
-                        //    && x.quantity < 5
-                        //    && x.stationType == PipelineJob.QueryMateriel(Wheel_Type)
-                        //    && x.Number == mes_Detail.jobID
-                        //    && x.heatNumber == mes_Detail.heatID).FirstOrDefault();
-                        //if (Stationinfo == null)
-                        //    Stationinfo = Stations.Where(x => x.enable && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity == 0).FirstOrDefault();
-                        //if (Stationinfo != null)
-                        //{
-
-                        //}
-
-                        //List<string> StationCodes = new List<string>() { "X01001001", "X01001002", "X01001003" };
-                        //if (name == "2鍗曞厓涓嬫枡鍖�")
-                        //    StationCodes = new List<string>() { "X02001001", "X02001002", "X02001003" };
-                        //if (name == "3鍗曞厓涓嬫枡鍖�")
-                        //    StationCodes = new List<string>() { "X03001001", "X03001002" };
-
                         #endregion
 
-                        #region
-                        //for (int i = 0; i < StationCodes.Count - 1; i++)
-                        //{
-                        //    var PartStatus = (Int32)DBExtension.Read(details.Where(x => x.plcdetail_name == "R_PartStatus").First(), client);//1:ok;2:nok
-                        //    string NG = StationCodes[StationCodes.Count - 1];//NG璐т綅
-                        //    var station = stationinfoRepository.FindFirst(x => x.stationCode == StationCodes[i] && x.enable && x.location_state == LocationStateEnum.Stroge.ToString() && x.quantity < 5);
-                        //    if (station == null) continue;
-                        //    var Pipelinedetails = plcRepository.Find(x => x.plcdetail_iotype == Pipelineplc.plcinfo_iotyep && x.plcdetail_number == StationCodes[i]).ToList();
-                        //    var PalletSignal = (Int16)DBExtension.Read(Pipelinedetails.Where(x => x.plcdetail_name == "R_PalletSignal").First(), client);//璇诲彇鎵樼洏淇″彿:1:鏈�,2鏃�
-                        //    if (PalletSignal == 1)
-                        //    {
-                        //        if (PartStatus == 1 && NG != station.stationCode)
-                        //        {
-                        //            client.WriteByOrder("W_AreaNr", (Int16)i + 1, name);//鍖哄煙璐т綅鍙�
-                        //            client.WriteByOrder("W_IndexNr", (Int16)station.quantity + 1, name);//鎵樼洏涓婄殑绗嚑涓溅杞�
-                        //            client.WriteByOrder("W_Storage_Type", (Int16)1, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
-                        //            client.WriteByOrder("W_Enabl_Load", true, name);//鏄惁鍏佽
-                        //            return;
-                        //        }
-                        //        else if (PartStatus == 2 && NG == station.stationCode)
-                        //        {
-                        //            client.WriteByOrder("W_AreaNr", (Int16)i + 1, name);//鍖哄煙璐т綅鍙�
-                        //            client.WriteByOrder("W_IndexNr", (Int16)station.quantity + 1, name);//鎵樼洏涓婄殑绗嚑涓溅杞�
-                        //            client.WriteByOrder("W_Storage_Type", (Int16)1, name);//鎵樼洏绫诲瀷1-妯斁;2-绔栨斁(鏆傛椂鍙湁妯斁鎵樼洏)
-                        //            client.WriteByOrder("W_Enabl_Load", true, name);//鏄惁鍏佽
-                        //            return;
-                        //        }
-                        //    }
-                        //}
-                        #endregion
                     }
                     catch (Exception ex)
                     {
-                        WriteDBLog.Error(name, $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                        //WriteDBLog.Error(name, $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                        WriteLog.Write_Log("鎶ラ敊鏃ュ織", name, "閿欒淇℃伅锛�", $"閿欒淇℃伅锛歿ex.Message}");
                     }
                 }
             }
             catch (Exception ex)
             {
-                WriteDBLog.Error("涓嬫枡鍖�", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                //WriteDBLog.Error("涓嬫枡鍖�", $"閿欒淇℃伅锛歿ex.Message}", "PCS");
+                WriteLog.Write_Log("鎶ラ敊鏃ュ織", "涓嬫枡鍖�", "閿欒淇℃伅锛�", $"閿欒淇℃伅锛歿ex.Message}");
             }
         }
         #endregion

--
Gitblit v1.9.3