和美安装包_v6.22.5 -20210529

Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia/Common/ERRNOs.cs

@@ -10,10 +10,10 @@ namespace FLY.FeedbackRenZiJia.Common
     {
         static ERRNOs()
         {
-            ERRNO_PLC_DISCONNECTED = new ERRNO() { Code = 255, Descrption = "风环 PLC连接断开" };
+            ERRNO_PLC_DISCONNECTED = new ERRNO() { Code = 65535, Descrption = "风环 PLC连接断开" };
 
             #region 收卷
-            ERRNO_NO_FAN = new ERRNO() { Code = 0, Descrption = "风机没开，不能加热" , OffIsError=true};
+            ERRNO_NO_FAN = new ERRNO() { Code = 0, Descrption = "风机没开，不能加热" };
             ERRNO_OPEN_CIRCUIT = new ERRNO() { Code = 1, Descrption = "加热棒断路" };
             ERRNO_SHORT_CIRCUIT = new ERRNO() { Code = 2, Descrption = "加热控制板短路" };
             ERRNO_POWER_OFF = new ERRNO() { Code = 3, Descrption = "电源没开启或电流计损坏" };

Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Server/TDGage.cs

@@ -502,7 +502,7 @@ namespace FLY.Thick.BlowingScan.Server
             Misc.BindingOperations.SetBinding(initParam, nameof(initParam.VScan), gmRenZiJiaScan, nameof(gmRenZiJiaScan.Velocity));
             Misc.BindingOperations.SetBinding(gmRenZiJiaScan.mPDetect, nameof(gmRenZiJiaScan.mPDetect.RollPerimeter), initParam, nameof(initParam.MmOfR), BindingOperations.BindingMode.TwoWay);
             
-            Misc.BindingOperations.SetBinding(gmRenZiJiaScan, nameof(gmRenZiJiaScan.mPDetect.FilmVelocity), dynArea, nameof(dynArea.FilmVelocity));
+            Misc.BindingOperations.SetBinding(gmRenZiJiaScan.mPDetect, nameof(gmRenZiJiaScan.mPDetect.FilmVelocity), dynArea, nameof(dynArea.FilmVelocity));
 
             dynArea.NBolts = gmRenZiJiaScan.NBolts;
             dynArea.FirstBoltNo = 1;

Project.FLY.Weight/FLY.Weight/Common/ERRNOs.cs

-using FLY.OBJComponents.Common;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace FLY.Weight.Common
-{
-    public static class ERRNOs
-    {
-        static ERRNOs()
-        {
-            ERRNO_PLC_DISCONNECTED = new ERRNO() { Code = 255, Descrption = "称重 PLC连接断开" };
-            ERRNO_PLC_REG = new ERRNO() { Code = 0, Descrption = "通过 PLC寄存器 触发的报警信息" };
-        }
-
-        /// <summary>
-        /// PLC连接断开
-        /// </summary>
-        public static ERRNO ERRNO_PLC_DISCONNECTED;
-        /// <summary>
-        /// 通过 PLC寄存器 触发的报警信息
-        /// </summary>
-        public static ERRNO ERRNO_PLC_REG;
-
-    }
-}

Project.FLY.Weight/FLY.Weight/Common/WeighterC.cs

@@ -829,86 +829,86 @@ namespace FLY.Weight.Common
         public float BinAlarmSet_6{ get; set; }
 
         /// <summary>
-        /// No.1料仓缺料报警
+        /// 1#料仓缺料报警
         /// </summary>
-        [Description("No.1料仓缺料报警")]
+        [Description("1#料仓缺料报警")]
         [IsError()]
         public bool IsErrorOfLack_1{ get; set; }
 
         /// <summary>
-        /// No.2料仓缺料报警
+        /// 2#料仓缺料报警
         /// </summary>
-        [Description("No.2料仓缺料报警")]
+        [Description("2#料仓缺料报警")]
         [IsError()]
         public bool IsErrorOfLack_2{ get; set; }
 
         /// <summary>
-        /// No.3料仓缺料报警
+        /// 3#料仓缺料报警
         /// </summary>
-        [Description("No.3料仓缺料报警")]
+        [Description("3#料仓缺料报警")]
         [IsError()]
         public bool IsErrorOfLack_3{ get; set; }
 
         /// <summary>
-        /// No.4料仓缺料报警
+        /// 4#料仓缺料报警
         /// </summary>
-        [Description("No.4料仓缺料报警")]
+        [Description("4#料仓缺料报警")]
         [IsError()]
         public bool IsErrorOfLack_4{ get; set; }
 
         /// <summary>
-        /// No.5料仓缺料报警
+        /// 5#料仓缺料报警
         /// </summary>
-        [Description("No.5料仓缺料报警")]
+        [Description("5#料仓缺料报警")]
         [IsError()]
         public bool IsErrorOfLack_5{ get; set; }
 
         /// <summary>
-        /// No.6料仓缺料报警
+        /// 6#料仓缺料报警
         /// </summary>
-        [Description("No.6料仓缺料报警")]
+        [Description("6#料仓缺料报警")]
         [IsError()]
         public bool IsErrorOfLack_6{ get; set; }
 
         /// <summary>
-        /// No.1料斗加料异常
+        /// 1#料斗加料异常
         /// </summary>
-        [Description("No.1料斗加料异常")]
+        [Description("1#料斗加料异常")]
         [IsError()]
         public bool IsErrorOfAdd_1{ get; set; }
 
         /// <summary>
-        /// No.2料斗加料异常
+        /// 2#料斗加料异常
         /// </summary>
-        [Description("No.2料斗加料异常")]
+        [Description("2#料斗加料异常")]
         [IsError()]
         public bool IsErrorOfAdd_2{ get; set; }
 
         /// <summary>
-        /// No.3料斗加料异常
+        /// 3#料斗加料异常
         /// </summary>
-        [Description("No.3料斗加料异常")]
+        [Description("3#料斗加料异常")]
         [IsError()]
         public bool IsErrorOfAdd_3{ get; set; }
 
         /// <summary>
-        /// No.4料斗加料异常
+        /// 4#料斗加料异常
         /// </summary>
-        [Description("No.4料斗加料异常")]
+        [Description("4#料斗加料异常")]
         [IsError()]
         public bool IsErrorOfAdd_4{ get; set; }
 
         /// <summary>
-        /// No.5料斗加料异常
+        /// 5#料斗加料异常
         /// </summary>
-        [Description("No.5料斗加料异常")]
+        [Description("5#料斗加料异常")]
         [IsError()]
         public bool IsErrorOfAdd_5{ get; set; }
 
         /// <summary>
-        /// No.6料斗加料异常
+        /// 6#料斗加料异常
         /// </summary>
-        [Description("No.6料斗加料异常")]
+        [Description("63料斗加料异常")]
         [IsError()]
         public bool IsErrorOfAdd_6{ get; set; }
 
@@ -999,6 +999,47 @@ namespace FLY.Weight.Common
         [IsError()]
         public bool IsErrorOfBinLack{ get; set; }
 
+        /// <summary>
+        /// 1#配料偏差大
+        /// </summary>
+        [Description("1#配料偏差大")]
+        [IsError()]
+        public bool IsErrorOfDosing_1 { get; set; }
+
+        /// <summary>
+        /// 2#配料偏差大
+        /// </summary>
+        [Description("2#配料偏差大")]
+        [IsError()]
+        public bool IsErrorOfDosing_2 { get; set; }
+
+        /// <summary>
+        /// 3#配料偏差大
+        /// </summary>
+        [Description("3#配料偏差大")]
+        [IsError()]
+        public bool IsErrorOfDosing_3 { get; set; }
+
+        /// <summary>
+        /// 4#配料偏差大
+        /// </summary>
+        [Description("4#配料偏差大")]
+        [IsError()]
+        public bool IsErrorOfDosing_4 { get; set; }
+
+        /// <summary>
+        /// 5#配料偏差大
+        /// </summary>
+        [Description("5#配料偏差大")]
+        [IsError()]
+        public bool IsErrorOfDosing_5 { get; set; }
+
+        /// <summary>
+        /// 6#配料偏差大
+        /// </summary>
+        [Description("6#配料偏差大")]
+        [IsError()]
+        public bool IsErrorOfDosing_6 { get; set; }
         #endregion
 
 

Project.FLY.Weight/FLY.Weight/FLY.Weight.csproj

@@ -54,7 +54,6 @@
     <Compile Include="IService\IBulkDbMixService.cs" />
     <Compile Include="IService\IBulkDbFlowService.cs" />
     <Compile Include="OBJ_INTERFACE\OBJ_INTERFACE.cs" />
-    <Compile Include="Common\ERRNOs.cs" />
     <Compile Include="Common\WeighterC.cs" />
     <Compile Include="Client\WeightSystemServiceClient.cs" />
     <Compile Include="IService\IWeightSystemService.cs" />

Project.FLY.Weight/FLY.Weight/Server/WeightSystem.cs

@@ -121,7 +121,7 @@ namespace FLY.Weight.Server
                 {
                     for (int i = 0; i < ItemsCnt; i++)
                     {
-                        Items[i].IsAlarmReseted = false;
+                        Items[i].IsAlarmReseted = true;
                     }
                 }
             });
@@ -156,7 +156,11 @@ namespace FLY.Weight.Server
                     nameof(WeighterC.CurrentFlow),
                     nameof(WeighterC.ScrewPSet),
                     nameof(WeighterC.ScrewPDisp),
-                    nameof(WeighterC.ScrewMotorFreq)
+                    nameof(WeighterC.ScrewMotorFreq),
+
+                    //报警复位用
+                    nameof(WeighterC.IsAlarmReseted),
+                    nameof(WeighterC.AlarmIsOn)
                 };
 
                 for (int j = 0; j < Items[i].BinCnt; j++)

thick_public @ 21ae28ec

-Subproject commit 2d5a6d3985d9e31ec384e92f00b97075f1fb762a
+Subproject commit 21ae28ec4f8ada4b9caf2c829a6f40ddb0f971e0

脚本/版本描述.txt

+和美安装包_v6.22.5 -20210529
+1. 优化 报警码升级为 uint16
+2. 优化 报警管理界面 删除 【消音】
+3. 添加 称重添加 444_v3.1(偏差报警)
+
+和美安装包_v6.22.4 -20210521
+1. 修复 扫描测厚仪 主界面 FilmVelocity一直显示为0
+
 和美安装包_v6.22.3 -20210510
 1. 修复 扫描测厚仪 FilmVelocity 同时由两个源生成。
 2. 修复 追边,扫描测厚仪 FilmVelocity 使用了 电脑时间生成后，不准的问题。