Skip to content

H
hemei
Commit 00caf7e5 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

1. 收卷报警 逻辑写反了

parent b76c6f9a
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 56 deletions
Project.FLY.Winder/FLY.Winder/Server/WinderSystem.cs
View file @ 00caf7e5
......@@ -198,7 +198,7 @@ namespace FLY.Winder.Server
ERRNO errno = errorAction.error_property[e.PropertyName];
ERR_STATE state;
if(!errno.OffIsError)
if(errno.OffIsError)
state = !b ? ERR_STATE.ON : ERR_STATE.OFF;
else
state = b ? ERR_STATE.ON : ERR_STATE.OFF;
......@@ -228,7 +228,7 @@ namespace FLY.Winder.Server
//objname 转 obj
PLCos.ObjNames.Add("Accessory", Accessory);
for (int i = 0; i < Items.Count(); i++)
PLCos.ObjNames.Add("Items[" + i + "]", Items[i]);
PLCos.ObjNames.Add($"Items[{i}]", Items[i]);
foreach (PLCGroup.PLCVariable var in plcgroup.Variables)
......
Resource/称重/设备连接变量表_446/Generated/WS.xml
View file @ 00caf7e5
......@@ -51,6 +51,9 @@
<PLCVariable DeviceIndex="1" Mode="0" Addr="150" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="ScrewMotorIsOn" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="150" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="ScrewMotorIsOn" />
<PLCVariable DeviceIndex="2" Mode="0" Addr="150" Type="bool" Scale="1" OwnerName="Items[2]" PropertyName="ScrewMotorIsOn" />
<PLCVariable DeviceIndex="1" Mode="0" Addr="490" Type="bool" Scale="1" OwnerName="Items[0]" PropertyName="IsMixSave" />
<PLCVariable DeviceIndex="0" Mode="0" Addr="490" Type="bool" Scale="1" OwnerName="Items[1]" PropertyName="IsMixSave" />
<PLCVariable DeviceIndex="2" Mode="0" Addr="490" Type="bool" Scale="1" OwnerName="Items[2]" PropertyName="IsMixSave" />
<PLCVariable DeviceIndex="1" Mode="4" Addr="1000" Type="UInt16" Scale="0.1" OwnerName="Items[0]" PropertyName="MixPSet_1" />
<PLCVariable DeviceIndex="0" Mode="4" Addr="1000" Type="UInt16" Scale="0.1" OwnerName="Items[1]" PropertyName="MixPSet_1" />
<PLCVariable DeviceIndex="2" Mode="4" Addr="1000" Type="UInt16" Scale="0.1" OwnerName="Items[2]" PropertyName="MixPSet_1" />
......
Resource/称重/设备连接变量表_446/graphcustom.xml deleted 100644 → 0
View file @ b76c6f9a
<?xml version="1.0" encoding="utf-8"?>
<BulkGraphParam DynAreaWidth="250" IsReversed="False">
<Items>
<BulkTabItem Header="自动上料" ColumnCount="1" RowCount="1" ControllerState="SCAN">
<Graphs>
<BulkGraphItemCustom Column="0" Row="0" RowSpan="1" ColumnSpan="1" Module="weight.FLY.Weight.UI.Client.MainPageModule" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="自动风环" ColumnCount="1" RowCount="4" ControllerState="SCAN">
<Graphs>
<BulkGraphItemScan2 Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-2" />
<BulkGraphItemScan2 Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-1" />
<BulkGraphItemCustom Column="0" Row="2" RowSpan="2" ColumnSpan="1" Module="feedbackrenzijia.FLY.FeedbackRenZiJia.UI.Client.MainPageModule" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="扫 描" ColumnCount="1" RowCount="4" ControllerState="SCAN">
<Graphs>
<BulkGraphItemScan Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-3" />
<BulkGraphItemScan Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-2" />
<BulkGraphItemScan Column="0" Row="2" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="-1" />
<BulkGraphItemScan Column="0" Row="3" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" ChartType="Column" BM="0" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="扫描环形" ColumnCount="1" RowCount="1" ControllerState="SCAN">
<Graphs>
<BulkGraphItemCircular Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="扫描图" Mix="1" YRangePercent="1" IsAutoTarget="False" IsPercent="False" BM="-1" BoltNoWithManual1st="1" ManualCnt="8" MPIsRight="True" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="2σ趋势图" ColumnCount="1" RowCount="2" ControllerState="SCAN">
<Graphs>
<BulkGraphItemCustom Column="0" Row="0" RowSpan="1" ColumnSpan="1" Module="weight.FLY.Weight.UI.Client.GraphModule" />
<BulkGraphItemTrend Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="趋势图" Mix="1" YRangePercent="3" IsAutoTarget="True" IsPercent="True" Len="120" BeginNo="0" EndNo="20" IsAll="True" Type="Sigma2" XType="Time" />
</Graphs>
</BulkTabItem>
<BulkTabItem Header="定 点" ColumnCount="1" RowCount="2" ControllerState="SCAN">
<Graphs>
<BulkGraphItemFix Column="0" Row="0" RowSpan="1" ColumnSpan="1" Title="3s 定点图" Mix="1" IsAutoTarget="True" IsPercent="True" Len="1000" Interval="1000" AnalyzeModule="FFT.FLY.FFT.FFTC" />
<BulkGraphItemFix Column="0" Row="1" RowSpan="1" ColumnSpan="1" Title="0.1s 定点图" Mix="10" IsAutoTarget="True" IsPercent="True" Len="500" Interval="50" AnalyzeModule="FFT.FLY.FFT.FFTC" />
</Graphs>
</BulkTabItem>
</Items>
<DynAreaItems>
<DynAreaItem Module="feedbackrenzijia.FLY.FeedbackRenZiJia.UI.Client.DynAreaModule" />
<DynAreaItem Module="weight.FLY.Weight.UI.Client.DynAreaModule" />
</DynAreaItems>
</BulkGraphParam>
\ No newline at end of file
WpfApplication1/Page_Main.xaml.cs
View file @ 00caf7e5
......@@ -26,25 +26,25 @@ namespace WpfApplication1
//FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_DynArea dynArea = new FLY.FeedbackRenZiJia.UI.Client.UIModule.Page_DynArea();
//FLY.IBC.UI.Client.UIModule.Page_DynArea dynArea = new FLY.IBC.UI.Client.UIModule.Page_DynArea();
//FLY.Winder.UI.Client.UIModule.Page_DynArea dynArea = new FLY.Winder.UI.Client.UIModule.Page_DynArea();
FLY.Weight.UI.Client.UIModule.Page_DynArea dynArea = new FLY.Weight.UI.Client.UIModule.Page_DynArea();
FLY.Winder.UI.Client.UIModule.Page_DynArea dynArea = new FLY.Winder.UI.Client.UIModule.Page_DynArea();
//FLY.Weight.UI.Client.UIModule.Page_DynArea dynArea = new FLY.Weight.UI.Client.UIModule.Page_DynArea();
dynArea.Init(0);
Frame f = new Frame();
f.Content = dynArea;
stackpanel_dynarea.Children.Add(f);
//FLY.Winder.UI.Client.UIModule.MenuSelect menu = new FLY.Winder.UI.Client.UIModule.MenuSelect();
FLY.Weight.UI.Client.UIModule.MenuSelect menu = new FLY.Weight.UI.Client.UIModule.MenuSelect();
FLY.Winder.UI.Client.UIModule.MenuSelect menu = new FLY.Winder.UI.Client.UIModule.MenuSelect();
//FLY.Weight.UI.Client.UIModule.MenuSelect menu = new FLY.Weight.UI.Client.UIModule.MenuSelect();
menu.Init(0);
stackpanel_toolbox.Children.Add(menu);
//FLY.IBC.UI.Client.UIModule.Page_Main p = new FLY.IBC.UI.Client.UIModule.Page_Main();
//FLY.Winder.UI.Client.UIModule.Page_Main p = new FLY.Winder.UI.Client.UIModule.Page_Main();
FLY.Winder.UI.Client.UIModule.Page_Main p = new FLY.Winder.UI.Client.UIModule.Page_Main();
//FLY.Weight.UI.Client.UIModule.Page_Main p = new FLY.Weight.UI.Client.UIModule.Page_Main();
FLY.Weight.UI.Client.UIModule.FlowGraph p = new FLY.Weight.UI.Client.UIModule.FlowGraph();
//FLY.Weight.UI.Client.UIModule.FlowGraph p = new FLY.Weight.UI.Client.UIModule.FlowGraph();
p.Init(0);
//graph.Init(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment