From 74976a6adedbb508a47a2e4ab19aefb52d1cb84d Mon Sep 17 00:00:00 2001 From: "liulb@mesnac.com" Date: Mon, 27 Nov 2023 14:53:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0=E4=B8=8A?= =?UTF-8?q?=E4=BD=8D=E6=9C=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Admin.Core.Api/Admin.Core.Model.xml | 5 ++ Admin.Core.Model/Model_New/BaseBomInfo.cs | 7 ++- Aucma.Core.PrintTo/App.xaml | 7 +++ Aucma.Core.PrintTo/Common/CommHelper.cs | 32 ++++++++++++ .../ViewModels/IndexPageViewModel.cs | 18 +++++-- .../ViewModels/MainWindowViewModel.cs | 20 ++------ Aucma.Core.PrintTo/Views/IndexPage.xaml.cs | 17 ------- .../{IndexPage.xaml => IndexPageView.xaml} | 49 ++++++++++--------- .../Views/IndexPageView.xaml.cs | 33 +++++++++++++ Aucma.Core.PrintTo/Views/MainWindow.xaml | 21 +++----- Aucma.Core.PrintTo/Views/PrintToDevView.xaml | 23 ++++----- .../Views/SpecialPrintView.xaml | 17 ++++--- .../Views/SpecialPrintView.xaml.cs | 8 ++- .../Views/SupplementPrintPageView.xaml | 20 ++++---- .../Views/SupplementPrintPageView.xaml.cs | 8 ++- 15 files changed, 179 insertions(+), 106 deletions(-) create mode 100644 Aucma.Core.PrintTo/Common/CommHelper.cs delete mode 100644 Aucma.Core.PrintTo/Views/IndexPage.xaml.cs rename Aucma.Core.PrintTo/Views/{IndexPage.xaml => IndexPageView.xaml} (86%) create mode 100644 Aucma.Core.PrintTo/Views/IndexPageView.xaml.cs diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 5017c3ff..6af79e50 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -301,6 +301,11 @@ 祖级列表 + + + 打印名称 + + 成品信息 diff --git a/Admin.Core.Model/Model_New/BaseBomInfo.cs b/Admin.Core.Model/Model_New/BaseBomInfo.cs index e9df3c8b..8f85ed56 100644 --- a/Admin.Core.Model/Model_New/BaseBomInfo.cs +++ b/Admin.Core.Model/Model_New/BaseBomInfo.cs @@ -99,7 +99,10 @@ namespace Admin.Core.Model /// [SugarColumn(ColumnName = "ANCESTORS")] public string Ancestors { get; set; } - - + /// + /// 打印名称 + /// + [SugarColumn(ColumnName = "PRINT_NAME")] + public string PrintName { get; set; } } } diff --git a/Aucma.Core.PrintTo/App.xaml b/Aucma.Core.PrintTo/App.xaml index 73939176..af6546e3 100644 --- a/Aucma.Core.PrintTo/App.xaml +++ b/Aucma.Core.PrintTo/App.xaml @@ -24,6 +24,13 @@ + + + + diff --git a/Aucma.Core.PrintTo/Common/CommHelper.cs b/Aucma.Core.PrintTo/Common/CommHelper.cs new file mode 100644 index 00000000..7f7dc9ba --- /dev/null +++ b/Aucma.Core.PrintTo/Common/CommHelper.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.PrintTo.Common +{ + public class CommHelper + { + #region 打开软盘 + /// + /// 打开软盘 + /// + public static void OpenOsk() + { + try + { + Process proc = new Process(); + proc.StartInfo.FileName = @"C:\Windows\System32\osk.exe"; + proc.StartInfo.UseShellExecute = true; + proc.StartInfo.Verb = "runas"; + proc.Start(); + } + catch + { + } + } + #endregion + } +} diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index 9ea9dedb..df39c7a4 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -1,5 +1,7 @@ using Admin.Core.Common; using Admin.Core.IService; +using Admin.Core.Model.ViewModels; +using Aucma.Core.PrintTo.Common; using Aucma.Core.PrintTo.Models; using Aucma.Core.PrintTo.Views; using CommunityToolkit.Mvvm.ComponentModel; @@ -9,6 +11,7 @@ using log4net; using Microsoft.Extensions.DependencyInjection; using NetTaste; using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; using System.Threading.Tasks; @@ -65,10 +68,18 @@ namespace Aucma.Core.PrintTo.ViewModels /// 查询 /// [RelayCommand] - private async Task QueryString(string queryStr) + private async void QueryString(string queryStr) { + List orderList = null; try { + if (!string.IsNullOrEmpty(queryStr)) + { + var list = await _baseOrderInfoServices.QueryPrintInfo(); + orderList = list.Where(d => d.OrderCode.Contains(queryStr) || d.ProductCode.Contains(queryStr) || d.ProductName.Contains(queryStr) || d.MaterialCode.Contains(queryStr) || d.MaterialName.Contains(queryStr)).ToList(); + + } + System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () => { if (!string.IsNullOrEmpty(queryStr)) @@ -81,10 +92,6 @@ namespace Aucma.Core.PrintTo.ViewModels // whereExpression = whereExpression.And(x => x.PLAN_CODE.Contains(queryStr)); //} - var list = await _baseOrderInfoServices.QueryPrintInfo(); - //list.Where(d => d.MaterialName.Contains("U壳") || d.MaterialName.Contains("内胆")); - - var orderList = list.Where(d => d.OrderCode.Contains(queryStr) || d.ProductCode.Contains(queryStr) || d.ProductName.Contains(queryStr) || d.MaterialCode.Contains(queryStr) || d.MaterialName.Contains(queryStr)); foreach (var item in orderList) { OrderInfo info = new OrderInfo(); @@ -117,6 +124,7 @@ namespace Aucma.Core.PrintTo.ViewModels log.Error("QueryString方法出现异常"); } } + #endregion #region radio查询按钮 diff --git a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs index 52127837..4ee81fbe 100644 --- a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs @@ -1,4 +1,5 @@ using Admin.Core.Common; +using Aucma.Core.PrintTo.Common; using Aucma.Core.PrintTo.Views; using AutoMapper.Configuration; using CommunityToolkit.Mvvm.ComponentModel; @@ -16,7 +17,7 @@ namespace Aucma.Core.PrintTo.ViewModels public partial class MainWindowViewModel : ObservableObject { private static readonly log4net.ILog log = LogManager.GetLogger(typeof(MainWindowViewModel)); - private IndexPage firstPage = new IndexPage();//首页 + private IndexPageView firstPage = new IndexPageView();//首页 public MainWindowViewModel() { UserContent = firstPage; @@ -114,8 +115,7 @@ namespace Aucma.Core.PrintTo.ViewModels break; // 打开软盘 case "TabTip": - - OpenOsk(); + CommHelper.OpenOsk(); break; // 还原 或者 最大化当前窗口 case "Normal": @@ -147,18 +147,6 @@ namespace Aucma.Core.PrintTo.ViewModels } #endregion - #region 打开软盘 - /// - /// 打开软盘 - /// - public static void OpenOsk() - { - Process proc = new Process(); - proc.StartInfo.FileName = @"C:\Windows\System32\osk.exe"; - proc.StartInfo.UseShellExecute = true; - proc.StartInfo.Verb = "runas"; - proc.Start(); - } - #endregion + } } diff --git a/Aucma.Core.PrintTo/Views/IndexPage.xaml.cs b/Aucma.Core.PrintTo/Views/IndexPage.xaml.cs deleted file mode 100644 index 4cf74907..00000000 --- a/Aucma.Core.PrintTo/Views/IndexPage.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Aucma.Core.PrintTo.ViewModels; -using System.Windows.Controls; - -namespace Aucma.Core.PrintTo.Views -{ - /// - /// IndexPage.xaml 的交互逻辑 - /// - public partial class IndexPage : UserControl - { - public IndexPage() - { - InitializeComponent(); - this.DataContext = new IndexPageViewModel(); - } - } -} diff --git a/Aucma.Core.PrintTo/Views/IndexPage.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml similarity index 86% rename from Aucma.Core.PrintTo/Views/IndexPage.xaml rename to Aucma.Core.PrintTo/Views/IndexPageView.xaml index ad0710c4..c7e72e63 100644 --- a/Aucma.Core.PrintTo/Views/IndexPage.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml @@ -1,4 +1,4 @@ - + Background="#1152AC" + d:DesignWidth="1500" FontSize="18"> @@ -39,7 +42,7 @@ - + @@ -158,9 +161,9 @@ -