From 384dbc75771f77deb98b82825b9929a4421d2200 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 27 May 2025 15:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B2=E6=9F=93=E6=A0=87=E7=AD=BE=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BF=91=E6=95=88=E6=9C=9F=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BE=E5=A4=87id=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs
index 6483942..ae0bc00 100644
--- a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs	
+++ b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs	
@@ -565,6 +565,9 @@ namespace DM_Weight.ViewModels
                             }
                             else
                             {
+                                //查询绑定库位的最近效期绑定到标签
+                                ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs =>cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")&& cs.DrawerNo == item.DrawerNo && cs.ColNo == item.ColNo && cs.Quantity > 0).OrderBy(cs => cs.EffDate).First();
+
                                 DrugInfo drugSelected = item.Drug ?? new DrugInfo();
                                 _portUtil.WindowName = "BindingChannelDialog";
                                 // 向显示屏写入库位信息
@@ -573,6 +576,10 @@ namespace DM_Weight.ViewModels
                                 _portUtil.WriteChannelInfo(2, drugSelected.DrugSpec ?? "", item.DrawerNo, item.ColNo);
                                 Thread.Sleep(200);
                                 _portUtil.WriteChannelInfo(8, drugSelected.Manufactory == null ? "" : drugSelected.Manufactory.Length > 10 ? drugSelected.Manufactory.Substring(0, 10) : drugSelected.Manufactory, item.DrawerNo, item.ColNo);
+                                Thread.Sleep(200); 
+                                _portUtil.WriteChannelInfo(5, (cs == null || cs.EffDate == null) ? "" : cs.EffDate, item.DrawerNo, item.ColNo);
+                                Thread.Sleep(200);
+                                _portUtil.WriteChannelInfo(6, (cs == null || cs.ManuNo == null) ? "" : cs.ManuNo, item.DrawerNo, item.ColNo);
                                 Thread.Sleep(200);
                                 _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                                 Thread.Sleep(200);