From 318f9528c264a3ee8d1f6bb340e916925d82e80f Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 10 十一月 2025 09:00:49 +0800
Subject: [PATCH] 修改问题

---
 Admin.NET/WCS.Application/PLC/PLCService.cs |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 2037a61..c15da93 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -388,7 +388,7 @@
 
                                     // 璇诲彇wcs鎺у埗瀛�
                                     var (ress, va1s) = plcConveyorConn.GetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos);
-                                    if (va1s.ToString() == "630") 
+                                    if (va1s.ToString() == "630")
                                     {
                                         var retc = plcConveyorConn.SetPlcDBValue(ConveyorMod.PosType, ConveyorMod.DbNumber, ConveyorMod.WcsPos, "640");
                                         if (retc.IsSucceed)
@@ -442,6 +442,32 @@
                                         HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
 
                                     }
+                                    else//鍨涙満鏄�840锛屽彇璐у伐浣嶄笉鏄�630锛岃鏄庢病缁欏灈鏈哄啓鎴愬姛850锛屽啀娆$粰鍨涙満鍐欏叆850
+                                    {
+                                        // 璇诲彇wcs鎺у埗瀛�
+                                        var (resss, va1ss) = plcConn.GetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos);
+                                        if (va1ss.ToString() == "830")
+                                        {
+                                            modInsertTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0}璺烘満鍙栬揣瀹屾垚鍐欏叆850", startStationVal);
+                                            modInsertTaskMonitor.EndLocat = modTask.EndLocate; // 鐩爣鍌ㄤ綅鍦板潃
+                                            // 鎻掑叆浜や簰鏃ュ織
+                                            _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+
+                                            // 鍐欏叆娴佺▼鎺у埗瀛�
+                                            var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "850");
+                                            if (!ret.IsSucceed)
+                                            {
+                                                modInsertTaskMonitor.InteractiveMsg = string.Format("宸ヤ綅锛歿0}璺烘満鍙栬揣瀹屾垚鍐欏叆850澶辫触,绛夊緟鍐嶆鍐欏叆銆�", startStationVal);
+                                                modInsertTaskMonitor.EndLocat = modTask.EndLocate;                  // 鐩爣鍌ㄤ綅鍦板潃
+                                                // 鎻掑叆浜や簰鏃ュ織
+                                                _db.Insertable(modInsertTaskMonitor).ExecuteCommand();
+                                                break;              // 鍐欏叆澶辫触璺冲嚭绛夊緟鍐嶆鍐欏叆
+                                            }
+
+                                            //涓嬪彂浠诲姟鏃ュ織
+                                            HubUtil.PublicTaskMonitor(modInsertTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+                                        }
+                                    }
                                 }
                             }
                         }

--
Gitblit v1.8.0