|
|
@@ -299,13 +299,13 @@ namespace TeamAAS_VP.Models.PLC
|
|
|
set { SetProperty(ref _Out_ScrewFeederIsChanged, value); }
|
|
|
}
|
|
|
|
|
|
- private PlcAddress _Check_Screw ;
|
|
|
+ private PlcAddress _Check_Screw;
|
|
|
/// <summary>
|
|
|
/// 点检扭力 电批正转
|
|
|
/// </summary>
|
|
|
public PlcAddress Check_ScrewTorque
|
|
|
{
|
|
|
- get { return _Check_Screw ; }
|
|
|
+ get { return _Check_Screw; }
|
|
|
set { SetProperty(ref _Check_Screw, value); }
|
|
|
}
|
|
|
|
|
|
@@ -426,6 +426,16 @@ namespace TeamAAS_VP.Models.PLC
|
|
|
set { SetProperty(ref _In_MesCheck, value); }
|
|
|
}
|
|
|
|
|
|
+ private PlcAddress _In_Result = new PlcAddress();
|
|
|
+ /// <summary>
|
|
|
+ /// 产品的最终结果
|
|
|
+ /// </summary>
|
|
|
+ public PlcAddress In_Result
|
|
|
+ {
|
|
|
+ get { return _In_Result; }
|
|
|
+ set { SetProperty(ref _In_Result, value); }
|
|
|
+ }
|
|
|
+
|
|
|
private PlcAddress _In_DowmCameraNum = new PlcAddress();
|
|
|
/// <summary>
|
|
|
/// 下相机拍照编号
|
|
|
@@ -955,7 +965,7 @@ namespace TeamAAS_VP.Models.PLC
|
|
|
Out_ScrewFeederIsChanged.Address = "ns=4;s=DB_Communication|FromPC.PickNumChange";
|
|
|
Out_ScrewFeederIsChanged.DataType = "int16";
|
|
|
Out_ScrewFeederIsChanged.Description = Lang.供料器发生改变;
|
|
|
-
|
|
|
+
|
|
|
|
|
|
// 4. In_* 默认(假定从 PLC 读到 PC,使用 ToPC 前缀)
|
|
|
In_Code = Ensure(In_Code);
|
|
|
@@ -968,6 +978,11 @@ namespace TeamAAS_VP.Models.PLC
|
|
|
In_MesCheck.DataType = "int16";
|
|
|
In_MesCheck.Description = Lang.Mes交互1获取过站信息当站是否生产2上传本站数据;
|
|
|
|
|
|
+ In_Result = Ensure(In_Result);
|
|
|
+ In_Result.Address = "ns=4;s=DB_Communication|ToPC.Mes[{0}].Result";
|
|
|
+ In_Result.DataType = "int16";
|
|
|
+ In_Result.Description = "产品的最终结果,1:OK; 2:NG";
|
|
|
+
|
|
|
In_DowmCameraNum = Ensure(In_DowmCameraNum);
|
|
|
In_DowmCameraNum.Address = "ns=4;s=DB_Communication|ToPC.DowmCameraNum";
|
|
|
In_DowmCameraNum.DataType = "int16";
|