Browse Source

fix查询优化

xu.lu 3 years ago
parent
commit
e17f77d1e3

+ 3 - 2
WCS_Client/Frm/MBtn_AgvTask/MBtn_AgvTask.cs

@@ -121,8 +121,9 @@ namespace WCS_Client.Frm
 
         private PageData QueryPageDataMethods(int PageIndex, int PageSize)
         {
-            string _SQLText = @"SELECT distinct a.*,t.ID WCSTASK,t.WMSTASK,b.MEP_MAPPINGCHNAME AgvTaskTypeCh,c.MEP_MAPPINGCHNAME StatusCh,d.MEP_MAPPINGCHNAME AgvStatusCh  FROM dbo.WCS_AGVTask a
-                                left join dbo.WCS_TASK t on a.ID=t.AgvTask
+            string _SQLText = @"SELECT a.*,t.ID WCSTASK,t.WMSTASK,b.MEP_MAPPINGCHNAME AgvTaskTypeCh,
+                                c.MEP_MAPPINGCHNAME StatusCh,d.MEP_MAPPINGCHNAME AgvStatusCh  FROM dbo.WCS_AGVTask a
+                                left join ( select ID,WMSTASK,AgvTask from ( select ROW_NUMBER() over (PARTITION BY AgvTask order by AgvTask desc) rowid,* from WCS_TASK where AgvTask>0 ) T where rowid=1  )t on a.ID=t.AgvTask
                                 left join dbo.WCS_MAPPINGENTRY b on a.TaskType=b.MEP_MAPPINGNO and b.MEP_MAPPINGTYPE='TaskType'
                                 left join dbo.WCS_MAPPINGENTRY c on a.Status=c.MEP_MAPPINGNO and c.MEP_MAPPINGTYPE='AGVStatus'
                                 left join dbo.WCS_MAPPINGENTRY d on a.AGVStatus=d.MEP_MAPPINGNO and d.MEP_MAPPINGTYPE='AGVStatus' Where 1=1 and a.Status < (case when b.MEP_MAPPINGCHNAME='入库'  then 100 else 99 end) ";

+ 1 - 1
WCS_Client/Frm/MBtn_Monitor/Frm_ALARAMRE.cs

@@ -33,7 +33,7 @@ namespace WCS_Client.Frm
                 //SuperGridUtil.Get_Datetime_GridColumn("ALARAMR_ALARAMENDTIME", "结束时间", 200)
                 SuperGridUtil.Get_GridColumn("DEVICECODE", "设备编号", 100),
                 SuperGridUtil.Get_GridColumn("DEVICENAME", "设备名称", 120),
-                SuperGridUtil.Get_GridColumn("ALARAMMSG", "故障信息", 800),
+                SuperGridUtil.Get_GridColumn("ALARAMMSG", "故障信息", 300),
                 SuperGridUtil.Get_Datetime_GridColumn("ALARAMSTARTTIME", "报警时间", 200),
                 SuperGridUtil.Get_Datetime_GridColumn("ALARAMENDTIME", "结束时间", 200),
                 SuperGridUtil.Get_GridColumn("FAULTTIME", "故障时间(秒)", 100)

+ 2 - 2
WCS_Client/Frm/MBtn_Task/FrmWCS_Task.cs

@@ -100,7 +100,7 @@ namespace WCS_Client.Frm
                     dt.Rows.Add(dr);
                 }
                 LCItemUtil.Refresh_LCItem(LCIList[LCIList.Count - 1], dt, "MEP_MAPPINGNO", "MEP_MAPPINGCHNAME");
-                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "TYPE like '%{0}%'" };
+                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.TYPE like '%{0}%'" };
             });
 
             LCIList.Add(LCItemUtil.Add_ComboBoxEx("STATUS", "任务状态:", 20, null, SubmitMethods));
@@ -119,7 +119,7 @@ namespace WCS_Client.Frm
                     dt.Rows.Add(dr);
                 }
                 LCItemUtil.Refresh_LCItem(LCIList[LCIList.Count - 1], dt, "MEP_MAPPINGNO", "MEP_MAPPINGCHNAME");
-                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "STATUS like '%{0}%'" };
+                LCIList[LCIList.Count - 1].Tag = new LCWhereInfo() { QWhereText = "t.STATUS like '%{0}%'" };
             });
 
             LCIList.Add(LCItemUtil.Add_ButtonX("btn_QDB", "查询", 100, 30, SubmitMethods));