From 5d84acc2a8d9b797c45fa042b191ddbc9f732a51 Mon Sep 17 00:00:00 2001 From: zhaojian Date: Thu, 23 May 2024 09:27:16 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90=E6=89=93=E5=8D=A1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD,=E4=BF=AE=E6=94=B9=E6=8A=A5=E4=BF=AE=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommonFunc/Tools/MachineRepairWin.xaml | 23 ++++---- .../CommonFunc/Tools/MachineRepairWin.xaml.cs | 55 +++++++++++++++---- .../Debug/CommonFunc_MarkupCompile.i.cache | 6 +- .../XGL.Data/DBService/DringRoomService.cs | 15 +++++ .../DBService/FormingMachineService.cs | 14 +++++ .../XGL.Model/Model/MachineRepairModel.cs | 3 +- shangjian/XGL/Views/DryingRoomUC.xaml.cs | 3 +- shangjian/XGL/Views/LanJu_Operator.xaml.cs | 3 +- .../XGLFinishPro/Views/LanJu_Operator.xaml | 7 ++- .../XGLFinishPro/Views/LanJu_Operator.xaml.cs | 10 +++- shangjian/XGLFinishPro/Views/LanJu_User.xaml | 4 +- shangjian/XGLFinishPro/Views/punchCard.xaml | 16 ++++++ .../XGLFinishPro/Views/punchCard.xaml.cs | 31 +++++++++++ shangjian/XGLFinishPro/XGLFinishPro.csproj | 7 +++ 14 files changed, 160 insertions(+), 37 deletions(-) create mode 100644 shangjian/XGLFinishPro/Views/punchCard.xaml create mode 100644 shangjian/XGLFinishPro/Views/punchCard.xaml.cs diff --git a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml index d41d41e..c0c07c3 100644 --- a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml +++ b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml @@ -8,7 +8,7 @@ Title="MachineRepairWin" Height="550" Width="900" WindowStartupLocation="CenterScreen" WindowStyle="None" Loaded="Window_Loaded"> - + - + @@ -314,9 +312,8 @@ - - - + + diff --git a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs index 4bd2b2f..e64cdb7 100644 --- a/shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs +++ b/shangjian/CommonFunc/Tools/MachineRepairWin.xaml.cs @@ -1,6 +1,8 @@ using Newtonsoft.Json; +using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; +using System.Data; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -22,30 +24,37 @@ namespace CommonFunc.Tools /// public partial class MachineRepairWin : Window { + List faultModels = new List(); + List CopyModel = new List(); string _apiUrl = ""; + DataTable _tables = new DataTable(); public MachineRepairWin() { InitializeComponent(); } - public MachineRepairWin(string apiUrl) + public MachineRepairWin(string apiUrl,DataTable dataTable) { InitializeComponent(); _apiUrl = apiUrl; + _tables= dataTable; } private void btnQueryUser_Click(object sender, RoutedEventArgs e) { string queryP = this.txtP.Text.Trim(); if (string.IsNullOrEmpty(queryP)) { - this.dgUserInfo.ItemsSource = Utils.userList; + this.dgUserInfo.ItemsSource = CopyModel; return; } this.dgUserInfo.ItemsSource = null; - var queryList = Utils.userList.Where(t => t.nick_name.Contains(queryP) || t.user_name.Contains(queryP)); + var queryList = faultModels.FindAll(t=>t.fault_subclass.Contains(queryP)); this.dgUserInfo.ItemsSource = queryList; } - + private void btnCloseWin_Click(object sender, RoutedEventArgs e) + { + this.Close(); + } private void txtP_TextChanged(object sender, TextChangedEventArgs e) { btnQueryUser_Click(null, null); @@ -53,12 +62,27 @@ namespace CommonFunc.Tools private void Window_Loaded(object sender, RoutedEventArgs e) { - this.dgUserInfo.ItemsSource = Utils.userList; + CopyModel = ConvertToFaultModelList(_tables); + faultModels= ConvertToFaultModelList(_tables); + this.dgUserInfo.ItemsSource = CopyModel; } - - private void btnCloseWin_Click(object sender, RoutedEventArgs e) + private List ConvertToFaultModelList(DataTable dataTable) { - this.Close(); + var faultList = new List(); + + if (dataTable != null) + { + foreach (DataRow row in dataTable.Rows) + { + var fault = new faultModel + { + fault_code = row["fault_code"].ToString(), + fault_subclass = row["fault_subclass"].ToString() + }; + faultList.Add(fault); + } + } + return faultList; } private async void btnUserConfirm_Click(object sender, RoutedEventArgs e) @@ -67,17 +91,18 @@ namespace CommonFunc.Tools { if (dgUserInfo.SelectedItems.Count <= 0) { - CustomMessageBox.Show("请选择人员！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); + CustomMessageBox.Show("请选择故障！", CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); return; } - - sys_user user = dgUserInfo.SelectedItem as sys_user; + var select= dgUserInfo.SelectedItem as faultModel; + var user= Utils.userList.Find(t=>t.nick_name== LoginUser.UserName); MachineRepairModel machineRepairModel = new MachineRepairModel(); machineRepairModel.equipmentCode = Utils.GetAppSetting("DeviceCode"); machineRepairModel.factory = Utils.GetAppSetting("SiteCode"); machineRepairModel.userName = user.user_name; machineRepairModel.phoneNumber = user.phonenumber; machineRepairModel.userNickName = user.nick_name; + machineRepairModel.orderDesc= select.fault_subclass.ToString(); // 将要发送的数据序列化为JSON格式 var jsonContent = JsonConvert.SerializeObject(machineRepairModel); @@ -104,7 +129,7 @@ namespace CommonFunc.Tools LogHelper.instance.log.Error($"报修时发生异常>>" + ex.Message); CustomMessageBox.Show($"调用报修接口时发生异常：" + ex.Message, CustomMessageBoxButton.OK, CustomMessageBoxIcon.Warning); } - + } private void dgWorkOrderInfo_LoadingRow(object sender, DataGridRowEventArgs e) @@ -112,4 +137,10 @@ namespace CommonFunc.Tools e.Row.Header = (e.Row.GetIndex() + 1).ToString(); } } + public class faultModel + { + public string fault_code { get; set; } + public string fault_subclass { get; set; } + } + } diff --git a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache index d051103..baa64cb 100644 --- a/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache +++ b/shangjian/CommonFunc/obj/x86/Debug/CommonFunc_MarkupCompile.i.cache @@ -4,7 +4,7 @@ library C# .cs -D:\WorkSpace\KHD\Project\Lanju\Lanju-client\shangjian\CommonFunc\obj\x86\Debug\ +E:\workspace\LanJu\榄菊上位机\shangjian\CommonFunc\obj\x86\Debug\ CommonFunc none false @@ -13,8 +13,8 @@ DEBUG;TRACE 489050341 2-1355062061 28-621354674 -44-239516262 +44-1016000948 HMessageBox.xaml;Tools\MachineRepairWin.xaml;Tools\PauseOrderWin.xaml;Tools\PauseRecoverWin.xaml; -True +False diff --git a/shangjian/XGL.Data/DBService/DringRoomService.cs b/shangjian/XGL.Data/DBService/DringRoomService.cs index f5ed375..f607d14 100644 --- a/shangjian/XGL.Data/DBService/DringRoomService.cs +++ b/shangjian/XGL.Data/DBService/DringRoomService.cs @@ -89,5 +89,20 @@ LEFT JOIN pro_order_workorder workorder WITH (NOLOCK) on dry.workorder_code = wo } return null; } + /// + /// 获取报修描述 + /// + /// + public DataTable ConvertToFaultModelList() + { + string getReportCodeSql = "SELECT fault_code, fault_subclass FROM equ_fault_description"; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(getReportCodeSql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } } } diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index 5cec352..82744bd 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -980,7 +980,21 @@ where machine_code = 'X1' and bind_status = '0' order by update_time DESC"; } return null; } + /// + /// 获取报修描述 + /// + /// + public DataTable ConvertToFaultModelList() + { + string getReportCodeSql = "SELECT fault_code, fault_subclass FROM equ_fault_description"; + DataSet dtset = Utils.netClientDBHelper.getDataSet(getReportCodeSql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + return null; + } public DataTable GetNewRFID() { string sql = $@"select max(rfid) as rfid from mes_rfidandsfc_bind where CONVERT(VARCHAR(10), create_time , 120) = CONVERT(VARCHAR(10),Getdate(), 120)"; diff --git a/shangjian/XGL.Model/Model/MachineRepairModel.cs b/shangjian/XGL.Model/Model/MachineRepairModel.cs index a17956e..11abb16 100644 --- a/shangjian/XGL.Model/Model/MachineRepairModel.cs +++ b/shangjian/XGL.Model/Model/MachineRepairModel.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace XGL.Models.Model { /// - /// 设备报修 equipmentCode（设备编码）、factory（工厂源）、userName（用户账号）、phoneNumber（联系方式）、userNickName（用户昵称） + /// 设备报修 equipmentCode（设备编码）、factory（工厂源）、userName（用户账号）、phoneNumber（联系方式）、userNickName（用户昵称） orderDesc(故障描述) /// public class MachineRepairModel { @@ -16,5 +16,6 @@ namespace XGL.Models.Model public string userName { get; set; } public string phoneNumber { get; set; } public string userNickName { get; set; } + public string orderDesc { get; set; } } } diff --git a/shangjian/XGL/Views/DryingRoomUC.xaml.cs b/shangjian/XGL/Views/DryingRoomUC.xaml.cs index cc1ad5b..4fc45d3 100644 --- a/shangjian/XGL/Views/DryingRoomUC.xaml.cs +++ b/shangjian/XGL/Views/DryingRoomUC.xaml.cs @@ -299,10 +299,11 @@ namespace XGL.Views } private void btnMachineRepair_Click(object sender, RoutedEventArgs e) { + var selefuel = dringRoomService.ConvertToFaultModelList(); FormingMachineService formingMachineService = new FormingMachineService(); //调用首件检验接口 string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair"); - MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl); + MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, selefuel); machineRepairWin.ShowDialog(); } } diff --git a/shangjian/XGL/Views/LanJu_Operator.xaml.cs b/shangjian/XGL/Views/LanJu_Operator.xaml.cs index 02f2ee7..5296d3f 100644 --- a/shangjian/XGL/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGL/Views/LanJu_Operator.xaml.cs @@ -608,9 +608,10 @@ VALUES private void btnMachineRepair_Click(object sender, RoutedEventArgs e) { + //调用首件检验接口 string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair"); - MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl); + MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, formingMachineService.ConvertToFaultModelList()); machineRepairWin.ShowDialog(); } } diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml index a1dfaab..4030661 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml +++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml @@ -457,7 +457,7 @@ Background="#F2F3F5" Click="btnRefresh_Click" Content="刷新"> - + Click="weigh_Click" + Content="打卡"> + diff --git a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs index e7f246e..702a6a9 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs +++ b/shangjian/XGLFinishPro/Views/LanJu_Operator.xaml.cs @@ -818,9 +818,11 @@ namespace XGLFinishPro.Views private void btnMachineRepair_Click(object sender, RoutedEventArgs e) { + + var selefuel= formingMachineService.ConvertToFaultModelList(); //调用首件检验接口 string apiUrl = formingMachineService.GetInterfaceUrl("machineRepair"); - MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl); + MachineRepairWin machineRepairWin = new MachineRepairWin(apiUrl, selefuel); machineRepairWin.ShowDialog(); } @@ -854,6 +856,12 @@ namespace XGLFinishPro.Views PieceSalaryCalWin pieceSalaryCalWin = new PieceSalaryCalWin(prodCode, prodName, deviceCode, workOrderCode, sapWorkOrderCode); pieceSalaryCalWin.ShowDialog(); } + + private void weigh_Click(object sender, RoutedEventArgs e) + { + punchCard punchCard = new punchCard(); + punchCard.ShowDialog(); + } } public class ReportWorkModel { diff --git a/shangjian/XGLFinishPro/Views/LanJu_User.xaml b/shangjian/XGLFinishPro/Views/LanJu_User.xaml index 72976d5..bf58e73 100644 --- a/shangjian/XGLFinishPro/Views/LanJu_User.xaml +++ b/shangjian/XGLFinishPro/Views/LanJu_User.xaml @@ -5,8 +5,8 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:XGLFinishPro.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - Width="1920" - Height="800" + HorizontalAlignment="Stretch" + VerticalAlignment="Stretch" mc:Ignorable="d">