打开成品/半成品模式切换

JinYuan.ControlCenter/ControlCenter_Plc.cs

@@ -512,9 +512,8 @@ namespace JinYuan.ControlCenters
 
                     // 获取电池等级信息
                     var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500);
-                    string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : CommonMethods.curFdConfig.Grade1;
+                    string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : "";
-                    string add = (gradeResult.Grade == null || string.IsNullOrEmpty(gradeResult.Grade)) ? ",临时使用本机架1垛位的挡位" : "";
+                    string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage;
-                    string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage + add;
 
                     // 反馈电池条码到PLC
                     //await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo);
@@ -729,9 +728,8 @@ namespace JinYuan.ControlCenters
 
                 // 获取电池等级信息
                 var gradeResult = await GetBatteryGradesWithTimeout(mesResult.TrayInfo, 500);
-                string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : CommonMethods.curFdConfig.Grade1;
+                string finalGrade = gradeResult.IsConsistent ? gradeResult.Grade : "";
-                string add = (gradeResult.Grade == null || string.IsNullOrEmpty(gradeResult.Grade) )? ",临时使用本机架1垛位的挡位" : "";
+                string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage;
-                string gradeRemark = gradeResult.IsConsistent ? "" : gradeResult.ErrorMessage + add;
 
                 // 反馈电池条码到PLC
                 await WriteBatteryBarcodesToPLC(pf, mesResult.TrayInfo);

JinYuan.Helper/ScanerHook.cs

@@ -84,6 +84,7 @@ namespace JinYuan.Helper
         {
             EventMsg msg = (EventMsg)Marshal.PtrToStructure(lParam, typeof(EventMsg));
             codes.Add(msg);
+            Debug.WriteLine($"scanerEvent: {codes.Result}, msg.message: {msg.message}, msg.paramH: {msg.paramH}");
             if (ScanerEvent != null && msg.message == 13 && msg.paramH > 0 && !string.IsNullOrEmpty(codes.Result))
             {
                 ScanerEvent(codes);

LargeSquareOne/CommunicationEditForm.cs

@@ -177,7 +177,13 @@ namespace LargeSquareOne
         {
             if (e.RowIndex < 0) return;
 
-            editingConfig = TotalGroups[e.RowIndex];
+            // 获取当前行显示的数据
+            var currentRow = groupTable.Rows[e.RowIndex];
+            var config = (PlcGroupConfig)currentRow.DataBoundItem;
+            editingConfig = TotalGroups.First(g =>
+                g.PlcNum == config.PlcNum &&
+                g.GroupName == config.GroupName &&
+                g.Start == config.Start);
 
             // 禁止编辑PLC编号和组名列
             if (groupTable.Columns[e.ColumnIndex].Name == "PlcNum")
@@ -193,7 +199,13 @@ namespace LargeSquareOne
         {
             if (e.RowIndex < 0 || e.RowIndex >= TotalGroups.Count) return;
 
-            var config = TotalGroups[e.RowIndex];
+            // 获取当前行显示的数据
+            var currentRow = groupTable.Rows[e.RowIndex];
+            var curConfig = (PlcGroupConfig)currentRow.DataBoundItem;
+            var config = TotalGroups.First(g =>
+                g.PlcNum == curConfig.PlcNum &&
+                g.GroupName == curConfig.GroupName &&
+                g.Start == curConfig.Start);
             var value = groupTable[e.ColumnIndex, e.RowIndex].Value;
 
             try

LargeSquareOne/FrmParamSet.Designer.cs

@@ -1255,6 +1255,7 @@
             this.tog_finishSwitch.TabIndex = 108;
             this.tog_finishSwitch.TrueColor = System.Drawing.Color.FromArgb(((int)(((byte)(73)))), ((int)(((byte)(119)))), ((int)(((byte)(232)))));
             this.tog_finishSwitch.TrueText = "";
+            this.tog_finishSwitch.CheckedChanged += new System.EventHandler(this.tog_finishSwitch_CheckedChanged);
             // 
             // lblQueryGrade
             //