diff --git a/ProductionSystem/Forms/HomeFormInfo.cs b/ProductionSystem/Forms/HomeFormInfo.cs index b509f94..ac597c5 100644 --- a/ProductionSystem/Forms/HomeFormInfo.cs +++ b/ProductionSystem/Forms/HomeFormInfo.cs @@ -722,7 +722,7 @@ namespace ProductionSystem.Forms if (d1314.ToDouble().ToInt() == 1 && !Over) { XTrace.WriteLine("开始步骤8"); - ToCache(Step8); + Step8(); Over = true; } @@ -984,6 +984,8 @@ namespace ProductionSystem.Forms private void Step7() { + TmTool.CleanSt(); + Thread.Sleep(300); if (D1004) { TmTool.SiTong(ModeTypeEnum.BZ7_DB, 1); @@ -1003,6 +1005,10 @@ namespace ProductionSystem.Forms private void Step5() { + + TmTool.CleanSt(); + Thread.Sleep(300); + var ba = ModeTypeEnum.BZ5_DB; //上位机将四通阀1运行到模式1,四通阀2运行到模式1,;反馈模式与设定模式相同时,反馈PLC=1或2(可以/不可以测试) if (D1004) @@ -1025,6 +1031,8 @@ namespace ProductionSystem.Forms private void Step6() { + TmTool.CleanSt(); + Thread.Sleep(300); //上位机将四通阀1运行到模式6,四通阀2运行到模式6,;反馈模式与设定模式相同时,反馈PLC=1或2(可以/不可以测试) var ba = ModeTypeEnum.BZ6_DB; //上位机将四通阀1运行到模式1,四通阀2运行到模式1,;反馈模式与设定模式相同时,反馈PLC=1或2(可以/不可以测试) @@ -1048,9 +1056,11 @@ namespace ProductionSystem.Forms private void Step8() { + //sitongfa 2 3 //膨胀阀0 + XTrace.WriteLine("第八部"+D1004); if (D1004) { TmTool.SiTong(ModeTypeEnum.BZ8_DB, 1,true); @@ -1065,7 +1075,8 @@ namespace ProductionSystem.Forms } if (D1004) - { TmTool.Dzpy(ModeTypeEnum.BZ8_DB,1, true); + { + TmTool.Dzpy(ModeTypeEnum.BZ8_DB,1, true); TmTool.WritePlc(TmTool.PengZhang1, 0); } diff --git a/ProductionSystem/Untils/Tool/TmTool.cs b/ProductionSystem/Untils/Tool/TmTool.cs index 62c53f7..d79ba31 100644 --- a/ProductionSystem/Untils/Tool/TmTool.cs +++ b/ProductionSystem/Untils/Tool/TmTool.cs @@ -19,13 +19,17 @@ namespace ProductionSystem.Untils.Tool public class TmTool { - - public static void CleanStatus() + public static void CleanSt() { - WritePlc(SiTong1, 0); WritePlc(SiTong2, 0); WritePlc(PengZhang1, 0); + } + + public static void CleanStatus() + { + CleanSt(); + WritePlc(ShuiBeng1,0); WritePlc(ShuiBeng2,0); WritePlc(ShuiBeng3,0); @@ -161,11 +165,12 @@ namespace ProductionSystem.Untils.Tool eq = EquipmentEnum.FKSTF2ZT_DB; } int val = stf1.TargetVal.ToDouble().ToInt(); - val = 1; + if (reset) { //四通阀回复出场 val = 3; + } SitongTool sitongTool = new SitongTool(stf1.Com, val);