From 0bbeeaf8cc151c2b31ca81c3989a6c6b1c6e4163 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 11 8月 2024 08:10:02 +0800
Subject: [PATCH] 修复 测量岛部分 数据要变更名称
---
iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs | 45 ++++++++++++++++++++++++++++++---------------
1 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs
index 0f22807..00cc22e 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/Dto/QualityDataInfoInput.cs
@@ -936,6 +936,13 @@
public string SZB_OP50_M7_YSJ2 { get; set; }
public string SZB_OP50_M8_CZX1 { get; set; }
public string SZB_OP50_M9_CZX2 { get; set; }
+
+ //鏂板鍙傛暟
+ public string SZB_OP60_M1_CSD { get; set; }
+ public string SZB_OP60_M2_CKD { get; set; }
+ public string SZB_OP60_M3_CJL { get; set; }
+
+
public string SZB_OP60_M1_ZJB { get; set; }
public string SZB_OP60_M2_YDB { get; set; }
public string SZB_OP60_M3_PXD { get; set; }
@@ -969,6 +976,14 @@
public string M31_OP60_M13_TTA { get; set; }
public string M31_OP60_M14_BTA { get; set; }
public string M31_OP60_M14_SQE { get; set; }
+
+ public string M31_OP60_M15_SQE { get; set; }
+
+ public string M31_OP60_M16_SQE { get; set; }
+ public string M31_OP60_M17_SQE { get; set; }
+ public string M31_OP60_M18_SQE { get; set; }
+ public string M31_OP60_M19_SQE { get; set; }
+
public string SPC_OP20_M1_BXC { get; set; }
public string SPC_OP20_M5_BDS { get; set; }
public string SPC_OP20_M6_BDJ { get; set; }
@@ -1023,13 +1038,13 @@
public string RGT_OP20_M10_YLW { get; set; }
public string RGT_OP20_M11_ZWT { get; set; }
public string RGT_OP20_M12_YWT { get; set; }
- public string RGT_OP20_M13_LZS { get; set; }
- public string RGT_OP20_M14_LYS { get; set; }
- public string RGT_OP20_M15_LZD { get; set; }
- public string RGT_OP20_M16_LYD { get; set; }
- public string RGT_OP20_M17_LZS { get; set; }
- public string RGT_OP20_M18_LYS { get; set; }
- public string RGT_OP20_M19_DLK { get; set; }
+ public string RGT_OP20_M11_LZS { get; set; }
+ public string RGT_OP20_M12_LZS { get; set; }
+ public string RGT_OP20_M13_LZD { get; set; }
+ public string RGT_OP20_M14_LYD { get; set; }
+ public string RGT_OP20_M15_LZS { get; set; }
+ public string RGT_OP20_M16_LYS { get; set; }
+ public string RGT_OP20_M17_DLK { get; set; }
public string RGT_OP30_M1_YZJ { get; set; }
public string RGT_OP30_M2_ZLX { get; set; }
public string RGT_OP30_M3_YLX { get; set; }
@@ -1146,7 +1161,7 @@
//M31 OP60 M12 Distance 144.5000 -25.0000 25.0000 M31_OP60_M12_DSC
//M31 OP60 M13 Twist to A 0.0000 0.0000 200.0000 M31_OP60_M13_TTA
//M31 OP60 M14 Bend to A 0.0000 0.0000 75.0000 M31_OP60_M14_BTA
- //M31 OP60 M15 Squareness 0.0000 0.0000 40.0000 M31_OP60_M14_SQE
+ //M31 OP60 M15 Squareness 0.0000 0.0000 40.0000 M31_OP60_M15_SQE
//SPC OP20 M1 OP20鏍囪闈㈠皬澶村瓟绮楃硻搴z6-9 6.0000 0.0000 3.0000 SPC_OP20_M1_BXC
//SPC OP20 M5 OP20鏍囪闈㈠ぇ澶村瓟鍊掕娣卞害2.1卤0.15 2.1000 -0.1500 0.1500 SPC_OP20_M5_BDS
//SPC OP20 M6 OP20鏍囪闈㈠ぇ澶村瓟鍊掕瑙掑害45掳 45.0000 -5.0000 5.0000 SPC_OP20_M6_BDJ
@@ -1201,13 +1216,13 @@
//浜哄伐妫�娴嬪彴 OP20 M10 OP20鍙宠灪绾筂8X1-6H 1.0000 0.0000 1.0000 RGT_OP20_M10_YLW
//浜哄伐妫�娴嬪彴 OP20 M11 OP20铻虹汗宸﹀簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90) 鏈夎灪绾硅烦杩� 7.5500 -0.0400 0.0400 RGT_OP20_M11_ZWT
//浜哄伐妫�娴嬪彴 OP20 M12 OP20铻虹汗鍙冲簳瀛旂洿寰�7.51-7.59(鎵嬫寔閲忚P90) 鏈夎灪绾硅烦杩� 7.5500 -0.0400 0.0400 RGT_OP20_M12_YWT
- //浜哄伐妫�娴嬪彴 OP20 M13 OP20铻烘爴瀛斿乏娣卞害26卤0.2锛堟墜鎸侀噺瑙凱91锛� 26.0000 -0.2000 0.2000 RGT_OP20_M13_LZS
- //浜哄伐妫�娴嬪彴 OP20 M14 OP20铻烘爴瀛斿彸娣卞害26卤0.2(鎵嬫寔閲忚P91) 26.0000 -0.2000 0.2000 RGT_OP20_M14_LYS
- //浜哄伐妫�娴嬪彴 OP20 M15 OP20铻虹汗宸﹀簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M15_LZD
- //浜哄伐妫�娴嬪彴 OP20 M16 OP20铻虹汗鍙冲簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M16_LYD
- //浜哄伐妫�娴嬪彴 OP20 M17 OP20铻虹汗宸︽繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M17_LZS
- //浜哄伐妫�娴嬪彴 OP20 M18 OP20铻虹汗鍙虫繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M18_LYS
- //浜哄伐妫�娴嬪彴 OP20 M19 OP20澶уご瀛旀瘺鍧鍦嗚疆寤撶浉瀵逛簬澶уご瀛斿悓杞村害蠁1 0.0000 0.0000 1.0000 RGT_OP20_M19_DLK
+ //浜哄伐妫�娴嬪彴 OP20 M13 OP20铻烘爴瀛斿乏娣卞害26卤0.2锛堟墜鎸侀噺瑙凱91锛� 26.0000 -0.2000 0.2000 RGT_OP20_M13_LZS 鏀逛负 RGT_OP20_M11_LZS
+ //浜哄伐妫�娴嬪彴 OP20 M14 OP20铻烘爴瀛斿彸娣卞害26卤0.2(鎵嬫寔閲忚P91) 26.0000 -0.2000 0.2000 RGT_OP20_M14_LYS 鏀逛负 RGT_OP20_M12_LZS
+ //浜哄伐妫�娴嬪彴 OP20 M15 OP20铻虹汗宸﹀簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M15_LZD 鏀逛负 RGT_OP20_M13_LZD
+ //浜哄伐妫�娴嬪彴 OP20 M16 OP20铻虹汗鍙冲簳瀛旀繁搴�42Max(鎵嬫寔閲忚P92) 21.0000 -21.0000 21.0000 RGT_OP20_M16_LYD 鏀逛负 RGT_OP20_M14_LYD
+ //浜哄伐妫�娴嬪彴 OP20 M17 OP20铻虹汗宸︽繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M17_LZS 鏀逛负 RGT_OP20_M15_LZS
+ //浜哄伐妫�娴嬪彴 OP20 M18 OP20铻虹汗鍙虫繁搴�38.3锛�+1/0锛�(鐢靛瓙铻虹汗娣卞害瑙勶級 38.3000 0.0000 1.0000 RGT_OP20_M18_LYS 鏀逛负 RGT_OP20_M16_LYS
+ //浜哄伐妫�娴嬪彴 OP20 M19 OP20澶уご瀛旀瘺鍧鍦嗚疆寤撶浉瀵逛簬澶уご瀛斿悓杞村害蠁1 0.0000 0.0000 1.0000 RGT_OP20_M19_DLK 鏀逛负 RGT_OP20_M17_DLK
//浜哄伐妫�娴嬪彴 OP30 M1 OP30琛鍘嬭瑙掑害45掳 45.0000 -5.0000 5.0000 RGT_OP30_M1_YZJ
//浜哄伐妫�娴嬪彴 OP30 M2 OP30宸﹁灪鏍撶粓鍔涚煩绠＄悊鑼冨洿35-70N.m 35.0000 0.0000 35.0000 RGT_OP30_M2_ZLX
//浜哄伐妫�娴嬪彴 OP30 M3 OP30鍙宠灪鏍撶粓鍔涚煩绠＄悊鑼冨洿35-70N.m 35.0000 0.0000 35.0000 RGT_OP30_M3_YLX
--
Gitblit v1.9.3