diff --git a/ProductionSystem/Forms/HomeFormInfo.cs b/ProductionSystem/Forms/HomeFormInfo.cs index c56ee7e..020e488 100644 --- a/ProductionSystem/Forms/HomeFormInfo.cs +++ b/ProductionSystem/Forms/HomeFormInfo.cs @@ -919,11 +919,13 @@ namespace ProductionSystem.Forms private void Step1() { + //上位机将四通阀运行到模式1，启动水泵1运行致设定转速，反馈PLC=1或2（可以/不可以测试） TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + TmTool.SbUx(ModeTypeEnum.BZ1_DB); @@ -938,83 +940,14 @@ namespace ProductionSystem.Forms private void StepGaoYa() { + + //上位机检测电子膨胀阀1，电子膨胀阀2在常开状态，不在最大值状态时，膨胀阀运行致常开状态，并反馈PLC=1或2（可以/不可以测试） - T_Product_Step step = new T_Product_Step - { - StepName = "BZ4_DB", - ProductType = Program.ProductType - }; - - - step.ProductBarcode = GetCode(); - - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ1_DB, Program.ProductType); - - //四通1 - var stf1 = model.STF1; - int val = stf1.TargetVal.ToDouble().ToInt(); - SitongTool sitongTool = new SitongTool(stf1.Com, val); - var si1 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - step.EquipmentName = "FKSTF1ZT_DB"; - - stepService.AddProductStep(step); - - - //四通2 - var stf2 = model.STF2; - sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt()); - var si2 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "FKSTF2ZT_DB"; - stepService.AddProductStep(step); - - - //// lin 1 com10 - ////1 调试成功 - - //电子膨胀阀 - - var pzf1 = model.PZF1; - val = pzf1.TargetVal.ToDouble().ToInt(); - ExvTool exv = new ExvTool(pzf1.Com, val); - var exv1 = exv.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = exv.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "DZPZF1_DB"; - stepService.AddProductStep(step); - - - //水泵1 - - var sb1 = model.SB1; - val = sb1.TargetVal.ToDouble().ToInt(); - UxTool uxTool = new UxTool(sb1.Com, val); - - - var ya = uxTool.ToAction(); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = uxTool.Val; - step.WriteValue = uxTool.Write; - step.CreateTime = DateTime.Now; - step.EquipmentName = "SB1ZS_DB"; - stepService.AddProductStep(step); - + TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + // TmTool.SbUx(ModeTypeEnum.BZ1_DB); //D1350 @@ -1023,118 +956,17 @@ namespace ProductionSystem.Forms } - /// - /// 停止水泵1 - /// - private void Step1Stop() - { - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ1_DB, Program.ProductType); - //去停止水泵1 - var sb1 = model.SB1; - UxTool uxTool = new UxTool(sb1.Com,0); - uxTool.ToAction(); - - - - - var point = Program.CommandPointKeyValues.FirstOrDefault(m => m.Key == "D1350"); - var writeResult = OmronHelper.WriteToPlc(point.DataType, point.Address, $"{0}"); - } - + private void Step2() { - - T_Product_Step step=new T_Product_Step - { - StepName = "BZ2_DB", - ProductType = Program.ProductType - }; + // 上位机将四通阀运行到模式1，停止水泵1；启动水泵2运行致设定转速，反馈PLC=1或2（可以/不可以测试） + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); - - step.ProductBarcode = GetCode(); - - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ2_DB, Program.ProductType); - - //四通1 - var stf1= model.STF1; - int val = stf1.TargetVal.ToDouble().ToInt(); - SitongTool sitongTool = new SitongTool(stf1.Com,val); - var si1 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - step.EquipmentName = "FKSTF1ZT_DB"; - - stepService.AddProductStep(step); - - - //四通2 - var stf2 = model.STF2; - sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt()); - var si2 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "FKSTF2ZT_DB"; - stepService.AddProductStep(step); - - - //// lin 1 com10 - ////1 调试成功 - - //电子膨胀阀 - - var pzf1 = model.PZF1; - val = pzf1.TargetVal.ToDouble().ToInt(); - ExvTool exv = new ExvTool(pzf1.Com,val); - var exv1 = exv.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = exv.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "DZPZF1_DB"; - stepService.AddProductStep(step); - - - - - - //去停止水泵1 - var sb1 = model.SB1; - UxTool uxTool = new UxTool(sb1.Com,0); - uxTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = uxTool.Val; - step.WriteValue = uxTool.Write; - step.CreateTime = DateTime.Now; - step.EquipmentName = "SB1ZS_DB"; - stepService.AddProductStep(step); - - //开始水泵2 - - var sb2 = model.SB2; - val = sb2.TargetVal.ToDouble().ToInt(); - uxTool = new UxTool(sb2.Com,val); - - var ya= uxTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = uxTool.Val; - step.WriteValue = uxTool.Write; - step.CreateTime = DateTime.Now; - step.EquipmentName = "SB2ZS_DB"; - stepService.AddProductStep(step); + TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + TmTool.SbUx(ModeTypeEnum.BZ1_DB,true); var point =Program.CommandPointKeyValues.FirstOrDefault(m=>m.Key=="D1352"); @@ -1142,131 +974,17 @@ namespace ProductionSystem.Forms } - private void Step2Stop() - { - - T_Product_Step step=new T_Product_Step - { - StepName = "BZ2_DB", - ProductType = Program.ProductType - }; - - - - - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ2_DB, Program.ProductType); - - - - - - - - //开始水泵2 - - var sb2 = model.SB2; - var val = sb2.TargetVal.ToDouble().ToInt(); - var uxTool = new UxTool(sb2.Com,val); - - var ya= uxTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = uxTool.Val; - step.WriteValue = uxTool.Write; - step.CreateTime = DateTime.Now; - step.EquipmentName = "SB2ZS_DB"; - stepService.AddProductStep(step); - Thread.Sleep(1000); - - var point =Program.CommandPointKeyValues.FirstOrDefault(m=>m.Key=="D1352"); - var writeResult = OmronHelper.WriteToPlc(point.DataType, point.Address, $"{0}"); - - } - + private void Step3() { - - T_Product_Step step=new T_Product_Step - { - StepName = "BZ3_DB", - ProductType = Program.ProductType - }; - - step.ProductBarcode = GetCode(); - - - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ3_DB, Program.ProductType); - - //四通1 - var stf1= model.STF1; - int val = stf1.TargetVal.ToDouble().ToInt(); - SitongTool sitongTool = new SitongTool(stf1.Com,val); - var si1 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - step.EquipmentName = "FKSTF1ZT_DB"; - - stepService.AddProductStep(step); - - - //四通2 - var stf2 = model.STF2; - sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt()); - var si2 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "FKSTF2ZT_DB"; - stepService.AddProductStep(step); - - - //// lin 1 com10 - ////1 调试成功 - - //电子膨胀阀 + // 上位机将四通阀运行到模式1，停止水泵2；启动水泵3运行致设定转速，反馈PLC=1或2（可以/不可以测试） + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); - var pzf1 = model.PZF1; - val = pzf1.TargetVal.ToDouble().ToInt(); - ExvTool exv = new ExvTool(pzf1.Com,val); - var exv1 = exv.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = exv.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "DZPZF1_DB"; - stepService.AddProductStep(step); - - - - - - - - //停止水泵2 - - var sb2 = model.SB2; - var uxTool = new UxTool(sb2.Com,0); - var ya= uxTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = uxTool.Val; - step.WriteValue = uxTool.Write; - step.CreateTime = DateTime.Now; - step.EquipmentName = "SB2ZS_DB"; - stepService.AddProductStep(step); - Thread.Sleep(2000); + TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + // TmTool.SbUx(ModeTypeEnum.BZ1_DB); var point =Program.CommandPointKeyValues.FirstOrDefault(m=>m.Key=="D1354"); var writeResult = OmronHelper.WriteToPlc(point.DataType, point.Address, $"{1}"); @@ -1278,68 +996,11 @@ namespace ProductionSystem.Forms private void Step7() { - T_Product_Step step=new T_Product_Step - { - StepName = "BZ7_DB", - ProductType = Program.ProductType - }; - - step.ProductBarcode = GetCode(); - - - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ4_DB, Program.ProductType); - - //四通1 - var stf1= model.STF1; - int val = stf1.TargetVal.ToDouble().ToInt(); - SitongTool sitongTool = new SitongTool(stf1.Com,val); - var si1 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - step.EquipmentName = "FKSTF1ZT_DB"; - - stepService.AddProductStep(step); - - - //四通2 - var stf2 = model.STF2; - sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt()); - var si2 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "FKSTF2ZT_DB"; - stepService.AddProductStep(step); - - - //// lin 1 com10 - ////1 调试成功 - - //电子膨胀阀 - - var pzf1 = model.PZF1; - val = pzf1.TargetVal.ToDouble().ToInt(); - ExvTool exv = new ExvTool(pzf1.Com,val); - var exv1 = exv.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = exv.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "DZPZF1_DB"; - stepService.AddProductStep(step); - - + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); - + TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + TmTool.SbUx(ModeTypeEnum.BZ1_DB); var point =Program.CommandPointKeyValues.FirstOrDefault(m=>m.Key=="D1356"); var writeResult = OmronHelper.WriteToPlc(point.DataType, point.Address, $"{1}"); @@ -1349,46 +1010,12 @@ namespace ProductionSystem.Forms private void Step5() { - T_Product_Step step=new T_Product_Step - { - StepName = "BZ5_DB", - ProductType = Program.ProductType - }; - - - step.ProductBarcode = GetCode(); - - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ5_DB, Program.ProductType); - - //四通1 - var stf1= model.STF1; - int val = stf1.TargetVal.ToDouble().ToInt(); - SitongTool sitongTool = new SitongTool(stf1.Com,val); - var si1 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - step.EquipmentName = "FKSTF1ZT_DB"; - - stepService.AddProductStep(step); - - - //四通2 - var stf2 = model.STF2; - sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt()); - var si2 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "FKSTF2ZT_DB"; - stepService.AddProductStep(step); + //上位机将四通阀1运行到模式1，四通阀2运行到模式1，；反馈模式与设定模式相同时，反馈PLC=1或2（可以/不可以测试） + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); + // TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + // TmTool.SbUx(ModeTypeEnum.BZ1_DB); @@ -1403,46 +1030,14 @@ namespace ProductionSystem.Forms private void Step6() - { - T_Product_Step step = new T_Product_Step - { - StepName = "BZ6_DB", - ProductType = Program.ProductType - }; - step.ProductBarcode = GetCode(); - - - - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ5_DB, Program.ProductType); - - //四通1 - var stf1 = model.STF1; - int val = stf1.TargetVal.ToDouble().ToInt(); - SitongTool sitongTool = new SitongTool(stf1.Com, val); - var si1 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - step.EquipmentName = "FKSTF1ZT_DB"; - - stepService.AddProductStep(step); - - - //四通2 - var stf2 = model.STF2; - sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt()); - var si2 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - - step.EquipmentName = "FKSTF2ZT_DB"; - stepService.AddProductStep(step); + { + + //上位机将四通阀1运行到模式6，四通阀2运行到模式6，；反馈模式与设定模式相同时，反馈PLC=1或2（可以/不可以测试） + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); + // + // TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + // TmTool.SbUx(ModeTypeEnum.BZ1_DB); var point = Program.CommandPointKeyValues.FirstOrDefault(m => m.Key == "D1360"); var writeResult = OmronHelper.WriteToPlc(point.DataType, point.Address, $"{1}"); @@ -1452,45 +1047,11 @@ namespace ProductionSystem.Forms private void Step8() { - T_Product_Step step = new T_Product_Step - { - StepName = "BZ8_DB", - ProductType = Program.ProductType - }; - - - - step.ProductBarcode = GetCode(); - - var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ5_DB, Program.ProductType); - - //四通1 - var stf1 = model.STF1; - int val = stf1.TargetVal.ToDouble().ToInt(); - SitongTool sitongTool = new SitongTool(stf1.Com, val); - var si1 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; - step.EquipmentName = "FKSTF1ZT_DB"; - - stepService.AddProductStep(step); - - - //四通2 - var stf2 = model.STF2; - sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt()); - var si2 = sitongTool.ToAction(); - - step.Id = Guid.NewGuid().ToString("N"); - step.ReturnValue = sitongTool.Val; - step.WriteValue = val.ToString(); - step.CreateTime = DateTime.Now; + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 1); + TmTool.SiTong(ModeTypeEnum.BZ1_DB, 2); - step.EquipmentName = "FKSTF2ZT_DB"; - stepService.AddProductStep(step); + // TmTool.Dzpy(ModeTypeEnum.BZ1_DB, 1); + // TmTool.SbUx(ModeTypeEnum.BZ1_DB); var point = Program.CommandPointKeyValues.FirstOrDefault(m => m.Key == "D1917"); var writeResult = OmronHelper.WriteToPlc(point.DataType, point.Address, $"{1}");