add - 自动控制添加下料检测 展示界面添加混炼完成指示无故熄灭报警

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/PlcAutoWriteHelper.cs

@@ -5,6 +5,7 @@ using Mesnac.Action.ChemicalWeighing.AutoControl.DB;
 using Mesnac.Action.ChemicalWeighing.AutoControl.Entity;
 using Mesnac.Action.ChemicalWeighing.LjMixManager;
 using Mesnac.Action.ChemicalWeighing.LjPlanning;
+using Mesnac.Action.ChemicalWeighing.MinAn;
 using Mesnac.Controls.Default;
 using Mesnac.Core.Service;
 using System;
@@ -540,35 +541,42 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             switch (ControlsHelper.SingleSelect(RadioE))
             {
                 case 1:
+                    PowderDownSignel(MinAnPlc.Heir1, 1);
                     DB2105WriteHelper.WriteManScrewH1();
                     DB2105WriteHelper.WriteSetValueH1(value);
                     break;
                 case 2:
+                    PowderDownSignel(MinAnPlc.Heir1, 1);
                     DB2105WriteHelper.WriteManScrewH2();
                     DB2105WriteHelper.WriteSetValueH1(value);
                     break;
                 case 3:
+                    PowderDownSignel(MinAnPlc.Heir2, 2);
                     DB2105WriteHelper.WriteManScrewH3();
                     DB2105WriteHelper.WriteSetValueH2(value);
                     break;
                 case 4:
+                    PowderDownSignel(MinAnPlc.Heir2, 2);
                     DB2105WriteHelper.WriteManScrewH4();
                     DB2105WriteHelper.WriteSetValueH2(value);
                     break;
-
                 case 5:
+                    PowderDownSignel(MinAnPlc.Heir3, 3);
                     DB2105WriteHelper.WriteManScrewH5();
                     DB2105WriteHelper.WriteSetValueH3(value);
                     break;
                 case 6:
+                    PowderDownSignel(MinAnPlc.Heir3, 3);
                     DB2105WriteHelper.WriteManScrewH6();
                     DB2105WriteHelper.WriteSetValueH3(value);
                     break;
                 case 7:
+                    PowderDownSignel(MinAnPlc.Heir4, 4);
                     DB2105WriteHelper.WriteManScrewH7();
                     DB2105WriteHelper.WriteSetValueH4(value);
                     break;
                 case 8:
+                    PowderDownSignel(MinAnPlc.Heir4, 4);
                     DB2105WriteHelper.WriteManScrewH8();
                     DB2105WriteHelper.WriteSetValueH4(value);
                     break;
@@ -755,5 +763,21 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
         }
 
         #endregion
+
+        #region 上料提示封装
+
+        private static void PowderDownSignel(bool minanResult, int num)
+        {
+            if (minanResult)
+            {
+                DialogResult result = MessageBox.Show(num + "号罐正在上料", "温馨提示：", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                if (result == DialogResult.OK)
+                {
+                    return;
+                }
+            }
+        }
+
+        #endregion
     }
 }

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/LjReport/WetWaitTime/ExportToPc.cs

@@ -27,7 +27,6 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.WetWaitTime
             this.list = list;
             FileName = address;
             this.ExportTo();
-
         }
 
         public Export(List<Lj_RGVTimeRecord> list)
@@ -64,9 +63,9 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.WetWaitTime
                 workbook.SaveAs(this.FileName);
                 MessageBox.Show("导出成功！");
             }
-            catch
+            catch(Exception e)
             {
-                MessageBox.Show("请重新选择导出路径！");
+                MessageBox.Show("请重新选择导出路径或关闭已打开的导出文件！ " + e);
             }
 
             // 关闭 Excel 应用程序和工作簿对象，并释放资源

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/MainDetailControl/MainDetailControlAction.cs

@@ -306,7 +306,6 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                     record = entity;
                     FreeSqlUnit.Instance.Insert(entity).ExecuteAffrows();
                 }
-
                 //逻辑判断插入数据库
                 if (Mixes[i] && !record.MixIsReady)
                 {
@@ -339,6 +338,10 @@ namespace Mesnac.Action.ChemicalWeighing.MainDetailControl
                         .Set(x => x.Done, true)
                         .Where(x => x.DeviceNo == deviceNo && !x.Done).ExecuteAffrows();
                 }
+                if (!Mixes[i] && !record.RGVIsReach && record.MixIsReady)
+                {
+                    MessageBox.Show("湿混机搅拌完毕指示灯无故熄灭\nRGV小车未到达 接料未结束");
+                }
             }
         }
 

Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/ManualControl/ManualControlAction.cs

@@ -888,16 +888,12 @@ namespace Mesnac.Action.ChemicalWeighing.ManualControl
             {
                 if (MinAnPlc.Heir1)
                 {
-                    DialogResult result1 =
-               MessageBox.Show("1号罐正在上料", "温馨提示：", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    DialogResult result1 = MessageBox.Show("1号罐正在上料", "温馨提示：", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     if (result1 == DialogResult.OK)
                     {
                         return;
                     }
                 }
-
-
-
                 short valueSet;
                 short valueFast;
                 short valuePoint;

DataBlockHelper/DBHelpers/DB2105Helper.cs

@@ -29,7 +29,7 @@ namespace DataBlockHelper.DBHelpers
                 List<NoVal> ls = new List<NoVal>();
                 var b = bytes.Skip(52).Take(1).First();
 
-                for (int i = 0; i <8; i++)
+                for (int i = 0; i < 8; i++)
                 {
                     int no = i + 1;
                     ls.Add(new NoVal()
@@ -54,7 +54,7 @@ namespace DataBlockHelper.DBHelpers
                 List<NoVal> ls = new List<NoVal>();
                 var b = bytes.Skip(53).Take(1).First();
 
-                for (int i = 0; i <8; i++)
+                for (int i = 0; i < 8; i++)
                 {
                     int no = i + 1;
                     ls.Add(new NoVal()
@@ -96,8 +96,8 @@ namespace DataBlockHelper.DBHelpers
                     ls.Add(new SetValue()
                     {
                         No = no,
-                        Value = PlcConnect.Instance.ByteTransform.TransSingle(b,0),
-                        Toterance = PlcConnect.Instance.ByteTransform.TransSingle(b,4),
+                        Value = PlcConnect.Instance.ByteTransform.TransSingle(b, 0),
+                        Toterance = PlcConnect.Instance.ByteTransform.TransSingle(b, 4),
                     });
                     start += 8;
                 }