iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoOutput.cs
@@ -476,6 +476,95 @@ public string OP80QualityState { get; set; } #region 新增OP80的一些质量数据 【Editby shaocx,2024-06-13】 /// <summary> /// OP80 质量数据-厚度 /// </summary> public string QualityOP80_Houdu { get; set; } /// <summary> /// OP80 质量数据-中心距 /// </summary> public string QualityOP80_ZXJ { get; set; } /// <summary> /// OP80 质量数据-大头孔圆柱度 /// </summary> public string QualityOP80_DTKYZD { get; set; } /// <summary> /// OP80 质量数据-小头上面圆度 /// </summary> public string QualityOP80_XTSMYD { get; set; } /// <summary> /// OP80 质量数据-小头下面圆度 /// </summary> public string QualityOP80_XTXMYD { get; set; } #region 大头孔直径 /// <summary> /// OP80 质量数据-大头孔直径,大头孔直径=（大头上面X方向直径+大头上面Y方向直径+大头下面X方向直径+大头下面Y方向直径）/4 /// </summary> public string QualityOP80_D_TKZJ { get; set; } /// <summary> /// OP80 质量数据-大头上面X方向直径 /// </summary> public string QualityOP80_D_S_X { get; set; } /// <summary> /// OP80 质量数据-大头上面Y方向直径 /// </summary> public string QualityOP80_D_S_Y { get; set; } /// <summary> /// OP80 质量数据-大头下面X方向直径 /// </summary> public string QualityOP80_D_X_X { get; set; } /// <summary> /// OP80 质量数据-大头下面Y方向直径 /// </summary> public string QualityOP80_D_X_Y { get; set; } #endregion #region 小头孔直径 /// <summary> /// OP80 质量数据-小头孔直径,小头孔直径=（小头上面X方向直径+小头上面Y方向直径+小头下面X方向直径+小头下面Y方向直径）/4 /// </summary> public string QualityOP80_X_TKZJ { get; set; } /// <summary> /// OP80 质量数据-小头上面X方向直径 /// </summary> public string QualityOP80_X_S_X { get; set; } /// <summary> /// OP80 质量数据-小头上面Y方向直径 /// </summary> public string QualityOP80_X_S_Y { get; set; } /// <summary> /// OP80 质量数据-小头下面X方向直径 /// </summary> public string QualityOP80_X_X_X { get; set; } /// <summary> /// OP80 质量数据-小头下面Y方向直径 /// </summary> public string QualityOP80_X_X_Y { get; set; } #endregion #endregion /// <summary> /// 备注 /// </summary> @@ -1131,6 +1220,64 @@ [Description("测量时间")] public string QualityReceiveTimeHand { get; set; } #region 新增OP80的一些质量数据 【Editby shaocx,2024-06-13】 /// <summary> /// OP80 质量数据-厚度 /// </summary> [Description("厚度")] public string QualityOP80_Houdu { get; set; } /// <summary> /// OP80 质量数据-中心距 /// </summary> [Description("中心距")] public string QualityOP80_ZXJ { get; set; } /// <summary> /// OP80 质量数据-大头孔圆柱度 /// </summary> [Description("大头孔圆柱度")] public string QualityOP80_DTKYZD { get; set; } /// <summary> /// OP80 质量数据-小头上面圆度 /// </summary> [Description("小头上面圆度")] public string QualityOP80_XTSMYD { get; set; } /// <summary> /// OP80 质量数据-小头下面圆度 /// </summary> [Description("小头下面圆度")] public string QualityOP80_XTXMYD { get; set; } #region 大头孔直径 /// <summary> /// OP80 质量数据-大头孔直径,大头孔直径=（大头上面X方向直径+大头上面Y方向直径+大头下面X方向直径+大头下面Y方向直径）/4 /// </summary> [Description("大头孔直径")] public string QualityOP80_D_TKZJ { get; set; } #endregion #region 小头孔直径 /// <summary> /// OP80 质量数据-小头孔直径,小头孔直径=（小头上面X方向直径+小头上面Y方向直径+小头下面X方向直径+小头下面Y方向直径）/4 /// </summary> [Description("小头孔直径")] public string QualityOP80_X_TKZJ { get; set; } #endregion #endregion /// <summary> /// 大头重量;OP80 /// </summary> iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs
@@ -137,6 +137,24 @@ QualityOP80To8 = m.a.QualityOP80To8, QualityOP80To9 = m.a.QualityOP80To9, QualityOP80To10 = m.a.QualityOP80To10, //新增OP80的一些质量数据 【Editby shaocx,2024 - 06 - 13】 QualityOP80_Houdu = m.a.QualityOP80_Houdu, QualityOP80_ZXJ = m.a.QualityOP80_ZXJ, QualityOP80_DTKYZD = m.a.QualityOP80_DTKYZD, QualityOP80_XTSMYD = m.a.QualityOP80_XTSMYD, QualityOP80_XTXMYD = m.a.QualityOP80_XTXMYD, QualityOP80_D_TKZJ = m.a.QualityOP80_D_TKZJ, QualityOP80_D_S_X = m.a.QualityOP80_D_S_X, QualityOP80_D_S_Y = m.a.QualityOP80_D_S_Y, QualityOP80_D_X_X = m.a.QualityOP80_D_X_X, QualityOP80_D_X_Y = m.a.QualityOP80_D_X_Y, QualityOP80_X_TKZJ = m.a.QualityOP80_X_TKZJ, QualityOP80_X_S_X = m.a.QualityOP80_X_S_X, QualityOP80_X_S_Y = m.a.QualityOP80_X_S_Y, QualityOP80_X_X_X = m.a.QualityOP80_X_X_X, QualityOP80_X_X_Y = m.a.QualityOP80_X_X_Y, Remarks = m.a.Remarks, }) //.OrderBy(PageInputOrder.OrderBuilder<QualityDataInfoSearch>(input)) @@ -247,6 +265,23 @@ OP30QualityStateCH5 = m.a.OP30QualityStateCH5, OP30QualityStateCH6 = m.a.OP30QualityStateCH6, //新增OP80的一些质量数据 【Editby shaocx,2024 - 06 - 13】 QualityOP80_Houdu = m.a.QualityOP80_Houdu, QualityOP80_ZXJ = m.a.QualityOP80_ZXJ, QualityOP80_DTKYZD = m.a.QualityOP80_DTKYZD, QualityOP80_XTSMYD = m.a.QualityOP80_XTSMYD, QualityOP80_XTXMYD = m.a.QualityOP80_XTXMYD, QualityOP80_D_TKZJ = m.a.QualityOP80_D_TKZJ, QualityOP80_D_S_X = m.a.QualityOP80_D_S_X, QualityOP80_D_S_Y = m.a.QualityOP80_D_S_Y, QualityOP80_D_X_X = m.a.QualityOP80_D_X_X, QualityOP80_D_X_Y = m.a.QualityOP80_D_X_Y, QualityOP80_X_TKZJ = m.a.QualityOP80_X_TKZJ, QualityOP80_X_S_X = m.a.QualityOP80_X_S_X, QualityOP80_X_S_Y = m.a.QualityOP80_X_S_Y, QualityOP80_X_X_X = m.a.QualityOP80_X_X_X, QualityOP80_X_X_Y = m.a.QualityOP80_X_X_Y, Remarks = m.a.Remarks, UpdateTime = m.a.UpdatedTime, }) @@ -348,6 +383,24 @@ OP35QualityState = m.a.OP35QualityState, OP60QualityState = m.a.OP60QualityState, OP80QualityState = m.a.OP80QualityState, //新增OP80的一些质量数据 【Editby shaocx,2024 - 06 - 13】 QualityOP80_Houdu = m.a.QualityOP80_Houdu, QualityOP80_ZXJ = m.a.QualityOP80_ZXJ, QualityOP80_DTKYZD = m.a.QualityOP80_DTKYZD, QualityOP80_XTSMYD = m.a.QualityOP80_XTSMYD, QualityOP80_XTXMYD = m.a.QualityOP80_XTXMYD, QualityOP80_D_TKZJ = m.a.QualityOP80_D_TKZJ, QualityOP80_D_S_X = m.a.QualityOP80_D_S_X, QualityOP80_D_S_Y = m.a.QualityOP80_D_S_Y, QualityOP80_D_X_X = m.a.QualityOP80_D_X_X, QualityOP80_D_X_Y = m.a.QualityOP80_D_X_Y, QualityOP80_X_TKZJ = m.a.QualityOP80_X_TKZJ, QualityOP80_X_S_X = m.a.QualityOP80_X_S_X, QualityOP80_X_S_Y = m.a.QualityOP80_X_S_Y, QualityOP80_X_X_X = m.a.QualityOP80_X_X_X, QualityOP80_X_X_Y = m.a.QualityOP80_X_X_Y, Remarks = m.a.Remarks, UpdateTime = m.a.UpdatedTime, }) iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -6413,6 +6413,81 @@ 小头垂直度；OP80 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_Houdu"> <summary> OP80 质量数据-厚度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_ZXJ"> <summary> OP80 质量数据-中心距 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_DTKYZD"> <summary> OP80 质量数据-大头孔圆柱度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_XTSMYD"> <summary> OP80 质量数据-小头上面圆度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_XTXMYD"> <summary> OP80 质量数据-小头下面圆度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_TKZJ"> <summary> OP80 质量数据-大头孔直径,大头孔直径=（大头上面X方向直径+大头上面Y方向直径+大头下面X方向直径+大头下面Y方向直径）/4 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_S_X"> <summary> OP80 质量数据-大头上面X方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_S_Y"> <summary> OP80 质量数据-大头上面Y方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_X_X"> <summary> OP80 质量数据-大头下面X方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_D_X_Y"> <summary> OP80 质量数据-大头下面Y方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_TKZJ"> <summary> OP80 质量数据-小头孔直径,小头孔直径=（小头上面X方向直径+小头上面Y方向直径+小头下面X方向直径+小头下面Y方向直径）/4 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_S_X"> <summary> OP80 质量数据-小头上面X方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_S_Y"> <summary> OP80 质量数据-小头上面Y方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_X_X"> <summary> OP80 质量数据-小头下面X方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.QualityOP80_X_X_Y"> <summary> OP80 质量数据-小头下面Y方向直径 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataInfoOutput.Remarks"> <summary> 备注 @@ -6958,6 +7033,41 @@ 测量时间 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_Houdu"> <summary> OP80 质量数据-厚度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_ZXJ"> <summary> OP80 质量数据-中心距 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_DTKYZD"> <summary> OP80 质量数据-大头孔圆柱度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_XTSMYD"> <summary> OP80 质量数据-小头上面圆度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_XTXMYD"> <summary> OP80 质量数据-小头下面圆度 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_D_TKZJ"> <summary> OP80 质量数据-大头孔直径,大头孔直径=（大头上面X方向直径+大头上面Y方向直径+大头下面X方向直径+大头下面Y方向直径）/4 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80_X_TKZJ"> <summary> OP80 质量数据-小头孔直径,小头孔直径=（小头上面X方向直径+小头上面Y方向直径+小头下面X方向直径+小头下面Y方向直径）/4 </summary> </member> <member name="P:iWare.Wms.Application.QualityDataOP80Output.QualityOP80To1"> <summary> 大头重量;OP80 iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/QualityDataInfo.cs
@@ -348,5 +348,94 @@ [Comment("备注")] [MaxLength(255)] public string Remarks { get; set; } #region 新增OP80的一些质量数据 【Editby shaocx,2024-06-13】 /// <summary> /// OP80 质量数据-厚度 /// </summary> public string QualityOP80_Houdu { get; set; } /// <summary> /// OP80 质量数据-中心距 /// </summary> public string QualityOP80_ZXJ { get; set; } /// <summary> /// OP80 质量数据-大头孔圆柱度 /// </summary> public string QualityOP80_DTKYZD { get; set; } /// <summary> /// OP80 质量数据-小头上面圆度 /// </summary> public string QualityOP80_XTSMYD { get; set; } /// <summary> /// OP80 质量数据-小头下面圆度 /// </summary> public string QualityOP80_XTXMYD { get; set; } #region 大头孔直径 /// <summary> /// OP80 质量数据-大头孔直径,大头孔直径=（大头上面X方向直径+大头上面Y方向直径+大头下面X方向直径+大头下面Y方向直径）/4 /// </summary> public string QualityOP80_D_TKZJ { get; set; } /// <summary> /// OP80 质量数据-大头上面X方向直径 /// </summary> public string QualityOP80_D_S_X { get; set; } /// <summary> /// OP80 质量数据-大头上面Y方向直径 /// </summary> public string QualityOP80_D_S_Y { get; set; } /// <summary> /// OP80 质量数据-大头下面X方向直径 /// </summary> public string QualityOP80_D_X_X { get; set; } /// <summary> /// OP80 质量数据-大头下面Y方向直径 /// </summary> public string QualityOP80_D_X_Y { get; set; } #endregion #region 小头孔直径 /// <summary> /// OP80 质量数据-小头孔直径,小头孔直径=（小头上面X方向直径+小头上面Y方向直径+小头下面X方向直径+小头下面Y方向直径）/4 /// </summary> public string QualityOP80_X_TKZJ { get; set; } /// <summary> /// OP80 质量数据-小头上面X方向直径 /// </summary> public string QualityOP80_X_S_X { get; set; } /// <summary> /// OP80 质量数据-小头上面Y方向直径 /// </summary> public string QualityOP80_X_S_Y { get; set; } /// <summary> /// OP80 质量数据-小头下面X方向直径 /// </summary> public string QualityOP80_X_X_X { get; set; } /// <summary> /// OP80 质量数据-小头下面Y方向直径 /// </summary> public string QualityOP80_X_X_Y { get; set; } #endregion #endregion } } iWara.SCADA.Code/iWare.Wms.Core/Entity/SCADA/QualityDataInfoLog.cs
@@ -351,5 +351,93 @@ [MaxLength(255)] public string Remarks { get; set; } #region 新增OP80的一些质量数据 【Editby shaocx,2024-06-13】 /// <summary> /// OP80 质量数据-厚度 /// </summary> public string QualityOP80_Houdu { get; set; } /// <summary> /// OP80 质量数据-中心距 /// </summary> public string QualityOP80_ZXJ { get; set; } /// <summary> /// OP80 质量数据-大头孔圆柱度 /// </summary> public string QualityOP80_DTKYZD { get; set; } /// <summary> /// OP80 质量数据-小头上面圆度 /// </summary> public string QualityOP80_XTSMYD { get; set; } /// <summary> /// OP80 质量数据-小头下面圆度 /// </summary> public string QualityOP80_XTXMYD { get; set; } #region 大头孔直径 /// <summary> /// OP80 质量数据-大头孔直径,大头孔直径=（大头上面X方向直径+大头上面Y方向直径+大头下面X方向直径+大头下面Y方向直径）/4 /// </summary> public string QualityOP80_D_TKZJ { get; set; } /// <summary> /// OP80 质量数据-大头上面X方向直径 /// </summary> public string QualityOP80_D_S_X { get; set; } /// <summary> /// OP80 质量数据-大头上面Y方向直径 /// </summary> public string QualityOP80_D_S_Y { get; set; } /// <summary> /// OP80 质量数据-大头下面X方向直径 /// </summary> public string QualityOP80_D_X_X { get; set; } /// <summary> /// OP80 质量数据-大头下面Y方向直径 /// </summary> public string QualityOP80_D_X_Y { get; set; } #endregion #region 小头孔直径 /// <summary> /// OP80 质量数据-小头孔直径,小头孔直径=（小头上面X方向直径+小头上面Y方向直径+小头下面X方向直径+小头下面Y方向直径）/4 /// </summary> public string QualityOP80_X_TKZJ { get; set; } /// <summary> /// OP80 质量数据-小头上面X方向直径 /// </summary> public string QualityOP80_X_S_X { get; set; } /// <summary> /// OP80 质量数据-小头上面Y方向直径 /// </summary> public string QualityOP80_X_S_Y { get; set; } /// <summary> /// OP80 质量数据-小头下面X方向直径 /// </summary> public string QualityOP80_X_X_X { get; set; } /// <summary> /// OP80 质量数据-小头下面Y方向直径 /// </summary> public string QualityOP80_X_X_Y { get; set; } #endregion #endregion } }
