合并冲突

JinYuan.ControlCenter/ControlCenter.cs

@@ -1013,7 +1013,7 @@ namespace JinYuan.ControlCenters
 
                 CommonMethods.Ppm = CommonMethods.PlcLink.ReadInt32("D13");
                 //CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadFloat("D11").ToString("F2"))/100;
-                CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadInt32("D11").ToString("F2")) / 100;
+                CommonMethods.JiaDL = Convert.ToDouble(CommonMethods.PlcLink.ReadFloat("D11").ToString("F2"));
 
                 #region 开机时间/运行时间
                 CommonMethods.PlcOpenAndRunTime = GetList<int>(6, 0);

JinYuan.ControlCenter/ControlCenter_Plc.cs

@@ -1874,7 +1874,7 @@ namespace JinYuan.ControlCenters
                     List<int> qrCodeAddressList = new List<int>();
                     for (int k = 0; k < 4; k++)
                     {
-                        int address = 9750 + k * 2 + i * 8;
+                        int address = (9750 - 3200) * 2 + k * 4 + i * 16;
                         qrCodeAddressList.Add(address);
                     }
 

JinYuan.MES/MesDataProcess.cs

@@ -1313,6 +1313,41 @@ namespace JinYuan.MES
                     tagCalculateResult = "",
                     tagRemark = "生产型号"
                 });
+
+                #region 二维码相关 by clm 20260910
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "QR_CODE_WIDTH",
+                    tagValue = m.QrCodeWidth,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "二维码宽度"
+                });
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "QR_CODE_HEIGHT",
+                    tagValue = m.QrCodeHeight,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "二维码高度"
+                });
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "QR_CODE_LEFT_DISTANCE",
+                    tagValue = m.QrCodeTopMargin,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "二维码左端距离"
+                });
+                datavolist.Add(new TagDataVOListItem()
+                {
+                    tagCode = "QR_CODE_UP_DISTANCE",
+                    tagValue = m.QrCodeLeftMargin,
+                    tagTime = DateTime.Now.ToString(),
+                    tagCalculateResult = "",
+                    tagRemark = "二维码上端距离"
+                });
+                #endregion
             }
 
             #endregion

采集项目表.csv

@@ -0,0 +1,44 @@
+采集项编码,采集项字段,采集项描述
+INBOUND_TIME_WGJC,CSBYHINSTATIONTIME,进站时间
+TOP_COVER_CODE_WGJC,BarCode,进站电芯条码
+in_battery_grade,in_battery_grade,进站电芯条码等级
+free_state_thickness_setpoint,Thickness1,自由态厚度（设定值）
+free_state_thickness_actual,ThicknessResult1,自由态厚度（实际值）
+free_state_thickness_judgment,CCDResult19,自由态厚度（判定结果）
+flatness_setpoint,flatness_setpoint,平面度（设定值）
+FLATNESS_WGJC02,flatness_actual,平面度（实际值）
+FLATNESS_RESULTS_WGJC02,CCDResult20,平面度（判定结果）
+appearance_standard,appearance_standard,外观标准（设定值）
+POSITIVE_AND_NEGATIVE_POLES1_WGJC02,CCDResult15,正极柱检测结果
+positive_terminal_ng_code,CCD15NgCode,正极柱检测NG代码
+EXPLOSION_PROOF_VALVE_WGJC02,CCDResult17,防爆阀检测结果
+explosion_valve_ng_code,CCD17NgCode,防爆阀检测NG代码
+QR_CODE_WGJC02,CCDResult18,二维码检测结果
+qr_code_ng_code,CCD18NgCode,二维码检测NG代码
+POSITIVE_AND_NEGATIVE_POLES2_WGJC02,CCDResult16,负极柱检测结果
+negative_terminal_ng_code,CCD16NgCode,负极柱检测NG代码
+top_surface_inspection_result,CCDResult5,顶面检测结果
+top_surface_ng_code,CCD5NgCode,顶面检测NG代码
+positive_side_inspection_result,CCDResult3,正极侧面检测结果
+positive_side_ng_code,CCD3NgCode,正极侧面检测NG代码
+negative_side_inspection_result,CCDResult4,负极侧面检测结果
+negative_side_ng_code,CCD4NgCode,负极侧面检测NG代码
+LARGESURFACEA_WGJC02,CCDResult1,大面A检测结果
+large_surface_A_ng_code,CCD1NgCode,大面A检测NG代码
+LARGESURFACEB_WGJC02,CCDResult2,大面B检测结果
+large_surface_B_ng_code,CCD2NgCode,大面B检测NG代码
+bottom_surface_inspection_result,CCDResult6,底面检测结果
+bottom_surface_ng_code,CCD6NgCode,底面检测NG代码
+OUT_TIME_WGJC,CSBYHOUTSTATIONTIME,出站时间
+out_battery_barcode,BarCode,出站电芯条码
+out_battery_grade,out_battery_grade,出站电芯条码等级
+barcode_match_result,barcode_match_result,进出站条码匹配结果
+OVERALL_APPEARANCE_RESULT_WGJC02,CCDResult22,总判定结果
+ng_code_summary,ng_code_summary,NG代码汇总
+TWOSIDESOFTHEBATTERYCELL_WGJC02,CCDResult24,电芯二侧面
+FOUR_SIDE_EDGES_WGJC02,CCDResult23,四个侧棱边
+BOTTOM_EDGE1_WGJC02,CCDResult7,底部菱边1
+TWO_LONG_EDGES_WGJC02,CCDResult25,二个底部长棱
+BOTTOM_EDGE2_WGJC02,CCDResult9,底部棱边2
+POSITIVE_AND_NEGATIVE_PLASTRICRINGS_WGJC02,CCDResult19,正负塑胶圈
+TOP_AND_BOTTOM_DETECTION_WGJC02,CCDResult26,顶底部检测