From 035fa7b6f035d7c267fc6188b55bafa92c024951 Mon Sep 17 00:00:00 2001 From: pengliangyang <1406009520@qq.com> Date: Sat, 6 Aug 2022 09:43:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9F=94=E6=80=A7=E5=91=B3=E9=AD=94?= =?UTF-8?q?=E6=96=B9=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/Model/MessageLog.cs | 29 +++++++++++++++++-- .../Pages/Model/UserInfo.cs | 12 +++++--- .../Pages/ViewModel/AlarmViewModel.cs | 8 ++--- .../Pages/ViewModel/RunLogViewModel.cs | 2 +- DosingSystem/App.xaml.cs | 7 +++-- DosingSystem/Model/DeviceAddress.cs | 10 +++---- DosingSystem/Model/DeviceInquire.cs | 9 +++--- DosingSystem/View/DeviceListView.xaml | 2 +- DosingSystem/View/RecipeControlView.xaml | 2 +- DosingSystem/ViewModel/NewRecipeViewModel.cs | 1 + .../ViewModel/RecipeControlViewModel.cs | 20 ++++++------- .../ViewModel/RecipeSettingsViewModel.cs | 9 ++++-- 12 files changed, 73 insertions(+), 38 deletions(-) diff --git a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs index da1d1e0e..31729435 100644 --- a/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs +++ b/BPASmartClient.CustomResource/Pages/Model/MessageLog.cs @@ -6,6 +6,7 @@ using System.Collections.ObjectModel; using System.Text; using System.Threading.Tasks; using System.Windows; +using BPASmartClient.Model; namespace BPASmartClient.CustomResource.Pages.Model { @@ -16,20 +17,26 @@ namespace BPASmartClient.CustomResource.Pages.Model public static readonly object runLock = new object(); public static readonly object userlock = new object(); + public static readonly object alarmlock = new object(); private MessageLog() { } public Action UserLog { get; set; } public Action RunLog { get; set; } + public Action AlarmLog { get; set; } + public ObservableCollection runLogs { get; set; } = new ObservableCollection(); public ObservableCollection userLogs { get; set; } = new ObservableCollection(); + public ObservableCollection alarmLogs { get; set; } = new ObservableCollection(); + public void LogSave() { Sqlite.GetInstance.Save(); Sqlite.GetInstance.Save(); + Sqlite.GetInstance.Save(); } //public void GetLog() @@ -71,7 +78,25 @@ namespace BPASmartClient.CustomResource.Pages.Model RunLog?.Invoke(info); } } - - + int AlarmID; + public void ShowAlarmLog(string info, string AlarmNumber="_", AlarmLevel level= AlarmLevel.一般报警) + { + lock (alarmlock) + { + AlarmID++; + Alarm alarmLog = new Alarm() + { + NumId = AlarmID, + Date = DateTime.Now.ToString("yyyy-MM-dd"), + Time = DateTime.Now.ToString("HH:mm:ss"), + Info = info, + Value = AlarmNumber, + Grade = (level)+"" + }; + Sqlite.GetInstance.Base.Add(alarmLog); + Application.Current.Dispatcher.Invoke(new Action(() => { alarmLogs.Insert(0, alarmLog); })); + AlarmLog?.Invoke(info); + } + } } } diff --git a/BPASmartClient.CustomResource/Pages/Model/UserInfo.cs b/BPASmartClient.CustomResource/Pages/Model/UserInfo.cs index 1164d95f..7aed871f 100644 --- a/BPASmartClient.CustomResource/Pages/Model/UserInfo.cs +++ b/BPASmartClient.CustomResource/Pages/Model/UserInfo.cs @@ -1,4 +1,5 @@ using BPASmartClient.CustomResource.Pages.Enums; +using Microsoft.Toolkit.Mvvm.ComponentModel; using System; using System.Collections.Generic; using System.Linq; @@ -7,11 +8,14 @@ using System.Threading.Tasks; namespace BPASmartClient.CustomResource.Pages.Model { - public class UserInfo + public class UserInfo:ObservableObject { - public Permission permission { get; set; } - public string UserName { get; set; } - public string Password { get; set; } + public Permission permission { get { return _permission; } set { _permission = value;OnPropertyChanged(); } } + private Permission _permission; + public string UserName { get { return _userName; }set { _userName = value;OnPropertyChanged(); } } + private string _userName; + public string Password { get { return _password; }set { _password = value;OnPropertyChanged(); } } + private string _password; } } diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs index 3213c65a..65788bcb 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs +++ b/BPASmartClient.CustomResource/Pages/ViewModel/AlarmViewModel.cs @@ -64,13 +64,13 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel } }); - AlarmInfos = AlarmHelper.Alarms; + AlarmInfos = MessageLog.GetInstance.alarmLogs; } private void GetHistoryAlarm() { - var data = Sqlite.GetInstance.GetData(); + var data = Sqlite.GetInstance.GetData(); if (data != null) { HistoryAlarm.Clear(); @@ -133,9 +133,5 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel public ObservableCollection AlarmInfos { get; set; } public ObservableCollection HistoryAlarm { get; set; } = new ObservableCollection(); - } - - - } diff --git a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs b/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs index d70defe2..fafff930 100644 --- a/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs +++ b/BPASmartClient.CustomResource/Pages/ViewModel/RunLogViewModel.cs @@ -106,7 +106,7 @@ namespace BPASmartClient.CustomResource.Pages.ViewModel /// public string ControlButText { get { return _mControlButText; } set { _mControlButText = value; OnPropertyChanged(); } } private string _mControlButText = "报警复位"; - + /// /// 开始时间 /// diff --git a/DosingSystem/App.xaml.cs b/DosingSystem/App.xaml.cs index cc308d2b..d7c2350f 100644 --- a/DosingSystem/App.xaml.cs +++ b/DosingSystem/App.xaml.cs @@ -26,13 +26,16 @@ namespace BPASmartClient.DosingSystem base.OnStartup(e); MenuInit(); DataInit(); - MainView mv = new MainView(); //mv.Show(); LoginView lv = new LoginView(); var res = lv.ShowDialog(); - if (res != null && res == true) + if (res != null && res == true) + { + MessageLog.GetInstance.ShowUserLog("用户登录"); mv.Show(); + DeviceInquire.GetInstance.Init(); + } else mv.Close(); MainWindow = mv; diff --git a/DosingSystem/Model/DeviceAddress.cs b/DosingSystem/Model/DeviceAddress.cs index 7c57aaa8..ba25028c 100644 --- a/DosingSystem/Model/DeviceAddress.cs +++ b/DosingSystem/Model/DeviceAddress.cs @@ -16,27 +16,27 @@ namespace BPASmartClient.DosingSystem.Model /// /// 料仓重量反馈起始地址 /// - public static string WeightFeedback { get; set; } = "LW204"; + public static string WeightFeedback { get; set; } = "LW52";//LW204 /// /// 重量设置地址 /// - public static string WeightSet { get; set; } = "LW200"; + public static string WeightSet { get; set; } = "LW21";//LW200 /// /// 启动信号地址 /// - public static string Start { get; set; } = "LW210"; + public static string Start { get; set; } = "LW20";//LW210 /// /// 下料重量反馈地址 /// - public static string CutWeightFeedback { get; set; } = "LW202"; + public static string CutWeightFeedback { get; set; } = "LW54";//LW202 /// /// 设备运行状态地址 /// - public static string RunStatus { get; set; } = "LW206"; + public static string RunStatus { get; set; } = "LW51";//LW206 } diff --git a/DosingSystem/Model/DeviceInquire.cs b/DosingSystem/Model/DeviceInquire.cs index 181abeda..c98f7eb7 100644 --- a/DosingSystem/Model/DeviceInquire.cs +++ b/DosingSystem/Model/DeviceInquire.cs @@ -1,5 +1,4 @@ using BPASmartClient.Helper; -using BPASmartClient.Message; using BPASmartClient.Modbus; using BPASmartClient.DosingSystem.ViewModel; using System; @@ -11,6 +10,8 @@ using System.Net.NetworkInformation; using System.Text; using System.Threading; using System.Threading.Tasks; +using BPASmartClient.CustomResource.UserControls.MessageShow; +using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.DosingSystem.Model { @@ -124,7 +125,7 @@ namespace BPASmartClient.DosingSystem.Model DS.modbusTcp.ConnectFail = new Action(() => { if (!InvalidIP.Contains(ip)) InvalidIP.Add(ip); - MessageLog.GetInstance.Show($"{ip}连接失败"); + //MessageLog.GetInstance.ShowAlarmLog($"设备{ip}连接失败"); }); DS.modbusTcp.Disconnect = new Action(() => @@ -135,7 +136,7 @@ namespace BPASmartClient.DosingSystem.Model App.Current.Dispatcher.Invoke(new Action(() => { DeviceListViewModel.devices.Remove(res); - if (!NewRecipeViewModel.RawMaterialNames.Contains(res.DeviceName)) + if (NewRecipeViewModel.RawMaterialNames.Contains(res.DeviceName)) NewRecipeViewModel.RawMaterialNames.Remove(res.DeviceName); })); if (DeviceLists.ContainsKey(ip)) DeviceLists[ip].Dispose(); @@ -186,7 +187,7 @@ namespace BPASmartClient.DosingSystem.Model //获取设备料仓剩余重量 deviceStatus.WeightFeedback = this.modbusTcp.GetUint(DeviceAddress.WeightFeedback) * 10; - + deviceStatus.CutWeightFeedback = this.modbusTcp.GetUint(DeviceAddress.CutWeightFeedback) * 10; Thread.Sleep(100); }), $"{DeviceName} 开始监听", true); } diff --git a/DosingSystem/View/DeviceListView.xaml b/DosingSystem/View/DeviceListView.xaml index d17dbae8..19d96251 100644 --- a/DosingSystem/View/DeviceListView.xaml +++ b/DosingSystem/View/DeviceListView.xaml @@ -51,7 +51,7 @@ Height="500" CurrentValue="50" />--> - + diff --git a/DosingSystem/View/RecipeControlView.xaml b/DosingSystem/View/RecipeControlView.xaml index 24b50e5d..72a1998a 100644 --- a/DosingSystem/View/RecipeControlView.xaml +++ b/DosingSystem/View/RecipeControlView.xaml @@ -97,7 +97,7 @@ VerticalAlignment="Center" BorderThickness="0" Command="{Binding DataContext.StartCommand, RelativeSource={RelativeSource AncestorType=ListView, Mode=FindAncestor}}" - CommandParameter="{Binding RecipCode}" + CommandParameter="{Binding RecipeName}" Content="订单下发" EnterBackground="Red" FontStyle="Normal" diff --git a/DosingSystem/ViewModel/NewRecipeViewModel.cs b/DosingSystem/ViewModel/NewRecipeViewModel.cs index 05c1403f..44b02670 100644 --- a/DosingSystem/ViewModel/NewRecipeViewModel.cs +++ b/DosingSystem/ViewModel/NewRecipeViewModel.cs @@ -8,6 +8,7 @@ using System.Collections.ObjectModel; using Microsoft.Toolkit.Mvvm.Input; using BPASmartClient.Helper; using BPASmartClient.DosingSystem.Model; +using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.DosingSystem.ViewModel { diff --git a/DosingSystem/ViewModel/RecipeControlViewModel.cs b/DosingSystem/ViewModel/RecipeControlViewModel.cs index 67e97ed9..dc630140 100644 --- a/DosingSystem/ViewModel/RecipeControlViewModel.cs +++ b/DosingSystem/ViewModel/RecipeControlViewModel.cs @@ -26,16 +26,16 @@ namespace BPASmartClient.DosingSystem.ViewModel Recipes = Json.Data.Recipes; StartCommand = new RelayCommand((o) => { - //if (o != null && o is string deviceName) - //{ - // int index = Array.FindIndex(Recipes.ToArray(), p => p.RecipeName == deviceName); - // if (index >= 0 && index < Recipes.Count) - // { - // Recipes.ElementAt(index).IsEnable = false; - // } - // MessageLog.GetInstance.ShowUserLog($"下发工单 { Recipes.ElementAt(index).RecipeName}"); - // devices.Enqueue(deviceName); - //} + if (o != null && o is string deviceName) + { + int index = Array.FindIndex(Recipes.ToArray(), p => p.RecipeName == deviceName); + if (index >= 0 && index < Recipes.Count) + { + Recipes.ElementAt(index).IsEnable = false; + } + MessageLog.GetInstance.ShowUserLog($"下发工单 { Recipes.ElementAt(index).RecipeName}"); + devices.Enqueue(deviceName); + } NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方下发成功!"); MessageLog.GetInstance.ShowUserLog($"下发工单 { Guid.NewGuid().ToString()}"); }); diff --git a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs index 926bf089..1d75c594 100644 --- a/DosingSystem/ViewModel/RecipeSettingsViewModel.cs +++ b/DosingSystem/ViewModel/RecipeSettingsViewModel.cs @@ -16,6 +16,7 @@ using BPASmartClient.CustomResource.UserControls.Model; using BPASmartClient.CustomResource.UserControls.Enum; using System.Windows.Media; using BPASmartClient.CustomResource.UserControls.MessageShow; +using BPASmartClient.CustomResource.Pages.Model; namespace BPASmartClient.DosingSystem.ViewModel { @@ -29,10 +30,12 @@ namespace BPASmartClient.DosingSystem.ViewModel { NewRecipeView nrv = new NewRecipeView(); nrv.ShowDialog(); + MessageLog.GetInstance.ShowUserLog("新建配方"); }); SaveRecipe = new RelayCommand(() => { Json.Save(); + MessageLog.GetInstance.ShowUserLog("保存配方"); NoticeDemoViewModel.OpenMsg(EnumPromptType.Success, App.MainWindow, "提示", $"配方保存成功!"); }); RemoveCommand = new RelayCommand((o) => @@ -41,6 +44,7 @@ namespace BPASmartClient.DosingSystem.ViewModel { var res = Json.Data.Recipes.FirstOrDefault(p => p.RecipCode == str); if (res != null) Json.Data.Recipes.Remove(res); + MessageLog.GetInstance.ShowUserLog($"删除名称——{res.RecipeName}"); } }); @@ -50,9 +54,10 @@ namespace BPASmartClient.DosingSystem.ViewModel { ActionManage.GetInstance.CancelRegister("Details"); NewRecipeView nrv = new NewRecipeView(); - ActionManage.GetInstance.Send("Details", Json.Data.Recipes.FirstOrDefault(p => p.RecipCode == str)); + var res = Json.Data.Recipes.FirstOrDefault(p => p.RecipCode == str); + ActionManage.GetInstance.Send("Details",res); nrv.ShowDialog(); - + MessageLog.GetInstance.ShowUserLog($"编辑配方名称——{res.RecipeName}"); } }); } From 658f5be0bbc30d5ec82c986222a57b1d5dcf86a0 Mon Sep 17 00:00:00 2001 From: taoye Date: Sat, 6 Aug 2022 10:15:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BPASmartClient.AGV/AGVHelper.cs | 84 +++--- .../BPASmartClient.CustomResource.csproj | 2 + .../Fonts/font/iconfont.ttf | Bin 0 -> 3852 bytes .../Pages/Model/Config.cs | 8 +- .../Pages/Model/MessageLog.cs | 2 +- .../Pages/Model/UserInfo.cs | 11 +- .../Pages/View/UserManageView.xaml | 20 +- .../Pages/View/UserManageView.xaml.cs | 20 +- .../Pages/ViewModel/LoginViewModel.cs | 8 +- .../Pages/ViewModel/UserManageViewModel.cs | 34 ++- BPASmartClient.Modbus/ModbusTcp.cs | 36 ++- DosingSystem/App.xaml.cs | 2 +- DosingSystem/Model/DeviceInquire.cs | 14 +- DosingSystem/View/RecipeControlView.xaml | 2 +- DosingSystem/ViewModel/NewRecipeViewModel.cs | 6 +- .../ViewModel/RecipeControlViewModel.cs | 34 +-- FryPot_DosingSystem/App.xaml.cs | 17 +- FryPot_DosingSystem/Control/DeviceOperate.cs | 1 + .../Control/DosingLogicControl.cs | 98 ++++++- .../FryPot_DosingSystem.csproj | 1 + .../Resources/fonts/demo_index.html | 71 ++++- .../Resources/fonts/iconfont.ttf | Bin 3676 -> 4300 bytes .../Resources/pictures/战斗机.jpeg | Bin 0 -> 284114 bytes FryPot_DosingSystem/View/LabelPrint.xaml | 32 +++ FryPot_DosingSystem/View/LabelPrint.xaml.cs | 28 ++ .../View/RecipeSendDownView.xaml | 39 ++- FryPot_DosingSystem/View/UserManageView.xaml | 14 +- .../View/UserManageView.xaml.cs | 11 +- .../ViewModel/LabelPrintViewModel.cs | 20 ++ .../ViewModel/RecipeSetDownViewModel.cs | 10 +- .../ViewModel/SqliteDataViewModel.cs | 267 ++++++++++-------- .../ViewModel/UserManageViewModel.cs | 2 +- 32 files changed, 644 insertions(+), 250 deletions(-) create mode 100644 BPASmartClient.CustomResource/Fonts/font/iconfont.ttf create mode 100644 FryPot_DosingSystem/Resources/pictures/战斗机.jpeg create mode 100644 FryPot_DosingSystem/View/LabelPrint.xaml create mode 100644 FryPot_DosingSystem/View/LabelPrint.xaml.cs create mode 100644 FryPot_DosingSystem/ViewModel/LabelPrintViewModel.cs diff --git a/BPASmartClient.AGV/AGVHelper.cs b/BPASmartClient.AGV/AGVHelper.cs index 54afe569..5f00a27a 100644 --- a/BPASmartClient.AGV/AGVHelper.cs +++ b/BPASmartClient.AGV/AGVHelper.cs @@ -95,49 +95,49 @@ namespace BPASmartClient.AGV /// public string AgvToLineOneLoadRoller(string robotJobId) { - //string url = AGVRequestUrl.GetInstance.TaskSendUrl; - ////请求报文头 - //HttpRequestHeaderModel.GetInstance.appKey = ""; - //HttpRequestHeaderModel.GetInstance.appSecret = ""; - //HttpRequestHeaderModel.GetInstance.requestId = ""; - //HttpRequestHeaderModel.GetInstance.timestamp = ""; - //HttpRequestHeaderModel.GetInstance.version = "2.8"; - //string head = JsonConvert.SerializeObject(HttpRequestHeaderModel.GetInstance); - ////请求报文体 - //AGVModel.GetInstance.robotJobId = robotJobId;//上游提供 - //AGVModel.GetInstance.warehouseId = 123; //仓库编号 - //AGVModel.GetInstance.jobPriority = 1;//任务执行的优先级 - //AGVModel.GetInstance.jobPriorityType = 1;//0:根据优先级来执行，1：强制执行 - //AGVModel.GetInstance.jobType = "POINT_ROLLER_MOVE"; //SLOT_ROLLER_MOVE / POINT_ROLLER_MOVE - ////详细任务数据 - ////点到点 - //AGV_PointRollerJobData.GetInstance.startPoint = "";//起点点位 - //AGV_PointRollerJobData.GetInstance.endPoint = "";//目的点位 - //AGV_PointRollerJobData.GetInstance.autoLoad = true;//是否自动上料 true:自动上料 false:人工上料 - //AGV_PointRollerJobData.GetInstance.enableIOLoad = true;//上料交互方式 false:接口交互 true:光电交互 - //AGV_PointRollerJobData.GetInstance.autoUnload = true;//是否自动下料 true:自动下料 false:人工下料 - //AGV_PointRollerJobData.GetInstance.enableIOUnload = true;//下料交互方式 false:接口交互 true:光电交互 - //AGVModel.GetInstance.jobData = AGV_PointRollerJobData.GetInstance; - //string body = JsonConvert.SerializeObject(AGVModel.GetInstance); - //// string newBody = String.Join(",\r\n", body.Split(','));//格式处理，看需求 + string url = AGVRequestUrl.GetInstance.TaskSendUrl; + //请求报文头 + HttpRequestHeaderModel.GetInstance.appKey = ""; + HttpRequestHeaderModel.GetInstance.appSecret = ""; + HttpRequestHeaderModel.GetInstance.requestId = ""; + HttpRequestHeaderModel.GetInstance.timestamp = ""; + HttpRequestHeaderModel.GetInstance.version = "2.8"; + string head = JsonConvert.SerializeObject(HttpRequestHeaderModel.GetInstance); + //请求报文体 + AGVModel.GetInstance.robotJobId = robotJobId;//上游提供 + AGVModel.GetInstance.warehouseId = 123; //仓库编号 + AGVModel.GetInstance.jobPriority = 1;//任务执行的优先级 + AGVModel.GetInstance.jobPriorityType = 1;//0:根据优先级来执行，1：强制执行 + AGVModel.GetInstance.jobType = "POINT_ROLLER_MOVE"; //SLOT_ROLLER_MOVE / POINT_ROLLER_MOVE + //详细任务数据 + //点到点 + AGV_PointRollerJobData.GetInstance.startPoint = "";//起点点位 + AGV_PointRollerJobData.GetInstance.endPoint = "";//目的点位 + AGV_PointRollerJobData.GetInstance.autoLoad = true;//是否自动上料 true:自动上料 false:人工上料 + AGV_PointRollerJobData.GetInstance.enableIOLoad = true;//上料交互方式 false:接口交互 true:光电交互 + AGV_PointRollerJobData.GetInstance.autoUnload = true;//是否自动下料 true:自动下料 false:人工下料 + AGV_PointRollerJobData.GetInstance.enableIOUnload = true;//下料交互方式 false:接口交互 true:光电交互 + AGVModel.GetInstance.jobData = AGV_PointRollerJobData.GetInstance; + string body = JsonConvert.SerializeObject(AGVModel.GetInstance); + // string newBody = String.Join(",\r\n", body.Split(','));//格式处理，看需求 - ////货位到货位 - ////AGV_SlotRollerJobData.GetInstance.startSlotCode = "";//起点槽位编号 - ////AGV_SlotRollerJobData.GetInstance.endSlotCode = "";//目的槽位编号 - ////AGV_SlotRollerJobData.GetInstance.autoLoad = true;//是否自动上料 true:自动上料 false:人工上料 - ////AGV_SlotRollerJobData.GetInstance.enableIOLoad = true;//上料交互方式 false:接口交互 true:光电交互 - ////AGV_SlotRollerJobData.GetInstance.autoUnload = true;//是否自动下料 true:自动下料 false:人工下料 - ////AGV_SlotRollerJobData.GetInstance.enableIOUnload = true;//下料交互方式 false:接口交互 true:光电交互 - ////AGVModel.GetInstance.jobData = AGV_SlotRollerJobData.GetInstance; - ////string body = JsonConvert.SerializeObject(AGVModel.GetInstance); - ////启用签名 - ////url = url + "?sign=" + MD5Deal(body); - //string data = HttpRequest(url, head, body); - //object objData = JsonConvert.DeserializeObject(data); - //if (objData != null && objData is HttpResponseBodyModel response) - //{ - // return response.code; - //} + //货位到货位 + //AGV_SlotRollerJobData.GetInstance.startSlotCode = "";//起点槽位编号 + //AGV_SlotRollerJobData.GetInstance.endSlotCode = "";//目的槽位编号 + //AGV_SlotRollerJobData.GetInstance.autoLoad = true;//是否自动上料 true:自动上料 false:人工上料 + //AGV_SlotRollerJobData.GetInstance.enableIOLoad = true;//上料交互方式 false:接口交互 true:光电交互 + //AGV_SlotRollerJobData.GetInstance.autoUnload = true;//是否自动下料 true:自动下料 false:人工下料 + //AGV_SlotRollerJobData.GetInstance.enableIOUnload = true;//下料交互方式 false:接口交互 true:光电交互 + //AGVModel.GetInstance.jobData = AGV_SlotRollerJobData.GetInstance; + //string body = JsonConvert.SerializeObject(AGVModel.GetInstance); + //启用签名 + //url = url + "?sign=" + MD5Deal(body); + string data = HttpRequest(url, head, body); + object objData = JsonConvert.DeserializeObject(data); + if (objData != null && objData is HttpResponseBodyModel response) + { + return response.code; + } return "Analysis Error"; } /// diff --git a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj index 5130dc63..80cbab40 100644 --- a/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj +++ b/BPASmartClient.CustomResource/BPASmartClient.CustomResource.csproj @@ -20,6 +20,7 @@ + @@ -233,6 +234,7 @@ + diff --git a/BPASmartClient.CustomResource/Fonts/font/iconfont.ttf b/BPASmartClient.CustomResource/Fonts/font/iconfont.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f964af1f901ffc4a0145b0727827fce5dc14055b GIT binary patch literal 3852 zcmd^C>u(#!5ud#ykK#k5D88vsKJiS_qA1Ft#G|7JP05yM$BN`vWW!D6&@wI2;6s%t zMfL|*MFS^|Yo|bvHgJH#MS&u1J|sbc25IxbX^a+a)6YSQq7ed=w&A!a(4;^=i0W@i zDwbU%{R4Wu-Tm$C?Ck99%M?E>}a6t=iKK(-SMIynC5}eJSJEKsG4PoIylW`x90DfHci%*s6T(r+;i`6L%Jg>1`D2j7H(|G;{)^QFb| z&A)k}iy7Duv`-vw*iY)x+-%I(lBG|!!X}Y&MiN_It&6mBy3$rdaMR3u-dt8o%(-> zO|?Bg-`F`$q0&_^uo+cwV!ZIfuFTa7Ke0-#UiisY5aqmZ->bY_FWmPl*XjlKrpmkZ z0?X5_wR+(ve*0X#)VvuY=rFxNU$Eos3j3L`L+lry7eC^9Y^;iZ6j#Ya9*X1KV(rXs zX8x#>T}~gf>m;4j#r&aQC^*FW5^6#f#IcpJ^fQ-NM%ma(dJAs*C*D(=<=nd(R*n9_3p@lCr&v0tro2)YAmga&)ny z`SR^tkt9@#3O2h0J%Z3q1khHTa#AD)-FCat*X%i0!gEfC>j8`ogN6j{heG2}zCwXmQM=pOy`uYv7`Gw{4jk~n0|Y5^6lvq zb6k3XIoYYHn>VLUF<~H_KAH}v`X++GzG3#NdxuT$?}@ZA7G-+ATmzXUZF zQ-!f-pRN8T`=MM90r@$P`$(XY#6WJ)!RJ$4ymuT%zlC!20q{q)(_P#iBGOiHQQ{>!Y@#>r)^#v z-dZN!_(J@(Xrdj6q!F4R+_?;n!A*&vfhl2T2_}Vya))xkd+Qx;aoD!*W$@=fFZK{b zlt~WB=~A#g=K$j*-4-mk)ZN2{)rAgacYJrIt<9}?5L1Kwd)e>g9uQ|6loEEcd%(czodc^%QZ+tG;OoLncRov29+%i7O(R;8!tX;61 z1!R=Iq>zA5Az%v1aR6BQ+QoYi33SNj`7zTSO?r{keeyk$9)#g7*sh> zd0vVk3&Fx>&Zh9l+#UKx_Q}sq3njIXRJH`XeJ=Q6qWw`L&`&zw2VcV9|)m*D)CqoXHVv4vYtygAS9i z>-aXCvB?@pctcGlQ&Y&B2w0npwr$6|OvZ<@?aT<194Sk{X4b~L)=vtc& zE?NbXUOBAjO+rigU{kB)4L334?%hT(c%_Fh=scVunKY)XmQEJ7SVcpxY>Rv1BSvk& z8_q^N0j+TaeVg2C5W&-VKZ~d90hap54T<|i58}!}0c0aY7xK9PM{#I-YvF>-!z1pi zL~6B50YATQ)EK{mB;n81@s8x=v4csu`qt;Nno?!9T&4ET&US&<)z4hA9F=7jV(!Rf zvID%4cixdz8E@6z>0=&WIP9z5YVSNLyB-5Cui(G@KK#2_7F%(%S|~^q2&pZhgtNuf zXagaKVolf(z_4^A9g|MKG0sqDgHu2hsCjqcnerL)EC!lszT<=I%dd`3RAP%6k{keAKp zOY;0e>1=kU9Gxqd=lgql_&S^(ohcP)4=qrZGE_!=nq)df=TPTphDubVGqt+>U;V@2 zo~0#xNM|tre{oNNdw~|g$7Ra&C`IvC@y ztcmHFff<>Jn$OQ=inDW>(n_wllCwOME1oVr(~ZA|C-b>tR#V6oGUjhBWiXa0&S!Jy z=W^Pad}%SOE#!(zi|w1U&(D>Lvk CardId { get; set; } = new List(); } diff --git a/BPASmartClient.CustomResource/Pages/View/UserManageView.xaml b/BPASmartClient.CustomResource/Pages/View/UserManageView.xaml index aa93f831..a3e55d72 100644 --- a/BPASmartClient.CustomResource/Pages/View/UserManageView.xaml +++ b/BPASmartClient.CustomResource/Pages/View/UserManageView.xaml @@ -342,7 +342,7 @@ - + @@ -365,21 +365,29 @@ - + + + + + + + + + - + - +