From b77481bae4d7c5e2d5baddfaadc16bd085e071d1 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 30 七月 2025 09:08:28 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 20 ++++++++++----------
Admin.NET/WCS.Application/Configuration/Database.json | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Admin.NET/WCS.Application/Configuration/Database.json b/Admin.NET/WCS.Application/Configuration/Database.json
index 96a6b86..5609100 100644
--- a/Admin.NET/WCS.Application/Configuration/Database.json
+++ b/Admin.NET/WCS.Application/Configuration/Database.json
@@ -12,8 +12,8 @@
//"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql 搴撹繛鎺ュ瓧绗︿覆",
//"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle 搴撹繛鎺ュ瓧绗︿覆
//"ConnectionString": "Server=10.18.99.10;Database=WCSnet6;User Id=sa;Password=sql2024;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
- //"ConnectionString": "Server=.;Database=WCS_JC23;User Id=sa;Password=sql2019;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
- "ConnectionString": "Server=172.16.105.2;Database=WCS_JC23;User Id=sa;Password=boxline@2024;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆姝ｅ紡鏈嶅姟鍣�
+ "ConnectionString": "Server=.\\SQLSERVER;Database=WMS_JC23;User ID=sa;Password=admin2023@;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆
+ //"ConnectionString": "Server=172.16.105.2;Database=WCS_JC23;User Id=sa;Password=boxline@2024;", // SqlServer 搴撹繛鎺ュ瓧绗︿覆姝ｅ紡鏈嶅姟鍣�
//"SlaveConnectionConfigs": [ // 璇诲啓鍒嗙/涓讳粠
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 430807e..2edf5f7 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -94,7 +94,7 @@
if (modTask.TaskType == TaskTypeEnum.Move)
{
// 绉诲簱鐩爣鍦板潃
- taskInfo = PLCCommon.GetEndPai(modTask.EndLocate.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
+ taskInfo = PLCCommon.GetEndPai(modTask.EndRoadway.Substring(1, 2), modTask.EndLocate.Substring(2, 2),
modTask.EndLocate.Substring(0, 2), modTask.EndLocate.Substring(4, 2),
modTask.EndLocate.Substring(6, 2));
@@ -265,7 +265,7 @@
// 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
var ret = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "830");
- // 灏嗙Щ搴撲换鍔″緟鎵ц鏀逛负姝ｅ湪鎵ц
+ // 灏嗕换鍔″緟鎵ц鏀逛负姝ｅ湪鎵ц
_db.Updateable<WcsTask>()
.SetColumns(s => s.Status == TaskStatusEnum.Doing)
.Where(s => s.Id == modTask.Id)
@@ -838,14 +838,14 @@
break;
case TaskTypeEnum.Move: // 绉诲簱浠诲姟
{
- var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
- var result = plcConn.SetPlcDBValueRepeat(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
- if (!result.IsSucceed)
- {
- Log.Error($"{modDevice.Text}鍐欏叆浠诲姟鍙峰け璐�");
- break;
- }
- result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
+ //var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "浠诲姟鍙�");
+ //var result = plcConn.SetPlcDBValueRepeat(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo);
+ //if (!result.IsSucceed)
+ //{
+ // Log.Error($"{modDevice.Text}鍐欏叆浠诲姟鍙峰け璐�");
+ // break;
+ //}
+ var result = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "870");
if (!result.IsSucceed)
{
Log.Error($"{modDevice.Text}鎺у埗瀛楀啓鍏�870澶辫触");
--
Gitblit v1.8.0