修改问题

wxw

3 天以前 b77481bae4d7c5e2d5baddfaadc16bd085e071d1

修改问题

 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": [ // 读写分离/主从

 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失败");