add-对接调度接口-询问小车信号、请求叫料信号

SlnMesnac.Common/GunHelper.cs

@@ -95,6 +95,7 @@ namespace SlnMesnac.Common
             Console.WriteLine(result);
         }
 
+
         /// <summary>
         /// 发送数据方法
         /// </summary>

SlnMesnac.Common/HttpHelper.cs

@@ -1,18 +1,18 @@
-using Microsoft.Extensions.DependencyInjection;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.IO.Ports;
-using System.Linq;
 using System.Net;
+using System.Net.Http;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
-using System.Text.Json;
+
 namespace SlnMesnac.Common
 {
     public class HttpHelper
     {
+
+      
         public static string Get(string serviceAddress)
         {
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(serviceAddress);
@@ -40,6 +40,94 @@ namespace SlnMesnac.Common
             return retString;
         }
 
+
+        public static string Post111(string url, string jsonContent)
+        {
+            HttpClient _client = new HttpClient();
+            var content = new StringContent(jsonContent, Encoding.UTF8, "application/json");
+
+            HttpResponseMessage response = _client.PostAsync(url, content).Result;
+
+            if (response.IsSuccessStatusCode)
+            {
+                return response.Content.ReadAsStringAsync().Result;
+            }
+            else
+            {
+                throw new HttpRequestException($"POST request to {url} failed with status code {response.StatusCode}");
+            }
+        }
+
+
+        public static string SendPostMessage(string ip, int port, string url, string message, string contentType = "application/Text")
+        {
+            string retsult = HttpPost("http://" + ip + ":" + port + "/" + url, message, contentType, 30, null);
+            return retsult;
+        }
+
+
+        public static string SendGetMessage(string ip, int port, string url)
+        {
+            string retsult = HttpGet("http://" + ip + ":" + port + "/" + url);
+            return retsult;
+        }
+
+
+
+        /// <summary>
+        /// 发起GET同步请求
+        /// </summary>
+        /// <param name="url"></param>
+        /// <param name="headers"></param>
+        /// <param name="contentType"></param>
+        /// <returns></returns>
+        public static string HttpGet(string url, Dictionary<string, string> headers = null)
+        {
+            using (HttpClient client = new HttpClient())
+            {
+                if (headers != null)
+                {
+                    foreach (var header in headers)
+                        client.DefaultRequestHeaders.Add(header.Key, header.Value);
+                }
+                HttpResponseMessage response = client.GetAsync(url).Result;
+                return response.Content.ReadAsStringAsync().Result;
+            }
+        }
+
+
+
+        public static  string HttpPost(string url, string postData = null, string contentType = null, int timeOut = 30, Dictionary<string, string> headers = null)
+        {
+            try
+            {
+
+
+                using (HttpClient client = new HttpClient())
+                {
+                    if (headers != null)
+                    {
+                        foreach (var header in headers)
+                            client.DefaultRequestHeaders.Add(header.Key, header.Value);
+                    }
+                    using (HttpContent httpContent = new StringContent(postData, Encoding.UTF8))
+                    {
+                        if (contentType != null)
+                            httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(contentType);
+
+
+                        HttpResponseMessage response = client.PostAsync(url, httpContent).Result;
+                        return response.Content.ReadAsStringAsync().Result;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message);
+                return null;
+            }
+        }
+
         public static string Post(string serviceAddress, string strContent = null)
         {
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(serviceAddress);
@@ -65,11 +153,85 @@ namespace SlnMesnac.Common
             return retString;
         }
 
+
+
+
+
+        //public static  void TestConnectionAsync(HttpClient client,string url)
+        //{
+        //    try
+        //    {
+        //        HttpResponseMessage response =  client.GetAsync(url).Result;
+
+        //        if (response.IsSuccessStatusCode)
+        //        {
+        //            Console.WriteLine($"Success: Connected to {url}");
+        //        }
+        //        else
+        //        {
+        //            Console.WriteLine($"Failure: Unable to connect to {url}. Status code: {response.StatusCode}");
+        //        }
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        Console.WriteLine($"Exception: {ex.Message}");
+        //    }
+        //}
+
+
+
+        //public static string Post(string serviceAddress, string strContent = null)
+        //{
+        //    HttpWebRequest request = (HttpWebRequest)WebRequest.Create(serviceAddress);
+        //    request.Method = "POST";
+        //    request.ContentType = "application/Json";
+        //    //判断有无POST内容
+        //    if (!string.IsNullOrWhiteSpace(strContent))
+        //    {
+        //        using (StreamWriter dataStream = new StreamWriter(request.GetRequestStream()))
+        //        {
+        //            dataStream.Write(strContent);
+        //            dataStream.Close();
+        //        }
+        //    }
+        //    HttpWebResponse response = (HttpWebResponse)request.GetResponse();
+        //    string encoding = response.ContentEncoding;
+        //    if (encoding.Length < 1)
+        //    {
+        //        encoding = "UTF-8"; //默认编码  
+        //    }
+        //    StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.GetEncoding(encoding));
+        //    string retString = reader.ReadToEnd();
+        //    return retString;
+        //}
+
+        //public static string Post1(string url, string postData = null, string contentType = null, int timeOut = 30, Dictionary<string, string> headers = null)
+        //{
+        //    postData = postData ?? "";
+        //    using (HttpClient client = new HttpClient())
+        //    {
+        //        if (headers != null)
+        //        {
+        //            foreach (var header in headers)
+        //                client.DefaultRequestHeaders.Add(header.Key, header.Value);
+        //        }
+        //        using (HttpContent httpContent = new StringContent(postData, Encoding.UTF8))
+        //        {
+        //            if (contentType != null)
+        //                httpContent.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue(contentType);
+
+        //            HttpResponseMessage response = client.PostAsync(url, httpContent).Result;
+        //            return response.Content.ReadAsStringAsync().Result;
+        //        }
+        //    }
+        //}
+
+
         public static async Task<string> PostAsync(string serviceAddress, string strContent = null)
         {
             HttpWebRequest request = (HttpWebRequest)WebRequest.Create(serviceAddress);
             request.Method = "POST";
-            request.ContentType = "application/json";
+            request.ContentType = "application/Json";
             //判断有无POST内容
             if (!string.IsNullOrWhiteSpace(strContent))
             {
@@ -92,25 +254,62 @@ namespace SlnMesnac.Common
 
 
         /// <summary>
-        /// 叫料
+        /// Agv任务是否完成的接口
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
-        public bool JL(string orderId)
+        public static bool JudgeAgvTaskComplete()
         {
-           
-            string url = $"http://10.100.72.10:8080/login";
-           
-            var loginResult = Post(url,orderId);//发送用户名密码给API
 
-            if(loginResult.Contains("200"))
+            try
             {
+                string url = $"http://192.168.1.103:5001/wcs/RecieveRcs/callMaterial";
+
+                string v = HttpHelper.SendPostMessage("127.0.0.1", 5001, "wcs/RecieveRcs/AgvTaskComplete", "", "application/Json");
+
                 return true;
             }
-            else
+            catch (Exception ex)
+            {
+
+                return false;
+            }
+
+        }
+
+
+        /// <summary>
+        /// 通知Agv小车送料
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <returns></returns>
+        public static bool SendAgvTask(string orderId)
+        {
+
+            try
+            {
+                // 创建请求对象
+                var request = new
+                {
+                    RawOutstockId = orderId
+                };
+
+                // 序列化为 JSON 字符串
+                string jsonData = JsonConvert.SerializeObject(request);
+
+                string url = $"http://127.0.0.1:5001/wcs/RecieveRcs/callMaterial";
+
+                var Result = Post(url, jsonData);
+
+                return true;
+            }
+            catch (Exception ex)
             {
                 return false;
             }
+
         }
+
+
     }
-}
+}

SlnMesnac.Common/Model/ReponseMessage.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Common.Model
+{
+    public class ReponseMessage
+    {
+        /// <summary>
+        /// 返回码
+        /// </summary>
+        public string code { get; set; }
+        /// <summary>
+        /// 返回消息,成功或其他
+        /// </summary>
+        public string message { get; set; }
+        /// <summary>
+        /// 请求编号
+        /// </summary>
+        public string reqCode { get; set; }
+        /// <summary>
+        /// 自定义返回（返回任务单号）
+        /// </summary>
+        public string data { get; set; }
+    }
+}

SlnMesnac.Common/SlnMesnac.Common.csproj

@@ -7,6 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
     <PackageReference Include="System.IO.Ports" Version="6.0.0" />
     <PackageReference Include="System.Text.Json" Version="8.0.4" />

SlnMesnac.Extensions/MesPlcSingalSetup.cs

@@ -46,7 +46,7 @@ namespace SlnMesnac.Extensions
                 }
             };
 
-            _server.Init(5000);
+            _server.Init(6000);
             return app;
         }
 

SlnMesnac.Extensions/SlnMesnac.Extensions.csproj

@@ -5,10 +5,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\SlnMesnac.Model\SlnMesnac.Model.csproj" />
     <ProjectReference Include="..\SlnMesnac.Plc\SlnMesnac.Plc.csproj" />

SlnMesnac.Extensions/SqlsugarSetup.cs

@@ -48,6 +48,12 @@ namespace SlnMesnac.Extensions
                 {
                     foreach (var item in appConfig.sqlConfig)
                     {
+                        #region 加载sqlite数据库地址
+                        if (item.configId == "local")
+                        {
+                            item.connStr = $"Data Source={System.Environment.CurrentDirectory}//data//data.db";
+                        }
+                        #endregion
                         var config = new ConnectionConfig()
                         {
                             ConfigId = item.configId,

SlnMesnac.Model/domain/WmsRawOutStock.cs

@@ -0,0 +1,198 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Model.domain
+* 唯一标识：8c0a747f-0ee1-4c2a-957a-95ff8345896f
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-09 16:17:47
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Model.domain
+{
+    [SugarTable("wms_raw_outstock"), TenantAttribute("mes")]
+    public class WmsRawOutstock
+    {
+
+       
+        [SugarColumn(ColumnName = "raw_outstock_id", IsPrimaryKey = true, IsIdentity = true)]
+        public long rawOutstockId { get; set; }
+
+        /// <summary>
+        /// 任务编号
+        /// </summary>
+        [SugarColumn(ColumnName = "task_code")]
+        public string taskCode { get; set; }
+
+        /// <summary>
+        /// 仓库ID;领料时需要保存
+        /// </summary>
+        [SugarColumn(ColumnName = "warehouse_id")]
+        public long? warehouseId { get; set; }
+
+        /// <summary>
+        /// 库位编码
+        /// </summary>
+        [SugarColumn(ColumnName = "location_code")]
+        public string locationCode { get; set; }
+
+        /// <summary>
+        /// 销售订单ID
+        /// </summary>
+        [SugarColumn(ColumnName = "order_id")]
+        public long? orderId { get; set; }
+
+        /// <summary>
+        /// 计划编号,关联mes_product_plan_info的plan_code
+        /// </summary>
+        [SugarColumn(ColumnName = "plan_code")]
+        public string planCode { get; set; }
+
+        /// <summary>
+        /// 计划明细编号,关联mes_product_plan_detail的plan_detail_code
+        /// </summary>
+        [SugarColumn(ColumnName = "plan_detail_code")]
+        public string planDetailCode { get; set; }
+
+        /// <summary>
+        /// 所属工位，关联mes_base_station_info的station_id
+        /// </summary>
+        [SugarColumn(ColumnName = "station_id")]
+        public int? stationId { get; set; }
+
+
+        [SugarColumn(ColumnName = "material_id")]
+        public long? materialId { get; set; }
+
+        /// <summary>
+        /// 物料批次
+        /// </summary>
+        [SugarColumn(ColumnName = "material_batch")]
+        public string materialBatch { get; set; }
+
+        /// <summary>
+        /// 托盘RFID代码
+        /// </summary>
+        [SugarColumn(ColumnName = "pallet_info_code")]
+        public string palletInfoCode { get; set; }
+
+        /// <summary>
+        /// 计划出库数量
+        /// </summary>
+        [SugarColumn(ColumnName = "outstock_amount")]
+        public decimal outstockAmount { get; set; }
+
+        /// <summary>
+        /// 已出库数量
+        /// </summary>
+        [SugarColumn(ColumnName = "real_outstock_amount")]
+        public decimal? realOutstockAmount { get; set; }
+
+        /// <summary>
+        /// 出库目的地
+        /// </summary>
+        [SugarColumn(ColumnName = "end_station_code")]
+        public string endStationCode { get; set; }
+
+        /// <summary>
+        /// 操作类型(0自动,1人工,2强制,3调度)
+        /// </summary>
+        [SugarColumn(ColumnName = "operation_type")]
+        public string operationType { get; set; }
+
+        /// <summary>
+        /// 任务类型(1生产领料,2拆分出库,3组装出库,9其他)
+        /// </summary>
+        [SugarColumn(ColumnName = "task_type")]
+        public string taskType { get; set; }
+
+        /// <summary>
+        /// 申请原因
+        /// </summary>
+        [SugarColumn(ColumnName = "apply_reason")]
+        public string applyReason { get; set; }
+
+        /// <summary>
+        /// 审核原因
+        /// </summary>
+        [SugarColumn(ColumnName = "audit_reason")]
+        public string auditReason { get; set; }
+
+        /// <summary>
+        /// 审核状态(0待审核,1审核通过,2审核未通过)
+        /// </summary>
+        [SugarColumn(ColumnName = "audit_status")]
+        public string auditStatus { get; set; }
+
+        /// <summary>
+        /// 执行状态(0待执行,1执行中,2执行完成)
+        /// </summary>
+        [SugarColumn(ColumnName = "execute_status")]
+        public string executeStatus { get; set; }
+
+        /// <summary>
+        /// 申请人
+        /// </summary>
+        [SugarColumn(ColumnName = "apply_by")]
+        public string applyBy { get; set; }
+
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        [SugarColumn(ColumnName = "apply_date")]
+        public DateTime? applyDate { get; set; }
+
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        [SugarColumn(ColumnName = "audit_by")]
+        public string auditBy { get; set; }
+
+        /// <summary>
+        /// 审核时间
+        /// </summary>
+        [SugarColumn(ColumnName = "audit_date")]
+        public DateTime? auditDate { get; set; }
+
+        /// <summary>
+        /// 最后更新人
+        /// </summary>
+        [SugarColumn(ColumnName = "update_by")]
+        public string updateBy { get; set; }
+
+        /// <summary>
+        /// 最后更新时间
+        /// </summary>
+        [SugarColumn(ColumnName = "update_date")]
+        public DateTime? updateDate { get; set; }
+
+        /// <summary>
+        /// 执行开始时间
+        /// </summary>
+        [SugarColumn(ColumnName = "begin_time")]
+        public DateTime? beginTime { get; set; }
+
+        /// <summary>
+        /// 执行结束时间
+        /// </summary>
+        [SugarColumn(ColumnName = "end_time")]
+        public DateTime? endTime { get; set; }
+    }
+}

SlnMesnac.Repository/service/IWmsOutStockService.cs

@@ -0,0 +1,18 @@
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace SlnMesnac.Repository.service
+{
+    public interface IWmsOutStockService : IBaseService<WmsRawOutstock>
+    {
+
+        /// <summary>
+        /// 根据计划编号获取
+        /// </summary>
+        /// <returns></returns>
+        WmsRawOutstock GetProdPlanByPlanCode(string planCode);
+    }
+}

SlnMesnac.Repository/service/Impl/WmsOutStockServiceImpl.cs

@@ -0,0 +1,59 @@
+using SlnMesnac.Config;
+using SlnMesnac.Model.domain;
+using SlnMesnac.Repository.service.@base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+#region << 版 本 注 释 >>
+/*--------------------------------------------------------------------
+* 版权所有 (c) 2024 WenJY 保留所有权利。
+* CLR版本：4.0.30319.42000
+* 机器名称：LAPTOP-E0N2L34V
+* 命名空间：SlnMesnac.Repository.service.Impl
+* 唯一标识：4775f606-89b8-4dba-88da-4920de3e1559
+*
+* 创建者：WenJY
+* 电子邮箱：wenjy@mesnac.com
+* 创建时间：2024-04-09 16:21:05
+* 版本：V1.0.0
+* 描述：
+*
+*--------------------------------------------------------------------
+* 修改人：
+* 时间：
+* 修改说明：
+*
+* 版本：V1.0.0
+*--------------------------------------------------------------------*/
+#endregion << 版 本 注 释 >>
+namespace SlnMesnac.Repository.service.Impl
+{
+    public class WmsOutStockServiceImpl : BaseServiceImpl<WmsRawOutstock>, IWmsOutStockService
+    {
+        public WmsOutStockServiceImpl(Repository<WmsRawOutstock> rep) : base(rep)
+        {
+
+           
+
+        }
+
+        /// <summary>
+        /// 根据计划编号获取生产计划
+        /// </summary>
+        /// <param name="planCode"></param>
+        /// <returns></returns>
+        /// <exception cref="Exception"></exception>
+        public WmsRawOutstock GetProdPlanByPlanCode(string planCode)
+        {
+            try
+            {
+                return base._rep.GetFirst(x => x.planCode == planCode);
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException($"根据计划编号获取生产计划异常：{ex.Message}");
+            }
+        }
+    }
+}

SlnMesnac.Repository/service/base/BaseServiceImpl.cs

@@ -277,6 +277,7 @@ namespace SlnMesnac.Repository.service.@base
             }
             catch (Exception ex)
             {
+
                 throw new InvalidOperationException($"查询所有信息异常:{ex.Message}");
             }
         }

SlnMesnac.TouchSocket/SlnMesnac.TouchSocket.csproj

@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="TouchSocket" Version="2.0.0-beta.270" />
+    <PackageReference Include="TouchSocket.Http" Version="1.4.5" />
   </ItemGroup>
 
   <ItemGroup>

SlnMesnac.WPF/App.xaml.cs

@@ -7,6 +7,13 @@ using SlnMesnac.Config;
 using System;
 using System.Windows;
 using Autofac.Extensions.DependencyInjection;
+using System.Net.Http;
+using System.IO;
+using System.Net;
+using System.Text;
+using SlnMesnac.Common;
+using System.Net.NetworkInformation;
+using System.Linq;
 
 namespace SlnMesnac.WPF
 {
@@ -22,6 +29,7 @@ namespace SlnMesnac.WPF
         // Startup事件
         protected override async void OnStartup(StartupEventArgs e)
         {
+
             bool ret;
             mutex = new System.Threading.Mutex(true, System.Diagnostics.Process.GetCurrentProcess().ProcessName, out ret);
             if (!ret)
@@ -29,22 +37,34 @@ namespace SlnMesnac.WPF
                 MessageBox.Show("应用程序已开启，禁止重复运行");
                 Environment.Exit(0);
             }
-
+           
             cracker.Cracker(100); //设置GC回收间隔
 
+
             base.OnStartup(e);
+
             var host = CreateHostBuilder(e.Args).Build();//生成宿主。
 
+          
+
+
             ServiceProvider = host.Services;
 
             await host.StartAsync();
 
+            //string url = $"http://localhost:5001/wcs/RecieveRcs/AgvTaskComplete";
+            //string result = HttpHelper.Post(url);
+            //Console.WriteLine(result);
+
+
             var appConfig = host.Services.GetService<AppConfig>();
             var logPath = $"{appConfig.logPath}/Logs/{DateTime.UtcNow:yyyy-MM-dd}/";
             Log.Information($"系统初始化完成,日志存放路径：{appConfig.logPath}");
 
         }
 
+       
+
         /// <summary>
         /// CreateHostBuilder
         /// </summary>
@@ -53,11 +73,18 @@ namespace SlnMesnac.WPF
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
                 .UseSerilog()
+            
                 .UseServiceProviderFactory(new AutofacServiceProviderFactory())
-                .ConfigureWebHostDefaults(webBuilder =>
+              .ConfigureWebHostDefaults(webBuilder =>
                 {
-                    webBuilder.UseStartup<Startup>();
+                    webBuilder.UseStartup<Startup>()
+                          .ConfigureKestrel(serverOptions =>
+                          {
+                              // 修改默认启动端口
+                              serverOptions.ListenAnyIP(4000); 
+                          });
                 });
+               
 
         // Exit事件
         protected override void OnExit(ExitEventArgs e)

SlnMesnac.WPF/Startup.cs

@@ -24,6 +24,8 @@ namespace SlnMesnac.WPF
         [Obsolete]
         public void ConfigureServices(IServiceCollection services)
         {
+
+
             services.AddControllers();
 
             //注册AppConfig
@@ -42,8 +44,11 @@ namespace SlnMesnac.WPF
 
             //RFID
             services.AddRfidFactorySetup();
+
+
+
         }
-        
+
         /// <summary>
         /// AutoFac自动注入
         /// </summary>
@@ -60,10 +65,10 @@ namespace SlnMesnac.WPF
         /// <param name="env"></param>
         public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
+            //if (env.IsDevelopment())
+            //{
+            //    app.UseDeveloperExceptionPage();
+            //}
 
             //启用Serilog中间件
             app.UseSerilogExtensions();

SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs

@@ -1,5 +1,6 @@
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using SlnMesnac.WPF.Page;
@@ -83,6 +84,7 @@ namespace SlnMesnac.WPF.ViewModel
 
         public MainWindowViewModel()
         {
+           
 
             _logger = App.ServiceProvider.GetService<ILogger<MainWindowViewModel>>();
 
@@ -101,6 +103,7 @@ namespace SlnMesnac.WPF.ViewModel
         {
             try
             {
+               
                 string controlType = obj as string;
                 switch (controlType)
                 {
@@ -126,6 +129,7 @@ namespace SlnMesnac.WPF.ViewModel
                         UserContent = generateControl;
                         break;
                     case "ConfigInfo":
+                      
                         UserContent = configInfoPage;
                         break;
                     // 还原 或者 最大化当前窗口

SlnMesnac.WPF/ViewModel/ProdMgmtViewModel.cs

@@ -19,6 +19,8 @@ using Microsoft.IdentityModel.Logging;
 using System.Windows.Documents;
 using SlnMesnac.Common;
 using HslCommunication.Profinet.GE;
+using static System.Net.Mime.MediaTypeNames;
+using Application = System.Windows.Application;
 
 namespace SlnMesnac.WPF.ViewModel
 {
@@ -168,7 +170,10 @@ namespace SlnMesnac.WPF.ViewModel
 
         public ProdMgmtViewModel()
         {
-            gunHelper.InstanceSerialPort();
+           
+
+
+            test();
             StartProdPlanCommand = new RelayCommand<string>(obj => StartProdPlan(obj));
             StopProdPlanCommand = new RelayCommand<string>(obj => StopProdPlan(obj));
             _logger = App.ServiceProvider.GetService<ILogger<ProdMgmtViewModel>>();
@@ -194,6 +199,13 @@ namespace SlnMesnac.WPF.ViewModel
             });
         }
         
+        public void test()
+        {
+            // gunHelper.InstanceSerialPort();
+            //  HttpHelper.JudgeAgvTaskComplete();
+            // HttpHelper.SendAgvTask("20245603");
+            //HttpHelper.JudgeAgvTaskComplete();
+        }
         /// <summary>
         /// 刷新计划执行
         /// </summary>

SlnMesnac.WPF/appsettings.json

@@ -14,6 +14,7 @@
       {
         "configId": "mes",
         "dbType": 0,
+       // "connStr": "Data Source=175.27.215.92;Port=3306;Initial Catalog=hwry-cloud;uid=root;pwd=haiwei@123;Charset=utf8mb4;SslMode=none"
         "connStr": "Data Source=172.16.12.100;Port=3306;Initial Catalog=hwjy-cloud;uid=root;pwd=JyhbRk@123456;Charset=utf8mb4;SslMode=none"
       },
       {