|
@@ -21,28 +21,18 @@ namespace WCS_Client.Frm
|
|
|
{
|
|
|
List<GridColumn> GCList = new List<GridColumn>()
|
|
|
{
|
|
|
- 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)
|
|
|
+ SuperGridUtil.Get_GridColumn("CODE", "设备编号", 80),
|
|
|
+ SuperGridUtil.Get_GridColumn("NAME", "设备名称", 200),
|
|
|
+ SuperGridUtil.Get_GridColumn("PLCCODE", "plc编号", 100),
|
|
|
+ SuperGridUtil.Get_GridColumn("PLCNAME", "plc名称", 140),
|
|
|
+ SuperGridUtil.Get_GridColumn("IP", "plc 地址", 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 = "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_EQUIPTYPE", "设备类型:", 20, SubmitMethods, null));
|
|
|
- //LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "Equ_Type like '%{0}%'" };
|
|
|
-
|
|
|
+ LCIList.Add(LCItemUtil.Add_TextboxX("CODE", "设备编号:", 20, SubmitMethods, null));
|
|
|
+ LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "a.CODE like '%{0}%'" };
|
|
|
|
|
|
+ LCIList.Add(LCItemUtil.Add_TextboxX("NAME", "设备名称:", 20, SubmitMethods, null));
|
|
|
+ LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "a.NAME like '%{0}%'" };
|
|
|
|
|
|
LCIList.Add(LCItemUtil.Add_ButtonX("btn_QDB", "查询", 80, 30, SubmitMethods));
|
|
|
LCIList.Add(LCItemUtil.Add_ButtonX("btn_QClear", "重置", 80, 30, SubmitMethods));
|
|
@@ -58,8 +48,12 @@ namespace WCS_Client.Frm
|
|
|
private PageData QueryPageDataMethodsms(int PageIndex, int PageSize)
|
|
|
{
|
|
|
|
|
|
- string _SQLText = string.Format(@"SELECT distinct(DEVICECODE) FROM [dbo].[WCS_DEVICEPROTOCOL] WHERE ENABLED=1 AND DEVICECODE NOT LIKE 'BCR%'");
|
|
|
- string _Orderby = "DEVICECODE asc";
|
|
|
+ string _SQLText = string.Format(@"select a.CODE,a.NAME,b.DBCODE,c.PLCCODE,d.NAME PLCNAME,d.IP from WCS_DEVICE a left join
|
|
|
+WCS_DEVICEPROTOCOL b on b.DEVICECODE=a.CODE
|
|
|
+left join WCS_DATABLOCK c on c.CODE=b.DBCODE
|
|
|
+left join WCS_PLC d on d.CODE=c.PLCCODE
|
|
|
+where DBCODE not like '%521%' and DBCODE not like '%523%' and DBCODE not like '%537%' AND a.CODE NOT like 'BCR%'");
|
|
|
+ string _Orderby = "a.CODE asc";
|
|
|
|
|
|
PageData pd = BaseWorkflow.QueryPageData(_SQLText, _Orderby, uC_QueryPage1.GetQueryWhere(), PageIndex, 3000);
|
|
|
return pd;
|
|
@@ -99,7 +93,7 @@ namespace WCS_Client.Frm
|
|
|
private void DoubleClikMethod(DataRow dr)
|
|
|
{
|
|
|
Current.RefreshData();
|
|
|
- string code = dr["DEVICECODE"].ToString();
|
|
|
+ string code = dr["CODE"].ToString();
|
|
|
//var pack = eqpData.deviceDataPack;
|
|
|
|
|
|
//if (code.Contains("SRM"))
|