From ddd9612ed7cefe12c8ea33ced0711a0b9a3feb99 Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期日, 16 二月 2025 18:18:42 +0800
Subject: [PATCH] 修改接口

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

diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 42f3e22..1366feb 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1771,7 +1771,7 @@
                             if (ret.IsSucceed)
                             {
                                 //鍥炰紶WMS鍙斁淇″彿
-                                strMsg = http.RequesContinueAgv(res1.ToString(),modTask.StationNum);
+                                strMsg = http.RequesContinueAgv(val.ToString(), modDevice.StationNum);
                                 if (!strMsg.Contains("-1"))
                                 {
                                     // 鎻掑叆浠诲姟鏄庣粏 
@@ -1780,7 +1780,6 @@
                                         PlcId = modDevice.Id,
                                         PlcName = modDevice.Text,
                                         InteractiveMsg = $"鍐欏叆鎸囦护151锛歿modDevice.StationNum}宸ヤ綅鍙帴鍙桝GV鏀捐揣鍏ュ簱",
-                                        PalletNo = modTask.PalletNo,
                                         Status = TaskStatusEnum.Complete,
                                         StartLocat = modDevice.StationNum
                                     };
@@ -1861,10 +1860,13 @@
                             // 閫氶亾鍙�
                             var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "閫氶亾鍙�");
 
-                            // 婕旂ず妯″紡鐩存帴鍐欏叆1鍒嗛亾
-                            var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, "1");
+                            // 婕旂ず妯″紡鐩存帴鍐欏叆鍒嗛亾鍙�
+                            Random random = new Random();
+                            int ranNumber = random.Next(2) == 0 ? 1 : 5;
+                            var ret = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, ranNumber.ToString());
                             if (ret.IsSucceed)
                             {
+                                Log.Information(string.Format("鍒嗛亾鎴愬姛锛岄亾鍙锋槸锛�" + ranNumber));
                                 // 鍐欏叆娴佺▼鎺у埗瀛� 2
                                 var retVal = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "2");
                                 if (!retVal.IsSucceed)

--
Gitblit v1.8.0