Browse Source

调整查询日志数量

章政 5 years ago
parent
commit
6616da452d

+ 1 - 1
PLCDataReader/Device/Information/DeviceDetailInfo.cs

@@ -67,7 +67,7 @@ namespace UAS_PLCDataReader.Device.Infomation
             {
                 BaseUtil.SetFormValue(Controls, dt);
             }
-            dt = (DataTable)dh.ExecuteSql("SELECT DC_CODE,DC_NAME,to_char(DPC_ENABLE)DPC_ENABLE FROM DEVICEPOLLINGCONFIG LEFT JOIN DEVICECOMMAND ON DPC_DCCODE=DC_CODE WHERE DPC_DECODE='" + de_code + "'", "select");
+            dt = (DataTable)dh.ExecuteSql("SELECT DC_CODE,DC_NAME,to_char(DPC_ENABLE)DPC_ENABLE FROM DEVICEPOLLINGCONFIG LEFT JOIN DEVICECOMMAND ON DPC_DCCODE=DC_CODE WHERE DPC_DECODE='" + de_code + "' and rownum<50", "select");
             GridDeviceDetailInfo.DataSource = dt;
         }
 

+ 2 - 2
PLCDataReader/Device/Information/DeviceStatusInfo.cs

@@ -35,7 +35,7 @@ namespace UAS_PLCDataReader.Device.Infomation
             //查询设备基础信息
             sql.Clear();
             sql.Append("select de_linecode,de_wccode,de_name,de_address,de_sourcecode,sc_name from device ");
-            sql.Append("left join source on sc_code=de_sourcecode where de_code='" + de_code + "'");
+            sql.Append("left join source on sc_code=de_sourcecode where de_code='" + de_code + "' and rownum<50 ");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             if (dt.Rows.Count > 0)
             {
@@ -57,7 +57,7 @@ namespace UAS_PLCDataReader.Device.Infomation
             GridViewDeviceStatusInfo.BestFitColumns();
             sql.Clear();
             //查询设备运行日志
-            sql.Append("select * from DEVICERUNRECORD where drr_decode='" + de_code + "'");
+            sql.Append("select * from DEVICERUNRECORD where drr_decode='" + de_code + "' and rownum<50 ");
             GridDeviceRunLog.DataSource = (DataTable)dh.ExecuteSql(sql.ToString(), "select");
             GridViewDeviceRunLog.BestFitColumns();
             sql.Clear();

+ 1 - 1
PLCDataReader/Main.cs

@@ -210,7 +210,7 @@ namespace UAS_PLCDataReader
 
             GridDeviceData.GetDataSQL = "select dr_decode,dr_dename,case when dr_runstatus='disconnect' then '无法连接' when dr_runstatus='stopped' then '未运行' when dr_runstatus='running' then '运行中' when dr_runstatus='noanswer' then '无应答' end dr_runstatus,dr_qty,dr_okqty,de_item1||':'||dr_value1 dr_value1,de_item2||':'||dr_value2 dr_value2,de_item3||':'||dr_value3 dr_value3,de_item4||':'||dr_value4 dr_value4,de_item5||':'||dr_value5 dr_value5,de_item6||':'||dr_value6 dr_value6,de_item7||':'||dr_value7 dr_value7,de_item8||':'||dr_value8 dr_value8,de_item9||':'||dr_value9 dr_value9,de_item10||':'||dr_value10 dr_value10 from devicerunstatus left join device on dr_decode=de_code order by dr_decode";
 
-            GridDeviceRunLog.GetDataSQL = "SELECT drr_id,drr_decode,drr_dename,to_char(drr_date,'YYYY-MM-DD hh24:mi:ss')drr_date,drr_doman,drr_remark,drr_logstatus FROM DEVICERUNRECORD order by drr_id desc";
+            GridDeviceRunLog.GetDataSQL = "SELECT drr_id,drr_decode,drr_dename,to_char(drr_date,'YYYY-MM-DD hh24:mi:ss')drr_date,drr_doman,drr_remark,drr_logstatus FROM DEVICERUNRECORD where rownum<500 order by drr_id desc";
             GridDeviceRunLog.ID = "drr_id";
             GridDeviceRunLog.TableName = "DEVICERUNRECORD";
 

+ 6 - 1
PLCDataReader/UAS_PLCDataReader.csproj

@@ -328,7 +328,6 @@
     <EmbeddedResource Include="MainWindow.resx">
       <DependentUpon>MainWindow.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
@@ -403,6 +402,12 @@
   <ItemGroup>
     <Folder Include="Device\Transfer\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\UAS-出货标签管理%28吉利通%29\UAS-出货标签管理%28吉利通%29.csproj">
+      <Project>{9520C162-69BE-41D0-BE89-3E702B746A48}</Project>
+      <Name>UAS-出货标签管理%28吉利通%29</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.