diff --git a/shangjian/XGL.Data/DBService/DBService.cs b/shangjian/XGL.Data/DBService/DBService.cs index ac0b13e..508214d 100644 --- a/shangjian/XGL.Data/DBService/DBService.cs +++ b/shangjian/XGL.Data/DBService/DBService.cs @@ -11,6 +11,7 @@ using System.Data.SqlClient; using MySql.Data.MySqlClient; using CommonFunc.Tools; +using XGL.Models.Model; namespace CentralControl.DBDAO { @@ -770,7 +771,42 @@ where route.route_code = '{processid}'"; //where CONVERT(VARCHAR(10), wet.plan_ } return null; } - + + /// + /// 查询烘房状态 + /// + /// + public List GetHFStatusInfo() + { + string sql = $@"SELECT * FROM [dbo].[base_equipment_attached] WHERE (property='dollyNumber' OR property='state') AND device_code LIKE '%H%' ORDER BY device_code"; + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + List result = new List(); + + foreach (DataRow row in dtset.Tables[0].Rows) + { + BaseEquipmentAttached model = new BaseEquipmentAttached + { + id = row["id"].ToString(), + device_type = row["device_type"].ToString(), + device_code = row["device_code"].ToString(), + property = row["property"].ToString(), + explain = row["explain"].ToString(), + isvalue = row["isvalue"].ToString(), + last_update_time = row["last_update_time"].ToString() + }; + + result.Add(model); + } + + return result; + } + + return null; + } + /// /// 查询物料信息 @@ -854,11 +890,42 @@ where workorder.workorder_id = '{workOrderNo}'"; /// 获取日志 /// /// - public DataTable GetLogList(string datetime,string key) + public DataTable GetLogList(string datetime,string key,string selectin) + { + if (selectin!="") + { + //根据工单获取成型机 + string sql = $@"SELECT Top 2000 * FROM [dbo].[mes_interface_log] where CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and remark like '%{selectin}%' order by creter_time desc ; "; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + } + else + { + //根据工单获取成型机 + string sql = $@"SELECT Top 2000 * FROM [dbo].[mes_interface_log] where CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and remark like '%{key}%' order by creter_time desc ; "; + + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); + if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) + { + return dtset.Tables[0]; + } + } + + return null; + } + /// + /// 获取类型 + /// + /// + public DataTable GettypeList() { //根据工单获取成型机 - string sql = $@"SELECT * FROM [dbo].[mes_interface_log] where CONVERT(VARCHAR(10), creter_time , 120)= CONVERT(VARCHAR(10), '{datetime}' , 120) and remark like '%{key}%' order by creter_time desc ; "; - + string sql = $@" SELECT DISTINCT remark FROM[dbo].[mes_interface_log] "; + DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) { @@ -866,6 +933,8 @@ where workorder.workorder_id = '{workOrderNo}'"; } return null; } + + public DataTable GetPlcValueList(string key,string deviceCode) { //根据工单获取成型机 diff --git a/shangjian/XGL.Data/DBService/FormingMachineService.cs b/shangjian/XGL.Data/DBService/FormingMachineService.cs index a201b76..8d1d053 100644 --- a/shangjian/XGL.Data/DBService/FormingMachineService.cs +++ b/shangjian/XGL.Data/DBService/FormingMachineService.cs @@ -162,7 +162,7 @@ FROM [dbo].[mes_material_transfer_result] res LEFT JOIN pro_order_workorder ord on res.OrderCode = ord.workorder_id left JOIN pro_wet_material_plan_detail wet on wet.workorder_id = ord.workorder_id LEFT JOIN pro_rfid_process_detail rfid on rfid.workorder_code = ord.workorder_code and rfid.rfid = res.rfid -where equipmentCode = '{devicecode}' and work_date = '{workDate}' and ord.workorder_code = '{workOrderCode}' and res.OrderCode is not null ORDER BY plan_time desc; "; +where equipmentCode = '{devicecode}' and work_date = '{workDate}' and ord.workorder_code = '{workOrderCode}' and res.OrderCode is not null ORDER BY update_time desc; "; DataSet dtset = Utils.netClientDBHelper.getDataSet(sql); if (dtset != null && dtset.Tables.Count > 0 && dtset.Tables[0].Rows.Count > 0) diff --git a/shangjian/XGL.Model/Model/BaseEquipmentAttached.cs b/shangjian/XGL.Model/Model/BaseEquipmentAttached.cs new file mode 100644 index 0000000..aa12d7c --- /dev/null +++ b/shangjian/XGL.Model/Model/BaseEquipmentAttached.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace XGL.Models.Model +{ + public class BaseEquipmentAttached + { + public string id { get; set; } + public string device_type { get; set; } + public string device_code { get; set; } + public string property { get; set; } + public string explain { get; set; } + public string isvalue { get; set; } + public string last_update_time { get; set; } + } +} diff --git a/shangjian/XGL/FormItem/Main.xaml.cs b/shangjian/XGL/FormItem/Main.xaml.cs index 4785456..9f85c4c 100644 --- a/shangjian/XGL/FormItem/Main.xaml.cs +++ b/shangjian/XGL/FormItem/Main.xaml.cs @@ -126,6 +126,16 @@ namespace XGL.FormItem { if (MessageBox.Show("是否确认关闭程序", "提示信息", MessageBoxButton.YesNo, MessageBoxImage.Information) == MessageBoxResult.Yes) { + try + { + serialHelper.ComOn(); + serialHelper.redLightOff(); + serialHelper.buzzerOff(); + serialHelper.ComOff(); + } + catch (Exception ex) + { + } System.Environment.Exit(System.Environment.ExitCode); } } diff --git a/shangjian/XGL/HFstatus.xaml b/shangjian/XGL/HFstatus.xaml new file mode 100644 index 0000000..cd723e1 --- /dev/null +++ b/shangjian/XGL/HFstatus.xaml @@ -0,0 +1,1160 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +