yangw
/
ProductionSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change -曲线显示跟随条码变化

Browse Source
dep_yangw
frankiecao 11 months ago
parent 135387df46 3b721eea4b
commit bcfab29e72
5 changed files with 65 additions and 38 deletions
Show Stats Download Patch File Download Diff File

48
ProductionSystem/Forms/HomeFormInfo.cs
Unescape Escape View File

@ -910,6 +910,12 @@ namespace ProductionSystem.Forms
private string GetCode()
{
var readM248 = OmronHelper.GetPlcVal(M248.DataType, M248.Address);
string plcTiaoMa = readM248.val.ToString().Replace("\r", "").Replace("\n", "");
return plcTiaoMa;
}
private void Step1()
@ -921,17 +927,20 @@ namespace ProductionSystem.Forms
ProductType = Program.ProductType
};
step.ProductBarcode = GetCode();
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ1_DB, Program.ProductType);
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();
sitongTool.Dispose();
step.Id = Guid.NewGuid().ToString("N");
step.ReturnValue = sitongTool.Val;
@ -946,6 +955,7 @@ namespace ProductionSystem.Forms
var stf2 = model.STF2;
sitongTool = new SitongTool(stf2.Com, stf2.TargetVal.ToDouble().ToInt());
var si2 = sitongTool.ToAction();
sitongTool.Dispose();
step.Id = Guid.NewGuid().ToString("N");
step.ReturnValue = sitongTool.Val;
@ -1010,7 +1020,7 @@ namespace ProductionSystem.Forms
};
step.ProductBarcode = GetCode();
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ1_DB, Program.ProductType);
@ -1116,11 +1126,11 @@ namespace ProductionSystem.Forms
ProductType = Program.ProductType
};
step.ProductBarcode = GetCode();
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ2_DB, Program.ProductType);
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ2_DB, Program.ProductType);
//四通1
var stf1= model.STF1;
@ -1259,11 +1269,11 @@ namespace ProductionSystem.Forms
ProductType = Program.ProductType
};
step.ProductBarcode = GetCode();
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ3_DB, Program.ProductType);
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ3_DB, Program.ProductType);
//四通1
var stf1= model.STF1;
@ -1348,11 +1358,11 @@ namespace ProductionSystem.Forms
ProductType = Program.ProductType
};
step.ProductBarcode = GetCode();
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ4_DB, Program.ProductType);
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ4_DB, Program.ProductType);
//四通1
var stf1= model.STF1;
@ -1419,11 +1429,11 @@ namespace ProductionSystem.Forms
ProductType = Program.ProductType
};
step.ProductBarcode = GetCode();
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ5_DB, Program.ProductType);
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ5_DB, Program.ProductType);
//四通1
var stf1= model.STF1;
@ -1473,7 +1483,7 @@ namespace ProductionSystem.Forms
StepName = "BZ6_DB",
ProductType = Program.ProductType
};
step.ProductBarcode = GetCode();
@ -1524,7 +1534,7 @@ namespace ProductionSystem.Forms
step.ProductBarcode = GetCode();
var model = paraConfigService.GetParaTargetVal(ModeTypeEnum.BZ5_DB, Program.ProductType);
@ -2206,7 +2216,7 @@ namespace ProductionSystem.Forms
//获取点位
var paraCode = middleMyTestResultControls[j].ParaCode;
var step = productStepService.QueryLatestStep(paraCategory, paraCode, Program.ProductType);
var step = productStepService.QueryLatestStep(paraCategory, paraCode, Program.ProductType,GetCode());
if (string.IsNullOrEmpty(testResultPoint) || string.IsNullOrEmpty(testValPoint))
{
//进行sql 进行查询sql
@ -2283,12 +2293,7 @@ namespace ProductionSystem.Forms
{
if (middleMyTestResultControls[j].IsHandleCreated && !middleMyTestResultControls[j].IsDisposed)
{
this.Invoke(new Action(() =>
{
SetColor(middleMyTestResultControls[j], -1, "0.000");
@ -2458,8 +2463,7 @@ namespace ProductionSystem.Forms
{
Program.cureManualReset.WaitOne();
if (GetPlcValue("D670") != "")
{
var productBarcode = txtProductCode.Text;
{
//模拟数据
for (int i = 0; i < Program.Times.Length; i++)
{
@ -2468,7 +2472,7 @@ namespace ProductionSystem.Forms
//Program.GastankPressData[i] = Convert.ToSingle(random.NextDouble() * 60 + 600);
//Program.XVibrateData[i] = Convert.ToSingle(random.NextDouble() * 60 + 800);
//Program.YVibrateData[i] = Convert.ToSingle(random.NextDouble() * 60 + 1000);
var product = result2Service.QueryLatestStep(Program.ProductType, productBarcode);
var product = result2Service.QueryLatestStep(Program.ProductType, GetCode());
var electricity = product.Electricity;
Program.CurrentData[i] = float.Parse(electricity);
Program.Times[i] = DateTime.Now.AddSeconds(i - 1000);

1
ProductionSystem/Untils/MFSerialInfo.cs
Unescape Escape View File

@ -66,7 +66,6 @@ namespace ProductionSystem.Untils
{
if (Exit)
{
// Dispose();
break;
}

41
ProductionSystem/Untils/Tool/SitongTool.cs
Unescape Escape View File

@ -11,22 +11,46 @@ using DevExpress.XtraPrinting.BarCode;
namespace ProductionSystem.Untils.Tool
{
public class SitongTool
public class SitongTool:IDisposable
{
string com;
int mo;
MfSerialInfo mfSerialInfo;
/// <summary>
/// 四通阀调试工具
/// </summary>
/// <param name="com">端口</param>
/// <param name="mo">模式 1 3 6</param>
public SitongTool(string com, int mo)
{
this.com = com;
this.mo = mo;
Write = mo.ToString();
mfSerialInfo = new MfSerialInfo(0x2D, 0x2E, com, "19200");
}
public string Val { get; set; } = "0";
public string Write { get; set; }
public void Dispose()
{
mfSerialInfo?.Dispose();
}
/// <summary>
/// 回复出场设计
/// </summary>
public void ResFactory()
{
//模式变成3 就是恢复出厂
mo = 3;
ToAction();
}
public bool ToAction()
{
var sendMes = "";
@ -44,11 +68,7 @@ namespace ProductionSystem.Untils.Tool
}
int cou = 0;
XTrace.WriteLine("发送报文:{0}", sendMes);
MfSerialInfo mfSerialInfo = new MfSerialInfo(0x2D, 0x2E,com, "19200");
bool b = false;
mfSerialInfo.MsgFunc += (x) =>
@ -65,19 +85,17 @@ namespace ProductionSystem.Untils.Tool
var intelLsb = me.GetIntelLsb(0, 4);
XTrace.WriteLine("mode: {0}", intelLsb);
//获取最后返回的模式
Val = intelLsb.ToInt().ToString();
if (intelLsb.ToInt() == mo && !b)
{
b = true;
mfSerialInfo.Exit = true;
return;
}
intelLsb = me.GetIntelLsb(8, 1);
XTrace.WriteLine("Hold Torque Active: {0}", intelLsb);
@ -122,15 +140,12 @@ namespace ProductionSystem.Untils.Tool
intelLsb = me.GetIntelLsb(40, 8);
XTrace.WriteLine("MCV_Version_L: {0}", intelLsb);
}
};
mfSerialInfo.SendMsg(sendMes,100,100);
mfSerialInfo.Dispose();
return b;
}
}

4
ProductionSystem_Model/DbModel/T_Product_Step.cs
Unescape Escape View File

@ -34,5 +34,9 @@ namespace ProductionSystem_Model.DbModel
[SugarColumn(ColumnName = "product_type")]
public string ProductType { get; set; }
[SugarColumn(ColumnName = "product_barcode")]
public string ProductBarcode { get; set; }
}
}

9
ProductionSystem_Service/ProductStepService.cs
Unescape Escape View File

@ -34,9 +34,14 @@ namespace ProductionSystem_Service
/// <param name="equipmentName"></param>
/// <param name="productType"></param>
/// <returns></returns>
public T_Product_Step QueryLatestStep(string stepName,string equipmentName,string productType)
public T_Product_Step QueryLatestStep(string stepName,string equipmentName,string productType,string productCode)
{
return db.Queryable<T_Product_Step>().Where(m => m.StepName == stepName && m.EquipmentName == equipmentName && m.ProductType == productType).First();
return db.Queryable<T_Product_Step>().
Where(m => m.StepName == stepName
&& m.EquipmentName == equipmentName
&& m.ProductType == productType)
.Where(x=>x.ProductBarcode==productCode)
.First();
}
}
}

Write Preview
Loading…
Cancel
Save