|
@@ -2,12 +2,7 @@
|
|
|
using DevComponents.DotNetBar.SuperGrid;
|
|
|
using System;
|
|
|
using System.Collections.Generic;
|
|
|
-using System.ComponentModel;
|
|
|
using System.Data;
|
|
|
-using System.Drawing;
|
|
|
-using System.Linq;
|
|
|
-using System.Text;
|
|
|
-using System.Threading.Tasks;
|
|
|
using System.Windows.Forms;
|
|
|
using WCS_Client.UC;
|
|
|
using WCS_Client.Utility;
|
|
@@ -21,31 +16,32 @@ namespace WCS_Client.Frm
|
|
|
InitializeComponent();
|
|
|
InitFrm();
|
|
|
}
|
|
|
- private void InitFrm()
|
|
|
+
|
|
|
+ private void InitFrm()
|
|
|
{
|
|
|
List<GridColumn> GCList = new List<GridColumn>()
|
|
|
{
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_No", "设备编号", 80),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_PlcName", "PLC名称", 100),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_Area", "设备区域", 100),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_Type", "设备类型", 100),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_BarCode", "条码", 100),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_SystemStatus", "系统状态", 100),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_WorkMode", "工作模式", 100),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_AlaramsMsg", "报警消息", 500),
|
|
|
- //SuperGridUtil.Get_GridColumn("PLC_NOTES", "说明", 200),
|
|
|
- SuperGridUtil.Get_GridColumn("Equ_Notes", "备注", 200)
|
|
|
+ SuperGridUtil.Get_GridColumn("DEVICECODE", "设备编号", 80),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_PlcName", "PLC名称", 100),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_Area", "设备区域", 100),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_Type", "设备类型", 100),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_BarCode", "条码", 100),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_SystemStatus", "系统状态", 100),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_WorkMode", "工作模式", 100),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_AlaramsMsg", "报警消息", 500),
|
|
|
+ ////SuperGridUtil.Get_GridColumn("PLC_NOTES", "说明", 200),
|
|
|
+ //SuperGridUtil.Get_GridColumn("Equ_Notes", "备注", 200)
|
|
|
};
|
|
|
List<LayoutControlItem> LCIList = new List<LayoutControlItem>();
|
|
|
LCIList.Add(LCItemUtil.Add_TextboxX("STA_EQUIPMENTNO", "设备编号:", 20, SubmitMethods, null));
|
|
|
- LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Equ_No like '%{0}%'" };
|
|
|
+ LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "DEVICECODE like '%{0}%'" };
|
|
|
|
|
|
- LCIList.Add(LCItemUtil.Add_TextboxX("STA_PLCNAME", "PLC名称:", 20, SubmitMethods, null));
|
|
|
- LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Equ_PlcName like '%{0}%'" };
|
|
|
+ //LCIList.Add(LCItemUtil.Add_TextboxX("STA_PLCNAME", "PLC名称:", 20, SubmitMethods, null));
|
|
|
+ //LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Equ_PlcName like '%{0}%'" };
|
|
|
|
|
|
LCIList.Add(LCItemUtil.Add_ButtonX("btn_QDB", "查询", 80, 30, SubmitMethods));
|
|
|
LCIList.Add(LCItemUtil.Add_ButtonX("btn_QClear", "重置", 80, 30, SubmitMethods));
|
|
|
- LCIList.Add(LCItemUtil.Add_ButtonX("updateEquNotes", "修改备注", 100, 30, SubmitMethods));
|
|
|
+ //LCIList.Add(LCItemUtil.Add_ButtonX("updateEquNotes", "修改备注", 100, 30, SubmitMethods));
|
|
|
|
|
|
uC_QueryPage1.Init_QueryPage(30, true, true, "", GCList, LCIList, QueryPageDataMethodsms, RefreshRoleMethodsms, DoubleClikMethod, null, ClikMethod);
|
|
|
CommonShow.ShowProcessing("正在处理中,请稍候...", this, (obj) =>
|
|
@@ -53,16 +49,17 @@ namespace WCS_Client.Frm
|
|
|
uC_QueryPage1.RefreshData(1, 0);
|
|
|
}, null);
|
|
|
}
|
|
|
+
|
|
|
private PageData QueryPageDataMethodsms(int PageIndex, int PageSize)
|
|
|
{
|
|
|
- string _SQLText = string.Format(@"SELECT [Equ_No],[Equ_Sequence],[Equ_Area],[Equ_PlcName],[Equ_Type],[Equ_BarCode],[Equ_AlaramsMsg],a.Equ_SystemStatus,a.Equ_WorkMode,a.Equ_Notes
|
|
|
-FROM [dbo].[WCS_EQUIPMENTINFO] a left join dbo.WCS_PLC b on a.Equ_PlcName=b.PLC_NAME where Equ_Area='A' ");
|
|
|
- string _Orderby = "Equ_No asc";
|
|
|
+ string _SQLText = string.Format(@"SELECT distinct(DEVICECODE) FROM [dbo].[WCS_DEVICEPROTOCOL] WHERE ENABLED=1 ");
|
|
|
+ string _Orderby = "DEVICECODE asc";
|
|
|
|
|
|
PageData pd = BaseWorkflow.QueryPageData(_SQLText, _Orderby, uC_QueryPage1.GetQueryWhere(), PageIndex, 3000);
|
|
|
return pd;
|
|
|
}
|
|
|
- private void SubmitMethods(string LCName)
|
|
|
+
|
|
|
+ private void SubmitMethods(string LCName)
|
|
|
{
|
|
|
if (LCName == "btn_QDB")
|
|
|
{
|
|
@@ -83,67 +80,43 @@ FROM [dbo].[WCS_EQUIPMENTINFO] a left join dbo.WCS_PLC b on a.Equ_PlcName=b.PLC_
|
|
|
MessageUtil.ShowTips("请选择配置信息。");
|
|
|
return;
|
|
|
}
|
|
|
- var frmupdate = new Frm.MBtn_Monitor.FrmUpdateEquMsg (dt.Rows[0]);
|
|
|
+ var frmupdate = new Frm.MBtn_Monitor.FrmUpdateEquMsg(dt.Rows[0]);
|
|
|
frmupdate.ShowDialog();
|
|
|
uC_QueryPage1.RefreshData(1, 0);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
private void RefreshRoleMethodsms(bool ChkValue)
|
|
|
{
|
|
|
-
|
|
|
}
|
|
|
+
|
|
|
private void DoubleClikMethod(DataRow dr)
|
|
|
{
|
|
|
Current.RefreshData();
|
|
|
- //string plc_name = dr["Equ_PlcName"].ToString();
|
|
|
- string equ_no = dr["Equ_No"].ToString();
|
|
|
- //var plc = Current.PlcSet.FirstOrDefault(v => v.PLC_NAME == plc_name);
|
|
|
- //var equ = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.Equ_No == equ_no);
|
|
|
- //string result = string.Empty;
|
|
|
- //DataTable dt = null;
|
|
|
- //if (equ.Equ_Type == EquipmentType.srm.ToString())
|
|
|
+ string code = dr["DEVICECODE"].ToString();
|
|
|
+ //var pack = eqpData.deviceDataPack;
|
|
|
+
|
|
|
+ //if (code.Contains("SRM"))
|
|
|
+ //{
|
|
|
+ //}
|
|
|
+ //else if (code.Contains("BCR"))
|
|
|
//{
|
|
|
- // result = equ.EquSignal_Srm.ToJson();
|
|
|
- // dt = equ.EquSignal_Srm.GetAttributesDataTable();
|
|
|
//}
|
|
|
- //else if (equ.Equ_Type == EquipmentType.rgv.ToString())
|
|
|
+ //else if (code.Contains("RGV"))
|
|
|
//{
|
|
|
- // result = equ.EquSignal_Rgv.ToJson();
|
|
|
- // dt = equ.EquSignal_Rgv.GetAttributesDataTable();
|
|
|
//}
|
|
|
- //else if (equ.Equ_Type == EquipmentType.conveyor.ToString())
|
|
|
+ //else
|
|
|
//{
|
|
|
- // result = equ.EquSignal_Conv.ToJson();
|
|
|
- // dt = equ.EquSignal_Conv.GetAttributesDataTable();
|
|
|
//}
|
|
|
- FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(equ_no);
|
|
|
+
|
|
|
+ FrmEquMsg_dtl Frm = new FrmEquMsg_dtl(code);
|
|
|
Frm.Show();
|
|
|
}
|
|
|
- private void ClikMethod(DataRow dr)
|
|
|
+
|
|
|
+ private void ClikMethod(DataRow dr)
|
|
|
{
|
|
|
try
|
|
|
{
|
|
|
- //Current.RefreshData();
|
|
|
- //string plc_name = dr["Equ_PlcName"].ToString();
|
|
|
- //string equ_no = dr["Equ_No"].ToString();
|
|
|
- //var plc = Current.PlcSet.FirstOrDefault(v => v.PLC_NAME == plc_name);
|
|
|
- //var equ = plc.WCS_EquipmentInfoSet.FirstOrDefault(v => v.DEVICECODE == equ_no);
|
|
|
- //string result = string.Empty;
|
|
|
- //if (equ.Equ_Type == EquipmentType.srm.ToString())
|
|
|
- // result = equ.EquSignal_Srm.ToJson();
|
|
|
- //else if (equ.Equ_Type == EquipmentType.rgv.ToString())
|
|
|
- // result = equ.EquSignal_Rgv.ToJson();
|
|
|
- //else if (equ.Equ_Type == EquipmentType.conveyor.ToString())
|
|
|
- // result = equ.EquSignal_Conv.ToJson();
|
|
|
-
|
|
|
- //string QeuMsg = null;
|
|
|
- ////string wcs_task_no =dr["STA_DATA"].ToString();
|
|
|
- //string[] msg = result.Split(',');
|
|
|
- //for (int i = 0; i < msg.Count(); i++)
|
|
|
- //{
|
|
|
- // QeuMsg += msg[i] + "\r\n";
|
|
|
- //}
|
|
|
- //textBox1.Text = QeuMsg;
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
@@ -151,4 +124,4 @@ FROM [dbo].[WCS_EQUIPMENTINFO] a left join dbo.WCS_PLC b on a.Equ_PlcName=b.PLC_
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+}
|