From 52d2da4db9fa01bb08ee027dfae11e4220c4a559 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Mon, 23 Jun 2025 16:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E9=80=89=E5=8F=96=E8=8D=AF=E6=97=A0?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=97=B6=E5=86=99=E6=A0=87=E7=AD=BE=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                          |  2 +-
 DM_Weight/Port/PortUtil.cs                    | 35 +++++++++++++------
 .../ViewModels/SelfTakeDialogViewModel.cs     |  6 ++++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 8d3fc20..c83a765 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -42,7 +42,7 @@
 		<!-- 抽屉串口的串口号 -->
 		<add key="DrawerPortPath" value="COM1" />
 		<!-- can总线串口的串口号 -->
-		<add key="CanBusPortPath" value="COM9" />
+		<add key="CanBusPortPath" value="COM31" />
 		<!-- 条码枪串口的串口号 -->
 		<add key="ScanCodePortPath" value="COM11" />
 		<!-- 抽屉串口的串口号 --><!--
diff --git a/DM_Weight/Port/PortUtil.cs b/DM_Weight/Port/PortUtil.cs
index 6ef87b5..f24777d 100644
--- a/DM_Weight/Port/PortUtil.cs
+++ b/DM_Weight/Port/PortUtil.cs
@@ -1052,6 +1052,9 @@ namespace DM_Weight.Port
                 }
                 byte[] buffer = new byte[] { 0xaa, (byte)channel, 1, (byte)type, 0, 0, 0, 0xee };
                 canBusSerial.Write(buffer, 0, 8);
+                logger.Info(Convert.ToHexString(buffer)); 
+                //byte[] bufferReturn = GetBufferByPort(canBusSerial, 8).Result;
+                //logger.Info($"写入数量返回:" + Convert.ToHexString(bufferReturn));
                 //await Task.Delay(20);
                 Thread.Sleep(20);
                 buffer[4] = 1;
@@ -1060,6 +1063,9 @@ namespace DM_Weight.Port
                     buffer[5] = contentBuf[i];
                     buffer[6] = contentBuf[i + 1];
                     canBusSerial.Write(buffer, 0, 8);
+                    logger.Info(Convert.ToHexString(buffer));
+                    //byte[] fBufferReturn = GetBufferByPort(canBusSerial, 8).Result;
+                    //logger.Info($"写入数量返回:" + Convert.ToHexString(fBufferReturn));
                     //await Task.Delay(20);
                     Thread.Sleep(20);
                 }
@@ -1067,17 +1073,23 @@ namespace DM_Weight.Port
                 buffer[5] = 0;
                 buffer[6] = 0;
                 canBusSerial.Write(buffer, 0, 8);
+                logger.Info(Convert.ToHexString(buffer));
+                //byte[] eBufferReturn = GetBufferByPort(canBusSerial, 8).Result;
+                //logger.Info($"写入数量返回:" + Convert.ToHexString(eBufferReturn));
                 //await Task.Delay(20);
                 Thread.Sleep(20);
             }
             catch (Exception ex)
             {
-                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
                 {
-                    EventType = util.EventType.OPENERROR,
-                    WindowName = WindowName,
-                    Message = $"2.4寸汉显屏异常{ex.Message}"
-                });
+                    _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                    {
+                        EventType = util.EventType.OPENERROR,
+                        WindowName = WindowName,
+                        Message = $"2.4寸汉显屏异常{ex.Message}"
+                    });
+                }));
                 logger.Info($"2.4寸汉显屏异常：ex:{ex.Message}");
             }
         }
@@ -1166,12 +1178,15 @@ namespace DM_Weight.Port
             }
             catch (Exception ex)
             {
-                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
                 {
-                    EventType = util.EventType.OPENERROR,
-                    WindowName = WindowName,
-                    Message = $"操作发生异常{ex.InnerException}"
-                });
+                    _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                    {
+                        EventType = util.EventType.OPENERROR,
+                        WindowName = WindowName,
+                        Message = $"操作发生异常{ex.InnerException}"
+                    });
+                }));
                 logger.Info($"操作发生异常：ex:{ex.InnerException}");
             }
         }
diff --git a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
index e2ff876..ebbd631 100644
--- a/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
+++ b/DM_Weight/ViewModels/SelfTakeDialogViewModel.cs
@@ -394,6 +394,12 @@ namespace DM_Weight.ViewModels
                                         _portUtil.WriteQuantity(csList[i].DrawerNo, csList[i].ColNo, totalQuantity);
                                         Thread.Sleep(200);
                                     }
+                                    else
+                                    {
+                                        //库位库存为0
+                                        _portUtil.WriteQuantity(singleChannels[i].DrawerNo, singleChannels[i].ColNo, 0);
+                                        Thread.Sleep(200);
+                                    }
                                 }
                             }
                         }