From ecdabfb38145838737ba1286feb97cf34ad21ffd Mon Sep 17 00:00:00 2001
From: SoulStar <gxhsoulstar@163.com>
Date: Thu, 21 May 2026 18:51:53 +0800
Subject: [PATCH] =?UTF-8?q?debug=20-=20=E5=81=9C=E6=AD=A2=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=86=99=E5=85=A5=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87epc=E5=8E=BB0=E5=A4=84=E7=90=86=E5=8F=96=E6=B6=88=20fe?=
 =?UTF-8?q?at=20-=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84MES=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E5=B9=B6=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Model/domain/MesOrderInfo.cs        |  4 +++
 SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml  |  3 ++-
 .../IndexPage/ChangeTypeViewModel.cs          | 25 +++++++++++--------
 .../IndexPage/ProductionLineViewModel.cs      | 23 ++++++++++++++---
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/SlnMesnac.Model/domain/MesOrderInfo.cs b/SlnMesnac.Model/domain/MesOrderInfo.cs
index b339522..4e9e040 100644
--- a/SlnMesnac.Model/domain/MesOrderInfo.cs
+++ b/SlnMesnac.Model/domain/MesOrderInfo.cs
@@ -30,6 +30,10 @@ namespace SlnMesnac.Model.domain
         public double PlanQty { get; set; }
         [JsonPropertyName("NextProductNo")]
         public int NextProductNo { get; set; }
+        [JsonPropertyName("PlanState")]
+        public string PlanState { get; set; }
+        [JsonPropertyName("PlanStateName")]
+        public string PlanStateName { get; set; }
 
         public DateTime InsertDate { get; set; }
     }
diff --git a/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml b/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
index 1c22228..699cccb 100644
--- a/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
+++ b/SlnMesnac.WPF/Page/IndexPage/ChangeType.xaml
@@ -156,7 +156,8 @@
                                 <DataGridTextColumn Binding="{Binding PlanQty}" Header="计划数量" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                                 <DataGridTextColumn Binding="{Binding NextProductNo}" Header="带号" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
                                 <DataGridTextColumn Binding="{Binding InsertDate}" Header="获取时间" Width="1*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
-                                <DataGridTemplateColumn Header="操作" Width="1.5*">
+                                <DataGridTextColumn Binding="{Binding PlanStateName}" Header="计划状态" Width="0.5*" ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}" />
+                                <DataGridTemplateColumn Header="操作" Width="1*">
                                     <DataGridTemplateColumn.CellTemplate>
                                         <DataTemplate>
                                             <Button Content="开始生产" Height="40" Width="100"  Command="{Binding DataContext.UpdateCommand, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}"
diff --git a/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
index 2f0388c..3b1ce1f 100644
--- a/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexPage/ChangeTypeViewModel.cs
@@ -150,17 +150,8 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
             }
 
             List<DeviceInfoConfig> DeviceInfos = appConfig.deviceInfoConfig.Where(x => x.Collectid == appConfig.StationCode && x.Name == QueryIsCheck.ToString().Trim() && x.Deleteflag == 0).ToList();
+            WeakReferenceMessenger.Default.Send(DeviceInfos[0].Deviceid, "Cancel");
 
-            var res = rfidList.FirstOrDefault(x => x.deviceid == DeviceInfos[0].Deviceid).Set_StopIdentify().GetAwaiter().GetResult();
-            if (res)
-            {
-                MessageBox.Show("停止盘点成功!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                WeakReferenceMessenger.Default.Send(DeviceInfos[0].Deviceid, "Cancel");
-            }
-            else
-            {
-                MessageBox.Show("停止盘点失败!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
         }
 
 
@@ -187,7 +178,7 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
             Console.WriteLine("调用MES获取订单接口");
             //调用MES接口获取生产订单信息
             //MessageBox.Show("MES订单获取成功!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //string response = "{\"code\":200,\"msg\":\"success\",\"data\":[{\"OrderNo\":\"SS042\",\"ProductCode\":\"4030502500100006\",\"ProductType\":\"钢丝带-ST-井下阻燃钢丝带\",\"ProductName\":\"输送带-井下阻燃钢丝带-ST\",\"ProductSpec\":\"1400mm；ST/S2500*1；8+8；MT/MT；D7.2；P15；N89\",\"PlanQty\":130.00,\"NextProductNo\":2}]}\r\n";
+            //string response = "{\"code\":200,\"msg\":\"success\",\"data\":[{\"OrderNo\":\"SS074\",\"ProductCode\":\"4030502500100006\",\"ProductType\":\"钢丝带-ST-井下阻燃钢丝带\",\"ProductName\":\"输送带-井下阻燃钢丝带-ST\",\"ProductSpec\":\"1400mm；ST/S2500*1；8+8；MT/MT；D7.2；P15；N89\",\"PlanQty\":130.00,\"NextProductNo\":1,\"PlanState\":\"7\",\"PlanStateName\":\"终止\"},{\"OrderNo\":\"SZ091\",\"ProductCode\":\"4030502000100017\",\"ProductType\":\"钢丝带-ST-井下阻燃钢丝带\",\"ProductName\":\"输送带-井下阻燃钢丝带-ST；\",\"ProductSpec\":\"1200mm；ST/S2000*1；8+6；MT/MT；D6；P12；N94\",\"PlanQty\":5.00,\"NextProductNo\":2,\"PlanState\":\"7\",\"PlanStateName\":\"终止\"},{\"OrderNo\":\"SS074\",\"ProductCode\":\"4031502500100003\",\"ProductType\":\"钢丝带-ST-井下阻燃钢网防撕裂钢丝带\",\"ProductName\":\"输送带-井下阻燃钢网防撕裂-ST\",\"ProductSpec\":\"1400mm；ST/S2500*1；8S+8；MT/MT；D7.2；P15；N89\",\"PlanQty\":160.00,\"NextProductNo\":14,\"PlanState\":\"7\",\"PlanStateName\":\"终止\"},{\"OrderNo\":\"SS074\",\"ProductCode\":\"4031502500100003\",\"ProductType\":\"钢丝带-ST-井下阻燃钢网防撕裂钢丝带\",\"ProductName\":\"输送带-井下阻燃钢网防撕裂-ST\",\"ProductSpec\":\"1400mm；ST/S2500*1；8S+8；MT/MT；D7.2；P15；N89\",\"PlanQty\":280.00,\"NextProductNo\":14,\"PlanState\":\"7\",\"PlanStateName\":\"终止\"}]}";
             string response = await _httpclient.GetMesOrderInfo(lineno, BeginDate.ToString("yyyy-MM-dd"));
             Console.WriteLine("接收MES接口返回:" + response);
             // 反序列化
@@ -333,3 +324,15 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
 
     }
 }
+
+
+
+//0,新建
+//1, 已审核
+//2, 已下发
+//3, 已接收
+//4, 执行中
+//5, 已完成
+//6, 暂停
+//7, 终止
+//8, 预执行
\ No newline at end of file
diff --git a/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs b/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs
index 3264ae0..5d92567 100644
--- a/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/IndexPage/ProductionLineViewModel.cs
@@ -249,8 +249,8 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
                         Task.Delay(100).Wait();
 
                         //处理写入字符串，并写入
-                        var originBytes = tagInfos[0].EPC.Where(b => b != 0x00).ToArray();
-                        bool writeflag = rfidInfo.Set_Write(originBytes, WriteData).GetAwaiter().GetResult();
+                        //var originBytes = tagInfos[0].EPC.Where(b => b != 0x00).ToArray();
+                        bool writeflag = rfidInfo.Set_Write(tagInfos[0].EPC, WriteData).GetAwaiter().GetResult();
                         WriteTime++;
 
                         if (writeflag) //写入成功
@@ -470,7 +470,18 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
         /// </summary>
         private void StopMessage(object o, string e)
         {
+            var rfid = rfidList.FirstOrDefault(x => x.deviceid == e); 
             StopInventoryTimer(e);
+
+            var res = rfid.Set_StopIdentify().GetAwaiter().GetResult();
+            if (res)
+            {
+                MessageBox.Show("停止盘点成功!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("停止盘点失败!", "系统提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
             CurrentState = "空闲";
         }
 
@@ -625,6 +636,12 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
             // 等待当前批次所有设备检测完成
             await Task.WhenAll(detectionTasks);
         }
+
+        /// <summary>
+        /// 重连核心算法
+        /// </summary>
+        /// <param name="device"></param>
+        /// <returns></returns>
         private async Task DetectSingleDeviceAsync(RfidAbsractFactory device)
         {
             try
@@ -638,7 +655,7 @@ namespace SlnMesnac.WPF.ViewModel.IndexPage
                         Deviceinfo.FirstOrDefault(x => x.Deviceid == device.deviceid).IsOnline = "已连接";
                     }
                 }
-                else
+                else //第一次的逻辑
                 {
                     await Reconnect(device);
                     Deviceinfo.FirstOrDefault(x => x.Deviceid == device.deviceid).IsOnline = "已连接";