和美安装包_v6.21.9 -20210304

1. 添加 称重添加v0版本，就是还原以前的，没有内外收卷计长与厚度

Project.FLY.Weight/FLY.Weight.UI.Client/FLY.Weight.UI.Client.csproj

@@ -98,9 +98,18 @@
     <Compile Include="UiModule\FlowGraph.xaml.cs">
       <DependentUpon>FlowGraph.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UiModule\MainGraph02.xaml.cs">
+      <DependentUpon>MainGraph02.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UiModule\MainGraph00.xaml.cs">
+      <DependentUpon>MainGraph00.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UiModule\MainGraph2.xaml.cs">
       <DependentUpon>MainGraph2.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UiModule\MainGraphV42.xaml.cs">
+      <DependentUpon>MainGraphV42.xaml</DependentUpon>
+    </Compile>
     <Compile Include="UiModule\MainGraphV4.xaml.cs">
       <DependentUpon>MainGraphV4.xaml</DependentUpon>
     </Compile>
@@ -221,10 +230,22 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UiModule\MainGraph02.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UiModule\MainGraph00.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="UiModule\MainGraph2.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="UiModule\MainGraphV42.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="UiModule\MainGraphV4.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/DynAreaWeight.xaml

@@ -39,7 +39,7 @@
                 <StackPanel >
 
 
-                    <Grid Name="grid_flow">
+                    <Grid Name="grid_flow" Margin="2">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="auto"/>
                             <ColumnDefinition/>

Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/MainGraph.xaml.cs

@@ -103,7 +103,7 @@ namespace FLY.Weight.UI.Client.UiModule
         /// 控件标题
         /// 它的值取决于culture
         /// </summary>
-        public string Title => "称重.主界面(3)";
+        public string Title => "称重.主界面v1(3)";
 
         public ComponentType Type => ComponentType.Graph;
 

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/DynAreaWeightV4.xaml

@@ -39,7 +39,7 @@
                 <StackPanel >
 
 
-                    <Grid Name="grid_flow">
+                    <Grid Name="grid_flow" Margin="2">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="auto"/>
                             <ColumnDefinition/>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/DynAreaWeightV4.xaml.cs

@@ -159,7 +159,7 @@ namespace FLY.Weight.UI.Client.UiModule
         /// 控件标题
         /// 它的值取决于culture
         /// </summary>
-        public string Title=> "称重.状态V4";
+        public string Title=> "称重.状态v4";
 
         public ComponentType Type => ComponentType.DynArea;
         public bool IsUnique => true;

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraph00.xaml

+<UserControl x:Class="FLY.Weight.UI.Client.UiModule.MainGraph00"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:local="clr-namespace:FLY.Weight.UI.Client.UiModule"
+        xmlns:control="clr-namespace:FLY.Weight.UI.Client.Control"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      mc:Ignorable="d"  >
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
+
+            </ResourceDictionary.MergedDictionaries>
+
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid x:Name="container_grid"/>
+        <Viewbox Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left">
+            <Grid Name="root_grid" d:DataContext="{StaticResource unittests_weighters}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <local:UcTotalFlowV4 x:Name="ucTotalFlow" Margin="{StaticResource ControlMargin}" />
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <ItemsControl x:Name="itemsControl" Grid.Column="1" ItemsSource="{Binding Items}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <local:UcWeighterItem Margin="{StaticResource ControlMargin}" 
+                                                      WeightSystemService="{Binding DataContext,ElementName=root_grid}"
+                                                      Container="{Binding DataContext, ElementName=container_grid}"/>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+
+                    </ItemsControl>
+                </Grid>
+
+            </Grid>
+        </Viewbox>
+    </Grid>
+
+</UserControl>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraph00.xaml.cs

+using FLY.OBJComponents.Client;
+using FLY.Weight.Client;
+using FLY.Weight.Common;
+using FLY.Weight.IService;
+using MultiLayout;
+using MultiLayout.UiModule;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Unity;
+
+namespace FLY.Weight.UI.Client.UiModule
+{
+    /// <summary>
+    /// Page_Main.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainGraph00 : UserControl
+    {
+        IWeightSystemService weightSystemService;
+
+        List<SetPLCUpdatePlan> setPlan_items = new List<SetPLCUpdatePlan>();
+        public MainGraph00()
+        {
+            InitializeComponent();
+
+        }
+
+        [InjectionMethod]
+        public void Init(
+            IUnityContainer container,
+            IWeightSystemService weightSystemService)
+        {
+            this.container_grid.DataContext = container;
+
+            ucTotalFlow.Init(weightSystemService);
+            this.weightSystemService = weightSystemService;
+            root_grid.DataContext = this.weightSystemService;
+
+            for (int i = 0; i < this.weightSystemService.Items.Count(); i++)
+            {
+                SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    this.weightSystemService.PLCos,
+                    this.weightSystemService.Items[i],
+                    UcWeighterItem.item_update_propertynames);
+                setPlan_items.Add(plan);
+            }
+            if (weightSystemService is WeightSystemServiceClient) { 
+
+                (weightSystemService as WeightSystemServiceClient).ResetItemsEvent += MWeighterCsService_ResetItemsEvent;
+            }
+        }
+
+        private void MWeighterCsService_ResetItemsEvent()
+        {
+            //把多出来的删除
+            int remove_cnt = setPlan_items.Count() - weightSystemService.Items.Count();
+            if (remove_cnt > 0)
+            {
+                for (int i = 0; i < remove_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = setPlan_items[setPlan_items.Count() - 1 - i];
+                    plan.Dispose();
+                }
+                setPlan_items.RemoveRange(setPlan_items.Count() - remove_cnt, remove_cnt);
+            }
+            else
+            {
+                int start_idx = setPlan_items.Count();
+                int add_cnt = -remove_cnt;
+                for (int i = 0; i < add_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    weightSystemService.PLCos,
+                    weightSystemService.Items[start_idx+i],
+                    UcWeighterItem.item_update_propertynames);
+                    setPlan_items.Add(plan);
+                }
+            }
+        }
+
+    }
+
+
+
+
+    public class UiModule2_MainGraph00 : IUiModule2
+    {
+        /// <summary>
+        /// 控件标题
+        /// 它的值取决于culture
+        /// </summary>
+        public string Title => "称重.主界面v0(3)";
+
+        public ComponentType Type => ComponentType.Graph;
+
+        public bool IsUnique => true;
+
+        /// <summary>
+        /// 控件
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetComponent(int id, IUnityContainer container)
+        {
+            MainGraph00 graph = new MainGraph00();
+            container.BuildUp(graph);
+            return graph;
+        }
+
+        /// <summary>
+        /// 控件缩略图，用于编辑界面时，大致看看
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetThumbnail()
+        {
+            return new System.Windows.Controls.Grid();
+        }
+
+
+        /// <summary>
+        /// 给出全部控件ID, 控件自行删除没有的参数
+        /// </summary>
+        /// <param name="IDs"></param>
+        public void MatchParam(int[] IDs)
+        {
+        }
+    }
+}

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraph02.xaml

+<UserControl x:Class="FLY.Weight.UI.Client.UiModule.MainGraph02"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:local="clr-namespace:FLY.Weight.UI.Client.UiModule"
+        xmlns:control="clr-namespace:FLY.Weight.UI.Client.Control"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      mc:Ignorable="d"  >
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
+
+            </ResourceDictionary.MergedDictionaries>
+
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid x:Name="container_grid"/>
+        <Viewbox Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left">
+            <Grid Name="root_grid" d:DataContext="{StaticResource unittests_weighters}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <local:UcTotalFlowV4 x:Name="ucTotalFlow" Margin="{StaticResource ControlMargin}" />
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <ItemsControl x:Name="itemsControl" Grid.Column="1" ItemsSource="{Binding Items}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <local:UcWeighterItem2 Margin="{StaticResource ControlMargin}" 
+                                                      WeightSystemService="{Binding DataContext,ElementName=root_grid}"
+                                                      Container="{Binding DataContext, ElementName=container_grid}"/>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+
+                    </ItemsControl>
+                </Grid>
+
+            </Grid>
+        </Viewbox>
+    </Grid>
+
+</UserControl>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraph02.xaml.cs

+using FLY.OBJComponents.Client;
+using FLY.Weight.Client;
+using FLY.Weight.Common;
+using FLY.Weight.IService;
+using MultiLayout;
+using MultiLayout.UiModule;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Unity;
+
+namespace FLY.Weight.UI.Client.UiModule
+{
+    /// <summary>
+    /// Page_Main.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainGraph02 : UserControl
+    {
+        IWeightSystemService weightSystemService;
+
+        List<SetPLCUpdatePlan> setPlan_items = new List<SetPLCUpdatePlan>();
+        public MainGraph02()
+        {
+            InitializeComponent();
+
+        }
+
+        [InjectionMethod]
+        public void Init(
+            IUnityContainer container,
+            IWeightSystemService weightSystemService)
+        {
+            this.container_grid.DataContext = container;
+
+            ucTotalFlow.Init(weightSystemService);
+            this.weightSystemService = weightSystemService;
+            root_grid.DataContext = this.weightSystemService;
+
+            for (int i = 0; i < this.weightSystemService.Items.Count(); i++)
+            {
+                SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    this.weightSystemService.PLCos,
+                    this.weightSystemService.Items[i],
+                    UcWeighterItem.item_update_propertynames);
+                setPlan_items.Add(plan);
+            }
+            if (weightSystemService is WeightSystemServiceClient) { 
+
+                (weightSystemService as WeightSystemServiceClient).ResetItemsEvent += MWeighterCsService_ResetItemsEvent;
+            }
+        }
+
+        private void MWeighterCsService_ResetItemsEvent()
+        {
+            //把多出来的删除
+            int remove_cnt = setPlan_items.Count() - weightSystemService.Items.Count();
+            if (remove_cnt > 0)
+            {
+                for (int i = 0; i < remove_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = setPlan_items[setPlan_items.Count() - 1 - i];
+                    plan.Dispose();
+                }
+                setPlan_items.RemoveRange(setPlan_items.Count() - remove_cnt, remove_cnt);
+            }
+            else
+            {
+                int start_idx = setPlan_items.Count();
+                int add_cnt = -remove_cnt;
+                for (int i = 0; i < add_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    weightSystemService.PLCos,
+                    weightSystemService.Items[start_idx+i],
+                    UcWeighterItem.item_update_propertynames);
+                    setPlan_items.Add(plan);
+                }
+            }
+        }
+
+    }
+
+
+
+
+    public class UiModule2_MainGraph02 : IUiModule2
+    {
+        /// <summary>
+        /// 控件标题
+        /// 它的值取决于culture
+        /// </summary>
+        public string Title => "称重.主界面v0(5)";
+
+        public ComponentType Type => ComponentType.Graph;
+
+        public bool IsUnique => true;
+
+        /// <summary>
+        /// 控件
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetComponent(int id, IUnityContainer container)
+        {
+            MainGraph02 graph = new MainGraph02();
+            container.BuildUp(graph);
+            return graph;
+        }
+
+        /// <summary>
+        /// 控件缩略图，用于编辑界面时，大致看看
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetThumbnail()
+        {
+            return new System.Windows.Controls.Grid();
+        }
+
+
+        /// <summary>
+        /// 给出全部控件ID, 控件自行删除没有的参数
+        /// </summary>
+        /// <param name="IDs"></param>
+        public void MatchParam(int[] IDs)
+        {
+        }
+    }
+}

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraph2.xaml.cs

@@ -102,7 +102,7 @@ namespace FLY.Weight.UI.Client.UiModule
         /// 控件标题
         /// 它的值取决于culture
         /// </summary>
-        public string Title => "称重.主界面(5)";
+        public string Title => "称重.主界面v1(5)";
 
         public ComponentType Type => ComponentType.Graph;
 

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraphV4.xaml.cs

@@ -101,7 +101,7 @@ namespace FLY.Weight.UI.Client.UiModule
         /// 控件标题
         /// 它的值取决于culture
         /// </summary>
-        public string Title => "称重.主界面(3)V4";
+        public string Title => "称重.主界面v4(3)";
 
         public ComponentType Type => ComponentType.Graph;
 

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraphV42.xaml

+<UserControl x:Class="FLY.Weight.UI.Client.UiModule.MainGraphV42"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+        xmlns:local="clr-namespace:FLY.Weight.UI.Client.UiModule"
+        xmlns:control="clr-namespace:FLY.Weight.UI.Client.Control"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
+      mc:Ignorable="d"  >
+
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/FLY.Weight.UI.Client;component/Themes/UcWeighterItemStyle.xaml"/>
+
+            </ResourceDictionary.MergedDictionaries>
+
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <Grid x:Name="container_grid"/>
+        <Viewbox Stretch="Uniform" VerticalAlignment="Top" HorizontalAlignment="Left">
+            <Grid Name="root_grid" d:DataContext="{StaticResource unittests_weighters}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto"/>
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+                <local:UcTotalFlowV4 x:Name="ucTotalFlow" Margin="{StaticResource ControlMargin}" />
+
+                <Grid Grid.Row="1">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <local:UcThicknessV4 x:Name="ucThickness" Margin="{StaticResource ControlMargin}"/>
+                    <ItemsControl x:Name="itemsControl" Grid.Column="1" ItemsSource="{Binding Items}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <StackPanel Orientation="Horizontal" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <local:UcWeighterItem2 Margin="{StaticResource ControlMargin}" 
+                                                      WeightSystemService="{Binding DataContext,ElementName=root_grid}"
+                                                      Container="{Binding DataContext,ElementName=container_grid}"/>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+
+                    </ItemsControl>
+                </Grid>
+
+            </Grid>
+        </Viewbox>
+    </Grid>
+
+</UserControl>

Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/MainGraphV42.xaml.cs

+using FLY.OBJComponents.Client;
+using FLY.Weight.Client;
+using FLY.Weight.Common;
+using FLY.Weight.IService;
+using MultiLayout;
+using MultiLayout.UiModule;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Unity;
+
+namespace FLY.Weight.UI.Client.UiModule
+{
+    /// <summary>
+    /// Page_Main.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainGraphV42 : UserControl
+    {
+        IWeightSystemService weightSystemService;
+
+        List<SetPLCUpdatePlan> setPlan_items = new List<SetPLCUpdatePlan>();
+        public MainGraphV42()
+        {
+            InitializeComponent();
+
+        }
+
+        [InjectionMethod]
+        public void Init(
+            IUnityContainer container,
+            IWeightSystemService weightSystemService)
+        {
+            this.container_grid.DataContext = container;
+            ucTotalFlow.Init(weightSystemService);
+            ucThickness.Init(weightSystemService);
+
+            this.weightSystemService = weightSystemService;
+            root_grid.DataContext = this.weightSystemService;
+
+            for (int i = 0; i < this.weightSystemService.Items.Count(); i++)
+            {
+                SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    this.weightSystemService.PLCos,
+                    this.weightSystemService.Items[i],
+                    UcWeighterItem.item_update_propertynames);
+                setPlan_items.Add(plan);
+            }
+            if (weightSystemService is WeightSystemServiceClient) { 
+
+                (weightSystemService as WeightSystemServiceClient).ResetItemsEvent += MWeighterCsService_ResetItemsEvent;
+            }
+        }
+
+        private void MWeighterCsService_ResetItemsEvent()
+        {
+            //把多出来的删除
+            int remove_cnt = setPlan_items.Count() - weightSystemService.Items.Count();
+            if (remove_cnt > 0)
+            {
+                for (int i = 0; i < remove_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = setPlan_items[setPlan_items.Count() - 1 - i];
+                    plan.Dispose();
+                }
+                setPlan_items.RemoveRange(setPlan_items.Count() - remove_cnt, remove_cnt);
+            }
+            else
+            {
+                int start_idx = setPlan_items.Count();
+                int add_cnt = -remove_cnt;
+                for (int i = 0; i < add_cnt; i++)
+                {
+                    SetPLCUpdatePlan plan = new SetPLCUpdatePlan(
+                    weightSystemService.PLCos,
+                    weightSystemService.Items[start_idx+i],
+                    UcWeighterItem.item_update_propertynames);
+                    setPlan_items.Add(plan);
+                }
+            }
+        }
+    }
+
+
+
+
+    public class UiModule2_MainGraphV42 : IUiModule2
+    {
+        /// <summary>
+        /// 控件标题
+        /// 它的值取决于culture
+        /// </summary>
+        public string Title => "称重.主界面v4(5)";
+
+        public ComponentType Type => ComponentType.Graph;
+
+        public bool IsUnique => false;
+
+        /// <summary>
+        /// 控件
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetComponent(int id, IUnityContainer container)
+        {
+            MainGraphV42 graph = new MainGraphV42();
+            container.BuildUp(graph);
+            return graph;
+        }
+
+        /// <summary>
+        /// 控件缩略图，用于编辑界面时，大致看看
+        /// 创建时，需要给它唯一ID，让加载自己的数据
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public FrameworkElement GetThumbnail()
+        {
+            return new System.Windows.Controls.Grid();
+        }
+
+
+        /// <summary>
+        /// 给出全部控件ID, 控件自行删除没有的参数
+        /// </summary>
+        /// <param name="IDs"></param>
+        public void MatchParam(int[] IDs)
+        {
+        }
+    }
+}

Resource/收卷/设备连接变量表_v3_全部合体-20210302/Generated/plcgroup.json

@@ -575,7 +575,7 @@
     {
       "DeviceIndex": 0,
       "Mode": "0",
-      "Addr": 64701,
+      "Addr": 275,
       "Type": "bool",
       "Scale": 1.0,
       "OwnerName": "Items[1]",

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/unity/base.component.config

-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
-  </configSections>
-  <unity>
-    <assembly name="FLY.Thick.Base.UI" />
-    <namespace name="FLY.Thick.Base.UI.UiModule" />
-    <alias alias="IUiModule2" type="MultiLayout.UiModule.IUiModule2, MultiLayout" />
-    <container>
-      <register type="IUiModule2" mapTo="UiModule2_MenuMotion" name="base_mm" />
-      <register type="IUiModule2" mapTo="UiModule2_DynAreaThick" name="base_dathk" />
-      <register type="IUiModule2" mapTo="UiModule2_DynAreaSample" name="base_das" />
-      <register type="IUiModule2" mapTo="UiModule2_DynAreaIO" name="base_daio" />
-      <register type="IUiModule2" mapTo="UiModule2_FixGraph" name="base_fg" />
-    </container>
-  </unity>
-</configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/unity/blowingScan.component.config

-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
-  </configSections>
-  <unity>
-    <assembly name="FLY.Thick.BlowingScan.UI" />
-    <namespace name="FLY.Thick.BlowingScan.UI.Client.UiModule" />
-    <assembly name="FLY.Thick.Blowing.UI" />
-    <namespace name="FLY.Thick.Blowing.UI.Fix.Client.UiModule" />
-    <alias alias="IUiModule2" type="MultiLayout.UiModule.IUiModule2, MultiLayout" />
-    <container>
-      <register type="IUiModule2" mapTo="UiModule2_MenuSetting" name="blowing_ms" />
-      <register type="IUiModule2" mapTo="UiModule2_MenuProfile" name="blowing_mp" />
-      <register type="IUiModule2" mapTo="UiModule2_DynAreaProfile" name="blowing_dap" />
-      <register type="IUiModule2" mapTo="UiModule2_DynAreaBlowing" name="blowing_dab" />
-      <register type="IUiModule2" mapTo="UiModule2_DynAreaFilmWidth" name="blowing_dafw" />
-      <register type="IUiModule2" mapTo="UiModule2_ScanGraph" name="blowing_sg" />
-      <register type="IUiModule2" mapTo="UiModule2_ScanGraph2" name="blowing_sg2" />
-      <register type="IUiModule2" mapTo="UiModule2_ScanGraphCircular" name="blowing_sgc" />
-      <register type="IUiModule2" mapTo="UiModule2_TrendGraph" name="blowing_tg" />
-    </container>
-  </unity>
-</configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/unity/blowingScan.service.config

-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
-  </configSections>
-  <unity>
-    <assembly name="FLY.Thick.BlowingScan" />
-    <namespace name="FLY.Thick.BlowingScan.IService" />
-    <namespace name="FLY.Thick.BlowingScan.Client" />
-    <assembly name="FLY.Thick.Blowing" />
-    <namespace name="FLY.Thick.Blowing.IService" />
-    <namespace name="FLY.Thick.Blowing.Client" />
-    <assembly name="FLY.Thick.Base" />
-    <namespace name="FLY.Thick.Base.IService" />
-    <namespace name="FLY.Thick.Base.Client" />
-    <assembly name="FLY.OBJComponents" />
-    <namespace name="FLY.OBJComponents.IService" />
-    <namespace name="FLY.OBJComponents.Client" />
-    <alias alias="WarningReasonWindow" type="FLY.Thick.Base.UI.WarningReasonWindow,FLY.Thick.Base.UI" />
-    <container>
-      <register type="IBlowingFixProfileService" mapTo="BlowingFixProfileServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30002" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="ICurveService" mapTo="CurveServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30003" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IInitParamService" mapTo="InitParamServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30004" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IDynAreaService" mapTo="DynAreaServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30005" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IFlyADService" mapTo="FlyADServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30006" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IFixService" mapTo="FixServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30007" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="ITDGageService" mapTo="TDGageServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30008" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IBlowingService" mapTo="BlowingScanServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30009" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IBlowingDetectService" mapTo="BlowingDetectServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30010" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IScanWarningService" mapTo="ScanWarningServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30011" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IBulkDbService" mapTo="BulkDbServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30012" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IBorderSearchService" mapTo="BorderSearchServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30013" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IGetSampleService" mapTo="GetSampleServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30014" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IScanCorrService" mapTo="ScanCorrServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30015" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IGageInfoService" mapTo="GageInfoServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="30016" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="IWarningService" mapTo="WarningServiceClient">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="serviceId" value="20000" />
-          <param name="connName" dependencyName="cn0" />
-        </constructor>
-      </register>
-      <register type="WarningReasonWindow">
-        <lifetime type="singleton" />
-        <constructor>
-          <param name="warningService" />
-          <param name="size" value="100" />
-        </constructor>
-      </register>
-    </container>
-  </unity>
-</configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/unity/onInit.config

-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <section name="unity" type="Microsoft.Practices.Unity.Configuration.UnityConfigurationSection,Unity.Configuration" />
-  </configSections>
-  <unity>
-    <assembly name="FLY.Thick.Base.UI" />
-    <namespace name="FLY.Thick.Base.UI.OnInit" />
-    <alias alias="IOnInit" type="MultiLayout.UiModule.IOnInit, MultiLayout" />
-    <container>
-      <register type="IOnInit" mapTo="OnInitAutoScan" name="autoscan">
-        <lifetime type="singleton" />
-      </register>
-      <register type="IOnInit" mapTo="OnInitGageCommand" name="gageCmd">
-        <lifetime type="singleton" />
-      </register>
-      <register type="IOnInit" mapTo="OnInitControllerState" name="controllerState">
-        <lifetime type="singleton" />
-      </register>
-    </container>
-  </unity>
-</configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/unity/weighter.component.config

@@ -15,12 +15,10 @@
       <register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph2" name="weighter_mg2" />
-      <register type="IUiModule2" mapTo="UiModule2_UcThickness" name="weighter_thk" />
-      <register type="IUiModule2" mapTo="UiModule2_UcTotalFlow" name="weigher_tf" />
-      <register type="IUiModule2" mapTo="UiModule2_UcWeighterItem" name="weighter_item" />
-      <register type="IUiModule2" mapTo="UiModule2_UcTotalFlowV4" name="weigher_tfV4" />
-      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV4" />
-      <register type="IUiModule2" mapTo="UiModule2_UcThicknessV4" name="weighter_thkV4" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV40" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV42" name="weighter_mgV42" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph00" name="weighter_mg00" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph02" name="weighter_mg02" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.Blowing.UI.Fix.Client/unity/weighter2.service.config

@@ -22,13 +22,27 @@
           <param name="connName" dependencyName="cn2" />
         </constructor>
       </register>
-      <register type="IBuffer[Lc_Flow]" mapTo="BufferServiceClient[Lc_Flow]">
+      <register type="IBulkDbFlowService" mapTo="BulkDbFlowServiceClient">
         <lifetime type="singleton" />
         <constructor>
           <param name="serviceId" value="35004" />
           <param name="connName" dependencyName="cn2" />
         </constructor>
       </register>
+      <register type="IWarningService" mapTo="WarningServiceClient" name="weighterWarningService">
+        <lifetime type="singleton" />
+        <constructor>
+          <param name="serviceId" value="20000" />
+          <param name="connName" dependencyName="cn2" />
+        </constructor>
+      </register>
+      <register type="WarningReasonWindow" name="weighterWarningReasonWindow">
+        <lifetime type="singleton" />
+        <constructor>
+          <param name="warningService" dependencyName="weighterWarningService" />
+          <param name="size" value="100" />
+        </constructor>
+      </register>
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/weighter.component.config

@@ -13,14 +13,12 @@
       <register type="IUiModule2" mapTo="UiModule2_DynAreaWeight" name="weighter_da" />
       <register type="IUiModule2" mapTo="UiModule2_DynAreaWeightV4" name="weighter_daV4" />
       <register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph00" name="weighter_mg00" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph02" name="weighter_mg02" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph2" name="weighter_mg2" />
-      <register type="IUiModule2" mapTo="UiModule2_UcThickness" name="weighter_thk" />
-      <register type="IUiModule2" mapTo="UiModule2_UcTotalFlow" name="weigher_tf" />
-      <register type="IUiModule2" mapTo="UiModule2_UcWeighterItem" name="weighter_item" />
-      <register type="IUiModule2" mapTo="UiModule2_UcTotalFlowV4" name="weigher_tfV4" />
-      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV4" />
-      <register type="IUiModule2" mapTo="UiModule2_UcThicknessV4" name="weighter_thkV4" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV40" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV42" name="weighter_mgV42" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/release_conf/FLY.Thick.BlowingScan.UI.Client/unity/weighter2.service.config

@@ -22,13 +22,27 @@
           <param name="connName" dependencyName="cn2" />
         </constructor>
       </register>
-      <register type="IBuffer[Lc_Flow]" mapTo="BufferServiceClient[Lc_Flow]">
+      <register type="IBulkDbFlowService" mapTo="BulkDbFlowServiceClient">
         <lifetime type="singleton" />
         <constructor>
           <param name="serviceId" value="35004" />
           <param name="connName" dependencyName="cn2" />
         </constructor>
       </register>
+      <register type="IWarningService" mapTo="WarningServiceClient" name="weighterWarningService">
+        <lifetime type="singleton" />
+        <constructor>
+          <param name="serviceId" value="20000" />
+          <param name="connName" dependencyName="cn2" />
+        </constructor>
+      </register>
+      <register type="WarningReasonWindow" name="weighterWarningReasonWindow">
+        <lifetime type="singleton" />
+        <constructor>
+          <param name="warningService" dependencyName="weighterWarningService" />
+          <param name="size" value="100" />
+        </constructor>
+      </register>
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/release_conf/FLY.Winder.UI.Server/Gage1/plcgroups/设备连接变量表_v3_全部合体-20210302/Generated/plcgroup.json

@@ -575,7 +575,7 @@
     {
       "DeviceIndex": 0,
       "Mode": "0",
-      "Addr": 64701,
+      "Addr": 275,
       "Type": "bool",
       "Scale": 1.0,
       "OwnerName": "Items[1]",

脚本/和美扫描客户端容器描述.unity/unity/weighter.component.config

@@ -13,9 +13,12 @@
       <register type="IUiModule2" mapTo="UiModule2_DynAreaWeight" name="weighter_da" />
       <register type="IUiModule2" mapTo="UiModule2_DynAreaWeightV4" name="weighter_daV4" />
       <register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph00" name="weighter_mg00" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph02" name="weighter_mg02" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph2" name="weighter_mg2" />
-      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV4" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV40" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV42" name="weighter_mgV42" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/和美追边客户端容器描述.unity/unity/weighter.component.config

@@ -15,7 +15,10 @@
       <register type="IUiModule2" mapTo="UiModule2_FlowGraph" name="weighter_fg" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph" name="weighter_mg" />
       <register type="IUiModule2" mapTo="UiModule2_MainGraph2" name="weighter_mg2" />
-      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV4" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV4" name="weighter_mgV40" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraphV42" name="weighter_mgV42" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph00" name="weighter_mg00" />
+      <register type="IUiModule2" mapTo="UiModule2_MainGraph02" name="weighter_mg02" />
     </container>
   </unity>
 </configuration>
\ No newline at end of file

脚本/版本描述.txt

+和美安装包_v6.21.9 -20210304
+1. 添加 称重添加v0版本，就是还原以前的，没有内外收卷计长与厚度
+
 和美安装包_v6.21.8 -20210302
 1. 添加 IBC温区，添加3组份支持
 2. 添加 收卷 v3_全部合体-20210302