diff --git a/WCS.WebApi/Controllers/FileDownLoadController.cs b/WCS.WebApi/Controllers/FileDownLoadController.cs index d17915e..c8b6bf6 100644 --- a/WCS.WebApi/Controllers/FileDownLoadController.cs +++ b/WCS.WebApi/Controllers/FileDownLoadController.cs @@ -20,12 +20,9 @@ namespace WCS.WebApi.Controllers [Route("[controller]")] public class FileDownLoadController : ControllerBase { - public FileDownLoadController() { - } - [HttpPost("uploadApp")] public async Task uploadApp([FromForm] IFormFile excelFile, [FromForm] string version, [FromForm] string content) { @@ -75,7 +72,6 @@ namespace WCS.WebApi.Controllers { await excelFile.CopyToAsync(stream); } - #region 保存数据 var appVersion = new AppVersion() { @@ -85,7 +81,6 @@ namespace WCS.WebApi.Controllers }; DbHelp.db.Insertable(appVersion).ExecuteCommand(); #endregion - // 文件上传成功，返回成功信息 return new ResponseCommon() { @@ -103,20 +98,16 @@ namespace WCS.WebApi.Controllers }; } } - - [HttpGet("downloadApp")] public IActionResult downloadApp(string fileName) { // 这里是文件的物理路径，你需要根据实际情况提供 var filePath = Path.Combine(Directory.GetCurrentDirectory(), $"Files/{fileName}"); - // 检查文件是否存在 if (!System.IO.File.Exists(filePath)) { return NotFound(); } - // 获取文件流 var stream = System.IO.File.OpenRead(filePath); // 设置HTTP响应头，使浏览器知道这是一个附件，应该下载而不是打开 @@ -134,7 +125,6 @@ namespace WCS.WebApi.Controllers FileInfo[] files = Directory.GetFiles(directoryPath, "*.APK") .Select(file => new FileInfo(file)) .ToArray(); - if (files == null || files.Length == 0) { return new ResponseCommon() @@ -160,7 +150,6 @@ namespace WCS.WebApi.Controllers Code = 201, Message = "服务器不存在App安装包" }; - } } diff --git a/WCS.WebApi/Program.cs b/WCS.WebApi/Program.cs index 0937cce..253dc48 100644 --- a/WCS.WebApi/Program.cs +++ b/WCS.WebApi/Program.cs @@ -1,4 +1,3 @@ - using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Server.Kestrel.Core; using System.Configuration; @@ -88,7 +87,6 @@ namespace WebApi builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); - builder.Services.AddScoped(); builder.Services.AddScoped(); diff --git a/货架标准上位机/Api/ApiHelp.cs b/货架标准上位机/Api/ApiHelp.cs index 4abe7dd..f98745c 100644 --- a/货架标准上位机/Api/ApiHelp.cs +++ b/货架标准上位机/Api/ApiHelp.cs @@ -15,7 +15,7 @@ using System.Windows.Input; using WCS.Model; using WCS.Model.ApiModel.MXBackgroundThread; -namespace 货架标准上位机.Api +namespace 智能仓储WCS管理系统.Api { public static class ApiHelp { diff --git a/货架标准上位机/App.xaml b/货架标准上位机/App.xaml index e87a63d..981dff7 100644 --- a/货架标准上位机/App.xaml +++ b/货架标准上位机/App.xaml @@ -1,7 +1,7 @@ - @@ -19,7 +19,7 @@ - pack://application,,,/货架标准上位机;component/Fonts/#iconfont + pack://application,,,/智能仓储WCS管理系统;component/Fonts/#iconfont 卓越盟讯 diff --git a/货架标准上位机/App.xaml.cs b/货架标准上位机/App.xaml.cs index 02490c8..5f50fa6 100644 --- a/货架标准上位机/App.xaml.cs +++ b/货架标准上位机/App.xaml.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Controls; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// App.xaml 的交互逻辑 diff --git a/货架标准上位机/Converters/AuthConverter.cs b/货架标准上位机/Converters/AuthConverter.cs index bad6d36..2cb8274 100644 --- a/货架标准上位机/Converters/AuthConverter.cs +++ b/货架标准上位机/Converters/AuthConverter.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; using System.Windows; using System.Windows.Data; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 权限转换器（转为bool） diff --git a/货架标准上位机/Converters/AuthVisConverter.cs b/货架标准上位机/Converters/AuthVisConverter.cs index 1ebcece..b1f1dea 100644 --- a/货架标准上位机/Converters/AuthVisConverter.cs +++ b/货架标准上位机/Converters/AuthVisConverter.cs @@ -8,7 +8,7 @@ using System.Windows.Data; using System.Windows; using HandyControl.Tools; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 权限转换器 diff --git a/货架标准上位机/Converters/AuthVisHidConverter.cs b/货架标准上位机/Converters/AuthVisHidConverter.cs index 6806129..2b340e5 100644 --- a/货架标准上位机/Converters/AuthVisHidConverter.cs +++ b/货架标准上位机/Converters/AuthVisHidConverter.cs @@ -8,7 +8,7 @@ using System.Windows.Data; using System.Windows; using HandyControl.Tools; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 权限转换器 diff --git a/货架标准上位机/Converters/WorkItemBackgroundConverter.cs b/货架标准上位机/Converters/WorkItemBackgroundConverter.cs index da34ea2..08f72f0 100644 --- a/货架标准上位机/Converters/WorkItemBackgroundConverter.cs +++ b/货架标准上位机/Converters/WorkItemBackgroundConverter.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Windows.Data; using System.Windows.Media; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { class WorkItemBackgroundConverter : IValueConverter { diff --git a/货架标准上位机/Db/DataDb.cs b/货架标准上位机/Db/DataDb.cs index d13fbb5..1e17bf2 100644 --- a/货架标准上位机/Db/DataDb.cs +++ b/货架标准上位机/Db/DataDb.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 默认数据库 diff --git a/货架标准上位机/Db/Models/DataModels.cs b/货架标准上位机/Db/Models/DataModels.cs index 05a4e00..2da166e 100644 --- a/货架标准上位机/Db/Models/DataModels.cs +++ b/货架标准上位机/Db/Models/DataModels.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { [SugarTable("test_table")] public class MyTestTable diff --git a/货架标准上位机/Db/WarnInfoDb.cs b/货架标准上位机/Db/WarnInfoDb.cs index bd40944..fe4a126 100644 --- a/货架标准上位机/Db/WarnInfoDb.cs +++ b/货架标准上位机/Db/WarnInfoDb.cs @@ -8,7 +8,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 警告信息数据库 diff --git a/货架标准上位机/LocalFile.cs b/货架标准上位机/LocalFile.cs index b5531c2..79b3b8a 100644 --- a/货架标准上位机/LocalFile.cs +++ b/货架标准上位机/LocalFile.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 本地文件 @@ -14,7 +14,7 @@ namespace 货架标准上位机 public class LocalFile { /// - /// 程序运行名称（货架标准上位机.exe） + /// 程序运行名称（智能仓储WCS管理系统.exe） /// public static readonly string AppName = AppDomain.CurrentDomain.FriendlyName.Contains('.') ? AppDomain.CurrentDomain.FriendlyName : $"{AppDomain.CurrentDomain.FriendlyName}.exe";//多环境兼容性 /// diff --git a/货架标准上位机/LocalStatic.cs b/货架标准上位机/LocalStatic.cs index 5a485f0..70c40bf 100644 --- a/货架标准上位机/LocalStatic.cs +++ b/货架标准上位机/LocalStatic.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 本地全局静态 diff --git a/货架标准上位机/Models/AuthEnum.cs b/货架标准上位机/Models/AuthEnum.cs index ac4edeb..81345d0 100644 --- a/货架标准上位机/Models/AuthEnum.cs +++ b/货架标准上位机/Models/AuthEnum.cs @@ -6,7 +6,7 @@ using System.Reflection; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 认证项 diff --git a/货架标准上位机/Models/CrudEnum.cs b/货架标准上位机/Models/CrudEnum.cs index dd3fe1b..ab5032f 100644 --- a/货架标准上位机/Models/CrudEnum.cs +++ b/货架标准上位机/Models/CrudEnum.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 增删改查（CRUD）枚举 diff --git a/货架标准上位机/Models/ExcelDevice.cs b/货架标准上位机/Models/ExcelDevice.cs index 36d2244..2e51eb8 100644 --- a/货架标准上位机/Models/ExcelDevice.cs +++ b/货架标准上位机/Models/ExcelDevice.cs @@ -1,4 +1,4 @@ -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.ViewModel; using Ping9719.WpfEx; using System; using System.Collections.Generic; @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 设备监控 diff --git a/货架标准上位机/Models/ITreeNode.cs b/货架标准上位机/Models/ITreeNode.cs index 1b5626a..5e94a90 100644 --- a/货架标准上位机/Models/ITreeNode.cs +++ b/货架标准上位机/Models/ITreeNode.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 树节点 diff --git a/货架标准上位机/Models/IpPort.cs b/货架标准上位机/Models/IpPort.cs index e3b6b3a..c3ebbc7 100644 --- a/货架标准上位机/Models/IpPort.cs +++ b/货架标准上位机/Models/IpPort.cs @@ -5,7 +5,7 @@ using System.Net; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// Ip和端口 diff --git a/货架标准上位机/Models/JsConfig.cs b/货架标准上位机/Models/JsConfig.cs index ad72217..c934110 100644 --- a/货架标准上位机/Models/JsConfig.cs +++ b/货架标准上位机/Models/JsConfig.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// json配置文件 diff --git a/货架标准上位机/ScannerManager.cs b/货架标准上位机/ScannerManager.cs index 7e42c39..0076d26 100644 --- a/货架标准上位机/ScannerManager.cs +++ b/货架标准上位机/ScannerManager.cs @@ -7,9 +7,9 @@ using System.Threading.Tasks; using TouchSocket.Core; using TouchSocket.SerialPorts; using TouchSocket.Sockets; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { public static class ScannerManager { diff --git a/货架标准上位机/Tool/Folder.cs b/货架标准上位机/Tool/Folder.cs index 303305d..69e506b 100644 --- a/货架标准上位机/Tool/Folder.cs +++ b/货架标准上位机/Tool/Folder.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 文件夹操作 diff --git a/货架标准上位机/Tool/GetBaseData.cs b/货架标准上位机/Tool/GetBaseData.cs index 2f5b7ab..f5d4b5b 100644 --- a/货架标准上位机/Tool/GetBaseData.cs +++ b/货架标准上位机/Tool/GetBaseData.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; using System.Windows.Documents; using WCS.Model; using WCS.Model.ApiModel.Home; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; -namespace 货架标准上位机.Tool +namespace 智能仓储WCS管理系统.Tool { public static class GetBaseData { diff --git a/货架标准上位机/Tool/JsonConverter.cs b/货架标准上位机/Tool/JsonConverter.cs index b38d3eb..d8acefd 100644 --- a/货架标准上位机/Tool/JsonConverter.cs +++ b/货架标准上位机/Tool/JsonConverter.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// json时间转换器 diff --git a/货架标准上位机/Tool/Logs.cs b/货架标准上位机/Tool/Logs.cs index 8dd2344..0c820b6 100644 --- a/货架标准上位机/Tool/Logs.cs +++ b/货架标准上位机/Tool/Logs.cs @@ -9,7 +9,7 @@ using System.Threading.Tasks; using WCS.Model; using WCS.Model.ApiModel; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 日志类型 diff --git a/货架标准上位机/Tool/PrintTender.cs b/货架标准上位机/Tool/PrintTender.cs index 07b65f1..b788684 100644 --- a/货架标准上位机/Tool/PrintTender.cs +++ b/货架标准上位机/Tool/PrintTender.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace 货架标准上位机.Tool +namespace 智能仓储WCS管理系统.Tool { public static class PrintTender { diff --git a/货架标准上位机/Tool/RichTextBoxTool.cs b/货架标准上位机/Tool/RichTextBoxTool.cs index fb153b1..6b2f74e 100644 --- a/货架标准上位机/Tool/RichTextBoxTool.cs +++ b/货架标准上位机/Tool/RichTextBoxTool.cs @@ -7,7 +7,7 @@ using System.Windows.Controls; using System.Windows.Documents; using System.Windows.Media; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 富文本框扩展类 diff --git a/货架标准上位机/Tool/WarnInfoContainer.cs b/货架标准上位机/Tool/WarnInfoContainer.cs index f9a8021..64ecfce 100644 --- a/货架标准上位机/Tool/WarnInfoContainer.cs +++ b/货架标准上位机/Tool/WarnInfoContainer.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 警告信息容器 diff --git a/货架标准上位机/Tool/While.cs b/货架标准上位机/Tool/While.cs index 3172d2c..757901d 100644 --- a/货架标准上位机/Tool/While.cs +++ b/货架标准上位机/Tool/While.cs @@ -5,7 +5,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 循环、暂停、继续、停止扩展 diff --git a/货架标准上位机/ViewModels/AboutViewModel.cs b/货架标准上位机/ViewModels/AboutViewModel.cs index fdd6d17..00f59d6 100644 --- a/货架标准上位机/ViewModels/AboutViewModel.cs +++ b/货架标准上位机/ViewModels/AboutViewModel.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class AboutViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/DataChartViewModel.cs b/货架标准上位机/ViewModels/DataChartViewModel.cs index d796ef7..fc90f6b 100644 --- a/货架标准上位机/ViewModels/DataChartViewModel.cs +++ b/货架标准上位机/ViewModels/DataChartViewModel.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Input; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class DataChartViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/DataListViewModel.cs b/货架标准上位机/ViewModels/DataListViewModel.cs index aa569d3..cf5c21d 100644 --- a/货架标准上位机/ViewModels/DataListViewModel.cs +++ b/货架标准上位机/ViewModels/DataListViewModel.cs @@ -14,7 +14,7 @@ using SqlSugar; using HandyControl.Data; using System.Windows; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class DataListViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/DataListWarnInfoViewModel.cs b/货架标准上位机/ViewModels/DataListWarnInfoViewModel.cs index 67183a9..a088f72 100644 --- a/货架标准上位机/ViewModels/DataListWarnInfoViewModel.cs +++ b/货架标准上位机/ViewModels/DataListWarnInfoViewModel.cs @@ -14,7 +14,7 @@ using SqlSugar; using HandyControl.Data; using System.Windows; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class DataListWarnInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/DeviceViewModel.cs b/货架标准上位机/ViewModels/DeviceViewModel.cs index ae5d0cc..f683fb2 100644 --- a/货架标准上位机/ViewModels/DeviceViewModel.cs +++ b/货架标准上位机/ViewModels/DeviceViewModel.cs @@ -12,9 +12,9 @@ using System.Windows.Input; using System.Windows.Markup; using WCS.Model; using WCS.Model.ApiModel.Home; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class DeviceViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/HomeViewModel.cs b/货架标准上位机/ViewModels/HomeViewModel.cs index 4a8eef8..83064e2 100644 --- a/货架标准上位机/ViewModels/HomeViewModel.cs +++ b/货架标准上位机/ViewModels/HomeViewModel.cs @@ -11,14 +11,14 @@ using System.Threading.Tasks; using System.Windows.Controls; using System.Windows.Input; using HandyControl.Tools.Extension; -using 货架标准上位机.Views.Controls; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Views.Controls; +using 智能仓储WCS管理系统.Api; using WCS.Model; using System.Diagnostics; using System.Security.Cryptography; using WCS.Model.ApiModel.Home; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class HomeViewModel : BindableBase { @@ -39,12 +39,10 @@ namespace 货架标准上位机.ViewModel Thread.Sleep(2000); } }); - #region 启动自检 SelfCheck(); #endregion } - #region 绑定 private string textErr; /// @@ -146,7 +144,6 @@ namespace 货架标准上位机.ViewModel #endregion } #endregion - #region 页面加载时任务 /// /// 页面第一次加载时执行的任务 diff --git a/货架标准上位机/ViewModels/ImageListenerViewModel.cs b/货架标准上位机/ViewModels/ImageListenerViewModel.cs index 350175f..2a974ff 100644 --- a/货架标准上位机/ViewModels/ImageListenerViewModel.cs +++ b/货架标准上位机/ViewModels/ImageListenerViewModel.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Media.Imaging; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class ImageListenerViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/InInventoryViewModel.cs b/货架标准上位机/ViewModels/InInventoryViewModel.cs index c704d7d..f8332bd 100644 --- a/货架标准上位机/ViewModels/InInventoryViewModel.cs +++ b/货架标准上位机/ViewModels/InInventoryViewModel.cs @@ -14,9 +14,9 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; using System.Windows.Controls; @@ -31,7 +31,7 @@ using System.Security.Cryptography; using Ping9719.WpfEx; using System.Diagnostics.Eventing.Reader; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class InInventoryViewModel : BindableBase { @@ -121,11 +121,9 @@ namespace 货架标准上位机.ViewModel } catch (Exception ex) { - } finally { - } }); } @@ -207,7 +205,6 @@ namespace 货架标准上位机.ViewModel } } } - /// /// 扫到模组码的数据处理 /// @@ -257,7 +254,6 @@ namespace 货架标准上位机.ViewModel #endregion } } - //调用接口 本次扫码的货架进入入库模式 #region 调用接口进入入库模式 try @@ -392,7 +388,6 @@ namespace 货架标准上位机.ViewModel } #endregion } - public ICommand BtnEndCommand { get => new DelegateCommand(BtnEnd); } public void BtnEnd() { diff --git a/货架标准上位机/ViewModels/InOutRecordViewModel.cs b/货架标准上位机/ViewModels/InOutRecordViewModel.cs index 3a13a23..ece10a5 100644 --- a/货架标准上位机/ViewModels/InOutRecordViewModel.cs +++ b/货架标准上位机/ViewModels/InOutRecordViewModel.cs @@ -14,9 +14,9 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; using System.Windows.Controls; @@ -28,10 +28,10 @@ using HandyControl.Tools.Extension; using WCS.Model.ApiModel.Stocktaking; using WCS.Model.ApiModel.InOutRecord; using System.Collections.ObjectModel; -using static 货架标准上位机.ViewModel.InOutRecordViewModel; +using static 智能仓储WCS管理系统.ViewModel.InOutRecordViewModel; using WCS.Model.ApiModel.Home; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class InOutRecordViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/InterfaceRecordViewModel.cs b/货架标准上位机/ViewModels/InterfaceRecordViewModel.cs index c5252ce..0670aa2 100644 --- a/货架标准上位机/ViewModels/InterfaceRecordViewModel.cs +++ b/货架标准上位机/ViewModels/InterfaceRecordViewModel.cs @@ -14,15 +14,15 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; using System.Windows.Controls; using WCS.Model.ApiModel.InterfaceRecord; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class InterfaceRecordViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MXViewModel/MXOutInventoryViewModel.cs b/货架标准上位机/ViewModels/MXViewModel/MXOutInventoryViewModel.cs index 9694c22..df9489e 100644 --- a/货架标准上位机/ViewModels/MXViewModel/MXOutInventoryViewModel.cs +++ b/货架标准上位机/ViewModels/MXViewModel/MXOutInventoryViewModel.cs @@ -22,10 +22,10 @@ using TouchSocket.Core; using WCS.Model; using WCS.Model.ApiModel.OutStore; using WCS.Model.ApiModel.Stocktaking; -using 货架标准上位机.Api; -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.Api; +using 智能仓储WCS管理系统.ViewModel; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MXOutInventoryViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MXViewModel/MXOutOrderDetailViewViewModel.cs b/货架标准上位机/ViewModels/MXViewModel/MXOutOrderDetailViewViewModel.cs index c32319a..e305e49 100644 --- a/货架标准上位机/ViewModels/MXViewModel/MXOutOrderDetailViewViewModel.cs +++ b/货架标准上位机/ViewModels/MXViewModel/MXOutOrderDetailViewViewModel.cs @@ -18,13 +18,13 @@ using TouchSocket.Core; using System.Windows.Markup; using System.Security.Policy; using WCS.Model.ApiModel.MXBackgroundThread; -using 货架标准上位机; +using 智能仓储WCS管理系统; using WCS.Model.ApiModel.MatInventoryDetail; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using System.Runtime.CompilerServices; using WCS.Model; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MXOutOrderDetailViewViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MXViewModel/MXOutOrderViewModel.cs b/货架标准上位机/ViewModels/MXViewModel/MXOutOrderViewModel.cs index f592f81..47df4b6 100644 --- a/货架标准上位机/ViewModels/MXViewModel/MXOutOrderViewModel.cs +++ b/货架标准上位机/ViewModels/MXViewModel/MXOutOrderViewModel.cs @@ -16,9 +16,9 @@ using System.Windows.Input; using TouchSocket.Core; using Newtonsoft.Json; using WCS.Model.ApiModel.MXBackgroundThread; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MXOutOrderViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MXViewModel/MXPDViewModel.cs b/货架标准上位机/ViewModels/MXViewModel/MXPDViewModel.cs index 5638b66..59535ef 100644 --- a/货架标准上位机/ViewModels/MXViewModel/MXPDViewModel.cs +++ b/货架标准上位机/ViewModels/MXViewModel/MXPDViewModel.cs @@ -25,10 +25,10 @@ using WCS.Model.ApiModel.MatInventoryDetail; using WCS.Model.ApiModel.MXBackgroundThread; using WCS.Model.ApiModel.OutStore; using WCS.Model.ApiModel.Stocktaking; -using 货架标准上位机.Api; -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.Api; +using 智能仓储WCS管理系统.ViewModel; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MXPDViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MainViewModel.cs b/货架标准上位机/ViewModels/MainViewModel.cs index 934852c..a1467a1 100644 --- a/货架标准上位机/ViewModels/MainViewModel.cs +++ b/货架标准上位机/ViewModels/MainViewModel.cs @@ -15,7 +15,7 @@ using System.Windows.Controls.Primitives; using System.Windows.Input; using System.Windows.Markup; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MainViewModel : BindableBase { @@ -67,7 +67,7 @@ namespace 货架标准上位机.ViewModel public bool InitAgo() { //只允许打开一个 - mutex = new Mutex(true, string.Concat("MengXun货架标准上位机", Path.GetFileNameWithoutExtension(LocalFile.AppName)), out bool createdNew); + mutex = new Mutex(true, string.Concat("MengXun智能仓储WCS管理系统", Path.GetFileNameWithoutExtension(LocalFile.AppName)), out bool createdNew); if (!createdNew) { MessageBox.Warning("已有实列在运行！", "提示"); diff --git a/货架标准上位机/ViewModels/MatBaseInfoAddOrUpdateViewModel.cs b/货架标准上位机/ViewModels/MatBaseInfoAddOrUpdateViewModel.cs index 0909878..20f0bd3 100644 --- a/货架标准上位机/ViewModels/MatBaseInfoAddOrUpdateViewModel.cs +++ b/货架标准上位机/ViewModels/MatBaseInfoAddOrUpdateViewModel.cs @@ -14,9 +14,9 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; using System.Windows.Controls; @@ -24,7 +24,7 @@ using WCS.Model.ApiModel.InterfaceRecord; using WCS.BLL.DbModels; using WCS.Model.ApiModel.MatBaseInfo; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MatBaseInfoAddOrUpdateViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs b/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs index abebc98..59e617b 100644 --- a/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs +++ b/货架标准上位机/ViewModels/MatBaseInfoViewModel.cs @@ -14,9 +14,9 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; using System.Windows.Controls; @@ -25,9 +25,9 @@ using WCS.BLL.DbModels; using WCS.Model.ApiModel.MatBaseInfo; using System.Collections.ObjectModel; using HandyControl.Tools.Extension; -using 货架标准上位机.Tool; +using 智能仓储WCS管理系统.Tool; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MatBaseInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MatBaseInoScanGenarateMatInfoViewModel.cs b/货架标准上位机/ViewModels/MatBaseInoScanGenarateMatInfoViewModel.cs index 29fc3e0..c13334b 100644 --- a/货架标准上位机/ViewModels/MatBaseInoScanGenarateMatInfoViewModel.cs +++ b/货架标准上位机/ViewModels/MatBaseInoScanGenarateMatInfoViewModel.cs @@ -13,11 +13,11 @@ using System.Windows.Input; using WCS.BLL.DbModels; using WCS.Model; using WCS.Model.ApiModel.MatBaseInfo; -using 货架标准上位机.Api; -using 货架标准上位机.Tool; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Api; +using 智能仓储WCS管理系统.Tool; +using 智能仓储WCS管理系统.Views.Controls; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MatBaseInoScanGenarateMatInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MatInfoViewModel.cs b/货架标准上位机/ViewModels/MatInfoViewModel.cs index 5c259ba..7b5d317 100644 --- a/货架标准上位机/ViewModels/MatInfoViewModel.cs +++ b/货架标准上位机/ViewModels/MatInfoViewModel.cs @@ -14,9 +14,9 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; using System.Windows.Controls; @@ -25,11 +25,11 @@ using WCS.BLL.DbModels; using WCS.Model.ApiModel.MatBaseInfo; using System.Collections.ObjectModel; using HandyControl.Tools.Extension; -using 货架标准上位机.Tool; +using 智能仓储WCS管理系统.Tool; using System.Printing; using System.Printing.IndexedProperties; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MatInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs b/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs index 9f93da9..f455f22 100644 --- a/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs +++ b/货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs @@ -14,9 +14,9 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; using System.Windows.Controls; @@ -28,7 +28,7 @@ using HandyControl.Tools.Extension; using WCS.Model.ApiModel.Stocktaking; using WCS.Model.ApiModel.Home; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class MatInventoryDetailViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/ModuleInfoViewModel.cs b/货架标准上位机/ViewModels/ModuleInfoViewModel.cs index 0b91e51..0d73257 100644 --- a/货架标准上位机/ViewModels/ModuleInfoViewModel.cs +++ b/货架标准上位机/ViewModels/ModuleInfoViewModel.cs @@ -9,8 +9,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Input; -using 货架标准上位机.Views.Controls; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Views.Controls; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel.Home; using WCS.Model.ApiModel.StoreInfo; @@ -21,7 +21,7 @@ using WCS.Model.ApiModel; using Newtonsoft.Json.Bson; using System.Windows; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class ModuleInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs b/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs index 40a3743..d5d70fb 100644 --- a/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs +++ b/货架标准上位机/ViewModels/OutInventoryAddDucumentViewModel.cs @@ -11,9 +11,9 @@ using WCS.BLL.DbModels; using WCS.Model; using WCS.Model.ApiModel.Home; using WCS.Model.ApiModel.MatInventoryDetail; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; -namespace 货架标准上位机.ViewModels +namespace 智能仓储WCS管理系统.ViewModels { public class OutInventoryAddDucumentViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/OutInventoryAddMatViewModel.cs b/货架标准上位机/ViewModels/OutInventoryAddMatViewModel.cs index b81c6c4..bc9fbdc 100644 --- a/货架标准上位机/ViewModels/OutInventoryAddMatViewModel.cs +++ b/货架标准上位机/ViewModels/OutInventoryAddMatViewModel.cs @@ -11,9 +11,9 @@ using WCS.BLL.DbModels; using WCS.Model; using WCS.Model.ApiModel.MatBaseInfo; using WCS.Model.ApiModel.MatInventoryDetail; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; -namespace 货架标准上位机.ViewModels +namespace 智能仓储WCS管理系统.ViewModels { public class OutInventoryAddMatViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/OutInventoryDocumentViewModel.cs b/货架标准上位机/ViewModels/OutInventoryDocumentViewModel.cs index 6ae3c98..68d53cb 100644 --- a/货架标准上位机/ViewModels/OutInventoryDocumentViewModel.cs +++ b/货架标准上位机/ViewModels/OutInventoryDocumentViewModel.cs @@ -16,10 +16,10 @@ using System.Windows.Media.Imaging; using WCS.Model; using WCS.Model.ApiModel.MatBaseInfo; using WCS.Model.ApiModel.OutStore; -using 货架标准上位机.Api; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Api; +using 智能仓储WCS管理系统.Views.Controls; -namespace 货架标准上位机.ViewModels +namespace 智能仓储WCS管理系统.ViewModels { public class OutInventoryDocumentViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/OutInventoryImportDucumentViewModel.cs b/货架标准上位机/ViewModels/OutInventoryImportDucumentViewModel.cs index 244a656..a23ffa0 100644 --- a/货架标准上位机/ViewModels/OutInventoryImportDucumentViewModel.cs +++ b/货架标准上位机/ViewModels/OutInventoryImportDucumentViewModel.cs @@ -12,9 +12,9 @@ using WCS.BLL.DbModels; using WCS.Model; using WCS.Model.ApiModel.MatBaseInfo; using WCS.Model.ApiModel.MatInventoryDetail; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; -namespace 货架标准上位机.ViewModels +namespace 智能仓储WCS管理系统.ViewModels { public class OutInventoryImportDucumentViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/OutInventoryViewModel.cs b/货架标准上位机/ViewModels/OutInventoryViewModel.cs index e9a2e3f..264a3ee 100644 --- a/货架标准上位机/ViewModels/OutInventoryViewModel.cs +++ b/货架标准上位机/ViewModels/OutInventoryViewModel.cs @@ -22,10 +22,10 @@ using TouchSocket.Core; using WCS.Model; using WCS.Model.ApiModel.OutStore; using WCS.Model.ApiModel.Stocktaking; -using 货架标准上位机.Api; -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.Api; +using 智能仓储WCS管理系统.ViewModel; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class OutInventoryViewModel : BindableBase { @@ -33,7 +33,6 @@ namespace 货架标准上位机.ViewModel { RefreshOutOrderList(); } - #region Property private OutOrderModel selectedOutOrder; public OutOrderModel SelectedOutOrder @@ -124,7 +123,6 @@ namespace 货架标准上位机.ViewModel }); } #endregion - #region Command public ICommand BtnOutOrderCommand { get => new DelegateCommand(BtnOutOrder); } public void BtnOutOrder() diff --git a/货架标准上位机/ViewModels/OutputStatChartViewModel.cs b/货架标准上位机/ViewModels/OutputStatChartViewModel.cs index 9814e50..ca2f54f 100644 --- a/货架标准上位机/ViewModels/OutputStatChartViewModel.cs +++ b/货架标准上位机/ViewModels/OutputStatChartViewModel.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class OutputStatChartViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/RoleEditTreeViewModel.cs b/货架标准上位机/ViewModels/RoleEditTreeViewModel.cs index e405199..ec4a55e 100644 --- a/货架标准上位机/ViewModels/RoleEditTreeViewModel.cs +++ b/货架标准上位机/ViewModels/RoleEditTreeViewModel.cs @@ -9,7 +9,7 @@ using System.Text; using System.Threading.Tasks; using WCS.Model; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { //https://dandelioncloud.cn/article/details/1472765022102446082 public class RoleEditTreeViewModel : BindableBase, ITreeNode diff --git a/货架标准上位机/ViewModels/RoleViewModel.cs b/货架标准上位机/ViewModels/RoleViewModel.cs index b2a83b9..3dced34 100644 --- a/货架标准上位机/ViewModels/RoleViewModel.cs +++ b/货架标准上位机/ViewModels/RoleViewModel.cs @@ -7,12 +7,12 @@ using System.Windows.Input; using SqlSugar; using WCS.Model.ApiModel; using HandyControl.Tools.Extension; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class RoleViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/SetViewModel.cs b/货架标准上位机/ViewModels/SetViewModel.cs index 509e7f5..0b6f0b6 100644 --- a/货架标准上位机/ViewModels/SetViewModel.cs +++ b/货架标准上位机/ViewModels/SetViewModel.cs @@ -19,11 +19,11 @@ using System.Windows.Input; using System.Windows.Markup; using System.Windows.Media.Imaging; using WCS.Model; -using 货架标准上位机.Api; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Api; +using 智能仓储WCS管理系统.Views.Controls; using static System.Net.WebRequestMethods; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class SetViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs b/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs index 0b24199..18a13ef 100644 --- a/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs +++ b/货架标准上位机/ViewModels/ShelfInfoAddOrUpdateViewModel.cs @@ -6,9 +6,9 @@ using System.Threading.Tasks; using WCS.Model; using WCS.Model.ApiModel.Home; using WCS.Model.ApiModel.StoreInfo; -using 货架标准上位机.Tool; +using 智能仓储WCS管理系统.Tool; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class ShelfInfoAddOrUpdateViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/ShelfInfoViewModel.cs b/货架标准上位机/ViewModels/ShelfInfoViewModel.cs index 167566a..2ac45ab 100644 --- a/货架标准上位机/ViewModels/ShelfInfoViewModel.cs +++ b/货架标准上位机/ViewModels/ShelfInfoViewModel.cs @@ -9,8 +9,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Input; -using 货架标准上位机.Views.Controls; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Views.Controls; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel.Home; using WCS.Model.ApiModel.StoreInfo; @@ -20,7 +20,7 @@ using WCS.Model.ApiModel.User; using WCS.Model.ApiModel; using Newtonsoft.Json.Bson; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class ShelfInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs b/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs index 03f3fc0..b7903f5 100644 --- a/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs +++ b/货架标准上位机/ViewModels/StocktakingDocumentViewModel.cs @@ -12,9 +12,9 @@ using WCS.Model; using WCS.Model.ApiModel.MatBaseInfo; using WCS.Model.ApiModel.OutStore; using WCS.Model.ApiModel.Stocktaking; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; -namespace 货架标准上位机.ViewModels +namespace 智能仓储WCS管理系统.ViewModels { public class StocktakingDocumentViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/StocktakingViewModel.cs b/货架标准上位机/ViewModels/StocktakingViewModel.cs index 9d9d470..fa67af8 100644 --- a/货架标准上位机/ViewModels/StocktakingViewModel.cs +++ b/货架标准上位机/ViewModels/StocktakingViewModel.cs @@ -22,10 +22,10 @@ using TouchSocket.Core; using WCS.Model; using WCS.Model.ApiModel.OutStore; using WCS.Model.ApiModel.Stocktaking; -using 货架标准上位机.Api; -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.Api; +using 智能仓储WCS管理系统.ViewModel; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class StocktakingViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/StoreInfoViewModel.cs b/货架标准上位机/ViewModels/StoreInfoViewModel.cs index 357a28f..121f2b5 100644 --- a/货架标准上位机/ViewModels/StoreInfoViewModel.cs +++ b/货架标准上位机/ViewModels/StoreInfoViewModel.cs @@ -9,8 +9,8 @@ using System.Text; using System.Threading; using System.Threading.Tasks; using System.Windows.Input; -using 货架标准上位机.Views.Controls; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Views.Controls; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel.Home; using WCS.Model.ApiModel.StoreInfo; @@ -22,7 +22,7 @@ using Newtonsoft.Json.Bson; using System.Windows; using System.Security.Cryptography; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class StoreInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/UserInfoViewModel.cs b/货架标准上位机/ViewModels/UserInfoViewModel.cs index df9cc4c..1100b6d 100644 --- a/货架标准上位机/ViewModels/UserInfoViewModel.cs +++ b/货架标准上位机/ViewModels/UserInfoViewModel.cs @@ -6,7 +6,7 @@ using System.Text; using System.Threading.Tasks; using WCS.Model.ApiModel; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { public class UserInfoViewModel : BindableBase { diff --git a/货架标准上位机/ViewModels/UserViewModel.cs b/货架标准上位机/ViewModels/UserViewModel.cs index a85c1ab..60bb0cd 100644 --- a/货架标准上位机/ViewModels/UserViewModel.cs +++ b/货架标准上位机/ViewModels/UserViewModel.cs @@ -14,13 +14,13 @@ using SqlSugar; using HandyControl.Data; using System.Windows; using Newtonsoft.Json.Linq; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; using WCS.Model.ApiModel.User; -using 货架标准上位机.Api; +using 智能仓储WCS管理系统.Api; using WCS.Model; using WCS.Model.ApiModel; -namespace 货架标准上位机.ViewModel +namespace 智能仓储WCS管理系统.ViewModel { public class UserViewModel : BindableBase { diff --git a/货架标准上位机/Views/Controls/DataChartView.xaml b/货架标准上位机/Views/Controls/DataChartView.xaml index 8fae814..0a745a7 100644 --- a/货架标准上位机/Views/Controls/DataChartView.xaml +++ b/货架标准上位机/Views/Controls/DataChartView.xaml @@ -1,9 +1,9 @@ - /// 数据图表 diff --git a/货架标准上位机/Views/Controls/DataListView.xaml b/货架标准上位机/Views/Controls/DataListView.xaml index 3377f9f..716be57 100644 --- a/货架标准上位机/Views/Controls/DataListView.xaml +++ b/货架标准上位机/Views/Controls/DataListView.xaml @@ -1,9 +1,9 @@ - /// 数据列表 diff --git a/货架标准上位机/Views/Controls/DataListWarnInfoView.xaml b/货架标准上位机/Views/Controls/DataListWarnInfoView.xaml index ae99fbe..338bfbb 100644 --- a/货架标准上位机/Views/Controls/DataListWarnInfoView.xaml +++ b/货架标准上位机/Views/Controls/DataListWarnInfoView.xaml @@ -1,9 +1,9 @@ - /// 数据列表 diff --git a/货架标准上位机/Views/Controls/DeviceView.xaml b/货架标准上位机/Views/Controls/DeviceView.xaml index 1794dea..9587c0d 100644 --- a/货架标准上位机/Views/Controls/DeviceView.xaml +++ b/货架标准上位机/Views/Controls/DeviceView.xaml @@ -1,9 +1,9 @@ - /// 设备手动信息 diff --git a/货架标准上位机/Views/Controls/ImageDialog.xaml b/货架标准上位机/Views/Controls/ImageDialog.xaml index 91740a1..6a3a005 100644 --- a/货架标准上位机/Views/Controls/ImageDialog.xaml +++ b/货架标准上位机/Views/Controls/ImageDialog.xaml @@ -1,4 +1,4 @@ - /// TextDialog.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/Controls/ImageListenerView.xaml b/货架标准上位机/Views/Controls/ImageListenerView.xaml index f1f7ebb..e759665 100644 --- a/货架标准上位机/Views/Controls/ImageListenerView.xaml +++ b/货架标准上位机/Views/Controls/ImageListenerView.xaml @@ -1,9 +1,9 @@ - diff --git a/货架标准上位机/Views/Controls/ImageListenerView.xaml.cs b/货架标准上位机/Views/Controls/ImageListenerView.xaml.cs index fd63653..a35be1c 100644 --- a/货架标准上位机/Views/Controls/ImageListenerView.xaml.cs +++ b/货架标准上位机/Views/Controls/ImageListenerView.xaml.cs @@ -1,4 +1,4 @@ -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.ViewModel; using HandyControl.Controls; using System; using System.Collections.Generic; @@ -19,7 +19,7 @@ using System.Windows.Navigation; using System.Windows.Shapes; using Path = System.IO.Path; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 图像监听。可针对文件夹文件进行监听显示 diff --git a/货架标准上位机/Views/Controls/OutputStatChartView.xaml b/货架标准上位机/Views/Controls/OutputStatChartView.xaml index f7849f2..ca07259 100644 --- a/货架标准上位机/Views/Controls/OutputStatChartView.xaml +++ b/货架标准上位机/Views/Controls/OutputStatChartView.xaml @@ -1,9 +1,9 @@ - /// 日产量统计扇形图 diff --git a/货架标准上位机/Views/Controls/ProcessDialog.xaml b/货架标准上位机/Views/Controls/ProcessDialog.xaml index 46586e5..ae8e99e 100644 --- a/货架标准上位机/Views/Controls/ProcessDialog.xaml +++ b/货架标准上位机/Views/Controls/ProcessDialog.xaml @@ -1,4 +1,4 @@ - /// TextDialog.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/Controls/ProcessDialogViewModel.cs b/货架标准上位机/Views/Controls/ProcessDialogViewModel.cs index addeffe..1b67a8d 100644 --- a/货架标准上位机/Views/Controls/ProcessDialogViewModel.cs +++ b/货架标准上位机/Views/Controls/ProcessDialogViewModel.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace 货架标准上位机.Views.Controls +namespace 智能仓储WCS管理系统.Views.Controls { public class ProcessDialogViewModel : BindableBase { diff --git a/货架标准上位机/Views/Controls/RoleView.xaml b/货架标准上位机/Views/Controls/RoleView.xaml index c3858f4..82f5d20 100644 --- a/货架标准上位机/Views/Controls/RoleView.xaml +++ b/货架标准上位机/Views/Controls/RoleView.xaml @@ -1,9 +1,9 @@ - /// 角色 diff --git a/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml b/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml index 4c6d772..35e2c25 100644 --- a/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml +++ b/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml @@ -1,9 +1,9 @@ - diff --git a/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml.cs b/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml.cs index 01b2208..e47c5b7 100644 --- a/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml.cs +++ b/货架标准上位机/Views/Controls/ScannerDisplayControl.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace 货架标准上位机.Views.Controls +namespace 智能仓储WCS管理系统.Views.Controls { /// /// ShelfStatusControl.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/Controls/ShelfStatusControl.xaml b/货架标准上位机/Views/Controls/ShelfStatusControl.xaml index be563c1..be82501 100644 --- a/货架标准上位机/Views/Controls/ShelfStatusControl.xaml +++ b/货架标准上位机/Views/Controls/ShelfStatusControl.xaml @@ -1,9 +1,9 @@ - diff --git a/货架标准上位机/Views/Controls/ShelfStatusControl.xaml.cs b/货架标准上位机/Views/Controls/ShelfStatusControl.xaml.cs index f43adcd..f6e0001 100644 --- a/货架标准上位机/Views/Controls/ShelfStatusControl.xaml.cs +++ b/货架标准上位机/Views/Controls/ShelfStatusControl.xaml.cs @@ -14,7 +14,7 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -namespace 货架标准上位机.Views.Controls +namespace 智能仓储WCS管理系统.Views.Controls { /// /// ShelfStatusControl.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/Controls/TextDialog.xaml b/货架标准上位机/Views/Controls/TextDialog.xaml index 29a0de1..3299702 100644 --- a/货架标准上位机/Views/Controls/TextDialog.xaml +++ b/货架标准上位机/Views/Controls/TextDialog.xaml @@ -1,4 +1,4 @@ - /// TextDialog.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/Controls/UserView.xaml b/货架标准上位机/Views/Controls/UserView.xaml index e28d148..1b0fc69 100644 --- a/货架标准上位机/Views/Controls/UserView.xaml +++ b/货架标准上位机/Views/Controls/UserView.xaml @@ -1,9 +1,9 @@ - /// 用户 diff --git a/货架标准上位机/Views/HomeView.xaml b/货架标准上位机/Views/HomeView.xaml index 7582b93..bb72328 100644 --- a/货架标准上位机/Views/HomeView.xaml +++ b/货架标准上位机/Views/HomeView.xaml @@ -1,10 +1,10 @@ - - @@ -25,36 +24,18 @@ - - - - - - - - 日志 - - - - - - - + + + + 日志 + + + + + + diff --git a/货架标准上位机/Views/HomeView.xaml.cs b/货架标准上位机/Views/HomeView.xaml.cs index a0cb4ed..f4765fd 100644 --- a/货架标准上位机/Views/HomeView.xaml.cs +++ b/货架标准上位机/Views/HomeView.xaml.cs @@ -1,4 +1,4 @@ -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.ViewModel; using Ping9719.WpfEx; using System; using System.Collections.Generic; @@ -15,9 +15,9 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.Views.Controls; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// 主页 @@ -25,13 +25,11 @@ namespace 货架标准上位机 public partial class HomeView : UserControlBase { public static HomeViewModel viewModel = new HomeViewModel(); - public HomeView() { InitializeComponent(); this.DataContext = viewModel; } - private void loadFir(object sender, EventArgs e) { viewModel.wrapPanel = shelfsWrapPanel; @@ -40,8 +38,6 @@ namespace 货架标准上位机 viewModel.LoadTask(); } - - private void vis(object sender, DependencyPropertyChangedEventArgs e) { if (IsInDesignMode) diff --git a/货架标准上位机/Views/InInventoryView.xaml b/货架标准上位机/Views/InInventoryView.xaml index 933e9c8..38d1f26 100644 --- a/货架标准上位机/Views/InInventoryView.xaml +++ b/货架标准上位机/Views/InInventoryView.xaml @@ -1,12 +1,12 @@  @@ -39,7 +39,6 @@ - @@ -53,20 +52,12 @@ - - - - - - - - @@ -78,7 +69,6 @@ - diff --git a/货架标准上位机/Views/InInventoryView.xaml.cs b/货架标准上位机/Views/InInventoryView.xaml.cs index d58575b..2b9368a 100644 --- a/货架标准上位机/Views/InInventoryView.xaml.cs +++ b/货架标准上位机/Views/InInventoryView.xaml.cs @@ -12,10 +12,10 @@ using System.Windows.Input; using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -using 货架标准上位机.ViewModel; -using 货架标准上位机.Views.Controls; +using 智能仓储WCS管理系统.ViewModel; +using 智能仓储WCS管理系统.Views.Controls; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// InInventoryView.xaml 的交互逻辑 @@ -27,8 +27,7 @@ namespace 货架标准上位机 { InitializeComponent(); this.DataContext = viewModel; - - + //初始化扫码枪 var scanners = ScannerManager.Scanners.Select(t => t).ToList(); scanners.ForEach(t => { @@ -45,24 +44,20 @@ namespace 货架标准上位机 private void UserControlBase_Loaded(object sender, RoutedEventArgs e) { - } private void Border_MouseUp(object sender, MouseButtonEventArgs e) { - } private void UserControlBase_LoadedVisibleFirst(object sender, EventArgs e) { if (IsInDesignMode) return; - } private void UserControlBase_LoadedVisible(object sender, EventArgs e) { - } private void Button_PreviewKeyDown(object sender, KeyEventArgs e) diff --git a/货架标准上位机/Views/InOutRecordView.xaml b/货架标准上位机/Views/InOutRecordView.xaml index 4778637..8c3a761 100644 --- a/货架标准上位机/Views/InOutRecordView.xaml +++ b/货架标准上位机/Views/InOutRecordView.xaml @@ -1,6 +1,6 @@  /// MainWindow1.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml b/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml index 7f66b5a..7356ade 100644 --- a/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml +++ b/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml @@ -1,12 +1,12 @@  diff --git a/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml.cs b/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml.cs index f93396f..b23ee5a 100644 --- a/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml.cs +++ b/货架标准上位机/Views/MXWindows/MXOutInventoryView.xaml.cs @@ -13,9 +13,9 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; using System.Text.RegularExpressions; -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.ViewModel; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { public partial class MXOutInventoryView : UserControlBase { diff --git a/货架标准上位机/Views/MXWindows/MXOutOrderDetailView.xaml b/货架标准上位机/Views/MXWindows/MXOutOrderDetailView.xaml index 4ad9511..742c67d 100644 --- a/货架标准上位机/Views/MXWindows/MXOutOrderDetailView.xaml +++ b/货架标准上位机/Views/MXWindows/MXOutOrderDetailView.xaml @@ -1,4 +1,4 @@ - diff --git a/货架标准上位机/Views/MXWindows/MXPDView.xaml.cs b/货架标准上位机/Views/MXWindows/MXPDView.xaml.cs index 4a001f2..6f2663c 100644 --- a/货架标准上位机/Views/MXWindows/MXPDView.xaml.cs +++ b/货架标准上位机/Views/MXWindows/MXPDView.xaml.cs @@ -13,9 +13,9 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; using System.Text.RegularExpressions; -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.ViewModel; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { public partial class MXPDView : UserControlBase { diff --git a/货架标准上位机/Views/MainWindows/MainWindow.xaml b/货架标准上位机/Views/MainWindows/MainWindow.xaml index b613a5c..3f8235d 100644 --- a/货架标准上位机/Views/MainWindows/MainWindow.xaml +++ b/货架标准上位机/Views/MainWindows/MainWindow.xaml @@ -1,9 +1,9 @@ - /// MainWindow.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/MainWindows/MainWindow1.xaml b/货架标准上位机/Views/MainWindows/MainWindow1.xaml index 1dbcd50..8d74a57 100644 --- a/货架标准上位机/Views/MainWindows/MainWindow1.xaml +++ b/货架标准上位机/Views/MainWindows/MainWindow1.xaml @@ -1,9 +1,9 @@ - - @@ -24,26 +23,6 @@ - @@ -287,10 +266,6 @@ - diff --git a/货架标准上位机/Views/MainWindows/MainWindow1.xaml.cs b/货架标准上位机/Views/MainWindows/MainWindow1.xaml.cs index 110ae4a..28573b3 100644 --- a/货架标准上位机/Views/MainWindows/MainWindow1.xaml.cs +++ b/货架标准上位机/Views/MainWindows/MainWindow1.xaml.cs @@ -15,10 +15,10 @@ using System.Windows.Media.Imaging; using System.Windows.Navigation; using System.Windows.Shapes; using System.Windows.Threading; -using 货架标准上位机.ViewModel; +using 智能仓储WCS管理系统.ViewModel; using HandyControl.Controls; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { /// /// MainWindow1.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/MainWindows/MainWindow2.xaml b/货架标准上位机/Views/MainWindows/MainWindow2.xaml index 46587b9..0c89d0e 100644 --- a/货架标准上位机/Views/MainWindows/MainWindow2.xaml +++ b/货架标准上位机/Views/MainWindows/MainWindow2.xaml @@ -1,9 +1,9 @@ - /// MainWindow2.xaml 的交互逻辑 diff --git a/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml b/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml index 94cda83..af3b016 100644 --- a/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml +++ b/货架标准上位机/Views/MatBaseInfoAddOrUpdateView.xaml @@ -1,6 +1,6 @@  diff --git a/货架标准上位机/Views/OutInventoryAddMatView.xaml.cs b/货架标准上位机/Views/OutInventoryAddMatView.xaml.cs index e94ffab..7397687 100644 --- a/货架标准上位机/Views/OutInventoryAddMatView.xaml.cs +++ b/货架标准上位机/Views/OutInventoryAddMatView.xaml.cs @@ -15,9 +15,9 @@ using System.Windows.Controls; using System.Windows.Input; using TouchSocket.Core; using WCS.Model.ApiModel.MatInventoryDetail; -using 货架标准上位机.ViewModels; +using 智能仓储WCS管理系统.ViewModels; -namespace 货架标准上位机 +namespace 智能仓储WCS管理系统 { public partial class OutInventoryAddMatView : HandyControl.Controls.Window { diff --git a/货架标准上位机/Views/OutInventoryDocumentDetailView.xaml b/货架标准上位机/Views/OutInventoryDocumentDetailView.xaml index e5649b7..572642a 100644 --- a/货架标准上位机/Views/OutInventoryDocumentDetailView.xaml +++ b/货架标准上位机/Views/OutInventoryDocumentDetailView.xaml @@ -1,4 +1,4 @@ - - - - - - @@ -77,11 +72,9 @@ - - @@ -127,7 +120,6 @@ - @@ -144,15 +136,11 @@ - - - - 10条/页 20条/页 @@ -161,8 +149,6 @@ 500条/页 - - @@ -175,7 +161,6 @@ -