Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

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

@@ -246,13 +246,13 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             //手动加糊化料
             if (ButtonE.WetManualGel == runtime.Sender)
             {
-                if (MessageBox.Show("请使用手动加料", "请使用手动加料", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.No)
+                if (MessageBox.Show("糊化机打成手动 然后开门放料", "请使用手动加料", MessageBoxButtons.OK, MessageBoxIcon.Question) == DialogResult.No)
                 {
                     return;
                 }
                 return;
 
-
+                
 
                 //bool isReady = WetGelatDownload(RadioE);
 
@@ -276,11 +276,15 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                     return;
                 }
 
-                WetGelatDownload(TextE, RadioE);
+               bool b= WetGelatDownload(TextE, RadioE);
+                if (b)
+                {
+                    LjLogControl.ManualLogControl("手动下冷水", 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), ControlsHelper.SingleSelect(RadioE), 2);
 
-                LjLogControl.ManualLogControl("手动下冷水", 3, Convert.ToInt32(TextE.ManualWeight.MCValue.ToString()), ControlsHelper.SingleSelect(RadioE), 2);
+                    MessageBox.Show("数据下传成功！");
+                }
 
-                MessageBox.Show("数据下传成功！");
+              
             }
 
             if(ButtonE.WetManualControlStop== runtime.Sender)

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

@@ -714,7 +714,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
 
         #region 湿混机手动下粉料
 
-        public static void WetGelatDownload(MCTextBoxEntity TextE, MCRadioButtonEntity RadioE)
+        public static bool WetGelatDownload(MCTextBoxEntity TextE, MCRadioButtonEntity RadioE)
         {
             float t = Convert.ToSingle(TextE.ManualTolerance.MCValue.ToString());
             float w = Convert.ToSingle(TextE.ManualWeight.MCValue.ToString());
@@ -722,7 +722,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             if (t < 0.1)
             {
                 MessageBox.Show("公差不能小于0.1！");
-                return;
+                return false;
             }
 
             SetValue value = new SetValue()
@@ -732,7 +732,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
             };
 
             DB2105Helper dB2105= new DB2105Helper();
-
+            bool run = false;
             var singE = ControlsHelper.SingleSelect(RadioE);
             switch (singE)
             {
@@ -742,7 +742,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                     if (h1.RunStatus)
                     {
                         ShowError();
-                        return;
+                        run = true;
+                        
                     }
                     break;
 
@@ -752,7 +753,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                     if (h2.RunStatus)
                     {
                         ShowError();
-                        return;
+                        run = true;
+                       
                     }
                     break;
 
@@ -762,7 +764,8 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                     if (h3.RunStatus)
                     {
                         ShowError();
-                        return;
+                        run = true;
+                       
                     }
                     break;
 
@@ -773,78 +776,88 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl
                     if (h4.RunStatus)
                     {
                         ShowError();
-                        return;
+                        run = true;
+                        
                     }
                     break;
 
             }
 
-
-            switch (singE)
+            if (run == false)
             {
-                case 1:
-                  
-                    PowderDownSignel(MinAnPlc.Heir1, 1);
-                    DB2105WriteHelper.WriteSetValueH1(value);
-                    DB2105WriteHelper.WriteH(1, "L", true);
-                  //  DB2105WriteHelper.WriteManScrewH1();
-
-                    break;
-                case 2:
-                    PowderDownSignel(MinAnPlc.Heir1, 1);
-                    DB2105WriteHelper.WriteSetValueH1(value);
-                    DB2105WriteHelper.WriteH(1, "R", true);
-                    // DB2105WriteHelper.WriteManScrewH2();
-
-                    break;
-                case 3:
-                    PowderDownSignel(MinAnPlc.Heir2, 2);
-                    DB2105WriteHelper.WriteSetValueH2(value);
-                    DB2105WriteHelper.WriteH(2, "L", true);
-                    // DB2105WriteHelper.WriteManScrewH3();
-
-                    break;
-                case 4:
-                    PowderDownSignel(MinAnPlc.Heir2, 2);
-                    DB2105WriteHelper.WriteSetValueH2(value);
-                    DB2105WriteHelper.WriteH(2, "R", true);
-                    //  DB2105WriteHelper.WriteManScrewH4();
+                switch (singE)
+                {
+                    case 1:
+
+                        PowderDownSignel(MinAnPlc.Heir1, 1);
+                        DB2105WriteHelper.WriteSetValueH1(value);
+                        DB2105WriteHelper.WriteH(1, "L", true);
+                        //  DB2105WriteHelper.WriteManScrewH1();
+
+                        break;
+                    case 2:
+                        PowderDownSignel(MinAnPlc.Heir1, 1);
+                        DB2105WriteHelper.WriteSetValueH1(value);
+                        DB2105WriteHelper.WriteH(1, "R", true);
+                        // DB2105WriteHelper.WriteManScrewH2();
+
+                        break;
+                    case 3:
+                        PowderDownSignel(MinAnPlc.Heir2, 2);
+                        DB2105WriteHelper.WriteSetValueH2(value);
+                        DB2105WriteHelper.WriteH(2, "L", true);
+                        // DB2105WriteHelper.WriteManScrewH3();
+
+                        break;
+                    case 4:
+                        PowderDownSignel(MinAnPlc.Heir2, 2);
+                        DB2105WriteHelper.WriteSetValueH2(value);
+                        DB2105WriteHelper.WriteH(2, "R", true);
+                        //  DB2105WriteHelper.WriteManScrewH4();
+
+                        break;
+                    case 5:
+                        PowderDownSignel(MinAnPlc.Heir3, 3);
+                        DB2105WriteHelper.WriteSetValueH3(value);
+                        DB2105WriteHelper.WriteH(3, "L", true);
+                        //DB2105WriteHelper.WriteManScrewH5();
+
+                        break;
+                    case 6:
+                        PowderDownSignel(MinAnPlc.Heir3, 3);
+                        DB2105WriteHelper.WriteSetValueH3(value);
+
+                        DB2105WriteHelper.WriteH(3, "R", true);
+                        // DB2105WriteHelper.WriteManScrewH6();
+                        break;
+                    case 7:
+                        PowderDownSignel(MinAnPlc.Heir4, 4);
+                        DB2105WriteHelper.WriteSetValueH4(value);
+                        DB2105WriteHelper.WriteH(4, "L", true);
+                        // DB2105WriteHelper.WriteManScrewH7();
+
+                        break;
+                    case 8:
+                        PowderDownSignel(MinAnPlc.Heir4, 4);
+                        DB2105WriteHelper.WriteSetValueH4(value);
+                        DB2105WriteHelper.WriteH(4, "R", true);
+                        //DB2105WriteHelper.WriteManScrewH8();
+
+                        break;
+                    default:
+                        MessageBox.Show("当前未选择产线！");
+                        return false;
+                }
 
-                    break;
-                case 5:
-                    PowderDownSignel(MinAnPlc.Heir3, 3);
-                    DB2105WriteHelper.WriteSetValueH3(value);
-                    DB2105WriteHelper.WriteH(3, "L", true);
-                    //DB2105WriteHelper.WriteManScrewH5();
+                ManualWeightLog(w, t, RadioE);
 
-                    break;
-                case 6:
-                    PowderDownSignel(MinAnPlc.Heir3, 3);
-                    DB2105WriteHelper.WriteSetValueH3(value);
 
-                    DB2105WriteHelper.WriteH(3, "R", true);
-                    // DB2105WriteHelper.WriteManScrewH6();
-                    break;
-                case 7:
-                    PowderDownSignel(MinAnPlc.Heir4, 4);
-                    DB2105WriteHelper.WriteSetValueH4(value);
-                    DB2105WriteHelper.WriteH(4, "L", true);
-                    // DB2105WriteHelper.WriteManScrewH7();
+                return true;
 
-                    break;
-                case 8:
-                    PowderDownSignel(MinAnPlc.Heir4, 4);
-                    DB2105WriteHelper.WriteSetValueH4(value);
-                    DB2105WriteHelper.WriteH(4,"R", true);
-                    //DB2105WriteHelper.WriteManScrewH8();
-
-                    break;
-                default:
-                    MessageBox.Show("当前未选择产线！");
-                    return;
             }
 
-            ManualWeightLog(w, t, RadioE);
+            return false;
+
 
         }
 

DataBlockHelper/DBHelpers/DB2104Helper.cs

@@ -82,7 +82,6 @@ namespace DataBlockHelper.DBHelpers
         private WaterEntity GetWater(int start)
         {
             var instanceByteTransform = PlcConnect.Instance.ByteTransform;
-
             var ls = this.bytes = PlcConnect.Instance.Read($"DB2104.{start}.0", 16).Content;
             WaterEntity entity = new WaterEntity
             {

DataBlockHelper/PlcConnect.cs

@@ -27,19 +27,22 @@ namespace DataBlockHelper
             SiemensPLCS siemensPLCS = SiemensPLCS.S1500;
             SiemensS7Net s7 = new SiemensS7Net(siemensPLCS);
             s7.SetPersistentConnection();
-            s7.IpAddress = "172.18.4.100";
+           // s7.IpAddress = "172.18.4.100";
+
+             
+            s7.IpAddress = "192.168.1.110";
             s7.Port = 102;
             var su = s7.ConnectServer();
 
             if (!su.IsSuccess)
             {
-                s7.IpAddress = "192.168.0.100";
-                s7.Port = 7788;
-                var fn = s7.ConnectServer();
-                if (!fn.IsSuccess)
-                {
-                    return new SiemensS7Net(siemensPLCS);
-                }
+                //s7.IpAddress = "192.168.0.100";
+                //s7.Port = 7788;
+                //var fn = s7.ConnectServer();
+                //if (!fn.IsSuccess)
+                //{
+                //    return new SiemensS7Net(siemensPLCS);
+                //}
             }
 
             return s7;