添加批次信息，修改称重及写标签、打开药盒代码

DM_Weight/App.config

@@ -3,7 +3,7 @@
   <connectionStrings>
 	<!-- 数据库连接字符串 -->
 	<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
-	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xichang_db;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=test_db;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
@@ -12,7 +12,7 @@
 	<appSettings>
 		
 		<!-- 设备id -->
-		<add key="machineId" value="DM1" />
+		<add key="machineId" value="DM2" />
 		<!--2023/7/13 药房代码 有则写无则空 -->
 		<add key="storage" value="" />
 		<!-- 登录模式 1单人登录2双人登录 -->
@@ -20,7 +20,7 @@
 		<!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 -->
 		<add key="firstLogin" value="operator" />
 		<!-- 按处方还药或者按取药记录还药 1:处方（ReturnDrugWindow2）2：药品（ReturnDrugWindow）-->
-		<add key="returnDrugMode" value="1" />
+		<add key="returnDrugMode" value="2" />
 		<!-- 1:多处方取药 0:无多处方取药-->
 		<add key="manyOrder" value="1" />
 		<!-- 自动退出时间，单位秒，为0时不自动退出 -->
@@ -40,7 +40,7 @@
 		<!-- 抽屉串口的串口号 -->
 		<add key="DrawerPortPath" value="COM1" />
 		<!-- can总线串口的串口号 -->
-		<add key="CanBusPortPath" value="COM9" />
+		<add key="CanBusPortPath" value="COM30" />
 		<!-- 条码枪串口的串口号 -->
 		<add key="ScanCodePortPath" value="COM8" />
 		<!-- 冰箱的串口号 -->
@@ -58,7 +58,7 @@
 		<!-- 指纹机号码 -->
 		<add  key="machineNumber" value="1"/>
 		<!-- 指纹机ip -->
-		<add  key="fingerIp" value="192.168.1.201"/>
+		<add  key="fingerIp" value="192.168.50.201"/>
 		
 		<!-- 多处方取药 0:不启用 1：启用-->
 		<add  key="MultiOrder" value="0"/>
@@ -73,11 +73,14 @@
 		<add key="temperatureValue" value="3.2"/>
 
 		<!--温度查询定时执行时间-->
-		<add key="Interval" value="60000"/>
+		<add key="Interval" value="0"/>
 		<!--冰箱状态1关闭；0打开-->
-		<add key="FridgeState" value="0"/>
+		<add key="FridgeState" value="1"/>
 		<!--报警状态1关闭；0打开-->
 		<add key="AlarmState" value="0"/>
-
+		<!--冰箱不在区间超时时间（超过指定的时间仍不在区间则提示）单位分-->
+		<add key="OutRangeTime" value="20"/>
+		<!--获取冰箱温度定时 单位秒-->
+		<add key="TemperatureTimer" value="10"/>
 	</appSettings>
 </configuration>

DM_Weight/App.xaml.cs

@@ -177,6 +177,7 @@ namespace DM_Weight
             containerRegistry.RegisterForNavigation<OrderReturnDialog, OrderReturnDialogViewModel>();
             // 还空瓶页面
             containerRegistry.RegisterForNavigation<ReturnEmptyWindow, ReturnEmptyWindowViewModel>();
+            containerRegistry.RegisterForNavigation<ReturnWithOrderWindow, ReturnWithOrderWindowViewModel>();
             // 归还空瓶模态框
             containerRegistry.RegisterDialog<ReturnEmptyDialog>();
             containerRegistry.RegisterForNavigation<ReturnEmptyDialog, ReturnEmptyDialogViewModel>();
@@ -223,6 +224,10 @@ namespace DM_Weight
 
             containerRegistry.RegisterForNavigation<ShowMessageDialog, ShowMessageDialogViewModel>();
 
+            containerRegistry.RegisterForNavigation<WarnDialog, WarnDialogViewModel>();
+
+            containerRegistry.RegisterForNavigation<BiaoDingDialog, BiaoDingDialogViewModel>();
+
         }
         private void PrismApplication_Startup(object sender, StartupEventArgs e)
         {

DM_Weight/Common/TemperatureRangeRule.cs

@@ -23,11 +23,18 @@ namespace DM_Weight.Common
                 string[] rang = value.ToString().Split('-');
                 if (rang.Length >= 2)
                 {
-                    bool bSRange = int.TryParse(rang[0], out int sRange);
+                    bool bSRange = float.TryParse(rang[0], out float sRange);
-                    bool bERange = int.TryParse(rang[1], out int eRange);
+                    bool bERange = float.TryParse(rang[1], out float eRange);
                     if (bSRange && bERange)
                     {
-                        if (sRange < 2 || eRange > 8)
+                        string[] sList = sRange.ToString().Split('.');
+                        string[] eList = eRange.ToString().Split(".");
+                        if ((sList.Length > 1 && sList[1].Length > 1) || (eList.Length > 1 && eList[1].Length > 1))
+                        {
+                            tips = "小数点后保留1位";
+                            return new ValidationResult(flag, tips);
+                        }
+                        if ((sRange < 2 || eRange > 8 || sRange > 8 || eRange < 2))
                         {
                             tips = "温度区间设置2-8度，请检查输入";
                             return new ValidationResult(flag, tips);

DM_Weight/Converter/OpenBoxConverter.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace DM_Weight.Converter
+{
+    internal class OpenBoxConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            bool status = bool.Parse(value.ToString());
+            if(status)
+            {
+                return Visibility.Visible;
+            }
+            else
+            {
+                return Visibility.Collapsed;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

DM_Weight/Converter/StatusConverter.cs

@@ -73,6 +73,42 @@ namespace DM_Weight.Converter
                     return Visibility.Collapsed;
                 }
             }
+            //清空按钮的显示与隐藏
+            if(parameter.ToString().Equals("clearVisuability"))
+            {
+                if (status == 1)
+                {
+                    return Visibility.Visible;
+                }
+                else
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+            //清空按钮的操作状态
+            if(parameter.ToString().Equals("clearBtnLoading"))
+            {
+                if (status == 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            //标定按钮的操作状态
+            if(parameter.ToString().Equals("biaoDingBtnLoading"))
+            {
+                if (status >3)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
 
             return Visibility.Collapsed;
         }

DM_Weight/DM_Weight.csproj

@@ -70,6 +70,7 @@
     <PackageReference Include="MaterialDesignThemes" Version="4.8.0" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
     <PackageReference Include="Prism.Unity" Version="8.1.97" />
+    <PackageReference Include="SharpPromise" Version="1.7.0" />
     <PackageReference Include="SqlSugarCore" Version="5.1.4.67" />
     <PackageReference Include="SuperSimpleTcp" Version="3.0.10" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />

DM_Weight/Models/MachineRecord.cs

@@ -1,4 +1,5 @@
-using SqlSugar;
+using Prism.Mvvm;
+using SqlSugar;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,7 +10,7 @@ using System.Threading.Tasks;
 namespace DM_Weight.Models
 {
     [SugarTable("dm_machine_record")]
-    public class MachineRecord
+    public class MachineRecord:BindableBase
     {
         /// <summary>
         /// 主键 
@@ -114,6 +115,27 @@ namespace DM_Weight.Models
         ///</summary>
         [SugarColumn(ColumnName = "return_quantity2", IsOnlyIgnoreInsert = true)]
         public int ReturnQuantity2 { get; set; }
+        /// <summary>
+        /// 当前还空瓶量 
+        /// 默认值: 0
+        ///</summary>
+        private int _currentReturn;
+        [SugarColumn(IsIgnore = true)]
+        public int CurrentReturn 
+        { 
+            get=>_currentReturn; 
+            set 
+            {
+                if (value > CanReturnQuantity) 
+                { 
+                    throw new ArgumentException(""); 
+                }
+                SetProperty(ref _currentReturn, value); 
+            } 
+        }
+
+
+
         /// <summary>
         /// 取药记录id 
         ///</summary>
@@ -143,5 +165,10 @@ namespace DM_Weight.Models
         /// </summary>
         [SugarColumn(ColumnName = "manunoQuantity")]
         public int? ManunoQuantity { get; set; }
+
+
+        private DrugManuNo? _drugManuNo;
+        [SugarColumn(IsIgnore = true)]
+        public DrugManuNo? drugManuNo { get => _drugManuNo; set => SetProperty(ref _drugManuNo, value); }
     }
 }

DM_Weight/Models/OrderDetail.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Prism.Mvvm;
 using SqlSugar;
 namespace DM_Weight.Models
 {
@@ -8,12 +9,12 @@ namespace DM_Weight.Models
     /// 
     ///</summary>
     [SugarTable("order_detail")]
-    public class OrderDetail
+    public class OrderDetail: BindableBase
     {
         /// <summary>
         ///  
         ///</summary>
-        [SugarColumn(ColumnName = "id", IsPrimaryKey = true, IsIdentity = true)]
+        [SugarColumn(ColumnName = "id", IsIdentity = true, IsPrimaryKey = true)]
         public int Id { get; set; }
         /// <summary>
         ///  
@@ -29,6 +30,11 @@ namespace DM_Weight.Models
         /// <summary>
         ///  
         ///</summary>
+        [SugarColumn(ColumnName = "order_id")]
+        public string OrderId { get; set; }
+        /// <summary>
+        ///  
+        ///</summary>
         [SugarColumn(ColumnName = "order_no")]
         public string OrderNo { get; set; }
         /// <summary>
@@ -50,6 +56,12 @@ namespace DM_Weight.Models
 
         [Navigate(NavigateType.ManyToOne, nameof(DrugId))]
         public DrugInfo DrugInfo { get; set; }
+
+        [Navigate(NavigateType.ManyToMany, nameof(DrugId))]
+        public List<DrugInfo> DrugInfos { get; set; }
+
+        [Navigate(NavigateType.ManyToMany, nameof(DrugId))]
+        public List<MachineRecord> MachineRecords { get; set; }
         /// <summary>
         ///  
         ///</summary>
@@ -127,5 +139,33 @@ namespace DM_Weight.Models
         ///</summary>
         [SugarColumn(ColumnName = "use_dosage")]
         public string UseDosage { get; set; }
+
+        /// <summary>
+        /// 已还药数
+        /// </summary>
+        private int _returnQuantity = 0;
+        [SugarColumn(ColumnName = "return_quantity")]
+        public int ReturnQuantity
+        {
+            get;
+            set;
+        }  
+        //当前还药数
+        private int currentReturnQuantity;
+        [SugarColumn(IsIgnore =true)]
+        public int CurrentReturnQuantity
+        {
+            get => currentReturnQuantity;
+            set
+            {
+                //if (value > Quantity - ReturnQuantity)
+                //    throw new ArgumentException("数量有误");
+                SetProperty(ref currentReturnQuantity, value);
+            }
+        }
+
+        private OrderInfo? _orderInfo;
+        [Navigate(NavigateType.OneToOne,nameof(OrderNo))]
+        public OrderInfo orderInfo { get => _orderInfo; set => SetProperty(ref _orderInfo, value); }
     }
 }

DM_Weight/Models/OrderFinish.cs

@@ -27,6 +27,19 @@ namespace DM_Weight.Models
 
         [SugarColumn(ColumnName = "operator")]
         public string Operator { get; set; }
-        
+
+        [SugarColumn(ColumnName = "drug_id")]
+        public string DrugId { get; set; }
+
+        [SugarColumn(ColumnName = "quantity")]
+        public int Quantity { get; set; }
+
+        //[SugarColumn(ColumnName = "manu_no")]
+        //public string ManuNo { get; set; }
+
+        //[SugarColumn(ColumnName = "eff_date")]
+        //public string EffDate { get; set; }
+
+
     }
 }

DM_Weight/Models/OrderInfo.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Prism.Mvvm;
 using SqlSugar;
 namespace DM_Weight.Models
 {
@@ -8,7 +9,7 @@ namespace DM_Weight.Models
     /// 
     ///</summary>
     [SugarTable("order_info")]
-    public class OrderInfo
+    public class OrderInfo:BindableBase
     {
 
 
@@ -16,7 +17,7 @@ namespace DM_Weight.Models
         /// 是否选中
         /// </summary>
         [SugarColumn(IsIgnore = true)]
-        public bool ItemIsChecked { get; set; }
+        public bool ItemIsChecked { get; set; } = false;
 
         /// <summary>
         ///  
@@ -197,6 +198,10 @@ namespace DM_Weight.Models
         //[SugarColumn(ColumnName = "identity")]
         //public string Identity { get; set; }
 
+        private OrderDetail? _orderDetail;
+        [Navigate(NavigateType.OneToOne, nameof(OrderDetail.OrderNo))]
+        public OrderDetail orderDetail { get=> _orderDetail; set=>SetProperty(ref _orderDetail, value); }
+        
 
     }
 }

DM_Weight/Port/PortUtil.cs

@@ -25,6 +25,7 @@ using DM_Weight.Views;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using DM_Weight.Common;
+using System.Threading;
 
 namespace DM_Weight.Port
 {
@@ -57,6 +58,10 @@ namespace DM_Weight.Port
         public int DrawerNo { get; set; }
         // 当前操作的库位号列表
         public int[] ColNos { get; set; } = new int[] { };
+        // 当前操作查数的库位号列表
+        public List<int> ColNoLst { get; set; } = new List<int>();
+        // 当前操作开药盒的库位号
+        public int OpenBoxColNo { get; set; } = 0;
 
         // 当前操作的窗口
         public string WindowName { get; set; }
@@ -72,7 +77,7 @@ namespace DM_Weight.Port
         public int BoardType { get; set; } = (Int32)BoardTypeEnum.separation;
         public int DrawerType { get; set; } = (Int32)DrawerTypeEnum.drawerTypeOne;
 
-        private int[] BeforeQuantity { get; set; } = new int[] { };
+        private int[] BeforeQuantity { get; set; } = new int[9];
         private int[] AfterQuantity { get; set; } = new int[] { };
 
         // 整体流程状态
@@ -108,18 +113,18 @@ namespace DM_Weight.Port
                     // 失能
                     CloseStorage();
                 }
-                if (BoardType == (Int32)BoardTypeEnum.weigh)
+                //if (BoardType == (Int32)BoardTypeEnum.weigh)
-                {
+                //{
-                    // 失能
+                //    // 失能
-                    await BoxLockLightOff2();
+                //    await BoxLockLightOff2();
-                }
+                //}
-                if (BoardType == (Int32)BoardTypeEnum.weighSmartBox || BoardType == (Int32)BoardTypeEnum.weighBox)
+                //if (BoardType == (Int32)BoardTypeEnum.weighSmartBox || BoardType == (Int32)BoardTypeEnum.weighBox)
-                {
+                //{
-                    // 失能
+                //    // 失能
-                    await BoxLockLightOff();
+                //    await BoxLockLightOff();
-                    // 失能
+                //    // 失能
-                    await BoxLockLightOff2();
+                //    await BoxLockLightOff2();
-                }
+                //}
             }
             Operate = false;
             dateTime = DateTime.Now;
@@ -219,9 +224,16 @@ namespace DM_Weight.Port
                         }
                         if (BoardType == (Int32)BoardTypeEnum.weigh || BoardType == (Int32)BoardTypeEnum.weighSmartBox || BoardType == (Int32)BoardTypeEnum.weighBox)
                         {
-                            int[] quantity = await CheckQuantityByAddr2();
+                            if (WindowName != "DrawerTakeDrugWindow" && WindowName != "DrawerAddDrugWindow")
-                            BeforeQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray();
+                            {
-                            logger.Info($"BeforeQuantity{string.Join(",", BeforeQuantity)}");
+                                int[] quantity = await CheckQuantityByAddr2();
+                                BeforeQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray();
+                                logger.Info($"BeforeQuantity{string.Join(",", BeforeQuantity)}");
+                            }
+                            else
+                            {
+                                logger.Info($"{WindowName}开锁前先不查数");
+                            }
                         }
 
                         byte[] buffer = await OpenDrawer();
@@ -259,15 +271,38 @@ namespace DM_Weight.Port
                                 }
                             }
                             // 药盒
-                            if (BoardType == (Int32)BoardTypeEnum.box)
+                            //if (BoardType == (Int32)BoardTypeEnum.box)
+                            //{
+                            //    //抽屉加药和抽屉取药不开药盒锁（单独开）
+                            //    if (WindowName != "DrawerTakeDrugWindow" || WindowName != "DrawerAddDrugWindow")
+                            //    {
+                            //        logger.Info("开锁后药盒自动打开");
+                            //        //// 药盒指示灯使能
+                            //        //await BoxLockLightOn();
+                            //        await OpenBox();
+                            //    }
+                            //    else
+                            //    {
+                            //        logger.Info("开锁后先不开药盒");
+                            //        //抽屉加药和抽屉取药根据点的开药盒按钮的库位查数
+                            //        ColNos = null;
+                            //    }
+                            //}
+                            if (BoardType == (Int32)BoardTypeEnum.box || BoardType == (Int32)BoardTypeEnum.weighSmartBox || BoardType == (Int32)BoardTypeEnum.weighBox)
                             {
-                                // 药盒指示灯使能
+                                //抽屉加药和抽屉取药不开药盒锁（单独开）
-                                await BoxLockLightOn();
+                                if (WindowName != "DrawerTakeDrugWindow" && WindowName != "DrawerAddDrugWindow")
-                            }
+                                {
-                            if (BoardType == (Int32)BoardTypeEnum.weigh || BoardType == (Int32)BoardTypeEnum.weighSmartBox || BoardType == (Int32)BoardTypeEnum.weighBox)
+                                    logger.Info($"开锁后药盒自动打开{WindowName}");
-                            {
+                                    // 药盒指示灯使能
-                                // 药盒指示灯使能
+                                    await OpenBox();
-                                await BoxLockLightOn2();
+                                }
+                                else
+                                {
+                                    logger.Info($"{WindowName}开锁后先不开药盒");
+                                    //抽屉加药和抽屉取药根据点的开药盒按钮的库位查数
+                                    ColNos = null;
+                                }
                             }
                             // 返回消息  抽屉已经打开
                             _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
@@ -378,42 +413,60 @@ namespace DM_Weight.Port
                         {
                             // 继续查询抽屉药品数量
                             // 查询抽屉药品数量
-                            int[] quantity = await CheckQuantityByAddr2();
+                            if (ColNos != null && ColNos.Length > 0 || OpenBoxColNo > 0)
-                            AfterQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray();
-                            logger.Info($"AfterQuantity{string.Join(",", AfterQuantity)}");
-                            int[] Quantitys = new int[BeforeQuantity.Length];
-                            for (int i = 0; i < BeforeQuantity.Length; i++)
                             {
-                                // 取药
+                                //开药盒锁
-                                if (Array.IndexOf(TakeNames, WindowName) > -1)
+                                if (OpenBoxColNo > 0&&(WindowName== "DrawerTakeDrugWindow" || WindowName== "DrawerAddDrugWindow"))
                                 {
-                                    Quantitys[i] = BeforeQuantity[i] - AfterQuantity[i];
+                                    //开药盒锁前先查数
+                                    int beforeQuantity = await CheckQuantityForSingle(OpenBoxColNo);
+                                    BeforeQuantity[OpenBoxColNo - 1] = beforeQuantity;
+                                    logger.Info($"BeforeQuantity:{OpenBoxColNo}-{beforeQuantity}数量{string.Join(",", BeforeQuantity)}");
+                                    OpenBoxByColNo(OpenBoxColNo);
+                                    OpenBoxColNo = 0;
+                                    await Task.Delay(TimeSpan.FromMilliseconds(20));
                                 }
-                                // 加药
+                                int[] quantity = await CheckQuantityByAddr2();
-                                if (Array.IndexOf(AddNames, WindowName) > -1)
+                                AfterQuantity = quantity.Select(it => Convert.ToInt32(it)).ToArray();
+                                logger.Info($"AfterQuantity{string.Join(",", AfterQuantity)}");
+                                int[] Quantitys = new int[BeforeQuantity.Length];
+                                for (int i = 0; i < BeforeQuantity.Length; i++)
                                 {
-                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                    // 取药
-                                }
+                                    if (Array.IndexOf(TakeNames, WindowName) > -1)
-                                // 盘点
+                                    {
-                                if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                        Quantitys[i] = BeforeQuantity[i] - AfterQuantity[i];
-                                {
+                                    }
-                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                    // 加药
-                                }
+                                    if (Array.IndexOf(AddNames, WindowName) > -1)
-                                // 空瓶
+                                    {
-                                if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                        Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
-                                {
+                                    }
-                                    Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                    // 盘点
-                                }
+                                    if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                    {
+                                        Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                    }
+                                    // 空瓶
+                                    if (Array.IndexOf(CheckNames, WindowName) > -1)
+                                    {
+                                        Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                    }
 
+                                }
+                                // 告诉前台数据变化
+                                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                                {
+                                    EventType = util.EventType.UPDATEQUANTITY,
+                                    WindowName = WindowName,
+                                    Quantitys = Quantitys
+                                });
+                                logger.Info($"数量变化【{string.Join(",", Quantitys)}】");
                             }
-                            // 告诉前台数据变化
+                            else
-                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
                             {
-                                EventType = util.EventType.UPDATEQUANTITY,
+                                logger.Info("无库位，不查数");
-                                WindowName = WindowName,
+                            }
-                                Quantitys = Quantitys
-                            });
-                            logger.Info($"数量变化【{string.Join(",", Quantitys)}】");
 
                         }
                         // 继续监听抽屉状态
@@ -430,16 +483,16 @@ namespace DM_Weight.Port
 
                         }
                         // 药盒
-                        if (BoardType == (Int32)BoardTypeEnum.box)
+                        //if (BoardType == (Int32)BoardTypeEnum.box)
-                        {
+                        //{
-                            // 药盒指示灯失能
+                        //    // 药盒指示灯失能
-                            await BoxLockLightOff();
+                        //    await BoxLockLightOff();
-                        }
+                        //}
-                        if (BoardType == (Int32)BoardTypeEnum.weigh || BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                        //if (BoardType == (Int32)BoardTypeEnum.weigh || BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                        {
+                        //{
-                            // 药盒指示灯使能
+                        //    // 药盒指示灯使能
-                            await BoxLockLightOff2();
+                        //    await BoxLockLightOff2();
-                        }
+                        //}
                         string _WindowName = WindowName;
                         logger.Info($"抽屉【{DrawerNo}】已关闭");
                         // 重新初始化数据
@@ -706,7 +759,7 @@ namespace DM_Weight.Port
             }
             if (_length != length)
             {
-                  throw new TimeoutException($"串口【{serialPort.PortName}】交互超时");
+                throw new TimeoutException($"串口【{serialPort.PortName}】交互超时");
             }
             serialPort.Read(buffer, 0, length);
             // }
@@ -735,27 +788,45 @@ namespace DM_Weight.Port
         // 打开抽屉
         public async Task<byte[]> OpenDrawer()
         {
-            drawerSerial.DiscardInBuffer();
+            try
-            byte[] buffer = new byte[] { 0xaa, 0x41, (byte)DrawerNo, 0xee };
-            if (_drawerProtocol == 485)
             {
-                if (DrawerNo > 8)
-                {
-                    buffer = new byte[] { 0xaa, 0x21, (byte)(DrawerNo - 8), 0xee };
-                }
-                else
-                {
-                    buffer = new byte[] { 0xaa, 0x11, (byte)DrawerNo, 0xee };
-                }
 
+                drawerSerial.DiscardInBuffer();
+                byte[] buffer = new byte[] { 0xaa, 0x41, (byte)DrawerNo, 0xee };
+                if (_drawerProtocol == 485)
+                {
+                    if (DrawerNo > 8)
+                    {
+                        buffer = new byte[] { 0xaa, 0x21, (byte)(DrawerNo - 8), 0xee };
+                    }
+                    else
+                    {
+                        buffer = new byte[] { 0xaa, 0x11, (byte)DrawerNo, 0xee };
+                    }
+
+                }
+                logger.Info($"打开抽屉，串口数据：{Convert.ToHexString(buffer)}");
+                drawerSerial.Write(buffer, 0, 4);
+
+                return await GetBufferByPort(drawerSerial, 11);
+            }
+            catch (Exception ex)
+            {
+                logger.Info($"抽屉【{DrawerNo}】打开失败");
+                // 返回消息  抽屉打开失败
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"抽屉【{DrawerNo}】打开失败"
+                });
+                // 重新初始化数据
+                ResetData();
+                return null;
             }
-            logger.Info($"打开抽屉，串口数据：{Convert.ToHexString(buffer)}");
-            drawerSerial.Write(buffer, 0, 4);
-
-            return await GetBufferByPort(drawerSerial, 11);
         }
 
-        private bool DrawerState(int[] r)
+        public bool DrawerState(int[] r)
         {
             int index = DrawerNo > 8 ? DrawerNo - 7 : DrawerNo + 1;
             return r[index] == 0;
@@ -947,6 +1018,65 @@ namespace DM_Weight.Port
         #endregion
 
         #region 药盒操作
+        //无按钮开药盒
+        /// <summary>
+        /// 开指定库位的药盒
+        /// </summary>
+        /// <param name="ColNo"></param>
+        /// <returns></returns>
+        public async Task<bool> OpenBoxByColNo(int colNo)
+        {
+            if (colNo > 0)
+            {
+                canBusSerial.DiscardInBuffer();
+                int ColNo = colNo;
+                int[] iNum = new int[] { 4, 2, 1 };
+                var colNo2 = ColNo % 3 > 0 ? (ColNo % 3) - 1 : 2;
+                var bColNo = iNum[colNo2];
+                decimal decolNO = (decimal)ColNo;
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 5, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
+                //byte[] buffer = new byte[] { 0xaa, 0x11, 0x05,0x01, 0x00,0x00,0x00,0xee};
+                logger.Info($"开药盒{ColNo}【{Convert.ToHexString(buffer)}】");
+                canBusSerial.Write(buffer, 0, 8);
+                byte[] retBuffer = await GetBufferByPort(canBusSerial, 8);
+                logger.Info($"开药盒返回{ColNo}【{Convert.ToHexString(retBuffer)}】");
+                int[] r = retBuffer.Select(it => Convert.ToInt32(it)).ToArray();
+                if (r[4] > 0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
+            return false;
+        }
+        /// <summary>
+        /// 打开药盒
+        /// </summary>
+        /// <param name="ColNo"></param>
+        /// <returns></returns>
+        public async Task OpenBox()
+        {
+            for (int i = 0; i < ColNos.Length; i++)
+            {
+                canBusSerial.DiscardInBuffer();
+                int ColNo = ColNos[i];
+                int[] iNum = new int[] { 4, 2, 1 };
+                var colNo2 = ColNo % 3 > 0 ? (ColNo % 3) - 1 : 2;
+                var bColNo = iNum[colNo2];
+                decimal decolNO = (decimal)ColNo;
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, 5, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
+                //byte[] buffer = new byte[] { 0xaa, 0x11, 0x05,0x01, 0x00,0x00,0x00,0xee};
+                logger.Info($"{Convert.ToHexString(buffer)}");
+                canBusSerial.Write(buffer, 0, 8);
+                await Task.Delay(800);
+            }
+
+        }
         // 指定药盒指示灯开启使能开锁
         public async Task BoxLockLightOn()
         {
@@ -962,12 +1092,15 @@ namespace DM_Weight.Port
         // 指定药盒指示灯开启失能开锁
         public async Task BoxLockLightOff()
         {
-            for (int i = 0; i < ColNos.Length; i++)
+            if (ColNos != null)
             {
-                var channel = Convert.ToInt32((DrawerNo * 10 + ColNos[i]).ToString(), 16);
+                for (int i = 0; i < ColNos.Length; i++)
-                byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x04, 0x00, 0x00, 0x00, 0x00, 0xee };
+                {
-                canBusSerial.Write(buffer, 0, 8);
+                    var channel = Convert.ToInt32((DrawerNo * 10 + ColNos[i]).ToString(), 16);
-                await Task.Delay(TimeSpan.FromMilliseconds(20));
+                    byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x04, 0x00, 0x00, 0x00, 0x00, 0xee };
+                    canBusSerial.Write(buffer, 0, 8);
+                    await Task.Delay(TimeSpan.FromMilliseconds(20));
+                }
             }
         }
         // 指定药盒状态查询
@@ -995,6 +1128,10 @@ namespace DM_Weight.Port
             byte[] buffer = new byte[] { 0xaa, (byte)(0xf0 + DrawerNo), 0x05, 0x00, 0x00, 0x00, 0x00, 0xee };
             canBusSerial.Write(buffer, 0, 8);
         }
+
+
+
+
         #endregion
 
         private string trim(string text)
@@ -1129,6 +1266,128 @@ namespace DM_Weight.Port
 
 
 
+        #endregion
+        #region 药盒标签显示屏
+        //清屏
+        public void ClearContentMethod(int drawerNo, int colNo)
+        {
+            decimal deColNo = colNo;
+            //var channel = drawerNo * 10 + Math.Ceiling(deColNo / 3);
+            int[] iNum = new int[] { 3, 2, 1 };
+            var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
+            var bColNo = Convert.ToInt32((iNum[colNo2] + 10).ToString(), 16);
+            //var index = Convert.ToInt32(((colNo % 3 == 0 ? 3 : colNo % 3)+10).ToString(),16);
+            int channel = Convert.ToInt32((drawerNo * 10 + Math.Ceiling((decimal)colNo / 3)).ToString(), 16);
+            byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x09, (byte)bColNo, 0, 0, 0, 0xee };
+            canBusSerial.Write(buffer, 0, 8);
+            logger.Info($"清屏指令：{Convert.ToHexString(buffer)}");
+        }
+        //刷新内容
+        public async void ShowContentMethod(int drawerNo, int colNo)
+        {
+            int channel = Convert.ToInt32((drawerNo * 10 + Math.Ceiling((decimal)colNo / 3)).ToString(), 16);
+            byte[] buffer = new byte[] { 0xaa, (byte)channel, 0x0c, 0x00, 0x00, 0x00, 0x00, 0xee };
+            logger.Info($"刷新内容指令：{Convert.ToHexString(buffer)}");
+            canBusSerial.Write(buffer, 0, 8);
+        }
+        // 基础数据写入方法
+        public async void WriteChannelInfoMethod(int type, string content, int drawerNo, int colNo)
+        {
+            try
+            {
+                canBusSerial.DiscardInBuffer();
+                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+                if (content.Length > 10)
+                {
+                    content = content.Substring(0, 10);
+                }
+                byte[] contentBuf = Encoding.GetEncoding("gb2312").GetBytes(trim(content));
+                int channel = Convert.ToInt32((drawerNo * 10 + Math.Ceiling((decimal)colNo / 3)).ToString(), 16);
+                int[] iNum = new int[] { 3, 2, 1 };
+                var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
+                var bColNo = iNum[colNo2] + 160;
+                //var index = (colNo % 3 == 0 ? 3 : colNo % 3)+160;
+                if (contentBuf.Length % 2 != 0)
+                {
+                    Array.Resize(ref contentBuf, contentBuf.Length + 1);
+                }
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, (byte)bColNo, (byte)type, 0, 0, 0, 0xee };
+
+
+                canBusSerial.Write(buffer, 0, 8);
+                logger.Info($"开始写标签指令：{Convert.ToHexString(buffer)}");
+                Thread.Sleep(20);
+                buffer[4] = 1;
+                for (int i = 0; i < contentBuf.Length; i += 2)
+                {
+                    buffer[5] = contentBuf[i];
+                    buffer[6] = contentBuf[i + 1];
+                    canBusSerial.Write(buffer, 0, 8);
+                    logger.Info($"写标签指令：{Convert.ToHexString(buffer)}");
+                    Thread.Sleep(50);
+                }
+                buffer[4] = 2;
+                buffer[5] = 0;
+                buffer[6] = 0;
+                canBusSerial.Write(buffer, 0, 8);
+                logger.Info($"结束写标签指令：{Convert.ToHexString(buffer)}");
+                Thread.Sleep(20);
+
+            }
+            catch (Exception ex)
+            {
+                _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}");
+            }
+        }
+
+        public async Task WriteQuantityMethod(int quantity, int drawerNo, int colNo)
+        {
+            try
+            {
+                logger.Info($"写数量：{drawerNo}-{colNo}：{quantity}");
+                canBusSerial.DiscardInBuffer();
+                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+                string strQuantity = quantity.ToString("X");
+                if (strQuantity.Length % 2 != 0)
+                {
+                    strQuantity = "0" + strQuantity;
+                }
+                int channel = Convert.ToInt32((drawerNo * 10 + Math.Ceiling((decimal)colNo / 3)).ToString(), 16);
+                int[] iNum = new int[] { 3, 2, 1 };
+                var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
+                var bColNo = iNum[colNo2] + 160;
+                byte[] buffer = new byte[] { 0xaa, (byte)channel, (byte)bColNo, 0xf2, 01, 0, 0, 0xee };
+                if (strQuantity.Length >= 4)
+                {
+                    buffer[5] = Convert.ToByte(strQuantity.Substring(0, 2), 16);
+                    buffer[6] = Convert.ToByte(strQuantity.Substring(2, 2), 16);
+                }
+                else
+                {
+
+                    buffer[6] = Convert.ToByte(strQuantity.Substring(0, 2), 16);
+                }
+                canBusSerial.Write(buffer, 0, 8);
+                logger.Info($"写标签指令：{Convert.ToHexString(buffer)}");
+            }
+            catch (Exception ex)
+            {
+                _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                {
+                    EventType = util.EventType.OPENERROR,
+                    WindowName = WindowName,
+                    Message = $"写标签数量异常{ex.Message}"
+                });
+                logger.Info($"写标签数量异常：ex:{ex.Message}");
+            }
+        }
+
         #endregion
 
         #region 回收箱操作
@@ -1249,7 +1508,121 @@ namespace DM_Weight.Port
             return res;
 
         }
+        // 以板子为单位获取抽屉内所有库位的药品数量
+        public async Task<int[]> CheckQuantityByAddrForMulti()
+        {
 
+
+            int[] res = new int[9];
+            for (int i = 0; i < ColNoLst.Count; i++)
+            {
+                await Task.Delay(300);
+                canBusSerial.DiscardInBuffer();
+                int colNo = ColNoLst[i];
+                int[] iNum = new int[] { 3, 2, 1 };
+                var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
+                var bColNo = iNum[colNo2];
+                decimal decolNO = (decimal)colNo;
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
+
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x27, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
+
+                logger.Info($"称重发送库位数量查询{ColNoLst[i]}【{Convert.ToHexString(buffer)}】");
+                canBusSerial.Write(buffer, 0, 8);
+                byte[] result = await GetBufferByPort(canBusSerial, 8);
+                logger.Info($"称重发送库位数量查询返回结果【{Convert.ToHexString(result)}】");
+                byte[] hl = result.Skip(4).Take(2).ToArray();
+                var r = Convert.ToHexString(result).Substring(8, 1);
+                int quantity = 0;
+                if (r == "8")
+                {
+                    hl[0] -= 0x80;
+                    quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                    logger.Info($"获取值为负数{quantity}");
+                    quantity=0 - quantity;
+                }
+                else
+                {
+                    quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                    logger.Info($"获取值为正数{quantity}");
+                }
+
+                res[ColNoLst[i] - 1] = quantity;
+            }
+
+            return res;
+
+        }
+        //获取单个称重药合的药品数量   --查数
+        public async Task<int> CheckQuantityForSingle(int colNo)
+        {
+            //await Task.Delay(300);
+            //canBusSerial.DiscardInBuffer();
+            //var index = colNo % 3 == 0 ? 3 : colNo % 3;
+            //var lock1 = colNo <= 3 ? 3 : colNo >= 7 ? 1 : 2;
+            //var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+
+
+            canBusSerial.DiscardInBuffer();
+            int[] iNum = new int[] { 3, 2, 1 };
+            var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
+            var bColNo = iNum[colNo2];
+            decimal decolNO = (decimal)colNo;
+            var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
+
+            byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x27, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
+
+            logger.Info($"称重发送库位数量查询{colNo}【{Convert.ToHexString(buffer)}】");
+            canBusSerial.Write(buffer, 0, 8);
+            byte[] result = await GetBufferByPort(canBusSerial, 8);
+            byte[] hl = result.Skip(4).Take(2).ToArray();
+            var r = Convert.ToHexString(result).Substring(8, 1);
+            logger.Info($"称重发送库位数量查询返回结果【{Convert.ToHexString(result)}】");
+
+            if (r == "8")
+            {
+                hl[0] -= 0x80;
+                int quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                logger.Info($"获取值为负数{quantity}");
+                return 0-quantity;
+            }
+            else
+            {
+                int quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                logger.Info($"获取值为正数{quantity}");
+                return quantity;
+            }
+
+        }
+        //获取单个称重药合的药品数量---标定
+        public async Task<int> CheckQuantityForBiaoDing(int colNo)
+        {
+            //await Task.Delay(300);
+            //canBusSerial.DiscardInBuffer();
+            //var index = colNo % 3 == 0 ? 3 : colNo % 3;
+            //var lock1 = colNo <= 3 ? 3 : colNo >= 7 ? 1 : 2;
+            //var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+
+
+            canBusSerial.DiscardInBuffer();
+            int[] iNum = new int[] { 3, 2, 1 };
+            var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
+            var bColNo = iNum[colNo2];
+            decimal decolNO = (decimal)colNo;
+            var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
+
+            byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x27, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
+
+            logger.Info($"称重发送库位数量查询{colNo}【{Convert.ToHexString(buffer)}】");
+            canBusSerial.Write(buffer, 0, 8);
+            byte[] result = await GetBufferByPort(canBusSerial, 8);
+            logger.Info($"称重发送库位数量查询返回结果【{Convert.ToHexString(result)}】");
+            byte[] hl = result.Skip(4).Take(2).ToArray();
+            int quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+
+            return quantity;
+
+        }
         // 以板子为单位获取抽屉内所有库位的药品数量
         public async Task<int[]> CheckQuantityByAddr2()
         {
@@ -1260,19 +1633,37 @@ namespace DM_Weight.Port
             {
                 await Task.Delay(300);
                 canBusSerial.DiscardInBuffer();
-                //var index = (int)Math.Ceiling(Convert.ToDecimal(ColNos[i]) / 3); // > 3 ? 2 : 1;
+                int colNo = ColNos[i];
-                //var lock1 = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                int[] iNum = new int[] { 3, 2, 1 };
-                var index = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
-                var lock1 = ColNos[i] <= 3 ? 3 : ColNos[i] >= 7 ? 1 : 2;
+                var bColNo = iNum[colNo2];
-                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                decimal decolNO = (decimal)colNo;
-                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x27, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
 
-                logger.Info($"称重发送库位数量查询1【{Convert.ToHexString(buffer)}】");
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x27, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
+
+                logger.Info($"称重发送库位数量查询{ColNos[i]}【{Convert.ToHexString(buffer)}】");
                 canBusSerial.Write(buffer, 0, 8);
                 byte[] result = await GetBufferByPort(canBusSerial, 8);
-                logger.Info($"称重发送库位数量查询1返回结果【{Convert.ToHexString(result)}】");
+                logger.Info($"称重发送库位数量查询返回结果【{Convert.ToHexString(result)}】");
                 byte[] hl = result.Skip(4).Take(2).ToArray();
-                int quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                //int quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                var r = Convert.ToHexString(result).Substring(8, 1);
+                int quantity = 0;
+                if (r == "8")
+                {
+                    hl[0] -= 0x80;
+                    quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                    logger.Info($"获取值为负数{quantity}");
+                    quantity = 0 - quantity;
+                }
+                else
+                {
+                    quantity = BitConverter.ToInt16(hl.Reverse().ToArray(), 0);
+                    logger.Info($"获取值为正数{quantity}");
+                }
+
+
                 res[ColNos[i] - 1] = quantity;
             }
 
@@ -1285,13 +1676,13 @@ namespace DM_Weight.Port
         {
             for (int i = 0; i < ColNos.Length; i++)
             {
-                //var index = ColNos[i] > 3 ? 2 : 1;
+                int colNo = ColNos[i];
-                //var lock1 = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                int[] iNum = new int[] { 3, 2, 1 };
-                //var index = (int)Math.Ceiling(Convert.ToDecimal(ColNos[i]) / 3);
+                var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
-                var index = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                var bColNo = iNum[colNo2];
-                var lock1 = ColNos[i] <= 3 ? 4 : ColNos[i] >= 7 ? 1 : 2;
+                decimal decolNO = (decimal)colNo;
-                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
-                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x03, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x03, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
                 logger.Info($"称重发送药盒使能【{Convert.ToHexString(buffer)}】");
                 canBusSerial.Write(buffer, 0, 8);
                 await Task.Delay(TimeSpan.FromMilliseconds(500));
@@ -1303,13 +1694,13 @@ namespace DM_Weight.Port
             canBusSerial.DiscardInBuffer();
             for (int i = 0; i < ColNos.Length; i++)
             {
-                //var index = ColNos[i] > 3 ? 2 : 1;
+                int colNo = ColNos[i];
-                //var lock1 = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                int[] iNum = new int[] { 3, 2, 1 };
-                //var index = (int)Math.Ceiling(Convert.ToDecimal(ColNos[i]) / 3);
+                var colNo2 = colNo % 3 > 0 ? (colNo % 3) - 1 : 2;
-                var index = ColNos[i] % 3 == 0 ? 3 : ColNos[i] % 3;
+                var bColNo = iNum[colNo2];
-                var lock1 = ColNos[i] <= 3 ? 4 : ColNos[i] >= 7 ? 1 : 2;
+                decimal decolNO = (decimal)colNo;
-                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
-                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x04, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x04, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
                 logger.Info($"称重发送药盒失能【{Convert.ToHexString(buffer)}】");
                 canBusSerial.Write(buffer, 0, 8);
                 await Task.Delay(TimeSpan.FromMilliseconds(50));
@@ -1321,13 +1712,12 @@ namespace DM_Weight.Port
             try
             {
                 canBusSerial.DiscardInBuffer();
-                //var index = ColNo > 3 ? 2 : 1;
+                int[] iNum = new int[] { 3, 2, 1 };
-                //var lock1 = ColNo % 3 == 0 ? 3 : ColNo % 3;
+                var colNo2 = ColNo % 3 > 0 ? (ColNo % 3) - 1 : 2;
-                //var index = (int)Math.Ceiling(Convert.ToDecimal(ColNo) / 3);
+                var bColNo = iNum[colNo2];
-                var index = ColNo % 3 == 0 ? 3 : ColNo % 3;
+                decimal decolNO = (decimal)ColNo;
-                var lock1 = ColNo <= 3 ? 3 : ColNo >= 7 ? 1 : 2;
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
-                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x25, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
-                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x25, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
 
                 logger.Info($"称重发送清空计数【{Convert.ToHexString(buffer)}】");
                 canBusSerial.Write(buffer, 0, 8);
@@ -1350,13 +1740,12 @@ namespace DM_Weight.Port
             try
             {
                 canBusSerial.DiscardInBuffer();
-                //var index = ColNo > 3 ? 2 : 1;
+                int[] iNum = new int[] { 3, 2, 1 };
-                //var lock1 = ColNo % 3 == 0 ? 3 : ColNo % 3;
+                var colNo2 = ColNo % 3 > 0 ? (ColNo % 3) - 1 : 2;
-                //var index = (int)Math.Ceiling(Convert.ToDecimal(ColNo) / 3);
+                var bColNo = iNum[colNo2];
-                var index = ColNo % 3 == 0 ? 3 : ColNo % 3;
+                decimal decolNO = (decimal)ColNo;
-                var lock1 = ColNo <= 3 ? 3 : ColNo >= 7 ? 1 : 2;
+                var channel = Convert.ToInt32((DrawerNo * 10 + Math.Ceiling(decolNO / 3)).ToString(), 16);
-                var channel = Convert.ToInt32((DrawerNo * 10 + index).ToString(), 16);
+                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x26, (byte)bColNo, 0x00, 0x00, 0x00, 0xee };
-                byte[] buffer = new byte[] { 0xaa, (byte)(channel), 0x26, (byte)lock1, 0x00, 0x00, 0x00, 0xee };
 
                 buffer[4] = (byte)(Quantity & 0xff);
                 //buffer[4] = (byte)(Quantity >> 8);
@@ -1607,6 +1996,44 @@ namespace DM_Weight.Port
             }
             return temperature;
         }
+        //读制冷片温度
+        public async Task<float> GetFridgeTemperature2()
+        {
+            float temperature = 0.0f;
+            try
+            {
+                fridgeSerial.DiscardInBuffer();
+                byte bAddress;
+                byte[] buffer = new byte[] { 0x01, 0x03, 0x10, 0x0C, 0x00, 0x01, 0x40, 0xC9 };
+                //byte[] buffer = new byte[] { 0x01, 0x03, 0x10, 0x02, 0x00, 0x01 };
+                ////获取数组CRC校验码
+                //byte[] byteDate = CRC16MODBUS.CrcModBus(buffer);
+                ////Array.Reverse(byteDate);
+                //int dataLength = buffer.Length;
+                //Array.Resize(ref buffer, dataLength + byteDate.Length);
+                //for (int i = 0; i < byteDate.Length; i++)
+                //{
+                //    buffer[dataLength + i] = byteDate[i];
+                //}
+                logger.Info($"获制冷片温度【{Convert.ToHexString(buffer)}】");
+                fridgeSerial.Write(buffer, 0, 8);
+                byte[] retByte = await GetBufferByPort(fridgeSerial, 7);
+                logger.Info($"获取制冷片温度返回【{Convert.ToHexString(retByte)}】");
+                if (retByte != null && retByte.Length >= 7)
+                {
+                    var hight = retByte[3];
+                    var low = retByte[4];
+                    int iHight = Convert.ToInt32(hight << 8);
+                    int iLow = Convert.ToInt32(retByte[4]);
+                    temperature = Convert.ToSingle(iHight + iLow) / 10;
+                }
+            }
+            catch (Exception ex)
+            {
+                logger.Info($"获取制冷片温度发生异常：ex:{ex.Message}");
+            }
+            return temperature;
+        }
         /// <summary>
         /// 设置冰箱温度
         /// </summary>

DM_Weight/ViewModels/AddDrugControlViewModel.cs

@@ -18,6 +18,7 @@ using System.Drawing.Printing;
 using System.Linq;
 using System.Reflection.PortableExecutable;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Documents;
 
@@ -356,7 +357,8 @@ namespace DM_Weight.ViewModels
                                 {
                                     singleChannels.ForEach(it =>
                                     {
-                                        _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
+                                        _portUtil.WriteQuantityMethod( it.Quantity + it.AddQuantity,it.DrawerNo, it.ColNo);
+                                        Thread.Sleep(200);
                                     });
                                 }
                                 RequestData();

DM_Weight/ViewModels/BiaoDingDialogViewModel.cs

@@ -0,0 +1,282 @@
+using DM_Weight.Common;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.util;
+using log4net;
+using log4net.Repository.Hierarchy;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class BiaoDingDialogViewModel : BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+        private readonly ILog logger = LogManager.GetLogger(typeof(BiaoDingWindowViewModel));
+        public string Title => "标定";
+
+        public bool KeepAlive => false;
+        private string titleStr;
+        public string TitleStr
+        {
+            get => titleStr;
+            set { SetProperty(ref titleStr, value); }
+        }
+        private ChannelStock channelStock;
+        private string WindowName = "BiaoDingDialog";
+        private string strMessage;
+        public string StrMessage
+        {
+            get => strMessage;
+            set => SetProperty(ref strMessage, value);
+        }
+        private int _status = 1;
+        public int Status { get => _status; set => SetProperty(ref _status, value); }
+
+        //标定数量
+        private int _bdQuantity = 0;
+        public int BDQuantity
+        {
+            get => _bdQuantity;
+            set => SetProperty(ref _bdQuantity, value);
+        }
+
+        public event Action<IDialogResult> RequestClose;
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+            // 取消消息订阅
+            //_eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            //_eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+            channelStock = parameters.GetValue<ChannelStock>("channelStock");
+            if (channelStock != null)
+            {
+                TitleStr = $"正在标定{channelStock.ColNo}号库位";
+                if (channelStock.Quantity > 0)
+                {
+                    StrMessage = "库位库存不为零，请取出药品后点击【清空】按钮，清空完成后输入标定数量并放入对应数量药品并根据下一步提示操作";
+                }
+                else
+                {
+                    StrMessage = "输入标定数量并放入对应数量药品后点击【标定】按钮";
+                    //无库存发送计数清零指令
+                    _portUtil.ClearCount(channelStock.DrawerNo, channelStock.ColNo);
+                    Status = 3;
+                }
+            }
+
+        }
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+        public BiaoDingDialogViewModel(PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+        //void DoMyPrismEvent(DeviceMsg msg)
+        //{
+
+        //    if (msg.WindowName.Equals(WindowName))
+        //    {
+        //        IGrouping<int, ChannelStock> grouping = enumerator.Current;
+        //        int DrawerNo = grouping.Key;
+        //        List<ChannelStock> channelStocks = grouping.ToList();
+
+        //        switch (msg.EventType)
+        //        {
+        //            // 抽屉打开
+        //            case EventType.DRAWEROPEN:
+
+
+        //                if (Status == 1)
+        //                {
+        //                    if (channelStocks[0].process == 1)
+        //                    {
+        //                        channelStocks.ForEach(it => it.process = 2);
+        //                    }
+        //                }
+        //                //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+        //                CheckIsFridgeOpen();
+        //                break;
+        //            // 抽屉关闭
+        //            case EventType.DRAWERCLOSE:
+        //                if (Status == 1)
+        //                {
+        //                    if (channelStocks[0].process == 2)
+        //                    {
+        //                        channelStocks.ForEach(it => it.process = 3);
+        //                    }
+        //                    IGrouping<int, ChannelStock> groupingBefore = enumerator.Current;
+        //                    int DrawerNoBefore = groupingBefore.Key;
+        //                    if (enumerator.MoveNext())
+        //                    {
+        //                        IGrouping<int, ChannelStock> groupingAfter = enumerator.Current;
+        //                        int DrawerNoAfter = groupingAfter.Key;
+        //                        if (DrawerNoBefore < 9 && DrawerNoAfter > 8)
+        //                        {
+        //                            Thread.Sleep(50);
+        //                        }
+        //                        OpenOneByOne();
+        //                    }
+        //                    // 已经全部取出
+        //                    else
+        //                    {
+        //                        Status = 3;
+        //                    }
+        //                }
+        //                //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+        //                CheckIsFridgeClose();
+        //                break;
+        //            // 数量变化
+        //            case EventType.UPDATEQUANTITY:
+        //                if (Status == 1)
+        //                {
+        //                    logger.Info($"抽屉【{DrawerNo}】库位药品数量【{msg.Quantitys}】");
+        //                }
+        //                break;
+        //            // 打开失败
+        //            case EventType.OPENERROR:
+        //                AlertMsg alertMsg = new AlertMsg
+        //                {
+        //                    Message = msg.Message,
+        //                    Type = MsgType.ERROR
+        //                };
+        //                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+        //                Status = 0;
+        //                break;
+        //        }
+        //    }
+
+        //}
+        //标定
+        public DelegateCommand BiaoDingCommand
+        {
+            get => new DelegateCommand(async () =>
+            {
+                if (BDQuantity <= 0)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "请输入标定数量",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    return;
+                }
+                try
+                {
+                    if (Status == 3)
+                    {
+                        //提示输入标定数量，发26指令
+                        _portUtil.SetNumCount(channelStock.DrawerNo, channelStock.ColNo, BDQuantity);
+                        Status = 4;
+                        await Task.Delay(200);
+                        //发27指令查询数量是否写标定时写入的数量一致，一致则标定成功，不一致则标定失败
+                        int stock = await _portUtil.CheckQuantityForBiaoDing(channelStock.ColNo);
+                        if (!(stock == BDQuantity))
+                        {
+                            int i = 1;
+                            while (i<=50&&i>0)
+                            {
+                                await Task.Delay(200);
+                                stock = await _portUtil.CheckQuantityForBiaoDing(channelStock.ColNo);
+                                if (stock == BDQuantity)
+                                {
+
+                                    logger.Info($"标定完成{stock}，{BDQuantity},{i}");  //标定成功
+                                    AlertMsg alertMsg = new AlertMsg
+                                    {
+                                        Message = "标定成功",
+                                        Type = MsgType.SUCCESS,
+                                    };
+                                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                    i = 0;
+                                }
+                                else
+                                {
+                                    i++;
+                                    logger.Info($"标定数量不一致{stock}，{BDQuantity}");
+                                    
+                                }
+
+                            }
+                            RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+                            if (i == 51)
+                            {
+                                AlertMsg alertMsg = new AlertMsg
+                                {
+                                    Message = "标定失败",
+                                    Type = MsgType.ERROR,
+                                };
+                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+
+                            }
+                        }
+                        else
+                        {
+
+                            //标定成功
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "标定成功",
+                                Type = MsgType.SUCCESS,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            logger.Info($"标定完成{stock}，{BDQuantity}");
+                        }
+                    }
+                }
+                catch (Exception e)
+                {
+                    logger.Error($"标定异常{e.Message}");
+                }
+            });
+        }
+        //清零
+        public DelegateCommand ClearCommand
+        {
+            get => new DelegateCommand(async () =>
+            {
+                //发计数请零指令
+                _portUtil.ClearCount(channelStock.DrawerNo, channelStock.ColNo);
+                Status = 3;
+            });
+        }
+        //取消
+        public DelegateCommand CancelCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+
+        //关闭
+        public DelegateCommand BtnCloseCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+    }
+}

DM_Weight/ViewModels/BiaoDingWindowViewModel.cs

@@ -39,7 +39,7 @@ namespace DM_Weight.ViewModels
             }
         }
         //状态,抽屉下的库位有库存为0的则可标定，否则不可标定
-        private int _status;
+        private int _status=0;
         public int Status { get => _status; set => SetProperty(ref _status, value); }
         //凭证号
         private string _pzh;
@@ -65,6 +65,13 @@ namespace DM_Weight.ViewModels
         private static readonly DateTime Jan1st1970 = new DateTime
     (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
+        private bool _openBoxVisibility = false;
+        public bool OpenBoxVisibility
+        {
+            get => _openBoxVisibility;
+            set => SetProperty(ref _openBoxVisibility, value);
+        }
+
         private PortUtil _portUtil;
         IEventAggregator _eventAggregator;
         IDialogService _dialogService;
@@ -74,68 +81,12 @@ namespace DM_Weight.ViewModels
             _portUtil = portUtil;
             _eventAggregator = eventAggregator;
         }
-        //public DelegateCommand SelectionChangedCommand => new DelegateCommand(selectionAction);
-
-        //private async void selectionAction()
-        //{
-        //    if (CStock != null)
-        //    {
-        //        // 此处延时1毫秒，等待页面渲染
-        //        await Task.Delay(TimeSpan.FromMilliseconds(1));
-        //        DialogParameters dialogParameters = new DialogParameters();
-        //        dialogParameters.Add("addManuno", CStock);
-        //        DialogServiceExtensions.ShowDialogHost(_dialogService, "AddManunoDialog", dialogParameters, DoDialogResult, "RootDialog");
-
-        //    }
-
-        //}
         private void DoDialogResult(IDialogResult dialogResult)
         {
             CStock = null;
+            Status = 0;
             RequestData();
         }
-        //void DoMyPrismEvent(DeviceMsg msg)
-        //{
-        //    if (msg.WindowName == "DrawerAddDrugWindow")
-        //    {
-        //        switch (msg.EventType)
-        //        {
-        //            // 抽屉打开
-        //            //case EventType.DRAWEROPEN:
-        //            //    if (Status == 1)
-        //            //    {
-        //            //        Status = 2;
-        //            //    }
-
-        //            //    break;
-        //            //// 抽屉关闭
-        //            //case EventType.DRAWERCLOSE:
-        //            //    if (Status == 2)
-        //            //    {
-        //            //        Status = 3;
-        //            //    }
-        //            //    break;
-        //            // 数量变化
-        //            //case EventType.UPDATEQUANTITY:
-        //            //    if (Status == 4)
-        //            //    {
-        //            //        ChannelStocks.ToList().ForEach(it => it.AddQuantity = msg.Quantitys[it.ColNo - 1]);
-        //            //    }
-        //            //    break;
-        //                // 打开失败
-        //                //case EventType.OPENERROR:
-        //                //    AlertMsg alertMsg = new AlertMsg
-        //                //    {
-        //                //        Message = msg.Message,
-        //                //        Type = MsgType.ERROR,
-        //                //    };
-        //                //    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-        //                //    Status = 0;
-        //                //    break;
-        //        }
-        //    }
-
-        //}
 
         private int _drawerNo = Convert.ToInt32(ConfigurationManager.AppSettings["WeightDrawerNumber"].Split(',')[0]);
 
@@ -157,317 +108,153 @@ namespace DM_Weight.ViewModels
         private bool _is17Drawer = false;
 
         public bool Is17Drawer { get => _is17Drawer; set => SetProperty(ref _is17Drawer, value); }
-        public DelegateCommand<string> UpdateDrawerNo
+
-        {
+        //打开抽屉
-            get => new DelegateCommand<string>((DrawerNo) =>
-            {
-                //BtnStatus = 0;
-                this.DrawerNo = Convert.ToInt32(DrawerNo);
-                RequestData();
-            });
-        }
         public DelegateCommand OpenDrawer
         {
-            get => new DelegateCommand(OpenDrawerMethod
+            get => new DelegateCommand(async () =>
-            //    async () =>
-            //{
-            //    try
-            //    {
-            //        List<ChannelStock> singleChannels = ChannelStocks.ToList().FindAll(it => it.BoardType == (Int32)BoardTypeEnum.weighBox && it.PosNo == 0 && it.Quantity == 0 && it.AddQuantity > 0);
-            //        if (singleChannels.Count > 0)
-            //        {
-            //            ChannelStocks = new ObservableCollection<ChannelStock> (singleChannels);
-            //            Status = 2;
-            //            _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
-            //            //发送称重25指令
-            //            await SendClearCount(singleChannels);
-            //            _portUtil.Operate = true;
-            //            _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : (Int32)BoardTypeEnum.separation;
-            //            _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
-            //            //_portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
-            //            _portUtil.DrawerNo = DrawerNo;
-            //            //_portUtil.Start();
-            //            byte[] buffer = await _portUtil.OpenDrawer();
-            //            int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
-
-            //            logger.Info($"OpenDrawer{string.Join(",", r)}");
-            //            if (DrawerState(r))
-            //            {
-            //                _portUtil.BoxLockLightOn2();
-            //            }
-            //            Status = 3; 
-            //        }
-
-            //        else
-            //        {
-            //            _isFinishClick = false;
-            //            AlertMsg alertMsg = new AlertMsg
-            //            {
-            //                Message = "请填写药品数量",
-            //                Type = MsgType.ERROR
-            //            };
-            //            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-            //        }
-            //    }
-
-            //    catch (Exception ex)
-            //    {
-            //        _portUtil.ResetData();
-            //        logger.Info($"OpenDrawer异常：{ex.Message}");
-            //        _isFinishClick = false;
-            //        AlertMsg alertMsg = new AlertMsg
-            //        {
-            //            Message = $"异常：{ex.Message}",
-            //            Type = MsgType.ERROR
-            //        };
-            //        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-            //        //Status = 1;
-            //    }
-            //    //finally { BiaoDingLoading = false;}
-
-            //}
-            );
-        }
-        private void OpenDrawerMethod()
-        {
-            _portUtil.Operate = true;
-            OpenDrawerMethodAction();
-
-        }
-        private async void OpenDrawerMethodAction()
-        {
-            try
             {
-                if (_portUtil.Operate)
+                try
                 {
-                    List<ChannelStock> singleChannels = ChannelStocks.ToList().FindAll(it => it.BoardType == (Int32)BoardTypeEnum.weighBox && it.PosNo == 0 && it.Quantity == 0 && it.AddQuantity > 0);
+                    if (Status == 0)
-                    if (singleChannels.Count > 0)
                     {
-                        ChannelStocks = new ObservableCollection<ChannelStock>(singleChannels);
+                        _portUtil.Operate = true;
-                        Status = 2;
                         _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
-                        //发送称重25指令
-                        await SendClearCount(singleChannels);
-                        _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : (Int32)BoardTypeEnum.separation;
-                        _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
-                        //_portUtil.Stocks = singleChannels.Select(it => it.Quantity).ToArray();
-                        _portUtil.DrawerNo = DrawerNo;
-                        //_portUtil.Start();
                         byte[] buffer = await _portUtil.OpenDrawer();
+
                         int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
 
                         logger.Info($"OpenDrawer{string.Join(",", r)}");
                         if (DrawerState(r))
                         {
-                            _portUtil.BoxLockLightOn2();
+                            new PromiseUtil<int>().taskAsyncLoop(200, 0, async (options, next, stop) =>
+                            {
+                                Status = 1;
+                                // 查询抽屉状态
+                                byte[] buffer = await _portUtil.CheckDrawerStatus();
+                                int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+                                if (DrawerState(r))
+                                {
+                                    Status = 2;
+                                    next();
+                                }
+                                else
+                                {
+                                    Status = 0;
+                                    //关闭抽屉
+                                    logger.Info($"抽屉【{DrawerNo}】已关闭");
+                                    // 重新初始化数据
+                                    _portUtil.ResetData();
+                                    stop();
+                                }
+                            });
                         }
-                        Status = 3;
+                        else
-                    }
-
-                    else
-                    {
-                        _portUtil.Operate = false;
-                        _isFinishClick = false;
-                        AlertMsg alertMsg = new AlertMsg
                         {
-                            Message = "请填写药品数量",
+                            logger.Info($"抽屉【{DrawerNo}】打开失败");
-                            Type = MsgType.ERROR
+                            // 重新初始化数据
-                        };
+                            _portUtil.ResetData();
-                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉打开失败",
+                                Type = MsgType.ERROR,
+                            };
+                            // 返回消息  抽屉打开失败
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
                     }
                 }
-            }
+                catch (Exception ex)
-
-            catch (Exception ex)
-            {
-                _portUtil.ResetData();
-                logger.Info($"OpenDrawer异常：{ex.Message}");
-                _isFinishClick = false;
-                AlertMsg alertMsg = new AlertMsg
                 {
-                    Message = $"异常：{ex.Message}",
+                    AlertMsg alertMsg = new AlertMsg
-                    Type = MsgType.ERROR
+                    {
-                };
+                        Message = $"操作异常{ex.Message}",
-                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Type = MsgType.ERROR,
-                //Status = 1;
+                    };
-            }
+                    // 返回消息  抽屉打开失败
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            });
         }
+       
+       
+        //开药盒
+        public DelegateCommand<object> OpenBoxCommand
+        {
+            get => new DelegateCommand<object>(async (param) =>
+            {
+                try
+                {
+                    if (Status >= 1)
+                    {
+                        //开药盒
+                        logger.Info("打开药盒");
+                        _portUtil.DrawerNo = DrawerNo;
+                        if (await _portUtil.OpenBoxByColNo(CStock.ColNo))
+                        {
+                            // 此处延时1毫秒，等待页面渲染
+                            await Task.Delay(TimeSpan.FromMilliseconds(1));
+                            DialogParameters dialogParameters = new DialogParameters();
+                            dialogParameters.Add("channelStock", CStock);
+                            DialogServiceExtensions.ShowDialogHost(_dialogService, "BiaoDingDialog", dialogParameters, DoDialogResult, "RootDialog");
+
+
+                        }
+                        else
+                        {
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "打开药盒失败",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            await Task.Delay(200);
+                        }
+                    }
+                    else
+                    {
+                        //if (Status >= 2)
+                        //{
+                        //    AlertMsg alertMsg = new AlertMsg
+                        //    {
+                        //        Message = "请先关闭药盒后再打开",
+                        //        Type = MsgType.ERROR,
+                        //    };
+                        //    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+
+                        //}
+                        if(Status<1)
+                        {
+
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "请先开抽屉后再打开药盒",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                    }
+                }
+                catch(Exception ex)
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = $"开药盒异常{ex.Message}",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+                
+            });
+        }
+
         //抽屉返回状态
         private bool DrawerState(int[] r)
         {
             int index = DrawerNo > 8 ? DrawerNo - 7 : DrawerNo + 1;
             return r[index] == 0;
         }
-        /// <summary>
+       
-        /// 发送计数清零25指令
-        /// </summary>
-        /// <returns></returns>
-        private async Task SendClearCount(List<ChannelStock> channels)
-        {
-            //发送计数清零指令25
-
-            if (channels.Count > 0)
-            {
-                for (int i = 0; i < channels.Count; i++)
-                {
-                    ChannelStock it = channels[i];
-                    _portUtil.ClearCount(it.DrawerNo, it.ColNo);
-                    await Task.Delay(50);
-                }
-                await Task.Delay(3000);
-            }
-        }
-
-        private bool _isFinishClick = false;
-
-        // 确认按钮
-        public DelegateCommand TakeFinish
-        {
-            get => new DelegateCommand(async () =>
-            {
-                Status = 4;
-                //ConfirmLoading = true;
-                if (!_isFinishClick)
-                {
-                    await Task.Delay(5000);
-                    _isFinishClick = true;
-                    List<ChannelStock> record = ChannelStocks.ToList().FindAll(it => it.AddQuantity != 0).ToList();
-                    if (record.Count > 0)
-                    {
-                        string InvoiceId = "BiaoDing_" + CurrentTimeMillis();
-                        //string InvoiceId = PZH;
-                        var f = SqlSugarHelper.Db.UseTran(() =>
-                        {
-
-                            for (int i = 0; i < record.Count; i++)
-                            {
-
-                                ChannelStock it = record[i];
-
-                                //it.ManuNo = it.drugManuNo.ManuNo;
-                                //it.EffDate = it.drugManuNo.EffDate;
-
-                                // 更新数据 库存信息
-                                SqlSugarHelper.Db.Updateable(new ChannelStock()
-                                {
-                                    Quantity = it.Quantity + it.AddQuantity,
-                                    //ManuNo = it.ManuNo,
-                                    //EffDate = it.EffDate,
-                                    Id = it.Id,
-                                    PosNo = 1
-                                }).UpdateColumns(it => new { it.Quantity, it.PosNo }).ExecuteCommand();
-                                // 获取更新完库存后的药品库存
-                                List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
-                                    .Where(cs => cs.MachineId.Equals(it.MachineId))
-                                    .Where(cs => cs.DrugId.Equals(it.DrugId))
-                                    .Where(cs => cs.DrawerType == (Int32)DrawerTypeEnum.drawerTypeOne)
-                                    .ToList();
-
-                                // 保存数据 入库记录
-                                SqlSugarHelper.Db.Insertable(new MachineRecord()
-                                {
-                                    MachineId = it.MachineId,
-                                    DrawerNo = it.DrawerNo,
-                                    ColNo = it.ColNo,
-                                    DrugId = it.DrugId,
-                                    //ManuNo = it.ManuNo,
-                                    //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
-                                    Operator = HomeWindowViewModel.Operator?.Id,
-                                    OperationTime = DateTime.Now,
-                                    Quantity = it.AddQuantity,
-                                    Type = 1,
-                                    InvoiceId = InvoiceId,
-                                    StockQuantity = nowChannels.Sum(it => it.Quantity),
-                                    ManunoQuantity = nowChannels.FindAll(it2 => it2.ManuNo == it.ManuNo).Sum(it => it.Quantity)
-                                }).ExecuteCommand();
-                                //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                                if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox || it.BoardType == (Int32)BoardTypeEnum.weighBox)
-                                {
-
-                                    Thread.Sleep(1000);
-                                    //计数数量设置，发送称重26指令
-                                    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                }
-                            }
-                            return true;
-                        });
-                        if (f.Data)
-                        {
-                            // 更新屏显库存
-                            List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != (Int32)BoardTypeEnum.separation);
-                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : (Int32)BoardTypeEnum.separation) == (Int32)BoardTypeEnum.smart || (singleChannels.Count > 0 ? singleChannels[0].BoardType : (Int32)BoardTypeEnum.separation) == (Int32)BoardTypeEnum.weighSmartBox)
-                            {
-                                singleChannels.ForEach(it =>
-                                {
-                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
-                                });
-                            }
-                            RequestData();
-                            AlertMsg alertMsg = new AlertMsg
-                            {
-                                Message = "抽屉标定完成，请关闭抽屉",
-                                Type = MsgType.SUCCESS,
-                            };
-                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-                        }
-                        else
-                        {
-                            AlertMsg alertMsg = new AlertMsg
-                            {
-                                Message = "标定更新库存失败",
-                                Type = MsgType.SUCCESS,
-                            };
-                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-                        }
-                        //Status = 0;
-                        _isFinishClick = false;
-                        //ConfirmVisibi = Visibility.Collapsed;
-                        //CancelVisibi = Visibility.Collapsed;
-                    }
-                    else
-                    {
-                        _isFinishClick = false;
-                        AlertMsg alertMsg = new AlertMsg
-                        {
-                            Message = "没有填写药品数量",
-                            Type = MsgType.ERROR
-                        };
-                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-                    }
-                    _portUtil.ResetData();
-                }
-
-            });
-        }
-
-        // 取消按钮
-        public DelegateCommand CancleTake
-        {
-            get => new DelegateCommand(() =>
-            {
-                _portUtil.ResetData();
-                //ConfirmVisibi = Visibility.Collapsed;
-                //CancelVisibi = Visibility.Collapsed;
-                RequestData();
-                //Status = 0;
-                //BtnStatus = 0;
-                //BiaoDingBtnFlag = false;
-            });
-        }
-
-        //选中批次
-        public DelegateCommand ComboboxSelected
-        {
-            get => new DelegateCommand(() =>
-            {
-                ChannelStocks.Where(it => it.Location == "").Select(it => it.ManuNo = "12").ToList();
-            });
-        }
-
-        public long CurrentTimeMillis()
-        {
-            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
-        }
         public bool KeepAlive => false;
 
         public void FindDrawerCount()
@@ -504,26 +291,11 @@ namespace DM_Weight.ViewModels
 
                 return cs;
             }).ToList());
-            ChannelStock cs = ChannelStocks.FirstOrDefault(cs => cs.Quantity <= 0);
-            if (cs != null && cs.Id != null && !string.IsNullOrEmpty(cs.Id))
-            {
-                //BiaoDingBtnFlag = true;
-                Status = 0;
-            }
-            else
-            {
-                Status = 1;
-                //BiaoDingBtnFlag = false;
-                //CancelVisibi = Visibility.Visible;
-            }
-            //ConfirmVisibi = Visibility.Collapsed;
-            //obChannelStock = new ObservableCollection<ChannelStock>(ChannelStocks);
         }
 
         //接收导航传过来的参数  现在是在此处初始化了表格数据
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
-            //_eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
             FindDrawerCount();
             RequestData();
         }
@@ -538,8 +310,6 @@ namespace DM_Weight.ViewModels
         //这个方法用于拦截请求
         public void OnNavigatedFrom(NavigationContext navigationContext)
         {
-            // 取消消息订阅
-            //_eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
         }
     }
 }

DM_Weight/ViewModels/BindingChannelDialogViewModel.cs

@@ -18,6 +18,7 @@ using DM_Weight.Port;
 using DM_Weight.util;
 using log4net;
 using DM_Weight.Common;
+using System.Threading;
 
 namespace DM_Weight.ViewModels
 {
@@ -78,11 +79,11 @@ namespace DM_Weight.ViewModels
             set
             {
                 SetProperty(ref _drugInfo, value);
-                //if (_drugInfo != null)
+                if (_drugInfo != null)
-                //{
+                {
-                //    //DrugManuNos = _drugInfo.DrugManuNos;
+                    //DrugManuNos = _drugInfo.DrugManuNos;
-                //    DrugManuNos = SqlSugarHelper.Db.Queryable<DrugManuNo>().Where(m => m.DrugId == _drugInfo.DrugId.ToString()).ToList();
+                    DrugManuNos = SqlSugarHelper.Db.Queryable<DrugManuNo>().Where(m => m.DrugId == _drugInfo.DrugId.ToString()).ToList();
-                //}
+                }
             }
         }
 
@@ -94,21 +95,21 @@ namespace DM_Weight.ViewModels
             set => SetProperty(ref _drugInfos, value);
         }
 
-        //private DrugManuNo? _drugManuNo;
+        private DrugManuNo? _drugManuNo;
 
-        //public DrugManuNo? DrugManuNo
+        public DrugManuNo? DrugManuNo
-        //{
+        {
-        //    get => _drugManuNo;
+            get => _drugManuNo;
-        //    set => SetProperty(ref _drugManuNo, value);
+            set => SetProperty(ref _drugManuNo, value);
-        //}
+        }
 
-        //private List<DrugManuNo>? _drugManuNos;
+        private List<DrugManuNo>? _drugManuNos;
 
-        //public List<DrugManuNo>? DrugManuNos
+        public List<DrugManuNo>? DrugManuNos
-        //{
+        {
-        //    get => _drugManuNos;
+            get => _drugManuNos;
-        //    set => SetProperty(ref _drugManuNos, value);
+            set => SetProperty(ref _drugManuNos, value);
-        //}
+        }
 
 
         private List<ChannelStock>? _channels;
@@ -167,8 +168,13 @@ namespace DM_Weight.ViewModels
 
         private void GetAllDrugInfos()
         {
-            var list = SqlSugarHelper.Db.Queryable<DrugInfo>().OrderBy(di => di.DrugId).ToList();
+            string str = @"SELECT d.drug_id,d.py_code,d.drug_barcode,d.drug_brand_name,d.drug_spec,d.dosage,d.pack_unit,
-            DrugInfos = list;
+                        d.manufactory,d.max_stock,CONCAT(drug_name,'  ',drug_spec)as drug_name FROM `drug_info` d";
+            DrugInfos = SqlSugarHelper.Db.SqlQueryable<DrugInfo>(str).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList();
+
+
+            //var list = SqlSugarHelper.Db.Queryable<DrugInfo>().Includes<DrugManuNo>(di => di.DrugManuNos).OrderBy(di => di.DrugId).ToList();
+            //DrugInfos = list;
         }
 
         private void GetChannelsByDrawerNo()
@@ -210,6 +216,12 @@ namespace DM_Weight.ViewModels
             {
 
                 var SelectChannels = Channels.FindAll(item => item.IsSelected && item.Quantity == 0);
+                if (SelectChannels is null || SelectChannels.Count <= 0)
+                {
+                    SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
+                    SnackbarMessageQueue.Enqueue("未选中库位或库位还存在药品无法绑定");
+                    return;
+                }
 
                 if (SelectChannels.All(it => it.DrawerType != (Int32)DrawerTypeEnum.drawerTypeOne))
                 {
@@ -230,7 +242,7 @@ namespace DM_Weight.ViewModels
                                 SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.PosNo }).ExecuteCommand();
                                 GetChannelsByDrawerNo();
 
-                                if (item.BoardType == (Int32)BoardTypeEnum.smart|| item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                                if (item.BoardType == (Int32)BoardTypeEnum.smart)
                                 {
                                     _portUtil.WindowName = "BindingChannelDialog";
                                     // 向显示屏写入库位信息
@@ -242,6 +254,22 @@ namespace DM_Weight.ViewModels
                                     await Task.Delay(200);
                                     _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                                 }
+                                if (item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                                {
+                                    _portUtil.WindowName = "BindingChannelDialog";
+                                    _portUtil.WriteChannelInfoMethod(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.WriteChannelInfoMethod(3, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.WriteChannelInfoMethod(4, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.WriteChannelInfoMethod(5, item.EffDate, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.WriteChannelInfoMethod(6, item.ManuNo, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.ShowContentMethod(item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                }
                                 //_screenUtil.SetStockInfo(item, 1);
 
                             }
@@ -265,7 +293,7 @@ namespace DM_Weight.ViewModels
                 }
                 else
                 {
-                    if (DrugInfo != null)
+                    if (DrugInfo != null && DrugManuNo != null)
                     {
 
                         var c = SelectChannels.Count;
@@ -278,30 +306,56 @@ namespace DM_Weight.ViewModels
                                 {
                                     item.PosNo = 0;
                                 }
-
+                                if (DrugManuNo.EffDate != null && DrugManuNo.EffDate.Length >= 10)
-                                item.DrugId = DrugInfo.DrugId.ToString();
-                                //item.ManuNo = DrugManuNo.ManuNo;
-                                item.DrugInfo = DrugInfo;
-                                //item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate);
-                                SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId,  it.PosNo }).ExecuteCommand();
-
-                                if (item.BoardType == (Int32)BoardTypeEnum.smart || item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
                                 {
-                                    _portUtil.WindowName = "BindingChannelDialog";
+                                    DrugManuNo.EffDate = DrugManuNo.EffDate.Substring(0, 10);
-                                    // 向显示屏写入库位信息
-                                    _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
-                                    await Task.Delay(200);
-                                    _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
-                                    await Task.Delay(200);
-                                    _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
-                                    await Task.Delay(200);
-                                    //_portUtil.WriteChannelInfo(6, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
-                                    await Task.Delay(200);
-                                    //_portUtil.WriteChannelInfo(5, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
-                                    await Task.Delay(200);
-                                    _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                                 }
-                                //_screenUtil.SetStockInfo(item, 1);
+                                item.DrugId = DrugInfo.DrugId.ToString();
+                                item.ManuNo = DrugManuNo.ManuNo;
+                                item.DrugInfo = DrugInfo;
+                                item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate.Length >= 10 ? DrugManuNo.EffDate.Substring(0, 10) : DrugManuNo.EffDate);
+                                SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.ManuNo, it.EffDate,  it.PosNo }).ExecuteCommand();
+
+                            });
+                            Task.Factory.StartNew(() =>
+                            {
+                                SelectChannels.ForEach((item) =>
+                                {
+                                    if (item.BoardType == (Int32)BoardTypeEnum.smart)
+                                    {
+                                        _portUtil.WindowName = "BindingChannelDialog";
+                                        // 向显示屏写入库位信息
+                                        _portUtil.WriteChannelInfo(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfo(2, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfo(8, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfo(5, DrugManuNo.ManuNo, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfo(6, String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate.Length >= 10 ? DrugManuNo.EffDate.Substring(0, 10) : DrugManuNo.EffDate), item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                                    }
+                                    if (item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                                    {
+
+                                        _portUtil.WindowName = "BindingChannelDialog";
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfoMethod(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfoMethod(3, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfoMethod(4, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfoMethod(5, item.EffDate, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.WriteChannelInfoMethod(6, item.ManuNo, item.DrawerNo, item.ColNo);
+                                        Thread.Sleep(200);
+                                        _portUtil.ShowContentMethod(item.DrawerNo, item.ColNo);
+
+                                    }
+                                });
                             });
                             GetChannelsByDrawerNo();
                         }
@@ -314,7 +368,7 @@ namespace DM_Weight.ViewModels
                     else
                     {
                         SnackbarBackground = new SolidColorBrush((Color)ColorConverter.ConvertFromString("#b71c1c"));
-                        SnackbarMessageQueue.Enqueue("请选择库位需要绑定的药品");
+                        SnackbarMessageQueue.Enqueue("请选择库位需要绑定的药品及批次信息");
                     }
                 }
             });
@@ -334,17 +388,31 @@ namespace DM_Weight.ViewModels
                         item.ManuNo = null;
                         item.EffDate = null;
                         item.DrugInfo = null;
-                        SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId }).ExecuteCommand();
+                        SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.ManuNo, it.EffDate }).ExecuteCommand();
-                        if (item.BoardType == (Int32)BoardTypeEnum.smart || item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                        {
-                            // 清除显示屏库位信息
-                            _portUtil.ClearContent(item.DrawerNo, item.ColNo);
-                            await Task.Delay(200);
-                            _portUtil.ShowContent(item.DrawerNo, item.ColNo);
-                        }
-
                         //_screenUtil.SetStockInfo(item, 1);
                     });
+                    Task.Factory.StartNew(() =>
+                    {
+                        SelectChannels.ForEach(item =>
+                        {
+                            if (item.BoardType == (Int32)BoardTypeEnum.smart)
+                            {
+                                // 清除显示屏库位信息
+                                _portUtil.ClearContent(item.DrawerNo, item.ColNo);
+                                Thread.Sleep(200);
+                                _portUtil.ShowContent(item.DrawerNo, item.ColNo);
+                            }
+                            if (item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            {
+                                Thread.Sleep(200);
+                                _portUtil.ClearContentMethod(item.DrawerNo, item.ColNo);
+                                Thread.Sleep(200);
+                                _portUtil.ShowContentMethod(item.DrawerNo, item.ColNo);
+                            }
+
+                            //_screenUtil.SetStockInfo(item, 1);
+                        });
+                    });
                     GetChannelsByDrawerNo();
                 }
                 else
@@ -392,8 +460,8 @@ namespace DM_Weight.ViewModels
 
         public void UpdateComboBoxItems(string text)
         {
-            string str = @"SELECT d.drug_id,d.py_code,d.drug_barcode,d.drug_name,d.drug_brand_name,d.drug_spec,d.dosage,d.pack_unit,
+            string str = @"SELECT d.drug_id,d.py_code,d.drug_barcode,d.drug_brand_name,d.drug_spec,d.dosage,d.pack_unit,
-                        d.manufactory,d.max_stock,CONCAT(drug_name,'  ',drug_spec)as drug_name_spec FROM `drug_info` d";
+                        d.manufactory,d.max_stock,CONCAT(drug_name,'  ',drug_spec)as d.drug_name FROM `drug_info` d";
             if(string.IsNullOrEmpty(text))
             {
                 DrugInfos = SqlSugarHelper.Db.SqlQueryable<DrugInfo>(str).OrderBy(di => di.DrugName).OrderBy(di => di.DrugId).ToList();

DM_Weight/ViewModels/BindingChannelNewDialogViewModel.cs

@@ -273,6 +273,18 @@ namespace DM_Weight.ViewModels
                                 item.DrugId = DrugInfo.DrugId.ToString();
                                 item.DrugSpec= DrugInfo.DrugSpec.ToString();
                                 SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.PosNo,it.DrugSpec }).ExecuteCommand();
+                                //绑定回收箱无批次写入一条ChannelStock 库存信息
+                                SqlSugarHelper.Db.Insertable(new ChannelStock()
+                                {
+                                    Chnguid = item.Id,
+                                    DrawerNo = item.DrawerNo,
+                                    ColNo = item.ColNo,
+                                    DrugId = item.DrugId,
+                                    DrawerType = item.DrawerType,
+                                    BoardType = item.BoardType,
+                                    Id = Guid.NewGuid().ToString(),
+                                    MachineId = ConfigurationManager.AppSettings["machineId"] ?? "DM1"
+                                }).ExecuteCommand();
                                 GetChannelsByDrawerNo();
 
                                 if (item.BoardType == (Int32)BoardTypeEnum.smart)
@@ -291,6 +303,18 @@ namespace DM_Weight.ViewModels
                                     //await Task.Delay(200);
                                     _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                                 }
+                                if(item.BoardType==(Int32)BoardTypeEnum.weighSmartBox)
+                                {
+                                    _portUtil.WindowName = "BindingChannelDialog";
+                                    _portUtil.WriteChannelInfoMethod(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.WriteChannelInfoMethod(3, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.WriteChannelInfoMethod(4, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                    _portUtil.ShowContentMethod(item.DrawerNo, item.ColNo);
+                                    Task.Delay(200);
+                                }
                                 //_screenUtil.SetStockInfo(item, 1);
 
                             }
@@ -345,7 +369,7 @@ namespace DM_Weight.ViewModels
                             //item.EffDate = String.Format("{0:yyyy-MM-dd}", DrugManuNo.EffDate);
                             SqlSugarHelper.Db.Updateable(item).UpdateColumns(it => new { it.DrugId, it.PosNo,it.DrugSpec }).ExecuteCommand();
 
-                            if (item.BoardType == (Int32)BoardTypeEnum.smart || item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            if (item.BoardType == (Int32)BoardTypeEnum.smart )
                             {
                                 _portUtil.WindowName = "BindingChannelDialog";
                                 // 向显示屏写入库位信息
@@ -366,6 +390,18 @@ namespace DM_Weight.ViewModels
                                 //Thread.Sleep(200);
                                 _portUtil.ShowContent(item.DrawerNo, item.ColNo);
                             }
+                            if(item.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            {
+                                _portUtil.WindowName = "BindingChannelDialog";
+                                _portUtil.WriteChannelInfoMethod(1, DrugInfo.DrugName, item.DrawerNo, item.ColNo);
+                                Task.Delay(200);
+                                _portUtil.WriteChannelInfoMethod(3, DrugInfo.DrugSpec, item.DrawerNo, item.ColNo);
+                                Task.Delay(200);
+                                _portUtil.WriteChannelInfoMethod(4, DrugInfo.Manufactory, item.DrawerNo, item.ColNo);
+                                Task.Delay(200);
+                                _portUtil.ShowContentMethod(item.DrawerNo, item.ColNo);
+                                Task.Delay(200);
+                            }
                         }
 
 

DM_Weight/ViewModels/CheckStockWindowViewModel.cs

@@ -16,6 +16,7 @@ using DM_Weight.msg;
 using DM_Weight.Port;
 using DM_Weight.util;
 using DM_Weight.Common;
+using System.Threading;
 
 namespace DM_Weight.ViewModels
 {
@@ -69,7 +70,7 @@ namespace DM_Weight.ViewModels
                     case EventType.UPDATEQUANTITY:
                         if (Status == 2)
                         {
-                            logger.Info($"抽屉【{DrawerNo}】库位药品数量【{msg.Quantitys}】");
+                            logger.Info($"抽屉【{DrawerNo}】库位药品数量【{string.Join(',',msg.Quantitys)}】");
                         }
                         break;
                     // 打开失败
@@ -165,7 +166,9 @@ namespace DM_Weight.ViewModels
                             {
                                 Quantity = it.CheckQuantity,                               
                                 Id = it.Id,
-                            }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+                                ManuNo = it.ManuNo,
+                                EffDate = it.EffDate,
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
                             // 获取更新完库存后的药品库存
                             List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                 .Where(cs => cs.MachineId.Equals(it.MachineId))
@@ -180,8 +183,8 @@ namespace DM_Weight.ViewModels
                                 DrawerNo = it.DrawerNo,
                                 ColNo = it.ColNo,
                                 DrugId = it.DrugId,
-                                //ManuNo = it.ManuNo,
+                                ManuNo = it.ManuNo,
-                                //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                 Operator = HomeWindowViewModel.Operator?.Id,
                                 Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                 OperationTime = DateTime.Now,
@@ -205,7 +208,8 @@ namespace DM_Weight.ViewModels
                         {
                             singleChannels.ForEach(it =>
                             {
-                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.CheckQuantity);
+                                _portUtil.WriteQuantityMethod(it.CheckQuantity,it.DrawerNo, it.ColNo);
+                                Thread.Sleep(200);
                             });
                         }
 

DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs

@@ -38,6 +38,12 @@ namespace DM_Weight.ViewModels
         private static readonly DateTime Jan1st1970 = new DateTime
     (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
+        private bool _openBoxVisibility = false;
+        public bool OpenBoxVisibility
+        {
+            get => _openBoxVisibility;
+            set => SetProperty(ref _openBoxVisibility, value);
+        }
         private PortUtil _portUtil;
         IEventAggregator _eventAggregator;
 
@@ -76,7 +82,7 @@ namespace DM_Weight.ViewModels
                     case EventType.UPDATEQUANTITY:
                         if (Status == 2)
                         {
-                            ChannelStocks.ForEach(it => it.AddQuantity = msg.Quantitys[it.ColNo - 1]);
+                            ChannelStocks.Where(cs => _portUtil.ColNoLst.Contains(cs.ColNo)).ToList().ForEach(it => it.AddQuantity = msg.Quantitys[it.ColNo - 1]);
                         }
                         break;
                     // 打开失败
@@ -127,34 +133,166 @@ namespace DM_Weight.ViewModels
             }, (DrawerNo) => Status == 0
             );
         }
+        int currentCol = 0;
+        private int[] BeforeQuantity { get; set; } = new int[9];
+        private int[] AfterQuantity { get; set; } = new int[9];
         public DelegateCommand OpenDrawer
         {
-            get => new DelegateCommand(() =>
+            get => new DelegateCommand(async () =>
             {
+                if (Status > 0 || _portUtil.Operate)
+                {
+                    return;
+                }
                 Status = 1;
                 _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
-
+                if (ChannelStocks!=null&& ChannelStocks.Count>0&&(ChannelStocks[0].BoardType == (Int32)BoardTypeEnum.weighSmartBox))
-                try
                 {
-                    List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != (Int32)BoardTypeEnum.separation);
 
+                    try
+                    {
+                        _portUtil.DrawerNo = DrawerNo;
+                        _portUtil.Operate = true;
+                        _portUtil.WindowName = "DrawerAddDrugWindow";
+                        byte[] buffer = await _portUtil.OpenDrawer();
+
+                        int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+
+                        logger.Info($"OpenDrawer{string.Join(",", r)}");
+                        if (_portUtil.DrawerState(r))
+                        {
+                            new PromiseUtil<int>().taskAsyncLoop(200, 0, async (options, next, stop) =>
+                            {
+                                if (Status == 3)
+                                {
+                                    stop();
+                                }
+                                try
+                                {
+                                    // 查询抽屉状态
+                                    byte[] buffer = await _portUtil.CheckDrawerStatus();
+                                    int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+                                    if (_portUtil.DrawerState(r))
+                                    {
+                                        Status = 2;
+                                        //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+                                        CheckIsFridgeOpen();
+                                        if (_portUtil.ColNoLst != null && _portUtil.ColNoLst.Count > 0 || currentCol > 0)
+                                        {
+                                            //库位列表不为空查数
+                                            if (currentCol > 0)
+                                            {
+                                                if (!_portUtil.ColNoLst.Contains(currentCol))  //已经开过一次药盒则不再查开药合前的数量
+                                                {
+                                                    //开药盒锁前先查数
+                                                    int beforeQuantity = await _portUtil.CheckQuantityForSingle(currentCol);
+                                                    BeforeQuantity[currentCol - 1] = beforeQuantity;
+                                                    logger.Info($"BeforeQuantity:{currentCol}-{beforeQuantity}数量{string.Join(",", BeforeQuantity)}");
+                                                    await Task.Delay(200);
+                                                    _portUtil.ColNoLst.Add(currentCol);
+                                                }
+                                                _portUtil.OpenBoxByColNo(currentCol);
+                                                await Task.Delay(200);
+                                                currentCol = 0;
+                                            }
+                                            // 继续查询抽屉药品数量
+                                            // 查询抽屉药品数量
+
+                                            int[] quantity = await _portUtil.CheckQuantityByAddrForMulti();
+                                            AfterQuantity = quantity;
+                                            logger.Info($"AfterQuantity{string.Join(",", AfterQuantity)}");
+                                            int[] Quantitys = new int[BeforeQuantity.Length];
+                                            for (int i = 0; i < BeforeQuantity.Length; i++)
+                                            {
+                                                Quantitys[i] = AfterQuantity[i] - BeforeQuantity[i];
+                                            }
+                                            // 告诉前台数据变化
+                                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                                            {
+                                                EventType = util.EventType.UPDATEQUANTITY,
+                                                WindowName = "DrawerAddDrugWindow",
+                                                Quantitys = Quantitys
+                                            });
+                                            logger.Info($"数量变化【{string.Join(",", Quantitys)}】");
+                                        }
+                                        next();
+                                    }
+                                    else
+                                    {
+                                        Status = 3;
+                                        //关闭抽屉
+                                        logger.Info($"抽屉【{DrawerNo}】已关闭");
+                                        // 重新初始化数据
+                                        _portUtil.ResetData();
+                                        //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+                                        CheckIsFridgeClose();
+                                        stop();
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    logger.Info($"异常{ex.Message}");
+                                }
+                            });
+                        }
+                        else
+                        {
+                            Status = 0;
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉打开失败",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.Info($"抽屉操作异常：{ex.Message}");
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = $"抽屉操作异常{ex.Message}",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                }
+                else
+                { List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != (Int32)BoardTypeEnum.separation);
                     _portUtil.WindowName = "DrawerAddDrugWindow";
                     _portUtil.Operate = true;
                     _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : (Int32)BoardTypeEnum.separation;
                     _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
                     _portUtil.DrawerNo = DrawerNo;
                     _portUtil.Start();
-
+                   
                 }
-                catch (Exception ex)
-                {
-                    logger.Info($"OpenDrawer异常：{ex.Message}");
-                }
-
 
             }, () => Status == 0).ObservesProperty(() => Status);
         }
-
+        //开药盒
+        public DelegateCommand<object> OpenBoxCommand
+        {
+            get => new DelegateCommand<object>((param) =>
+            {
+                if (Status == 2)
+                {
+                    ChannelStock cs = param as ChannelStock;
+                    currentCol = cs.ColNo;
+                    logger.Info($"开药盒{cs.ColNo}");
+                }
+                else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "请先开抽屉后再打开药盒",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                }
+            });
+        }
         private bool _isFinishClick = false;
 
         // 完成按钮
@@ -175,18 +313,18 @@ namespace DM_Weight.ViewModels
                             for (int i = 0; i < record.Count; i++)
                             {
                                 ChannelStock it = record[i];
-                                //it.ManuNo = it.drugManuNo==null?it.ManuNo: it.drugManuNo.ManuNo;
+                                it.ManuNo = it.drugManuNo == null ? it.ManuNo : it.drugManuNo.ManuNo;
-                                //it.EffDate = it.drugManuNo == null? it.EffDate: it.drugManuNo.EffDate;
+                                it.EffDate = it.drugManuNo == null ? it.EffDate : it.drugManuNo.EffDate;
 
 
                                 // 更新数据 库存信息
                                 SqlSugarHelper.Db.Updateable(new ChannelStock()
                                 {
                                     Quantity = it.Quantity + it.AddQuantity,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = it.EffDate,
+                                    EffDate = it.EffDate,
                                     Id = it.Id,
-                                }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
                                 // 获取更新完库存后的药品库存
                                 List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                     .Where(cs => cs.MachineId.Equals(it.MachineId))
@@ -201,8 +339,8 @@ namespace DM_Weight.ViewModels
                                     DrawerNo = it.DrawerNo,
                                     ColNo = it.ColNo,
                                     DrugId = it.DrugId,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                     Operator = HomeWindowViewModel.Operator?.Id,
                                     Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                     OperationTime = DateTime.Now,
@@ -212,12 +350,12 @@ namespace DM_Weight.ViewModels
                                     StockQuantity = nowChannels.Sum(it => it.Quantity)
                                 }).ExecuteCommand();
                                 //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                                if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                                //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                                {
+                                //{
-                                    //计数数量设置，发送称重26指令
+                                //    //计数数量设置，发送称重26指令
-                                    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                                //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                    Thread.Sleep(80);
+                                //    Thread.Sleep(80);
-                                }
+                                //}
                             }
                             return true;
                         });
@@ -230,7 +368,8 @@ namespace DM_Weight.ViewModels
                             {
                                 singleChannels.ForEach(it =>
                                 {
-                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
+                                    _portUtil.WriteQuantityMethod( it.Quantity + it.AddQuantity,it.DrawerNo,it.ColNo);
+                                    Thread.Sleep(200);
                                 });
                             }
                             RequestData();
@@ -252,6 +391,7 @@ namespace DM_Weight.ViewModels
                         }
                         Status = 0;
                         _isFinishClick = false;
+                        _portUtil.ColNoLst = new List<int>(); 
                     }
                     else
                     {
@@ -358,12 +498,10 @@ namespace DM_Weight.ViewModels
                .ToList();
             if (queryData != null && queryData.Count > 0)
             {
-                ChannelStocks = queryData.Select(cs =>
+                OpenBoxVisibility = (queryData[0].BoardType == (Int32)BoardTypeEnum.box || queryData[0].BoardType == (Int32)BoardTypeEnum.weighBox || queryData[0].BoardType == (Int32)BoardTypeEnum.weighSmartBox) ? true : false;
-                {
-                    //cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
-                    return cs;
-                }).ToList();
             }
+
+            ChannelStocks = queryData;
         }
 
         //接收导航传过来的参数  现在是在此处初始化了表格数据

DM_Weight/ViewModels/DrawerTakeDrugWindowViewModel.cs

@@ -22,6 +22,7 @@ using Newtonsoft.Json;
 using System.Text.RegularExpressions;
 using System.Windows.Controls;
 using DM_Weight.Common;
+using System.Reflection.Metadata;
 
 namespace DM_Weight.ViewModels
 {
@@ -40,7 +41,12 @@ namespace DM_Weight.ViewModels
         private static readonly DateTime Jan1st1970 = new DateTime
     (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
 
-
+        private bool _openBoxVisibility = false;
+        public bool OpenBoxVisibility
+        {
+            get => _openBoxVisibility;
+            set => SetProperty(ref _openBoxVisibility, value);
+        }
 
         private PortUtil _portUtil;
         IEventAggregator _eventAggregator;
@@ -80,7 +86,7 @@ namespace DM_Weight.ViewModels
                     case EventType.UPDATEQUANTITY:
                         if (Status == 2)
                         {
-                            ChannelStocks.ForEach(it => it.TakeQuantity = msg.Quantitys[it.ColNo - 1]);
+                            ChannelStocks.Where(cs => _portUtil.ColNoLst.Contains(cs.ColNo)).ToList().ForEach(it => it.TakeQuantity = msg.Quantitys[it.ColNo - 1]);
                         }
                         break;
                     // 打开失败
@@ -132,27 +138,164 @@ namespace DM_Weight.ViewModels
             );
         }
 
-
+        List<int> ColLst = new List<int>();
+        int currentCol = 0;
+        private int[] BeforeQuantity { get; set; } = new int[9];
+        private int[] AfterQuantity { get; set; } = new int[9];
         public DelegateCommand OpenDrawer
         {
-            get => new DelegateCommand(() =>
+            get => new DelegateCommand(async () =>
             {
-                if (Status == 0)
+                if (Status > 0 || _portUtil.Operate)
                 {
-                    Status = 1;
+                    return;
-                    _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+                }
+                Status = 1;
+                _portUtil.SpeakAsync("正在打开" + DrawerNo + "号抽屉");
+                if (ChannelStocks!=null&& ChannelStocks .Count>0&& (ChannelStocks[0].BoardType == (Int32)BoardTypeEnum.weighSmartBox))
+                {
+                    try
+                    {
+                        _portUtil.DrawerNo = DrawerNo;
+                        _portUtil.Operate = true;
+                        _portUtil.WindowName = "DrawerTakeDrugWindow";
+                        byte[] buffer = await _portUtil.OpenDrawer();
 
+                        int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
 
+                        logger.Info($"OpenDrawer{string.Join(",", r)}");
+                        if (_portUtil.DrawerState(r))
+                        {
+                            new PromiseUtil<int>().taskAsyncLoop(200, 0, async (options, next, stop) =>
+                            {
+                                if (Status == 3)
+                                {
+                                    stop();
+                                }
+                                try
+                                {
+                                    // 查询抽屉状态
+                                    byte[] buffer = await _portUtil.CheckDrawerStatus();
+                                    int[] r = buffer.Select(it => Convert.ToInt32(it)).ToArray();
+                                    if (_portUtil.DrawerState(r))
+                                    {
+                                        Status = 2;
+                                        //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+                                        CheckIsFridgeOpen();
+                                        if (_portUtil.ColNoLst != null && _portUtil.ColNoLst.Count > 0 || currentCol > 0)
+                                        {
+                                            //库位列表不为空查数
+                                            if (currentCol > 0)
+                                            {
+                                                if (!_portUtil.ColNoLst.Contains(currentCol))
+                                                {
+                                                    //开药盒锁前先查数
+                                                    int beforeQuantity = await _portUtil.CheckQuantityForSingle(currentCol);
+                                                    BeforeQuantity[currentCol - 1] = beforeQuantity;
+                                                    logger.Info($"BeforeQuantity:{currentCol}-{beforeQuantity}数量{string.Join(",", BeforeQuantity)}");
+                                                    await Task.Delay(200);
+                                                    _portUtil.ColNoLst.Add(currentCol);
+                                                }
+                                                _portUtil.OpenBoxByColNo(currentCol);
+                                                await Task.Delay(200);
+                                                currentCol = 0;
+                                            }
+                                            // 继续查询抽屉药品数量
+                                            // 查询抽屉药品数量
+
+                                            int[] quantity = await _portUtil.CheckQuantityByAddrForMulti();
+                                            AfterQuantity = quantity;
+                                            logger.Info($"AfterQuantity{string.Join(",", AfterQuantity)}");
+                                            int[] Quantitys = new int[BeforeQuantity.Length];
+                                            for (int i = 0; i < BeforeQuantity.Length; i++)
+                                            {
+                                                Quantitys[i] = BeforeQuantity[i] - AfterQuantity[i];
+                                            }
+                                            // 告诉前台数据变化
+                                            _eventAggregator.GetEvent<PortUtilEvent>().Publish(new util.DeviceMsg()
+                                            {
+                                                EventType = util.EventType.UPDATEQUANTITY,
+                                                WindowName = "DrawerTakeDrugWindow",
+                                                Quantitys = Quantitys
+                                            });
+                                            logger.Info($"数量变化【{string.Join(",", Quantitys)}】");
+                                        }
+                                        next();
+                                    }
+                                    else
+                                    {
+                                        Status = 3;
+                                        //关闭抽屉
+                                        logger.Info($"抽屉【{DrawerNo}】已关闭");
+                                        // 重新初始化数据
+                                        _portUtil.ResetData();
+                                        //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+                                        CheckIsFridgeClose();
+                                        stop();
+                                    }
+                                }
+                                catch (Exception ex)
+                                {
+                                    logger.Info($"异常{ex.Message}");
+                                }
+                            });
+                        }
+                        else
+                        {
+                            Status = 0;
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "抽屉打开失败",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+
+                    }
+                    catch (Exception ex)
+                    {
+                        logger.Info($"抽屉操作异常：{ex.Message}");
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = $"抽屉操作异常{ex.Message}",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                }
+                else
+                {
                     List<ChannelStock> singleChannels = ChannelStocks.FindAll(it => it.BoardType != (Int32)BoardTypeEnum.separation);
 
                     _portUtil.WindowName = "DrawerTakeDrugWindow";
                     _portUtil.BoardType = singleChannels.Count > 0 ? singleChannels[0].BoardType : (Int32)BoardTypeEnum.separation;
                     _portUtil.ColNos = singleChannels.Select(it => it.ColNo).ToArray();
                     _portUtil.DrawerNo = DrawerNo;
-                    Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Normal, () => _portUtil.Start())
+                    Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Normal, () => _portUtil.Start());
-                    ;
+                }
+            });
+        }
+        List<int> openBoxColNOs = new List<int>();
+        //开药盒
+        public DelegateCommand<object> OpenBoxCommand
+        {
+            get => new DelegateCommand<object>((param) =>
+            {
+                if (Status == 2)
+                {
+                    ChannelStock cs = param as ChannelStock;
+                    currentCol = cs.ColNo;
+                    logger.Info($"开药盒{cs.ColNo}");
+                }
+                else
+                {
+                    AlertMsg alertMsg = new AlertMsg
+                    {
+                        Message = "请先开抽屉后再打开药盒",
+                        Type = MsgType.ERROR,
+                    };
+                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
                 }
-
             });
         }
 
@@ -183,10 +326,10 @@ namespace DM_Weight.ViewModels
                                 SqlSugarHelper.Db.Updateable(new ChannelStock()
                                 {
                                     Quantity = it.Quantity - it.TakeQuantity,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = it.EffDate,
+                                    EffDate = it.EffDate,
                                     Id = it.Id,
-                                }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
                                 // 获取更新完库存后的药品库存
                                 List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                     .Where(cs => cs.MachineId.Equals(it.MachineId))
@@ -201,8 +344,8 @@ namespace DM_Weight.ViewModels
                                     DrawerNo = it.DrawerNo,
                                     ColNo = it.ColNo,
                                     DrugId = it.DrugId,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                     Operator = HomeWindowViewModel.Operator?.Id,
                                     Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                     OperationTime = DateTime.Now,
@@ -220,11 +363,13 @@ namespace DM_Weight.ViewModels
                         {
                             // 更新屏显库存
                             List<ChannelStock> singleChannels = record.FindAll(it => it.BoardType != 1);
-                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == (Int32)BoardTypeEnum.smart|| (singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == (Int32)BoardTypeEnum.weighSmartBox)
+                            if ((singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == (Int32)BoardTypeEnum.smart || (singleChannels.Count > 0 ? singleChannels[0].BoardType : 1) == (Int32)BoardTypeEnum.weighSmartBox)
                             {
                                 singleChannels.ForEach(it =>
                                 {
-                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                    _portUtil.WriteQuantityMethod(it.Quantity - it.TakeQuantity, it.DrawerNo, it.ColNo );
+
+                                    Thread.Sleep(200);
                                 });
                             }
                             RequestData();
@@ -246,6 +391,7 @@ namespace DM_Weight.ViewModels
                         }
                         Status = 0;
                         _isFinishClick = false;
+                        _portUtil.ColNoLst = new List<int>();
                     }
                     else
                     {
@@ -275,9 +421,9 @@ namespace DM_Weight.ViewModels
         //检查是否是冰箱抽屉（冰箱抽屉打开时需要发送冰箱延迟报警的指令）
         public async Task CheckIsFridgeOpen()
         {
-            if(ChannelStocks!=null&& ChannelStocks.Count>0)
+            if (ChannelStocks != null && ChannelStocks.Count > 0)
             {
-                if (_portUtil.BoardType==(Int32)BoardTypeEnum.fridge)
+                if (_portUtil.BoardType == (Int32)BoardTypeEnum.fridge)
                 {
                     _portUtil.FridgeOperate = true;
                     //发送冰箱延迟报警的指令
@@ -291,11 +437,11 @@ namespace DM_Weight.ViewModels
         {
             if (ChannelStocks != null && ChannelStocks.Count > 0)
             {
-                if (_portUtil.BoardType== (Int32)BoardTypeEnum.fridge)
+                if (_portUtil.BoardType == (Int32)BoardTypeEnum.fridge)
                 {
                     string[] iTempertureRange = ConfigurationManager.AppSettings["temperatureRange"].Split('-');
                     //发送查询冰箱温度的指令
-                    float retT=   await _portUtil.GetFridgeTemperature();
+                    float retT = await _portUtil.GetFridgeTemperature();
                     if (retT > Convert.ToSingle(iTempertureRange[0]) && retT < Convert.ToSingle(iTempertureRange[1]))
                     {
                         _portUtil.FridgeOperate = true;
@@ -350,6 +496,10 @@ namespace DM_Weight.ViewModels
                 .Where(cs => cs.Quantity > 0)
                 .OrderBy(cs => cs.ColNo)
                 .ToList();
+            if (queryData != null && queryData.Count > 0)
+            {
+                OpenBoxVisibility = (queryData[0].BoardType == (Int32)BoardTypeEnum.box || queryData[0].BoardType == (Int32)BoardTypeEnum.weighBox || queryData[0].BoardType == (Int32)BoardTypeEnum.weighSmartBox) ? true : false;
+            }
             ChannelStocks = queryData;
         }
 

DM_Weight/ViewModels/FridgeWindowViewModel.cs

@@ -2,6 +2,7 @@
 using DM_Weight.msg;
 using DM_Weight.Port;
 using DM_Weight.util;
+using log4net;
 using Prism.Commands;
 using Prism.Events;
 using Prism.Mvvm;
@@ -20,6 +21,7 @@ namespace DM_Weight.ViewModels
 {
     public class FridgeWindowViewModel : BindableBase, IRegionMemberLifetime, INavigationAware
     {
+        private readonly ILog logger = LogManager.GetLogger(typeof(FridgeWindowViewModel));
         //温度区间
         private string _temperatureRange = CommonClass.ReadAppSetting("temperatureRange").ToString();
         public string TemperatureRange
@@ -28,10 +30,19 @@ namespace DM_Weight.ViewModels
             set
             {
                 SetProperty(ref _temperatureRange, value);
-                //更新配置文件中冰箱温度区间
-                CommonClass.SaveAppSetting("temperatureRange", _temperatureRange);
             }
         }
+        //温度不在范围超时时间
+        private string _outRangeTime = CommonClass.ReadAppSetting("OutRangeTime").ToString();
+        public string OutRangeTime
+        {
+            get => _outRangeTime;
+            set
+            {
+                SetProperty(ref _outRangeTime, value);
+            }
+        }
+
         private float defaultValue = Convert.ToSingle(CommonClass.ReadAppSetting("temperatureValue"));
         //温度值
         private float _temperatureValue = Convert.ToSingle(CommonClass.ReadAppSetting("temperatureValue"));
@@ -62,14 +73,14 @@ namespace DM_Weight.ViewModels
             get => _btnIsEnable;
             set => SetProperty(ref _btnIsEnable, value);
         }
-        //冰箱状态:true关;false开
+        //冰箱状态:true关1;false开0
         private bool _fridgeState;
         public bool FridgeState
         {
             get => _fridgeState;
             set => SetProperty(ref _fridgeState, value);
         }
-        //报警状态:true关;false开
+        //报警状态:true关1;false开0
         private bool _alarmState;
         public bool AlarmState
         {
@@ -77,9 +88,7 @@ namespace DM_Weight.ViewModels
             set => SetProperty(ref _alarmState, value);
         }
 
-        private int _defaultLoginMode;//1开0关
 
-        private int _defaultAlarmMode;//1开0关
 
         private float retTemperature = Convert.ToSingle(ConfigurationManager.AppSettings["temperatureValue"]);
 
@@ -109,51 +118,58 @@ namespace DM_Weight.ViewModels
                 //{
                 //    ConfigurationManager.RefreshSection("FridgeState");
                 //发送冰箱使能/失能指令
-                if (_fridgeState)
+                if (FridgeState)
                 {
                     await _portUtil.FridgeOff();
                     Thread.Sleep(100);
-                    CommonClass.SaveAppSetting("FridgeState", "0");
+                    CommonClass.SaveAppSetting("FridgeState", "1");
+
+                    //Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    //_configuration.AppSettings.Settings["FridgeState"].Value = "1";
+                    //_configuration.Save();
+                    //ConfigurationManager.RefreshSection("FridgeState");
                 }
                 else
                 {
                     await _portUtil.FridegOpen();
                     Thread.Sleep(100);
-                    CommonClass.SaveAppSetting("FridgeState", "1");
+                    CommonClass.SaveAppSetting("FridgeState", "0");
+                    //Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    //_configuration.AppSettings.Settings["FridgeState"].Value = "0";
+                    //_configuration.Save();
+                    //ConfigurationManager.RefreshSection("FridgeState");
+                    //冰箱打开定时获取冰箱温度
+                    _eventAggregator.GetEvent<FridgeEvent>().Publish();
                 }
-                //}
-                //温度报警设定
-                //if (AlarmState != _defaultAlarmMode.Equals(1))
-                //{
                 //发送警报使能/失能指令
-                if (_alarmState)
+                if (AlarmState)
                 {
                     await _portUtil.FridgeAlarmOff();
                     Thread.Sleep(100);
-                    CommonClass.SaveAppSetting("AlarmState", "0");
+                    CommonClass.SaveAppSetting("AlarmState", "1");
+                    //Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    //_configuration.AppSettings.Settings["AlarmState"].Value = "1";
+                    //_configuration.Save();
+                    //ConfigurationManager.RefreshSection("AlarmState");
                 }
                 else
                 {
                     await _portUtil.FridgeAlarmOn();
                     Thread.Sleep(100);
-                    CommonClass.SaveAppSetting("AlarmState", "1");
+                    CommonClass.SaveAppSetting("AlarmState", "0");
+
+                    //Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    //_configuration.AppSettings.Settings["AlarmState"].Value = "0";
+                    //_configuration.Save();
+                    //ConfigurationManager.RefreshSection("AlarmState");
                 }
-                //}
+                //设定冰箱1温度区间
-
+                //string[] range = ConfigurationManager.AppSettings["temperatureRange"].Split('-');
-                //if (retTemperature != TemperatureValue)
-                //{
-                //    //设定冰箱温度
-                //    await _portUtil.SetFridgeTemperature(TemperatureValue);
-
-                //    CommonClass.SaveAppSetting("temperatureValue", TemperatureValue.ToString());
-                //}
-                //设定冰箱温度区间
-                string[] range = ConfigurationManager.AppSettings["temperatureRange"].Split('-');
                 string[] newRange = TemperatureRange.Split('-');
-                if (range.Length >= 2)
+                if (newRange.Length >= 2)
                 {
-                    bool bMix = float.TryParse(range[0], out float Min);
+                    bool bMix = float.TryParse(newRange[0], out float Min);
-                    bool bMax = float.TryParse(range[1], out float Max);
+                    bool bMax = float.TryParse(newRange[1], out float Max);
 
                     if (bMix && bMax)
                     {
@@ -166,12 +182,27 @@ namespace DM_Weight.ViewModels
                         if (Max != Convert.ToSingle(newRange[1]))
                         {
                             Thread.Sleep(100);
-                            //设定冰箱温度最有值
+                            //设定冰箱温度最大值
                             await _portUtil.FridgeMaxSetting(Convert.ToSingle(newRange[1]));
                             Thread.Sleep(100);
                         }
                     }
+                    //Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    //_configuration.AppSettings.Settings["TemperatureRange"].Value = TemperatureRange;
+                    //_configuration.Save();
+                    //ConfigurationManager.RefreshSection("TemperatureRange");
+                    CommonClass.SaveAppSetting("TemperatureRange", TemperatureRange);
                 }
+                //超时时间
+                if (OutRangeTime != null)
+                {
+                    //Configuration _configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+                    //_configuration.AppSettings.Settings["OutRangeTime"].Value = OutRangeTime;
+                    //_configuration.Save();
+                    //ConfigurationManager.RefreshSection("OutRangeTime");
+                    CommonClass.SaveAppSetting("OutRangeTime", OutRangeTime);
+                }
+
 
                 _portUtil.FridgeOperate = false;
                 AlertMsg alertMsg = new AlertMsg
@@ -180,13 +211,6 @@ namespace DM_Weight.ViewModels
                     Type = MsgType.SUCCESS
                 };
                 _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
-
-                //_fridgeState = ReadAppSetting("FridgeState").Equals(1);
-                //_defaultLoginMode = ReadAppSetting("FridgeState");
-                //_defaultAlarmMode = ReadAppSetting("AlarmState");
-                //_alarmState = ReadAppSetting("AlarmState").Equals(1);
-                //_temperatureRange = CommonClass.ReadAppSetting("temperatureRange");
-                //_temperatureValue = Convert.ToSingle(CommonClass.ReadAppSetting("temperatureValue"));
             }
             catch (Exception ex)
             {
@@ -200,21 +224,17 @@ namespace DM_Weight.ViewModels
                 _portUtil.FridgeOperate = false;
             }
         }
-        public FridgeWindowViewModel()
-        {
-
-        }
-
         //手动实现调用配置的逻辑 规避修改配置文件后不起作用的问题
-        public int ReadAppSetting(string key)
+        //public int ReadAppSetting(string key)
-        {
+        //{
-            string xPath = "/configuration/appSettings//add[@key='" + key + "']";
+        //    string xPath = "/configuration/appSettings//add[@key='" + key + "']";
-            XmlDocument doc = new XmlDocument();
+        //    XmlDocument doc = new XmlDocument();
-            string exeFileName = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
+        //    string exeFileName = System.Reflection.Assembly.GetExecutingAssembly().GetName().Name;
-            doc.Load(exeFileName + ".dll.config");
+        //    doc.Load(exeFileName + ".dll.config");
-            XmlNode node = doc.SelectSingleNode(xPath);
+        //    XmlNode node = doc.SelectSingleNode(xPath);
-            return Convert.ToInt32(node.Attributes["value"].Value);
+        //    logger.Info($"xPath:{xPath} exeFileName:{exeFileName} ReadAppSetting key:{key} value:{node.Attributes["value"].Value}");
-        }
+        //    return Convert.ToInt32(node.Attributes["value"].Value);
+        //}
 
         public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
         {
@@ -222,12 +242,11 @@ namespace DM_Weight.ViewModels
 
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
-            _fridgeState = ReadAppSetting("FridgeState").Equals(0);
+            FridgeState = CommonClass.ReadAppSetting("FridgeState").Equals("1");
-            _defaultLoginMode = ReadAppSetting("FridgeState");
+
-            _defaultAlarmMode = ReadAppSetting("AlarmState");
+            AlarmState = CommonClass.ReadAppSetting("AlarmState").Equals("1");
-            _alarmState = ReadAppSetting("AlarmState").Equals(0);
+
 
-            GetTemperature();
         }
 
         public bool IsNavigationTarget(NavigationContext navigationContext)
@@ -237,22 +256,7 @@ namespace DM_Weight.ViewModels
 
         public void OnNavigatedFrom(NavigationContext navigationContext)
         {
-
         }
-
-        //public void OnNavigatedTo(NavigationContext navigationContext)
-        //{
-        //    GetTemperature();
-        //}
-
-        //public bool IsNavigationTarget(NavigationContext navigationContext)
-        //{
-        //    return true;
-        //}
-
-        //public void OnNavigatedFrom(NavigationContext navigationContext)
-        //{
-        //}
         //获取冰箱温度值，如有更改则保存更改
         private async Task GetTemperature()
         {

DM_Weight/ViewModels/HomeWindowViewModel.cs

@@ -25,6 +25,7 @@ using DM_Weight.msg;
 using DM_Weight.Common;
 using Microsoft.IdentityModel.Logging;
 using System.Threading;
+using System.Windows.Media;
 
 namespace DM_Weight.ViewModels
 {
@@ -40,12 +41,28 @@ namespace DM_Weight.ViewModels
         /// </summary>
         private string _wd = "恒温冷藏抽屉当前温度2.8（非真实数据）";
         public string WD { get => _wd; set => SetProperty(ref _wd, value); }
-        System.Timers.Timer WDTimer;
+        private SolidColorBrush _alertColor = Brushes.White;
+        public SolidColorBrush AlertColor
+        {
+            get => _alertColor;
+            set => SetProperty(ref _alertColor, value);
+        }
         private int loginMode = Convert.ToInt32(ConfigurationManager.AppSettings["loginMode"]?.ToString() ?? "1");
         public bool MultiLogin
         {
             get => loginMode == 2;
         }
+        //温度区间
+        private string TemperatureRange = CommonClass.ReadAppSetting("temperatureRange").ToString();
+        //温度不在区间计时器（超过配置文件中的时间后要报警）
+        public DateTime? FridgeTime { get; set; }
+        //冰箱是否异常状态:0正常，1异常
+        //public string FridgeWorkingState = ConfigurationManager.AppSettings["FridgeworkingState"].ToString();
+        //冰箱开关状态:0开，1关
+        public string FridgeState = ConfigurationManager.AppSettings["FridgeState"].ToString();
+        //冰箱渡不在区间超时时间
+        private string _outRangeTime = ConfigurationManager.AppSettings["OutRangeTime"].ToString();
+        public string OutRangeTime { get => _outRangeTime; set => SetProperty(ref _outRangeTime, value); }
 
         private PremissionDm? _selectedMenu;
 
@@ -186,7 +203,8 @@ namespace DM_Weight.ViewModels
 
         IRegionManager _regionManager;
         IUnityContainer _container;
-
+        //是否退出
+        bool IsLeave = false;
         private bool _is16Drawer;
         public bool Is16Drawer { get => _is16Drawer; set => SetProperty(ref _is16Drawer, value); }
         public bool KeepAlive => false;
@@ -266,32 +284,6 @@ namespace DM_Weight.ViewModels
             Is16Drawer = count == 16;
         }
         /// <summary>
-        /// 获取温度信息
-        /// </summary>
-        private async void GetWD(object sender, ElapsedEventArgs e)
-        {
-            if (!_portUtil.FridgeOperate)
-            {
-                string retStr = string.Empty;
-                byte[] data = null;
-                float retT = await _portUtil.GetFridgeTemperature();
-                Thread.Sleep(80);
-                WD = $"恒温冷藏抽屉当前温度：{Math.Round((retT), 2)}℃";
-            }
-        }
-
-        private async void GetWD()
-        {
-            if (!_portUtil.FridgeOperate)
-            {
-                string retStr = string.Empty;
-                byte[] data = null;
-                float retT = await _portUtil.GetFridgeTemperature();
-                Thread.Sleep(80);
-                WD = $"恒温冷藏抽屉当前温度：{Math.Round((retT),2)}℃";
-            }
-        }
-        /// <summary>
         /// 将收到的返回转换成具体温度数值
         /// </summary>
         /// <param name="receiveData"></param>
@@ -371,43 +363,229 @@ namespace DM_Weight.ViewModels
             int autoExit = Convert.ToInt32(ConfigurationManager.AppSettings["autoExit"] ?? "0");
             if (autoExit > 0)
             {
-                System.Timers.Timer timer = new System.Timers.Timer();
+                //int interval = autoExit * 1000;
-                timer.Interval = 1000;
+                new PromiseUtil<int>().taskAsyncLoop(1000, 0, async (options, next, stop) =>
-                timer.Elapsed += (sender, e) =>
                 {
-                    // 串口无人操作
+                    try
-                    if (!_portUtil.Operate)
                     {
-                        // 30秒内无人操作鼠标键盘
+                        if (!_portUtil.Operate)
-                        if ((DateTime.Now - _portUtil.dateTime).TotalSeconds > autoExit && CheckComputerFreeState.GetLastInputTime() > autoExit)
                         {
-                            logger.Info($"设备30秒内无人操作，用户【{Operator?.Nickname}】自动退出登录");
+                            // 无人操作鼠标键盘
-                            Operator = null;
+                            if ((DateTime.Now - _portUtil.dateTime).TotalSeconds > autoExit && CheckComputerFreeState.GetLastInputTime() > autoExit)
-                            Reviewer = null;
-                            Application.Current.Dispatcher.Invoke(() =>
                             {
-                                _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                                logger.Info($"设备{autoExit}内无人操作，用户【{Operator?.Nickname}】自动退出登录,_portUtil.Operate:{_portUtil.Operate},totalSecond:{(DateTime.Now - _portUtil.dateTime).TotalSeconds},lastInputTime:{CheckComputerFreeState.GetLastInputTime()},autoExit:{autoExit}");
-                                timer.Stop();
+
-                            });
+                                Operator = null;
+                                Reviewer = null;
+                                //Application.Current.Dispatcher.Invoke(() =>
+                                //{
+                                stop();
+                                System.Windows.Application.Current.Dispatcher.Invoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                                {
+                                    _regionManager.RequestNavigate("MainRegion", "LoginWindow");
+                                }));
+                                //});
+                                //timer.Dispose();
+                            }
+                            else
+                            {
+                                if (Operator == null)
+                                {
+                                    stop();
+                                }
+                                else
+                                {
+                                    next();
+                                }
+                            }
+                        }
+                        else
+                        {
+                            _portUtil.dateTime = DateTime.Now;
+                            next();
                         }
                     }
-                };
+                    catch (Exception ex)
-                timer.Start();
+                    {
+                        logger.Info($"自动退出异常:{ex.Message}");
+                    }
+                });
             }
-            #region 温度查询定时
+            GetFridgeTemperature();
-            int interval = Convert.ToInt32(ConfigurationManager.AppSettings["Interval"]);
-            if (interval > 0)
-            {
-                WDTimer = new System.Timers.Timer();
 
-                WDTimer.Elapsed += new System.Timers.ElapsedEventHandler(GetWD);
+            _eventAggregator.GetEvent<FridgeEvent>().Subscribe(GetFridgeTemperature);
-                WDTimer.Interval = interval;
+        }
-                WDTimer.Start();
+
-                //WDTimer.AutoReset = true;
+
-                //WDTimer.Enabled = true;
+        //获取冰箱温度定时
-            }
+        private void GetFridgeTemperature()
-            #endregion
+        {
-            GetWD();
+            //根据配置文件中的 冰箱温度定时时间循环
+            logger.Info("获取冰箱温度定时");
+            int TemperatureTimer = Convert.ToInt32(CommonClass.ReadAppSetting("TemperatureTimer")) * 1000;
+            logger.Info($"获取冰箱温度定时-TemperatureTimer");
+            string[] tempRange = TemperatureRange.Split('-');
+
+            new PromiseUtil<int>().taskAsyncLoop(TemperatureTimer, 0, async (options, next, stop) =>
+            {
+                try
+                {
+                    FridgeState = CommonClass.ReadAppSetting("FridgeState");
+                    if (!_portUtil.FridgeOperate && FridgeState.Equals("0"))
+                    {
+                        string retStr = string.Empty;
+                        byte[] data = null;
+                        float retT = await _portUtil.GetFridgeTemperature();
+                        Thread.Sleep(80);
+                        WD = $"恒温冷藏抽屉当前温度：{Math.Round((retT), 2)}℃;";
+                        AlertColor = Brushes.White;
+                        logger.Info(WD);
+                        if (tempRange != null && tempRange.Count() >= 2)
+                        {
+                            if (retT < Convert.ToSingle(tempRange[0]) || retT > Convert.ToSingle(tempRange[1]))
+                            {
+                                //查询制冷片温度
+                                float retT2 = await _portUtil.GetFridgeTemperature2();
+                                if (retT2 > 65)
+                                {
+                                    if (!FridgeState.Equals("1"))
+                                    {
+                                        //停掉冰箱
+                                        await _portUtil.FridgeOff();
+                                        CommonClass.SaveAppSetting("FridgeState", "1");
+                                        //AlertMsg alertMsg = new AlertMsg
+                                        //{
+                                        //    Message = $"冰箱制冷片温度超过65度，已关闭冰箱制冷功能!!!",
+                                        //    Type = MsgType.ERROR
+                                        //};
+                                        //_eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+
+                                        System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                                        {
+                                            DialogParameters dialogParameters = new DialogParameters();
+                                            dialogParameters.Add("warnMessage", "冰箱制冷片温度超过65度，已关闭冰箱制冷功能!!!");
+                                            DialogServiceExtensions.ShowDialogHost(_dialogService, "WarnDialog", dialogParameters, DoDialogResult, "RootDialog");
+
+                                        }));
+                                    }
+                                    logger.Info($"制冷片温度超过65度");
+                                    Thread.Sleep(100);
+                                    //给出提示
+                                    WD += "冰箱温度异常，已关闭冰箱制冷功能";
+                                    AlertColor = Brushes.Red;
+                                    FridgeTime = null;
+                                    stop();
+                                }
+                                else
+                                {
+                                    if (FridgeTime == null)
+                                    {
+                                        FridgeTime = DateTime.Now;
+                                        //温度不在范围，但没有超过时间
+                                        if (IsLeave)
+                                        {
+                                            FridgeTime = null;
+                                            stop();
+                                        }
+                                        else
+                                        {
+                                            next();
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if ((DateTime.Now - FridgeTime.Value).TotalMinutes > Convert.ToInt32(OutRangeTime))
+                                        {
+                                            logger.Info($"冰箱温度不在范围内，超过{OutRangeTime}分钟");
+                                            //停掉冰箱
+                                            await _portUtil.FridgeOff();
+                                            Thread.Sleep(100);
+                                            CommonClass.SaveAppSetting("FridgeState", "0");
+                                            //给出提示
+                                            WD += "冰箱温度异常，已关闭冰箱制冷功能;";
+                                            AlertColor = Brushes.Red;
+                                            FridgeState = "1";
+                                            CommonClass.SaveAppSetting("FridgeState", "1");
+                                            //AlertMsg alertMsg = new AlertMsg
+                                            //{
+                                            //    Message = $"冰箱温度异常，已关闭冰箱制冷功能!!!",
+                                            //    Type = MsgType.ERROR
+                                            //};
+                                            //_eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                            System.Windows.Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send, new Action(() =>
+                                            {
+                                                DialogParameters dialogParameters = new DialogParameters();
+                                                dialogParameters.Add("warnMessage", "冰箱温度异常，已关闭冰箱制冷功能!!!");
+                                                DialogServiceExtensions.ShowDialogHost(_dialogService, "WarnDialog", dialogParameters, DoDialogResult, "RootDialog");
+
+                                            }));
+                                            FridgeTime = null;
+                                            stop();
+                                        }
+                                        else
+                                        {
+                                            //温度不在范围，但没有超过时间
+                                            if (IsLeave)
+                                            {
+                                                FridgeTime = null;
+                                                stop();
+                                            }
+                                            else
+                                            {
+                                                next();
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                if (IsLeave)
+                                {
+                                    FridgeTime = null;
+                                    stop();
+                                }
+                                else
+                                {
+                                    next();
+                                }
+                            }
+                        }
+                        else
+                        {
+                            logger.Info($"获取冰箱温度范围有误{TemperatureRange}");
+
+                            //if (Convert.ToInt32(ConfigurationManager.AppSettings["hasFridge"]) > 1)
+                            //{
+                            //    float retTemp = await _portUtil.GetFridgeTemperature(2);
+                            //    Thread.Sleep(80);
+                            //    WD += $"{retTemp}℃";
+                            //}
+                            if (IsLeave)
+                            {
+                                FridgeTime = null;
+                                stop();
+                            }
+                            else
+                            {
+                                next();
+                            }
+                        }
+                    }
+                    else
+                    {
+                        WD = $"恒温冷藏抽屉串口关闭或冰箱制冷异常制冷关闭！！！";
+                        AlertColor = Brushes.Red;
+                        FridgeTime = null;
+                        stop();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    logger.Info($"获取冰箱异常:{ex.Message}");
+                    next();
+                }
+            });
         }
 
         //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建
@@ -419,7 +597,9 @@ namespace DM_Weight.ViewModels
         //这个方法用于拦截请求
         public void OnNavigatedFrom(NavigationContext navigationContext)
         {
+            IsLeave = true;
             navigationContext.NavigationService.Region.RegionManager.Regions.Remove(PrismManager.SettingViewRegionName);
+            _eventAggregator.GetEvent<FridgeEvent>().Unsubscribe(GetFridgeTemperature);
         }
     }
 }

DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs

@@ -247,17 +247,19 @@ namespace DM_Weight.ViewModels
                         for (int i = 0; i < record.Count; i++)
                         {
                             ChannelStock it = record[i];
-                            if (it.BoardType == (Int32)BoardTypeEnum.weigh && it.PosNo == 0)
+                            //if (it.BoardType == (Int32)BoardTypeEnum.weigh && it.PosNo == 0)
-                            {
+                            //{
-                                _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                            //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                            }
+                            //}
                             // 更新数据 库存信息
                             SqlSugarHelper.Db.Updateable(new ChannelStock()
                             {
                                 Quantity = it.Quantity + it.AddQuantity,
                                 PosNo = 1,
                                 Id = it.Id,
-                            }).UpdateColumns(it => new { it.Quantity, it.PosNo }).ExecuteCommand();
+                                ManuNo = it.ManuNo,
+                                EffDate = it.EffDate,
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
                             // 获取更新完库存后的药品库存
                             List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                 .Where(cs => cs.MachineId.Equals(it.MachineId))
@@ -272,8 +274,8 @@ namespace DM_Weight.ViewModels
                                 DrawerNo = it.DrawerNo,
                                 ColNo = it.ColNo,
                                 DrugId = it.DrugId,
-                                //ManuNo = it.ManuNo,
+                                ManuNo = it.ManuNo,
-                                //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                 Operator = HomeWindowViewModel.Operator?.Id,
                                 Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                 OperationTime = DateTime.Now,
@@ -283,12 +285,12 @@ namespace DM_Weight.ViewModels
                                 StockQuantity = nowChannels.Sum(it => it.Quantity)
                             }).ExecuteCommand();
                             //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                            if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                            {
+                            //{
-                                //计数数量设置，发送称重26指令
+                            //    //计数数量设置，发送称重26指令
-                                _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                            //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                Thread.Sleep(80);
+                            //    Thread.Sleep(80);
-                            }
+                            //}
                         }
                         return true;
                     });
@@ -301,7 +303,8 @@ namespace DM_Weight.ViewModels
                         {
                             singleChannels.ForEach(it =>
                             {
-                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
+                                _portUtil.WriteQuantityMethod(it.Quantity + it.AddQuantity,it.DrawerNo, it.ColNo);
+                                Thread.Sleep(200);
                             });
                         }
 

DM_Weight/ViewModels/InvoiceInWindowViewModel.cs

@@ -206,8 +206,8 @@ namespace DM_Weight.ViewModels
                 {
                     List<ChannelStock> q = SqlSugarHelper.Db.Queryable<ChannelStock>()
                     .Includes<DrugInfo>(cs => cs.DrugInfo)
-                    //.WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Equals(invoice.DrugEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Equals(invoice.DrugEffDate))
-                    //.WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
                     .Where(cs => cs.DrugId == invoice.DrugId)
                     .Where(cs => cs.DrawerType == (Int32)DrawerTypeEnum.drawerTypeOne)
                     .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))

DM_Weight/ViewModels/InvoiceTakeDialogViewModel.cs

@@ -192,10 +192,10 @@ namespace DM_Weight.ViewModels
                     .Where(cs => cs.Quantity > 0)
                     .Where(cs => cs.DrawerType == (Int32)DrawerTypeEnum.drawerTypeOne)
                     .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                    //.WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Equals(invoice.DrugEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Equals(invoice.DrugEffDate))
-                    //.WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
+                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
                     .Where(cs => cs.DrugId == invoice.DrugId)
-                    //.OrderBy(cs => cs.EffDate)
+                    .OrderBy(cs => cs.EffDate)
                     .ToList();
                 int total = HasQChannels.Sum(it => it.Quantity);
                 int TakeQ = invoice.quantity;
@@ -317,10 +317,10 @@ namespace DM_Weight.ViewModels
                                 SqlSugarHelper.Db.Updateable(new ChannelStock()
                                 {
                                     Quantity = it.Quantity - it.TakeQuantity,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = it.EffDate,
+                                    EffDate = it.EffDate,
                                     Id = it.Id,
-                                }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+                                }).UpdateColumns(it => new { it.Quantity,it.ManuNo,it.EffDate }).ExecuteCommand();
                                 // 获取更新完库存后的药品库存
                                 List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                     .Where(cs => cs.MachineId.Equals(it.MachineId))
@@ -335,8 +335,8 @@ namespace DM_Weight.ViewModels
                                     DrawerNo = it.DrawerNo,
                                     ColNo = it.ColNo,
                                     DrugId = it.DrugId,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                     Operator = HomeWindowViewModel.Operator?.Id,
                                     Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                     OperationTime = DateTime.Now,
@@ -346,12 +346,12 @@ namespace DM_Weight.ViewModels
                                     StockQuantity = nowChannels.Sum(it => it.Quantity)
                                 }).ExecuteCommand();
                                 //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                                if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                                //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                                {
+                                //{
-                                    //计数数量设置，发送称重26指令
+                                //    //计数数量设置，发送称重26指令
-                                    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                                //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                    Thread.Sleep(80);
+                                //    Thread.Sleep(80);
-                                }
+                                //}
                             }
                             return true;
                         });
@@ -364,7 +364,8 @@ namespace DM_Weight.ViewModels
                             {
                                 singleChannels.ForEach(it =>
                                 {
-                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                    _portUtil.WriteQuantityMethod(it.Quantity - it.TakeQuantity,it.DrawerNo, it.ColNo);
+                                    Thread.Sleep(200);
                                 });
                             }
                             AlertMsg alertMsg = new AlertMsg

DM_Weight/ViewModels/MainWindowViewModel.cs

@@ -17,6 +17,7 @@ using DM_Weight.Views;
 using Unity;
 using System.Threading;
 using System.Timers;
+using System.Configuration;
 
 namespace DM_Weight.ViewModels
 {
@@ -83,7 +84,7 @@ namespace DM_Weight.ViewModels
             }));
 
             #region 温度查询定时
-            int interval = 60000;
+            int interval = Convert.ToInt32(ConfigurationManager.AppSettings["Interval"]);
             if (interval > 0)
             {
                 System.Timers.Timer doorTimer = new System.Timers.Timer();
@@ -93,8 +94,6 @@ namespace DM_Weight.ViewModels
                 doorTimer.Start();
             }
             #endregion
-
-            
         }
         /// <summary>
         /// 监测后门是否打开

DM_Weight/ViewModels/MultiOrderTakeDialogViewModel.cs

@@ -178,7 +178,7 @@ namespace DM_Weight.ViewModels
               .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == (Int32)DrawerTypeEnum.drawerTypeOne).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (od, t) => od.DrugId == t.DrugId)
               .Where(od => OrderInfo.Select(o => o.OrderNo).Contains(od.OrderNo)).GroupBy(od => od.DrugId)
 
-              .Select(od => new OrderDetail { DrugId = od.DrugId,Quantity = SqlFunc.AggregateSum(od.Quantity) })
+              .Select(od => new OrderDetail { DrugId = od.DrugId, SetEffDate = od.SetEffDate, SetManuNo = od.SetManuNo, Quantity = SqlFunc.AggregateSum(od.Quantity) })
 
                 //.Where(od => od.OrderNo. OrderInfo.OrderNo)
                 .ToList();
@@ -195,8 +195,8 @@ namespace DM_Weight.ViewModels
                     .Where(cs => cs.Quantity > 0)
                     .Where(cs => cs.DrawerType == (Int32)DrawerTypeEnum.drawerTypeOne)
                     .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                    //.WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
-                    //.WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
                     .Where(cs => cs.DrugId == orderDetail.DrugId)
                     .OrderBy(cs => cs.EffDate)
                     .OrderBy(cs => cs.DrawerNo)
@@ -375,8 +375,8 @@ namespace DM_Weight.ViewModels
                                     SqlSugarHelper.Db.Updateable(new ChannelStock()
                                     {
                                         Quantity = it.Quantity - it.TakeQuantity,
-                                        //ManuNo = it.ManuNo,
+                                        ManuNo = it.ManuNo,
-                                        //EffDate = it.EffDate,
+                                        EffDate = it.EffDate,
                                         Id = it.Id,
                                     }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
                                     // 获取更新完库存后的药品库存
@@ -393,8 +393,8 @@ namespace DM_Weight.ViewModels
                                         DrawerNo = it.DrawerNo,
                                         ColNo = it.ColNo,
                                         DrugId = it.DrugId,
-                                        //ManuNo = it.ManuNo,
+                                        ManuNo = it.ManuNo,
-                                        //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                        EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                         Operator = HomeWindowViewModel.Operator?.Id,
                                         Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                         OperationTime = DateTime.Now,
@@ -405,12 +405,12 @@ namespace DM_Weight.ViewModels
                                     }).ExecuteCommand();
 
                                     //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                                    if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                                    //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                                    {
+                                    //{
-                                        //计数数量设置，发送称重26指令
+                                    //    //计数数量设置，发送称重26指令
-                                        _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                                    //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                        Thread.Sleep(80);
+                                    //    Thread.Sleep(80);
-                                    }
+                                    //}
                                 }
                                 //更新处方状态
                                 SqlSugarHelper.Db.Updateable(new OrderInfo()
@@ -432,7 +432,8 @@ namespace DM_Weight.ViewModels
                                 {
                                     singleChannels.ForEach(it =>
                                     {
-                                        _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                        _portUtil.WriteQuantityMethod(it.Quantity - it.TakeQuantity,it.DrawerNo, it.ColNo);
+                                        Thread.Sleep(200);
                                     });
                                 }
                                 AlertMsg alertMsg = new AlertMsg

DM_Weight/ViewModels/OrderReturnDialogViewModel.cs

@@ -342,12 +342,12 @@ namespace DM_Weight.ViewModels
                                 StockQuantity = nowChannels.Sum(it => it.Quantity)
                             }).ExecuteCommand();
                             //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                            if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                            {
+                            //{
-                                //计数数量设置，发送称重26指令
+                            //    //计数数量设置，发送称重26指令
-                                _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                            //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                Thread.Sleep(80);
+                            //    Thread.Sleep(80);
-                            }
+                            //}
                         }
                         return true;
                     });
@@ -360,7 +360,8 @@ namespace DM_Weight.ViewModels
                         {
                             singleChannels.ForEach(it =>
                             {
-                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.TakeQuantity);
+                                _portUtil.WriteQuantityMethod(it.Quantity + it.TakeQuantity,it.DrawerNo, it.ColNo);
+                                Thread.Sleep(200);
                             });
                         }
                         AlertMsg alertMsg = new AlertMsg

DM_Weight/ViewModels/OrderTakeDialogViewModel.cs

@@ -190,10 +190,10 @@ namespace DM_Weight.ViewModels
                     .Where(cs => cs.Quantity > 0)
                     .Where(cs => cs.DrawerType == (Int32)DrawerTypeEnum.drawerTypeOne)
                     .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                    //.WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetEffDate), cs => cs.EffDate.Equals(orderDetail.SetEffDate))
-                    //.WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
+                    .WhereIF(!string.IsNullOrEmpty(orderDetail.SetManuNo), cs => cs.ManuNo.Equals(orderDetail.SetManuNo))
                     .Where(cs => cs.DrugId == orderDetail.DrugId)
-                    //.OrderBy(cs => cs.EffDate)
+                    .OrderBy(cs => cs.EffDate)
                     .OrderBy(cs => cs.DrawerNo)
                     .ToList();
                 int total = HasQChannels.Sum(it => it.Quantity);
@@ -337,8 +337,8 @@ namespace DM_Weight.ViewModels
                                 SqlSugarHelper.Db.Updateable(new ChannelStock()
                                 {
                                     Quantity = it.Quantity - it.TakeQuantity,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = it.EffDate,
+                                    EffDate = it.EffDate,
                                     Id = it.Id,
                                 }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
                                 // 获取更新完库存后的药品库存
@@ -355,8 +355,8 @@ namespace DM_Weight.ViewModels
                                     DrawerNo = it.DrawerNo,
                                     ColNo = it.ColNo,
                                     DrugId = it.DrugId,
-                                    //ManuNo = it.ManuNo,
+                                    ManuNo = it.ManuNo,
-                                    //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                    EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                     Operator = HomeWindowViewModel.Operator?.Id,
                                     Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                     OperationTime = DateTime.Now,
@@ -366,12 +366,12 @@ namespace DM_Weight.ViewModels
                                     StockQuantity = nowChannels.Sum(it => it.Quantity)
                                 }).ExecuteCommand();
                                 //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                                if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                                //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                                {
+                                //{
-                                    //计数数量设置，发送称重26指令
+                                //    //计数数量设置，发送称重26指令
-                                    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                                //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                    Thread.Sleep(80);
+                                //    Thread.Sleep(80);
-                                }
+                                //}
                             }
                             return true;
                         });
@@ -383,7 +383,8 @@ namespace DM_Weight.ViewModels
                             {
                                 singleChannels.ForEach(it =>
                                 {
-                                    _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                    _portUtil.WriteQuantityMethod(it.Quantity - it.TakeQuantity,it.DrawerNo, it.ColNo);
+                                    Thread.Sleep(200);
                                 });
                             }
                             AlertMsg alertMsg = new AlertMsg

DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs

@@ -233,7 +233,7 @@ namespace DM_Weight.ViewModels
                 .Where(oi => oi.DmStatus == 0)
                 .Where(oi => oi.HisDispFlag == 0)
                 .Where(oi => oi.CancelFlag == 0)
-                .GroupBy(oi => oi.RecvDate)
+                .GroupBy(oi => oi.ChargeDate)
                 .Select(oi => oi)
                 .ToPageList(PageNum, PageSize, ref totalCount);
             //.ToList();

DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs

@@ -273,12 +273,12 @@ namespace DM_Weight.ViewModels
                             StockQuantity = nowChannels.Sum(it => it.Quantity)
                         }).ExecuteCommand();
                     //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                    if (ChannelStock.BoardType == (Int32)BoardTypeEnum.weigh || ChannelStock.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                    //if (ChannelStock.BoardType == (Int32)BoardTypeEnum.weigh || ChannelStock.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                    {
+                    //{
-                        //计数数量设置，发送称重26指令
+                    //    //计数数量设置，发送称重26指令
-                        _portUtil.SetNumCount(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.AddQuantity);
+                    //    _portUtil.SetNumCount(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.AddQuantity);
-                        Thread.Sleep(80);
+                    //    Thread.Sleep(80);
-                    }
+                    //}
                     return true;
                 });
                 if (f.Data)
@@ -286,7 +286,8 @@ namespace DM_Weight.ViewModels
                     // 更新屏显库存
                     if (ChannelStock.BoardType == (Int32)BoardTypeEnum.smart|| ChannelStock.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
                     {
-                        _portUtil.WriteQuantity(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.Quantity + ReturnQuantity);
+                        _portUtil.WriteQuantityMethod(ChannelStock.Quantity + ReturnQuantity,ChannelStock.DrawerNo, ChannelStock.ColNo);
+                        Thread.Sleep(200);
                     }
 
                     AlertMsg alertMsg = new AlertMsg

DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs

@@ -281,12 +281,12 @@ namespace DM_Weight.ViewModels
                                 StockQuantity = nowChannels.Sum(it => it.Quantity)
                             }).ExecuteCommand();
                             //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                            if (ChannelStock.BoardType == (Int32)BoardTypeEnum.weigh || ChannelStock.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            //if (ChannelStock.BoardType == (Int32)BoardTypeEnum.weigh || ChannelStock.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                            {
+                            //{
-                                //计数数量设置，发送称重26指令
+                            //    //计数数量设置，发送称重26指令
-                                _portUtil.SetNumCount(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.AddQuantity);
+                            //    _portUtil.SetNumCount(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.AddQuantity);
-                                Thread.Sleep(80);
+                            //    Thread.Sleep(80);
-                            }
+                            //}
                         }
 
                         return true;
@@ -296,7 +296,8 @@ namespace DM_Weight.ViewModels
                         // 更新屏显库存
                         if (ChannelStock.BoardType == (Int32)BoardTypeEnum.smart|| ChannelStock.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
                         {
-                            _portUtil.WriteQuantity(ChannelStock.DrawerNo, ChannelStock.ColNo, ChannelStock.Quantity + ReturnQuantity);
+                            _portUtil.WriteQuantityMethod(ChannelStock.Quantity + ReturnQuantity,ChannelStock.DrawerNo, ChannelStock.ColNo);
+                            Thread.Sleep(200);
                         }
 
                         AlertMsg alertMsg = new AlertMsg

DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs

@@ -57,7 +57,7 @@ namespace DM_Weight.ViewModels
                 {
                     DialogParameters dialogParameters = new DialogParameters();
                     dialogParameters.Add("channel", Channel);
-                    DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnEmptyDialog", dialogParameters, DoDialogResult, "RootDialog");
+                    DialogServiceExtensions.ShowDialogHost(_dialogService, "ReturnEmptyWithOrderDialog", dialogParameters, DoDialogResult, "RootDialog");
                 }
             });
         }

DM_Weight/ViewModels/ReturnWithOrderWindowViewModel.cs

@@ -0,0 +1,716 @@
+using DM_Weight.Common;
+using DM_Weight.Models;
+using DM_Weight.msg;
+using DM_Weight.Port;
+using DM_Weight.select;
+using DM_Weight.util;
+using log4net;
+using log4net.Repository.Hierarchy;
+using Prism.Commands;
+using Prism.Events;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using SqlSugar;
+using SqlSugar.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Drawing.Printing;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DM_Weight.ViewModels
+{
+    public class ReturnWithOrderWindowViewModel : BindableBase, IConfirmNavigationRequest, IRegionMemberLifetime
+    {
+        private int _pageNum = 1;
+        public int PageNum
+        {
+            get => _pageNum;
+            set
+            {
+                SetProperty(ref _pageNum, value);
+                RequestData();
+            }
+        }
+
+        private int _pageCount = 1;
+        public int PageCount
+        {
+            get => _pageCount;
+            set
+            {
+                SetProperty(ref _pageCount, value);
+            }
+        }
+
+        private int _pageSize = 8;
+        public int PageSize
+        {
+            get => _pageSize;
+            set
+            {
+                SetProperty(ref _pageSize, value);
+            }
+        }
+
+        private int _totalCount = 0;
+        public int TotalCount
+        {
+            get => _totalCount;
+            set
+            {
+                SetProperty(ref _totalCount, value);
+            }
+        }
+        public static List<OrderTakeSelect> StaticOrderTakeSelects = new()
+        {
+            new OrderTakeSelect
+            {
+                Code = "OrderNo",
+                Name = "处方号"
+            },
+            new OrderTakeSelect
+            {
+                Code = "PatientId",
+                Name = "患者编号"
+            }
+        };
+
+        private List<OrderTakeSelect> _orderTakeSelects = StaticOrderTakeSelects;
+
+        public List<OrderTakeSelect> OrderTakeSelects
+        {
+            get { return _orderTakeSelects; }
+            set
+            {
+                SetProperty(ref _orderTakeSelects, value);
+            }
+        }
+        private OrderTakeSelect _selectedItem = StaticOrderTakeSelects[0];
+        /// <summary>
+        /// 查询条件 查询字段
+        /// </summary>
+        public OrderTakeSelect SelectedItem
+        {
+            get { return _selectedItem; }
+            set
+            {
+                SetProperty(ref _selectedItem, value);
+                RequestData();
+            }
+        }
+
+        private OrderInfo? _selectedOrder;
+
+        public OrderInfo? SelectedOrder
+        {
+            get { return _selectedOrder; }
+            set
+            {
+                SetProperty(ref _selectedOrder, value);
+
+                //OpenOrderDialog();
+            }
+        }
+        private List<OrderInfo> _orderInfos = new();
+
+        public List<OrderInfo> OrderInfos { get { return _orderInfos; } set { SetProperty(ref _orderInfos, value); } }
+        private string _orderDate = DateTime.Now.ToString("yyyy-MM-dd");
+        /// <summary>
+        /// 查询条件  处方日期
+        /// </summary>
+        public string OrderDate
+        {
+            get { return _orderDate; }
+            set
+            {
+                if (!String.IsNullOrEmpty(value))
+                {
+                    SetProperty(ref _orderDate, DateTime.Parse(value).ToString("yyyy-MM-dd"));
+                }
+                else
+                {
+                    SetProperty(ref _orderDate, value);
+                }
+
+                RequestData();
+            }
+        }
+
+        private string? _searchValue;
+
+        /// <summary>
+        /// 查询条件 查询字段值
+        /// </summary>
+        public string? SearchValue
+        {
+            get { return _searchValue; }
+            set
+            {
+                SetProperty(ref _searchValue, value);
+                RequestData();
+            }
+        }
+        /// <summary>
+        /// 取药日期
+        /// </summary>
+        private string _optDate;
+        public string OptDate
+        {
+            get { return _optDate; }
+            set
+            {
+                if (!String.IsNullOrEmpty(value))
+                {
+                    SetProperty(ref _optDate, DateTime.Parse(value).ToString("yyyy-MM-dd"));
+                }
+                else
+                {
+                    SetProperty(ref _optDate, value);
+                }
+                BindDrugInfo();
+            }
+        }
+
+        private int _status = 0;
+
+        public int Status
+        {
+            get => _status; set => SetProperty(ref _status, value);
+        }
+
+        private string _detailDrugName;
+        public string DetailDrugName { get => _detailDrugName; set => SetProperty(ref _detailDrugName, value); }
+
+        private string _detailDrugSpec;
+        public string DetailDrugSpec { get => _detailDrugSpec; set => SetProperty(ref _detailDrugSpec, value); }
+
+        private string _detailDrugFactory;
+        public string DetailDrugFactory { get => _detailDrugFactory; set => SetProperty(ref _detailDrugFactory, value); }
+
+        private MachineRecord _machineRecord;
+        public MachineRecord _MachineRecord
+        {
+            get => _machineRecord;
+            set
+            {
+                SetProperty(ref _machineRecord, value);
+            }
+        }
+
+
+
+        private ChannelList? _channelLsts;
+
+        public ChannelList? ChannelLsts
+        {
+            get => _channelLsts;
+            set => SetProperty(ref _channelLsts, value);
+        }
+        private List<ChannelStock> __channelStocks = new List<ChannelStock>();
+        public List<ChannelStock> ChannelStocks
+        {
+            get => __channelStocks;
+            set => SetProperty(ref __channelStocks, value);
+        }
+
+
+        //回收箱库位
+        public ChannelStock? CStock;
+
+        private List<MachineRecord>? _machineRecords;
+
+        public List<MachineRecord>? MachineRecords
+        {
+            get => _machineRecords;
+            set => SetProperty(ref _machineRecords, value);
+        }
+        private List<OrderDetail>? _ordertails;
+
+        public List<OrderDetail>? OrderDetails
+        {
+            get => _ordertails;
+            set => SetProperty(ref _ordertails, value);
+        }
+        /// <summary>
+        /// 取药人列表
+        /// </summary>
+        private List<UserList>? _userLists = new() { new UserList() { UserName = "全部", Id = 0 } };
+        public List<UserList>? UserLists
+        {
+            get => _userLists;
+            set => SetProperty(ref _userLists, value);
+        }
+        /// <summary>
+        /// 选中取药人
+        /// </summary>
+        private UserList? _userSelects = new UserList();
+        public UserList? UserSelects
+        {
+            get => _userSelects;
+            set
+            {
+                SetProperty(ref _userSelects, value);
+
+                BindDrugInfo();
+            }
+        }
+
+        private string WindowName = "ReturnWithOrderWindow";
+        private readonly ILog logger = LogManager.GetLogger(typeof(ReturnWithOrderWindowViewModel));
+        private bool _isFinishClick = false;
+        private static readonly DateTime Jan1st1970 = new DateTime
+ (1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
+
+        private IEnumerable<IGrouping<int, ChannelStock>> enumerable;
+        private IEnumerator<IGrouping<int, ChannelStock>> enumerator;
+
+        public bool IsFinishClick { get => _isFinishClick; set => SetProperty(ref _isFinishClick, value); }
+        IDialogService _dialogService;
+        private PortUtil _portUtil;
+        IEventAggregator _eventAggregator;
+        public ReturnWithOrderWindowViewModel(IDialogService dialogService, PortUtil portUtil, IEventAggregator eventAggregator)
+        {
+            _dialogService = dialogService;
+            _portUtil = portUtil;
+            _eventAggregator = eventAggregator;
+        }
+        public DelegateCommand RowSelected
+        {
+            get => new DelegateCommand(() =>
+            {
+                BindDrugInfo();
+            });
+        }
+        private void DoDialogResult(IDialogResult dialogResult)
+        {
+            //dialogResult 第一方面可以拿到任意参数   第二方面 可判断关闭状态
+            //if (dialogResult.Result == ButtonResult.OK)
+            //{
+            //    MachineRecords.ForEach(mr => mr.ManuNo = "123");
+            //    _MachineRecord = dialogResult.Parameters.GetValue<MachineRecord>("MachineRecord");
+
+            //}
+            // 委托   被动执行     被子窗口执行
+            // dialogResult  第一方面可以拿到任意参数   第二方面   可判断关闭状态
+            RequestData();
+        }
+
+        public bool KeepAlive => false;
+
+        public void ConfirmNavigationRequest(NavigationContext navigationContext, Action<bool> continuationCallback)
+        {
+            continuationCallback(true);
+        }
+
+        public bool IsNavigationTarget(NavigationContext navigationContext)
+        {
+            return true;
+        }
+
+        /// <summary>
+        /// 还空瓶按钮--打开抽屉
+        /// </summary>
+        public DelegateCommand OpenDrawer
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (Status == 0)
+                {
+                    if (OrderDetails != null && OrderDetails.Count > 0)
+                    {
+                        List<MachineRecord> records = OrderDetails[0].MachineRecords.Where(rd => rd.CurrentReturn > 0).ToList();
+                        if (records != null && records.Count > 0)
+                        {
+                            CStock = SqlSugarHelper.Db.Queryable<ChannelStock>()
+                            .Where(c => c.DrawerType != 1 && c.DrugId == records[0].DrugId && c.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).First();
+                            if (CStock != null)
+                            {
+                                Status = 1;
+                                _portUtil.SpeakAsync("正在打开" + CStock.DrawerNo + "号抽屉");
+                                _portUtil.WindowName = "ReturnWithOrderWindow";
+                                _portUtil.Operate = true;
+                                _portUtil.BoardType = CStock.BoardType;
+                                _portUtil.ColNos = new int[] { };// singleChannels.Select(it => it.ColNo).ToArray();
+                                _portUtil.DrawerNo = CStock.DrawerNo;
+                                _portUtil.Start();
+                            }
+                            else
+                            {
+                                //药品未绑定回收药箱
+                                AlertMsg alertMsg = new AlertMsg
+                                {
+                                    Message = "药品未绑定回收药箱",
+                                    Type = MsgType.ERROR,
+                                };
+                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                            }
+                        }
+                        else
+                        {
+                            //未输入还空瓶数量
+                            AlertMsg alertMsg = new AlertMsg
+                            {
+                                Message = "没有与之对应的取药记录或没有填写空瓶数量",
+                                Type = MsgType.ERROR,
+                            };
+                            _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        }
+                    }
+                    else
+                    {
+                        AlertMsg alert = new AlertMsg
+                        {
+                            Message = "该处方下无药品明细",
+                            Type = MsgType.ERROR
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alert);
+                    }
+                }
+            });
+        }
+        // 完成按钮
+        public DelegateCommand SaveCommand
+        {
+            get => new DelegateCommand(() =>
+            {
+                if (!_isFinishClick)
+                {
+                    _isFinishClick = true;
+                    var f = SqlSugarHelper.Db.UseTran(() =>
+                    {
+                        //0)检查处方中药品数量是否与还空瓶数量相等
+                        if (OrderDetails != null && OrderDetails.Count > 0)
+                        {
+                            if (OrderDetails[0].Quantity != OrderDetails.Sum(it => it.MachineRecords.Sum(m => m.CurrentReturn)))
+                            {
+                                AlertMsg alert = new AlertMsg
+                                {
+                                    Message = "处方用药数量与还空瓶数量不一致",
+                                    Type = MsgType.ERROR
+                                };
+                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alert);
+                                return false;
+                            }
+                        }
+                        if (OrderDetails[0].MachineRecords != null && OrderDetails[0].MachineRecords.Count > 0)
+                        {
+                            List<MachineRecord> recordList = OrderDetails[0].MachineRecords.Where(mr=>mr.CanReturnQuantity>0).ToList();
+                            for (int i = 0; i < recordList.Count; i++)
+                            {
+                                if (recordList[i].CanReturnQuantity < recordList[i].CurrentReturn)
+                                {
+                                    AlertMsg alert = new AlertMsg
+                                    {
+                                        Message = "还空瓶数量不能大于可还空瓶数量",
+                                        Type = MsgType.ERROR
+                                    };
+                                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alert);
+                                    break;
+                                }
+
+                                //1) 写一条还空瓶记录
+                                SqlSugarHelper.Db.Insertable(new MachineRecord()
+                                {
+                                    MachineId = recordList[i].MachineId,
+                                    DrawerNo = CStock.DrawerNo,
+                                    ColNo = CStock.ColNo,
+                                    DrugId = recordList[i].DrugId,
+                                    ManuNo = recordList[i].ManuNo,
+                                    EffDate = recordList[i].EffDate.HasValue ? recordList[i].EffDate.Value.Date : null,
+                                    Operator = HomeWindowViewModel.Operator?.Id,
+                                    Reviewer = HomeWindowViewModel.Reviewer?.Id,
+                                    OperationTime = DateTime.Now,
+                                    Quantity = recordList[i].CurrentReturn,
+                                    Type = 32,
+                                    InvoiceId = OrderDetails[0].OrderNo,
+                                    GetId = recordList[i].Id,
+                                    StockQuantity = recordList[i].ReturnQuantity2
+                                }).ExecuteCommand();
+
+                                //2）更改当前取药记录的状态
+                                SqlSugarHelper.Db.Updateable(new MachineRecord()
+                                {
+                                    ReturnQuantity2 = recordList[i].CurrentReturn + recordList[i].ReturnQuantity2,
+                                    Id = recordList[i].Id,
+                                    Status = recordList[i].ReturnQuantity2 + recordList[i].ReturnQuantity1+ recordList[i].CurrentReturn == recordList[i].Quantity ? 2 : 1,
+                                }).UpdateColumns(it => new { it.ReturnQuantity2, it.Status }).ExecuteCommand();
+
+                                ////3）写hkc_order_finished数据供his反查
+                                //SqlSugarHelper.Db.Insertable(new OrderFinish()
+                                //{
+                                //    OrderNo = OrderDetails[0].OrderNo,
+                                //    PatientId = SelectedOrder.PatientId,
+                                //    Pharmacy = SelectedOrder.Pharmacy,
+                                //    State = 1,
+                                //    Operator = HomeWindowViewModel.Operator?.Nickname,
+                                //    DrugId = OrderDetails[0].DrugId,
+                                //    Quantity = recordList[i].CurrentReturn,
+                                //    //ManuNo = recordList[i].ManuNo.ToString(),
+                                //    //EffDate =recordList[i].EffDate.HasValue ? recordList[i].EffDate.Value.ToString("yyyy-MM-dd") : null,
+
+                                //}).ExecuteCommand();
+                            }
+                            //4）加回收箱的库存数
+                            if (CStock != null)
+                            {
+                                CStock.Quantity = CStock.Quantity + OrderDetails[0].MachineRecords.Sum(m => m.CurrentReturn);
+                                SqlSugarHelper.Db.Updateable<ChannelStock>(CStock).ExecuteCommand();
+                            }
+                            //5) 更新处方状态
+                            SqlSugarHelper.Db.Updateable(new OrderInfo()
+                            {
+                                DmStatus = 1,
+                                OrderNo = OrderDetails[0].OrderNo
+                            }).UpdateColumns(it => new { it.DmStatus }).WhereColumns(it => new { it.OrderNo }).ExecuteCommand();
+
+                           
+
+                        }
+                        return true;
+                    });
+                    if (f.Data)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "操作完成",
+                            Type = MsgType.SUCCESS,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    if (!f.IsSuccess)
+                    {
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = "操作失败！",
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                    }
+                    Status = 0;
+                    _isFinishClick = false;
+                }
+                RequestData();
+            });
+        }
+
+        public long CurrentTimeMillis()
+        {
+            return (long)(DateTime.UtcNow - Jan1st1970).TotalMilliseconds;
+        }
+
+        // 取消按钮
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                IsFinishClick = false;
+                _portUtil.ResetData();
+                Status = 0;
+            });
+        }
+        void DoMyPrismEvent(DeviceMsg msg)
+        {
+
+            if (msg.WindowName.Equals(WindowName))
+            {
+                switch (msg.EventType)
+                {
+                    // 抽屉打开
+                    case EventType.DRAWEROPEN:
+                        if (Status == 1)
+                        {
+                            Status = 2;
+                        }
+                        //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+                        //CheckIsFridgeOpen();
+                        break;
+                    // 抽屉关闭
+                    case EventType.DRAWERCLOSE:
+                        if (Status == 2)
+                        {
+                            //IGrouping<int, ChannelStock> groupingBefore = enumerator.Current;
+                            //int DrawerNoBefore = groupingBefore.Key;
+                            //if (enumerator.MoveNext())
+                            //{
+                            //    IGrouping<int, ChannelStock> groupingAfter = enumerator.Current;
+                            //    int DrawerNoAfter = groupingAfter.Key;
+                            //    if (DrawerNoBefore < 9 && DrawerNoAfter > 8)
+                            //    {
+                            //        Thread.Sleep(50);
+                            //    }
+                            //    //OpenOneByOne();
+                            //}
+                            //else
+                            {
+                                Status = 3;
+                            }
+                        }
+                        //是冰箱抽屉则开冰箱抽屉时发送延迟报警指令
+                        //CheckIsFridgeClose();
+                        break;
+                    // 数量变化
+                    case EventType.UPDATEQUANTITY:
+                        if (Status == 1)
+                        {
+                            logger.Info($"抽屉【{CStock.DrawerNo}】库位还空瓶数量【{msg.Quantitys}】");
+                            //channelStocks.ForEach(it => it.ReturnQuantity = msg.Quantitys[it.ColNo - 1]);
+                        }
+                        break;
+                    // 打开失败
+                    case EventType.OPENERROR:
+                        AlertMsg alertMsg = new AlertMsg
+                        {
+                            Message = msg.Message,
+                            Type = MsgType.ERROR,
+                        };
+                        _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                        Status = 0;
+                        break;
+                }
+            }
+
+        }
+        public void OnNavigatedFrom(NavigationContext navigationContext)
+        {
+            // 取消消息订阅
+            _eventAggregator.GetEvent<PortUtilEvent>().Unsubscribe(DoMyPrismEvent);
+        }
+
+        public void OnNavigatedTo(NavigationContext navigationContext)
+        {
+            //查询表格数据
+            RequestData();
+            BindUserList();
+            _eventAggregator.GetEvent<PortUtilEvent>().Subscribe(DoMyPrismEvent);
+        }
+        private void RequestData()
+        {
+
+            OrderInfos.Clear();
+            int totalCount = 0;
+
+            List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
+                .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
+                // .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
+                .WhereIF(OrderDate != null, oi => oi.RecvDate.ToString("yyyy-MM-dd") == OrderDate)
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("OrderNo"), oi => oi.OrderNo == SearchValue)
+                .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PatientId"), oi => oi.PatientId == SearchValue)
+                .WhereIF(!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]), oi => oi.Pharmacy == ConfigurationManager.AppSettings["storage"])
+                .Where(oi => oi.DmStatus == 0)
+                .Where(oi => oi.HisDispFlag == 0)
+                .Where(oi => oi.CancelFlag == 0)
+                .GroupBy(oi => oi.ChargeDate)
+                .Select(oi => new OrderInfo()
+                {
+                    PatientId= oi.PatientId,
+                    IdNumber = oi.IdNumber,
+                    PName=oi.PName,
+                    Sex=oi.Sex,
+                    ChargeDate=oi.ChargeDate,
+                    OrderNo = oi.OrderNo,
+                    orderDetail =SqlFunc.Subqueryable<OrderDetail>().Where(od => od.OrderNo == oi.OrderNo).First(),
+                })
+                .ToPageList(PageNum, PageSize, ref totalCount);
+            OrderInfos = queryData;
+            TotalCount = totalCount;
+            PageCount = (int)Math.Ceiling((double)TotalCount / PageSize);
+        }
+        private void BindUserList()
+        {
+            UserLists = SqlSugarHelper.Db.Queryable<UserList>().Distinct()
+                  .InnerJoin<MachineRecord>((ul, mr) => ul.Id == mr.Operator)
+                  .Where(ul => ul.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                  .Where((ul, mr) => mr.Type == 2 && mr.Status != 2 && mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                  .ToList();
+        }
+
+        private void BindDrugInfo()
+        {
+            if (SelectedOrder != null)
+            {
+
+                OrderDetails = SqlSugarHelper.Db.Queryable<OrderDetail>()
+                    .Includes(cl => cl.DrugInfo, di => di.DrugManuNos)
+                    .Where(od => od.OrderNo == SelectedOrder.OrderNo).ToList();
+                if (OrderDetails != null && OrderDetails.Count > 0)
+                {
+                    for (int i = 0; i < OrderDetails.Count; i++)
+                    {
+                        List<MachineRecord> machineRecords = new List<MachineRecord>();
+                        machineRecords = SqlSugarHelper.Db.Queryable<MachineRecord>()
+                            .Where(mr => mr.DrugId == OrderDetails[i].DrugId && mr.Type == 2 && mr.Status != 2 && mr.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                            .WhereIF(!String.IsNullOrEmpty(OptDate), mr => mr.OperationTime.ToString("yyyy-MM-dd") == OptDate)
+                            .WhereIF(!String.IsNullOrEmpty(UserSelects.UserName), mr => mr.Reviewer == UserSelects.Id)
+                            .WhereIF(String.IsNullOrEmpty(UserSelects.UserName) && HomeWindowViewModel.Reviewer != null, mr => mr.Reviewer == HomeWindowViewModel.Reviewer.Id)
+                            .ToList();
+                        if (machineRecords != null && machineRecords.Count > 0)
+                        {
+                            machineRecords.ForEach(mr =>
+                            {
+                                mr.DrugInfo = OrderDetails[i].DrugInfo;
+                                mr.drugManuNo = OrderDetails[i].DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(mr.ManuNo));
+                            });
+                            //处方中取药数量大于第一个取药的可还空瓶数，需要将处方中数据平均分配到取药列表中的还空瓶数量中
+                            if (OrderDetails[i].Quantity > machineRecords[0].CanReturnQuantity)
+                            {
+                                int orderQuantity = OrderDetails[i].Quantity;
+                                for (int j = 0; j < machineRecords.Count; j++)
+                                {
+                                    if (orderQuantity > machineRecords[j].CanReturnQuantity)
+                                    {
+                                        machineRecords[j].CurrentReturn = machineRecords[j].CanReturnQuantity;
+                                        orderQuantity = orderQuantity - machineRecords[j].CanReturnQuantity;
+                                    }
+                                    else
+                                    {
+                                        machineRecords[j].CurrentReturn = orderQuantity;
+                                        break;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                machineRecords[0].CurrentReturn = OrderDetails[i].Quantity;
+                            }
+                        }
+                        OrderDetails[i].MachineRecords = machineRecords;
+
+                    }
+                }
+
+                //ChannelList queryData = SqlSugarHelper.Db.Queryable<ChannelList>()
+                //    .Includes(cl => cl.Drug, di => di.DrugManuNos)
+                //    .Includes(cl => cl.channelStocks, dr => dr.DrugInfo, d => d.DrugManuNos)
+                //    .Where(cl => cl.DrawerType == 2&&cl.DrugId== od.DrugId)
+                //    .Where(cl => cl.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).First();
+
+                //queryData.channelStocks = queryData.channelStocks.Select(cs => {
+                //    cs.drugManuNo = queryData.Drug.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
+                //    return cs;
+                //}).ToList();
+                //ChannelLsts = queryData;
+                //if (Ordetails != null)
+                //{
+                //    DetailDrugName = Ordetails[0].DrugInfo.DrugName;
+                //    DetailDrugSpec = Ordetails[0].DrugInfo.DrugSpec;
+                //    DetailDrugFactory = Ordetails[0].DrugInfo.Manufactory;
+                //}
+                //ChannelLsts.channelStocks.ForEach(cs => cs.DrugInfo = ChannelLsts.Drug);
+            }
+            else
+            {
+                OrderDetails = null;
+            }
+        }
+
+
+    }
+}

DM_Weight/ViewModels/RoleManagerWindowViewModel.cs

@@ -250,11 +250,17 @@ namespace DM_Weight.ViewModels
                 PremissionName = "归还药品",
                 PremissionPath = "ReturnDrugWindow2",
             };
+            //PremissionDm huanyao2 = new PremissionDm
+            //{
+            //    Id = 32,
+            //    PremissionName = "归还空瓶",
+            //    PremissionPath = "ReturnEmptyWindow",
+            //};
             PremissionDm huanyao2 = new PremissionDm
             {
                 Id = 32,
                 PremissionName = "归还空瓶",
-                PremissionPath = "ReturnEmptyWindow",
+                PremissionPath = "ReturnWithOrderWindow",
             };
             PremissionDm huanyao3 = new PremissionDm
             {

DM_Weight/ViewModels/SelfAddDialogViewModel.cs

@@ -243,10 +243,10 @@ namespace DM_Weight.ViewModels
                             {
                                 Quantity = it.Quantity + it.AddQuantity,
                                 PosNo = 1,
-                                //ManuNo = it.ManuNo,
+                                ManuNo = it.ManuNo,
-                                //EffDate = it.EffDate,
+                                EffDate = it.EffDate,
                                 Id = it.Id,
-                            }).UpdateColumns(it => new { it.Quantity, it.PosNo }).ExecuteCommand();
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate, it.PosNo }).ExecuteCommand();
                             // 获取更新完库存后的药品库存
                             List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                 .Where(cs => cs.MachineId.Equals(it.MachineId))
@@ -261,8 +261,8 @@ namespace DM_Weight.ViewModels
                                 DrawerNo = it.DrawerNo,
                                 ColNo = it.ColNo,
                                 DrugId = it.DrugId,
-                                //ManuNo = it.ManuNo,
+                                ManuNo = it.ManuNo,
-                                //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                 Operator = HomeWindowViewModel.Operator?.Id,
                                 Reviewer = HomeWindowViewModel.Reviewer?.Id,
                                 OperationTime = DateTime.Now,
@@ -272,12 +272,12 @@ namespace DM_Weight.ViewModels
                                 StockQuantity = nowChannels.Sum(it => it.Quantity)
                             }).ExecuteCommand();
                             //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                            if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                            {
+                            //{
-                                //计数数量设置，发送称重26指令
+                            //    //计数数量设置，发送称重26指令
-                                _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                            //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                Thread.Sleep(80);
+                            //    Thread.Sleep(80);
-                            }
+                            //}
                         }
                         return true;
                     });
@@ -290,7 +290,8 @@ namespace DM_Weight.ViewModels
                         {
                             singleChannels.ForEach(it =>
                             {
-                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity + it.AddQuantity);
+                                _portUtil.WriteQuantityMethod(it.Quantity + it.AddQuantity,it.DrawerNo, it.ColNo);
+                                Thread.Sleep(200);
                             });
                         }
                         

DM_Weight/ViewModels/SelfTakeDialogViewModel.cs

@@ -220,10 +220,10 @@ namespace DM_Weight.ViewModels
                             SqlSugarHelper.Db.Updateable(new ChannelStock()
                             {
                                 Quantity = it.Quantity - it.TakeQuantity,
-                                //ManuNo = it.ManuNo,
+                                ManuNo = it.ManuNo,
-                                //EffDate = it.EffDate,
+                                EffDate = it.EffDate,
                                 Id = it.Id,
-                            }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+                            }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
                             // 获取更新完库存后的药品库存
                             List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                                 .Where(cs => cs.MachineId.Equals(it.MachineId))
@@ -238,8 +238,8 @@ namespace DM_Weight.ViewModels
                                 DrawerNo = it.DrawerNo,
                                 ColNo = it.ColNo,
                                 DrugId = it.DrugId,
-                                //ManuNo = it.ManuNo,
+                                ManuNo = it.ManuNo,
-                                //EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
+                                EffDate = !String.IsNullOrEmpty(it.EffDate) ? DateTime.ParseExact(it.EffDate, "yyyy-MM-dd", System.Globalization.CultureInfo.CurrentCulture) : null,
                                 Operator = HomeWindowViewModel.Operator?.Id,
                                 OperationTime = DateTime.Now,
                                 Quantity = it.TakeQuantity,
@@ -249,12 +249,12 @@ namespace DM_Weight.ViewModels
                                 StockQuantity = nowChannels.Sum(it => it.Quantity)
                             }).ExecuteCommand();
                             //称重计数或称重+智能显示+管控药盒 类型需要 发26指令
-                            if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
+                            //if (it.BoardType == (Int32)BoardTypeEnum.weigh || it.BoardType == (Int32)BoardTypeEnum.weighSmartBox)
-                            {
+                            //{
-                                //计数数量设置，发送称重26指令
+                            //    //计数数量设置，发送称重26指令
-                                _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
+                            //    _portUtil.SetNumCount(it.DrawerNo, it.ColNo, it.AddQuantity);
-                                Thread.Sleep(80);
+                            //    Thread.Sleep(80);
-                            }
+                            //}
                         }
                         return true;
                     });
@@ -267,7 +267,8 @@ namespace DM_Weight.ViewModels
                         {
                             singleChannels.ForEach(it =>
                             {
-                                _portUtil.WriteQuantity(it.DrawerNo, it.ColNo, it.Quantity - it.TakeQuantity);
+                                _portUtil.WriteQuantityMethod(it.Quantity - it.TakeQuantity,it.DrawerNo, it.ColNo);
+                                Thread.Sleep(200);
                             });
                         }
 

DM_Weight/ViewModels/WarnDialogViewModel.cs

@@ -0,0 +1,50 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using Prism.Regions;
+using Prism.Services.Dialogs;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.ViewModels
+{
+    public class WarnDialogViewModel:BindableBase, IDialogAware, IRegionMemberLifetime
+    {
+        private string _warnMessage;
+        public string WarnMessage
+        {
+            get => _warnMessage;
+            set => SetProperty(ref _warnMessage, value);
+        }
+
+        public string Title => "警告";
+
+        public bool KeepAlive => false;
+
+        public event Action<IDialogResult> RequestClose;
+
+        public bool CanCloseDialog()
+        {
+            return true;
+        }
+
+        public void OnDialogClosed()
+        {
+        }
+
+        public void OnDialogOpened(IDialogParameters parameters)
+        {
+            WarnMessage=parameters.GetValue<string>("warnMessage");
+
+        }
+        public DelegateCommand CancleTake
+        {
+            get => new DelegateCommand(() =>
+            {
+                RequestClose?.Invoke(new DialogResult(ButtonResult.Cancel));
+            });
+        }
+    }
+}

DM_Weight/Views/BiaoDingWindow.xaml

@@ -16,6 +16,8 @@
         <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
         <convert:DrawerBtnVisiConverter x:Key="DrawerBtnVisiConverter" />
         <convert:BiaoDingStatusConverter x:Key="BiaoDingStatusConverter" />
+        <convert:OpenBoxConverter x:Key="OpenBoxConverter" />
+        <FrameworkElement x:Key="ProxyElement" DataContext="{Binding}"/>
         <!--<convert:BiaoDingBtnVisibleConverter x:Key="BiaoDingBtnVisibleConverter" />
         <convert:BiaoDingBtnVisibleConverter x:Key="BiaoDingQuantityConverter" />-->
         <Style x:Key="st" TargetType="GridViewColumnHeader">
@@ -181,16 +183,26 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition />
             </Grid.RowDefinitions>
+
+            <ContentControl Content="{StaticResource ProxyElement}" Visibility="Collapsed"/>
             <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Right">
-                <TextBlock Text="放好药品后击确认按钮，点击按钮后勿触碰抽屉" Foreground="Red" Margin="1 10 10 1" Visibility="{Binding  Status,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=ConfirmVisibi}"/>
+                <TextBlock Text="点击【开药盒】按钮打开药盒开始标定" FontWeight="Bold" Margin="1 10 10 1" />
                 <Button
                     Margin="0 0 3 0"
                     VerticalAlignment="Center"
                     Command="{Binding OpenDrawer}"
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
+                    materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+                    Content="开抽屉" /> 
+                
+                <!--<Button
+                    Margin="0 0 3 0"
+                    VerticalAlignment="Center"
+                    Command="{Binding BiaoDingCommand}"
                     materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=BiaoDingLoading}"
-                    materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding  Status,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=BiaoDingLoading}"
+                    materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding  Status,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=BiaoDingLoading}"                    
-                    
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"
-                    IsEnabled="{Binding Status,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=BiaoDingBtnFlag}" Style="{StaticResource MaterialDesignOutlinedLightButton}"
                     Content="标定" /> 
 
                 <Button
@@ -210,7 +222,7 @@
                     Command="{Binding CancleTake}"
                     Visibility="{Binding  Status,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=CancelVisibi}"
                     Style="{StaticResource MaterialDesignOutlinedLightButton}"
-                    Content="取消" />
+                    Content="取消" />-->
             </StackPanel>
             <DataGrid
                 Padding="0 6 0 0"
@@ -219,7 +231,6 @@
                 ItemsSource="{Binding ChannelStocks,UpdateSourceTrigger=PropertyChanged}" SelectedItem="{Binding CStock,Mode=TwoWay}"
                 materialDesign:DataGridAssist.EnableEditBoxAssist="False"
                 materialDesign:DataGridAssist.CellPadding="13"
-                SelectionUnit="Cell"
                 CanUserAddRows="False"
                 AutoGenerateColumns="False">
                 <!--<i:Interaction.Triggers>
@@ -262,11 +273,11 @@
                         Header="规格"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <!--<DataGridTextColumn Width="100"
+                    <DataGridTextColumn Width="100"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                     <!--<DataGridTemplateColumn Width="200" IsReadOnly="True"
                         Header="批次">
                         <DataGridTemplateColumn.CellTemplate>
@@ -281,22 +292,22 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>-->
-                    <!--<DataGridTextColumn Width="100"
+                    <DataGridTextColumn Width="100"
                         Binding="{Binding drugManuNo.EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                     <DataGridTextColumn Width="60"
                         Binding="{Binding Quantity}"
                         Header="库存"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <DataGridTextColumn Width="80"
+                    <!--<DataGridTextColumn Width="80"
                         Binding="{Binding PosNo,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=BiaoDingStatus}"
                         Header="状态"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <DataGridTemplateColumn Width="100" Header="添加数量">
+                    <DataGridTemplateColumn Width="100" Header="标定数量">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <TextBox IsEnabled="{Binding PosNo,Converter={StaticResource BiaoDingStatusConverter},ConverterParameter=AddQuantityEnabled}" Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"> 
@@ -311,6 +322,13 @@
                                 </TextBox>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>-->
+                    <DataGridTemplateColumn Width="100" Header="操作">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Button Content="开药盒" Command="{Binding DataContext.OpenBoxCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}" CommandParameter="{Binding}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>

DM_Weight/Views/CheckStockWindow.xaml

@@ -215,7 +215,7 @@
                         Header="规格"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <!--<DataGridTextColumn Width="100"
+                    <DataGridTextColumn Width="100"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
@@ -224,7 +224,7 @@
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                     <DataGridTextColumn Width="100"
                         Binding="{Binding Quantity}"
                         Header="库存"

DM_Weight/Views/Dialog/BiaoDingDialog.xaml

@@ -0,0 +1,90 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.BiaoDingDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DM_Weight.Views.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             MinWidth="380" Width="Auto"
+             Height="Auto">
+    
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+    </UserControl.Resources>
+    <materialDesign:Card Padding="0">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid Background="#03a9f4" Grid.Row="0">
+                <TextBlock VerticalAlignment="Center" Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}" Margin="16 4 16 4" Style="{StaticResource MaterialDesignHeadline5TextBlock}" Text="{Binding TitleStr}" />
+                <Button
+                    Style="{StaticResource MaterialDesignIconForegroundButton}"
+                    Foreground="{DynamicResource PrimaryHueDarkForegroundBrush}"
+                    HorizontalAlignment="Right"
+                    Command="{Binding BtnCloseCommand}"
+                    ToolTip="关闭"
+                >
+                    <materialDesign:PackIcon Kind="Close" Width="34" Height="34" />
+                </Button>
+            </Grid>
+
+            <StackPanel Grid.Row="1" Margin="0">
+                <TextBlock Text="{Binding StrMessage}" Margin="12" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" /> 
+                <TextBox Height="50" Width="200"
+Grid.Column="1"
+materialDesign:HintAssist.Hint="标定数量"
+Margin="6 0 0 10" Text="{Binding BDQuantity, UpdateSourceTrigger=PropertyChanged}"
+Style="{StaticResource MaterialDesignOutlinedTextBox}">
+                </TextBox>
+            </StackPanel>
+            <Grid Grid.Row="2">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <StackPanel Orientation="Horizontal" Grid.Column="1" HorizontalAlignment="Center" Margin="6">
+
+                    <Button Margin="6"
+                        Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                        Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=clearVisuability}"
+                        materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=clearBtnLoading}"
+                        materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=clearBtnLoading}"
+                        Content="清空"
+                        Command="{Binding ClearCommand}"></Button>
+
+                    <Button
+                        Margin="6"
+                        Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                        materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=biaoDingBtnLoading}"
+                        materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=biaoDingBtnLoading}"
+                        Content="标定"
+                        Command="{Binding BiaoDingCommand}">
+                    </Button>
+                    <!--<Button
+                        Margin="2"
+                        Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+                        Style="{StaticResource MaterialDesignRaisedAccentButton}"
+                        Content="完成"
+                        Command="{Binding FinishCommand}"/>-->
+                    <!--<Button
+                        Margin="6"
+                        Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+                        Style="{StaticResource MaterialDesignRaisedButton}"
+                        Background="Orange"
+                        BorderBrush="Orange"
+                        Content="取消"
+                        Command="{Binding CancelCommand}" />-->
+                </StackPanel>
+
+            </Grid>
+        </Grid>
+    </materialDesign:Card>
+</UserControl>

DM_Weight/Views/Dialog/BiaoDingDialog.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DM_Weight.Views.Dialog
+{
+    /// <summary>
+    /// BiaoDingDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class BiaoDingDialog : UserControl
+    {
+        public BiaoDingDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

DM_Weight/Views/Dialog/BindingChannelDialog.xaml

@@ -54,13 +54,13 @@
                     SelectedItem="{Binding DrugInfo}"
                     DisplayMemberPath="DrugName" IsEnabled="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
                 />
-            <!--<ComboBox
+            <ComboBox
                     Grid.Column="1"
                     Style="{StaticResource MaterialDesignOutlinedComboBox}"
                     materialDesign:HintAssist.Hint="批次"
                     ItemsSource="{Binding DrugManuNos}"
                     SelectedItem="{Binding DrugManuNo}"
-                    DisplayMemberPath="ManuNo"/>-->
+                    DisplayMemberPath="ManuNo"/>
                 <StackPanel HorizontalAlignment="Right"  Grid.Column="2" Orientation="Horizontal">
                     <Button
                         Style="{StaticResource MaterialDesignOutlinedLightButton}"
@@ -151,14 +151,11 @@
                                         HorizontalAlignment="Right"
                                         Orientation="Horizontal">
                                     <TextBlock Text="{Binding DrugInfo.DrugName}" />
+                                    <TextBlock
+                                          Visibility="{Binding Quantity, Converter={StaticResource NotZeroToVisibilityConverter}}"
+                                          Text="{Binding Quantity, StringFormat=({0})}" />
                                 </StackPanel>
-                                <TextBlock HorizontalAlignment="Left" Grid.Row="1" Grid.Column="0" Text="数量"/>
+                                <TextBlock
-                                <TextBlock HorizontalAlignment="Right"
-                                            Grid.Row="1"
-                                            Grid.Column="1"
-                                            Visibility="{Binding Quantity, Converter={StaticResource NotZeroToVisibilityConverter}}"
-                                            Text="{Binding Quantity}" />
-                                <!--<TextBlock
                                         HorizontalAlignment="Left"
                                         Grid.Row="1"
                                         Grid.Column="0"
@@ -177,7 +174,7 @@
                                         HorizontalAlignment="Right"
                                         Grid.Row="2"
                                         Grid.Column="1"
-                                        Text="{Binding EffDate}" />-->
+                                        Text="{Binding EffDate}" />
                             </Grid>
                         </Grid>
                     </materialDesign:Card>

DM_Weight/Views/Dialog/InvoiceTakeDialog.xaml

@@ -119,7 +119,7 @@
                             ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
                         />
-                    <!--<DataGridTextColumn  Width="130"
+                    <DataGridTextColumn  Width="130"
                             Header="批次"
                             IsReadOnly="True"
                             Binding="{Binding ManuNo}"
@@ -132,7 +132,7 @@
                             Binding="{Binding EffDate}"
                             ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
-                        />-->
+                        />
                     <DataGridTextColumn Width="100"
                             Header="取出数量"
                             IsReadOnly="True"

DM_Weight/Views/Dialog/SelfAddDialog.xaml

@@ -81,7 +81,7 @@
                             ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
                         />
-                    <!--<DataGridTextColumn
+                    <DataGridTextColumn
                             Header="批次"
                             IsReadOnly="True"
                             Binding="{Binding ManuNo}"
@@ -94,7 +94,7 @@
                             Binding="{Binding EffDate}"
                             ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"
                             EditingElementStyle="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}"
-                        />-->
+                        />
                     <DataGridTextColumn
                             Header="添加数量"
                             IsReadOnly="True"

DM_Weight/Views/Dialog/WarnDialog.xaml

@@ -0,0 +1,40 @@
+<UserControl x:Class="DM_Weight.Views.Dialog.WarnDialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DM_Weight.Views.Dialog"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+            <RowDefinition Height="2*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+            
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Row="0" Background="#FFD32F2F" Grid.ColumnSpan="3">
+            <TextBlock Text="警告" HorizontalAlignment="Center" FontSize="20" FontWeight="Bold" Foreground="White" Margin="16 4 16 4" VerticalAlignment="Center"/>
+        </Grid>
+
+        <TextBlock Grid.Row="1" Grid.RowSpan="2" Grid.ColumnSpan="3" VerticalAlignment="Center" 
+                   Margin="16 14 16 4" FontSize="16" FontWeight="Bold"
+                   Style="{StaticResource MaterialDesignHeadline5TextBlock}" 
+        Text="{Binding WarnMessage,UpdateSourceTrigger=PropertyChanged}" TextWrapping="Wrap" />
+
+        <Button  Grid.Row="3" Grid.Column="1"
+          Margin="6"
+          Style="{StaticResource MaterialDesignOutlinedLightButton}"
+          Content="确认"
+          Command="{Binding CancleTake}" />
+    </Grid>
+</UserControl>

DM_Weight/Views/Dialog/WarnDialog.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DM_Weight.Views.Dialog
+{
+    /// <summary>
+    /// WarnDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class WarnDialog : UserControl
+    {
+        public WarnDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

DM_Weight/Views/DrawerAddDrugWindow.xaml

@@ -15,6 +15,8 @@
         <convert:StatusConverter x:Key="StatusConverter" />
         <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
         <convert:QuantityCountConverter x:Key="QuantityCountConverter"/>
+        <convert:OpenBoxConverter x:Key="OpenBoxConverter" />
+        <FrameworkElement x:Key="ProxyElement" DataContext="{Binding}"/>
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
@@ -22,7 +24,7 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-
+        <ContentControl Content="{StaticResource ProxyElement}" Visibility="Collapsed"/>
         <Grid Margin="0" Grid.Column="0" Width="280" Height="570" Visibility="{Binding Is8Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
             <Grid.Background>
                 <ImageBrush ImageSource="/Images/box.png" />
@@ -183,6 +185,7 @@
                 ItemsSource="{Binding ChannelStocks}"
                 materialDesign:DataGridAssist.EnableEditBoxAssist="False"
                 materialDesign:DataGridAssist.CellPadding="13"
+               HorizontalScrollBarVisibility="Visible"
                 SelectionUnit="Cell"
                 CanUserAddRows="False"
                 AutoGenerateColumns="False" ScrollViewer.HorizontalScrollBarVisibility="Hidden">
@@ -206,31 +209,54 @@
                     </Style>
                 </DataGrid.Resources>
                 <DataGrid.Columns>
-                    <DataGridTextColumn Width="80"
+                    <DataGridTextColumn Width="60"
                         Binding="{Binding ColNo}"
                         Header="库位"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <DataGridTextColumn Width="181"
+                    <!--<DataGridTextColumn Width="181"
                         Binding="{Binding DrugInfo.DrugName}"
                         Header="药品名称"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <!--<DataGridTextColumn Width="100"
+                    <DataGridTextColumn Width="100"
                         Binding="{Binding DrugInfo.DrugSpec}"
                         Header="规格"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
-                    <DataGridTextColumn Width="100"
+                    <DataGridTemplateColumn Header="药品名称">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock TextAlignment="Center" Text="{Binding DrugInfo.DrugName}"/>
+                                    <TextBlock TextAlignment="Center" Text="{Binding DrugInfo.DrugSpec}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+
+                    </DataGridTemplateColumn>
+
+                    <DataGridTemplateColumn Header="批次">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <StackPanel>
+                                    <TextBlock TextAlignment="Center" Text="{Binding ManuNo}"/>
+                                    <TextBlock TextAlignment="Center" Text="{Binding EffDate}"/>
+                                </StackPanel>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+
+                    </DataGridTemplateColumn>
+                    <!--<DataGridTextColumn Width="100"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                     <DataGridTextColumn Width="100"
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
                     <!--<DataGridTemplateColumn Width="200" IsReadOnly="True"
                         Header="批次">
                         <DataGridTemplateColumn.CellTemplate>
@@ -279,7 +305,7 @@
                             </Binding>
                         </DataGridTextColumn.Binding>
                     </DataGridTextColumn>-->
-                    <DataGridTemplateColumn Width="100"
+                    <DataGridTemplateColumn Width="90"
                         Header="添加数量">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
@@ -296,7 +322,14 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-
+                    <DataGridTemplateColumn Width="100" 
+      Header="操作" Visibility="{Binding DataContext.OpenBoxVisibility,Source={StaticResource ProxyElement},Converter={StaticResource OpenBoxConverter}}">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Button Content="开药盒" Command="{Binding DataContext.OpenBoxCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}" CommandParameter="{Binding}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
             <!--<ListView

DM_Weight/Views/DrawerTakeDrugWindow.xaml

@@ -15,12 +15,15 @@
         <convert:DrawerSelectConverter x:Key="DrawerSelectConverter" />
         <convert:StatusConverter x:Key="StatusConverter" />
         <convert:InputQuantityConverter x:Key="InputQuantityConverter" />
+        <convert:OpenBoxConverter x:Key="OpenBoxConverter" />
+        <FrameworkElement x:Key="ProxyElement" DataContext="{Binding}"/>
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
+        <ContentControl Content="{StaticResource ProxyElement}" Visibility="Collapsed"/>
         <Grid Margin="0" Grid.Column="0" Width="280" Height="570"  Visibility="{Binding Is8Drawer, Converter={StaticResource BooleanToVisibilityConverter}}">
             <Grid.Background>
                 <ImageBrush ImageSource="/Images/box.png" />
@@ -218,7 +221,7 @@
                         Header="规格"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <!--<DataGridTextColumn  Width="100"
+                    <DataGridTextColumn  Width="100"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
@@ -227,7 +230,7 @@
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                     <DataGridTextColumn  Width="80"
                         Binding="{Binding Quantity}"
                         Header="库存"
@@ -261,7 +264,14 @@
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>
                     </DataGridTemplateColumn>
-
+                    <DataGridTemplateColumn Width="100" 
+      Header="操作" Visibility="{Binding DataContext.OpenBoxVisibility,Source={StaticResource ProxyElement},Converter={StaticResource OpenBoxConverter}}">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Button Content="开药盒" Command="{Binding DataContext.OpenBoxCommand, RelativeSource={RelativeSource AncestorType=DataGrid}}" CommandParameter="{Binding}"/>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
                 </DataGrid.Columns>
             </DataGrid>
         </Grid>

DM_Weight/Views/DrugListWindow.xaml

@@ -162,7 +162,7 @@
                         </StackPanel>
                     </Grid>
                 </TabItem>
-                <!--<TabItem Header="批次信息">
+                <TabItem Header="批次信息">
                     <Grid Grid.Column="0">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -212,7 +212,7 @@
                             </Grid>
                         </Border>
                     </Grid>
-                </TabItem>-->
+                </TabItem>
             </TabControl>
         </materialDesign:Card>
     </Grid>

DM_Weight/Views/FridgeWindow.xaml

@@ -15,24 +15,25 @@
     </i:Interaction.Behaviors>
     <Grid Width="400">
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="2*"/>
             <ColumnDefinition Width="2*"/>
         </Grid.ColumnDefinitions>
         <Grid.RowDefinitions>
             <RowDefinition Height="*"/>
-            <RowDefinition Height="1.2*"/>
+            <RowDefinition Height="*"/>
-            <RowDefinition Height="2*"/>
+            <RowDefinition Height="*"/>
-            <RowDefinition Height="2*"/>
+            <RowDefinition Height="*"/>
-            <RowDefinition Height="2*"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
         <TextBlock Margin="6 0 0 0" Text="冰箱温度区间：" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" />
-        <TextBox Grid.Row="1"
+        <TextBox Grid.Row="1" Height="50"
-                Grid.Column="1"
+            Grid.Column="1"
-                materialDesign:HintAssist.Hint="温度区间2-8度以-分隔"
+            materialDesign:HintAssist.Hint="温度区间2-8度以-分隔"
-                Margin="6 0 0 10"
+            Margin="6 0 0 10"
-                Style="{StaticResource MaterialDesignOutlinedTextBox}">
+            Style="{StaticResource MaterialDesignOutlinedTextBox}">
             <TextBox.Text>
                 <Binding Path="TemperatureRange" Delay="1000" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" NotifyOnValidationError="True">
                     <Binding.ValidationRules>
@@ -41,37 +42,30 @@
                 </Binding>
             </TextBox.Text>
         </TextBox>
-        <!--<TextBlock Text="冰箱温度：" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" />
-        <TextBox Grid.Row="1"
-                Grid.Column="1"
-                materialDesign:HintAssist.Hint="保留小数点后一位"
-                Margin="6 10 0 10"
-                Style="{StaticResource MaterialDesignOutlinedTextBox}">
-            <TextBox.Text>
-                <Binding Path="TemperatureValue" Delay="1000" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" NotifyOnValidationError="True">
-                    <Binding.ValidationRules>
-                        <rules:TemperatureRule/>
-                    </Binding.ValidationRules>
-                </Binding>
-            </TextBox.Text>
-        </TextBox>-->
         <TextBlock Text="冰箱状态：" Margin="0 18 0 0" Grid.Row="2" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" />
         <ToggleButton Grid.Row="2" Grid.Column="1"  Width="38" Height="38" Margin="6 18 0 0"
-            HorizontalAlignment="Left"
+        HorizontalAlignment="Left"
-            x:Name="MaterialDesignFilledTextBoxEnabledComboBox"
+        x:Name="MaterialDesignFilledTextBoxEnabledComboBox"
-            Style="{StaticResource MaterialDesignActionToggleButton}"
+        Style="{StaticResource MaterialDesignActionToggleButton}"
-            IsChecked="{Binding FridgeState}"
+        IsChecked="{Binding FridgeState}"
-            ToolTip="冰箱状态"
+        ToolTip="冰箱状态"
-            Content="打开"
+        Content="打开"
-            materialDesign:ToggleButtonAssist.OnContent="关闭" />
+        materialDesign:ToggleButtonAssist.OnContent="关闭" />
         <TextBlock Text="报警状态：" Margin="0 18 0 0" Grid.Row="3" Grid.Column="0" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" FontWeight="Bold" />
         <ToggleButton Grid.Row="3" Grid.Column="1"  Width="38" Height="38" Margin="6 18 0 0"
-            HorizontalAlignment="Left"
+        HorizontalAlignment="Left"
-            Style="{StaticResource MaterialDesignActionToggleButton}"
+        Style="{StaticResource MaterialDesignActionToggleButton}"
-            IsChecked="{Binding AlarmState}"
+        IsChecked="{Binding AlarmState}"
-            ToolTip="报警状态"
+        ToolTip="报警状态"
-            Content="打开"
+        Content="打开"
-            materialDesign:ToggleButtonAssist.OnContent="关闭" />
+        materialDesign:ToggleButtonAssist.OnContent="关闭" />
-        <Button Grid.Row="4" Grid.ColumnSpan="2"  Content="保存" Command="{Binding SaveCommand}" IsEnabled="{Binding BtnIsEnable}" />
+        <TextBlock Grid.Column="0" Grid.Row="4"  Text="冰箱不在区间超时时间:" Margin="0 18 0 0" HorizontalAlignment="Right" VerticalAlignment="Center" FontSize="14" FontWeight="Bold"  />
+        <TextBox Grid.Row="4" Height="50"
+    Grid.Column="1"
+    materialDesign:HintAssist.Hint="超时时间以分钟为单位"
+    Margin="6 0 0 10" Text="{Binding OutRangeTime, UpdateSourceTrigger=PropertyChanged}"
+    Style="{StaticResource MaterialDesignOutlinedTextBox}">
+        </TextBox>
+        <Button Grid.Row="5" Grid.ColumnSpan="2"  Content="保存" Command="{Binding SaveCommand}" IsEnabled="{Binding BtnIsEnable}" />
     </Grid>
 </UserControl>

DM_Weight/Views/HomeWindow.xaml

@@ -118,7 +118,7 @@
             <Grid Grid.Column="2">
                 <StackPanel Margin="6" Orientation="Horizontal" HorizontalAlignment="Right">
                     <Button Content="储物箱" Command="{Binding OpenRecoverCommand}" Visibility="{Binding Is16Drawer, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource MaterialDesignFlatSecondaryLightButton}" />
-                    <TextBlock Margin="0,10,10,0" Text="{Binding WD}" Foreground="White" FontWeight="Bold" FontSize="14"/>
+                    <TextBlock Margin="0,10,10,0" Text="{Binding WD}"  Foreground="{Binding AlertColor}"  FontWeight="Bold" FontSize="14"/>
                 </StackPanel>
             </Grid>
 

DM_Weight/Views/InvoiceInWindow.xaml

@@ -199,7 +199,7 @@
                         Header="库位"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                    <!--<DataGridTextColumn  Width="147"
+                    <DataGridTextColumn  Width="147"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
@@ -208,7 +208,7 @@
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                     <DataGridTextColumn  Width="100"
                         Binding="{Binding Quantity}"
                         Header="库存"

DM_Weight/Views/MachineRecordWindow.xaml

@@ -111,7 +111,7 @@
                     <GridViewColumn  Width="100"
                         DisplayMemberBinding="{Binding DrugInfo.DrugSpec}"
                         Header="规格"/>
-                    <!--<GridViewColumn  Width="100"
+                    <GridViewColumn  Width="100"
                         DisplayMemberBinding="{Binding Quantity}"
                         Header="数量"/>
                     <GridViewColumn  Width="180"
@@ -119,7 +119,7 @@
                         Header="批次"/>
                     <GridViewColumn  Width="150"
                         DisplayMemberBinding="{Binding EffDate, StringFormat=yyyy-MM-dd}"
-                        Header="效期"/>-->
+                        Header="效期"/>
                     <GridViewColumn  Width="100"
                         Header="库位">
                         <GridViewColumn.CellTemplate>

DM_Weight/Views/ReturnWithOrderWindow.xaml

@@ -0,0 +1,316 @@
+<UserControl x:Class="DM_Weight.Views.ReturnWithOrderWindow"
+             xmlns:pagination="clr-namespace:DM_Weight.Components.pagination"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DM_Weight.Views"
+             xmlns:prism="http://prismlibrary.com/"
+             prism:ViewModelLocator.AutoWireViewModel="True"
+             xmlns:convert="clr-namespace:DM_Weight.Converter"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
+             MinWidth="880"
+             Width="Auto"
+             Height="Auto"
+             mc:Ignorable="d">
+    <UserControl.Resources>
+        <convert:StatusConverter x:Key="StatusConverter" />
+        <Style x:Key="st" TargetType="GridViewColumnHeader">
+            <Style.Setters>
+                <Setter Property="Height">
+                    <Setter.Value>55</Setter.Value>
+                </Setter>
+                <Setter Property="Background">
+                    <Setter.Value>#31ccec</Setter.Value>
+                </Setter>
+                <Setter Property="Foreground">
+                    <Setter.Value>white</Setter.Value>
+                </Setter>
+            </Style.Setters>
+        </Style>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="4*" />
+            <ColumnDefinition Width="5*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="8*"/>
+                <RowDefinition/>
+            </Grid.RowDefinitions>
+            <Grid Margin="0 6 0 6" Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1.5*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="2*" />
+                    <ColumnDefinition Width="4.5*"/>
+                </Grid.ColumnDefinitions>
+                <ComboBox
+          Grid.Column="0"
+          Margin="6 0 0 0"
+          Style="{StaticResource MaterialDesignOutlinedComboBox}"
+          SelectedItem="{Binding SelectedItem}"
+          DisplayMemberPath="Name"
+          ItemsSource="{Binding OrderTakeSelects}"
+          />
+                <TextBox
+          Grid.Column="1"
+          Text="{Binding SearchValue, UpdateSourceTrigger=PropertyChanged}"
+          materialDesign:HintAssist.Hint="{Binding SelectedItem.Name}"
+          materialDesign:HintAssist.IsFloating="True"
+          Margin="6 0 0 0"
+          Style="{StaticResource MaterialDesignOutlinedTextBox}"/>
+                <DatePicker
+          Grid.Column="2"
+          SelectedDate="{Binding OrderDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
+          SelectedDateFormat="Short"
+          Margin="6 0 0 0"
+          materialDesign:HintAssist.Hint="开方日期"
+          Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+               
+            </Grid>
+            <ListView Grid.Row="1"
+         ItemsSource="{Binding OrderInfos}"
+         SelectedItem="{Binding SelectedOrder}"
+         materialDesign:ListViewAssist.HeaderRowBackground="#31ccec"
+         materialDesign:DataGridAssist.ColumnHeaderPadding="10"
+         materialDesign:ListViewAssist.ListViewItemPadding="13">
+                <ListView.Resources>
+                    <Style TargetType="{x:Type GridViewColumnHeader}" BasedOn="{StaticResource {x:Type GridViewColumnHeader}}">
+                        <Setter Property="Foreground" Value="White" />
+                    </Style>
+                </ListView.Resources>
+                <i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding RowSelected}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>
+                <ListView.View>
+                    <GridView ColumnHeaderContainerStyle="{StaticResource st}">
+                        <GridViewColumn Width="100"
+                              Header="处方号"
+                              DisplayMemberBinding="{Binding OrderNo}"/>
+                        <GridViewColumn Width="70"
+                              Header="时间"
+                              DisplayMemberBinding="{Binding ChargeDate, StringFormat=yyyy-MM-dd}" />
+                        <GridViewColumn Width="60" DisplayMemberBinding="{Binding PName}" Header="姓名">
+                            <!--<GridViewColumn.Header>
+                             <TextBlock Text= "" TextWrapping="Wrap"/>
+                             </GridViewColumn.Header>-->
+                        </GridViewColumn>
+                        <GridViewColumn Width="60"
+                             DisplayMemberBinding="{Binding Sex}" Header="性别">
+                            <!--<GridViewColumn.Header>
+                            <TextBlock Text="" TextWrapping="Wrap"/>
+                            </GridViewColumn.Header>-->
+                        </GridViewColumn>
+                        <GridViewColumn Width="200"
+                            DisplayMemberBinding="{Binding IdNumber}"
+                            Header="身份证号"/>
+                        <GridViewColumn Width="130"
+                            DisplayMemberBinding="{Binding DeptName}"
+                            Header="科室"/>
+                        <GridViewColumn Width="80"
+                            DisplayMemberBinding="{Binding orderDetail.Quantity}"
+                            Header="数量"/>
+                    </GridView>
+                </ListView.View>
+            </ListView>
+            <pagination:Pagination Grid.Row="2"
+                         CurrentPage="{Binding PageNum}"
+                         PageSize="{Binding PageSize}"
+                         TotalPages="{Binding TotalCount}"
+                         InfoTextIsEnabel="True"
+                      />
+        </Grid>
+        <Grid Grid.Column="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid Margin="0 6 0 6" Grid.Row="0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
+                <ComboBox materialDesign:HintAssist.Hint="取药人"
+                     Grid.Column="0"
+                     Margin="6 0 0 0"
+                     Style="{StaticResource MaterialDesignOutlinedComboBox}"
+                     SelectedItem="{Binding UserSelects}"
+                     DisplayMemberPath="UserName"
+                     ItemsSource="{Binding UserLists}"
+                     />
+                <DatePicker
+                     Grid.Column="1"
+                     SelectedDate="{Binding OptDate, StringFormat=yyyy-MM-dd, TargetNullValue='',UpdateSourceTrigger=PropertyChanged}"
+                     SelectedDateFormat="Short"
+                     Margin="6 0 0 0"
+                     materialDesign:HintAssist.Hint="取药日期"
+                     Style="{StaticResource MaterialDesignOutlinedDatePicker}" />
+                <StackPanel  Margin="6" Grid.Column="3" Orientation="Horizontal" HorizontalAlignment="Right">
+
+                    <Button 
+               Margin="16 0 6 0"
+               VerticalAlignment="Center"
+               Command="{Binding OpenDrawer}"
+               Visibility="{Binding Status,Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnVisible}"
+               materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+               materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
+               Style="{StaticResource MaterialDesignOutlinedLightButton}"
+               Content="还空瓶" />
+                    <Button
+               Margin="0 0 3 0" 
+               VerticalAlignment="Center"
+               Command="{Binding SaveCommand}"
+               materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding Status,Converter={StaticResource StatusConverter},ConverterParameter=TakeFinishLoading}"
+               materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding  Status,Converter={StaticResource StatusConverter},ConverterParameter=TakeFinishLoading}"
+               Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CompleteBtn}"
+               Style="{StaticResource MaterialDesignOutlinedLightButton}"
+               Content="完成" />
+                    <Button 
+               Margin="0 0 6 0"
+               VerticalAlignment="Center"
+               Command="{Binding CancleTake}"
+               Visibility="{Binding Status, Converter={StaticResource StatusConverter}, ConverterParameter=CancelBtn}"
+               Style="{StaticResource MaterialDesignOutlinedLightButton}"
+               Content="取消" />
+                </StackPanel>
+            </Grid>
+            <ScrollViewer  Grid.Row="1">
+                <ItemsControl  
+           ItemsSource="{Binding OrderDetails}"
+           Grid.IsSharedSizeScope="True" >
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="200"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Border BorderBrush="White" BorderThickness="1">
+                                    <StackPanel Orientation="Horizontal" Background="#31ccec" Grid.Column="0">
+
+                                        <Grid>
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition/>
+                                                <RowDefinition/>
+                                                <!--<RowDefinition/>-->
+                                            </Grid.RowDefinitions>
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="200"/>
+                                            </Grid.ColumnDefinitions>
+                                            <TextBlock TextWrapping="Wrap" Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center"  Padding="0 10 0 0 " Text="{Binding DrugInfo.DrugName}"/>
+
+                                            <TextBlock TextWrapping="Wrap" Grid.Row="1"  HorizontalAlignment="Center" VerticalAlignment="Center"  Padding="0 0 0 1 " Text="{Binding DrugInfo.DrugSpec}"/>
+                                            <!--<Button  Grid.Row="2"   Padding="0 0 0 1 "  Style="{x:Null}" BorderBrush="{x:Null}" Background="{x:Null}" Click="Button_Click" CommandParameter="{Binding}">
+
+                                                <Button.Content>
+                                                    <Border Width="32" Height="32" CornerRadius="16" Background="CornflowerBlue" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                        <Path Data="M0 11L22 11M11 0L11 22" Stroke="WhiteSmoke" StrokeThickness="4" VerticalAlignment="Center" HorizontalAlignment="Center"></Path>
+                                                    </Border>
+                                                </Button.Content>
+                                            </Button>-->
+                                        </Grid>
+
+
+                                    </StackPanel>
+                                </Border>
+
+                                <DataGrid
+           Margin="0"
+            Grid.Column="1" 
+           materialDesign:DataGridAssist.ColumnHeaderPadding="15"
+            ItemsSource="{Binding MachineRecords}"  
+           materialDesign:DataGridAssist.EnableEditBoxAssist="False"
+           materialDesign:DataGridAssist.CellPadding="13"
+           SelectionUnit="Cell"
+           CanUserAddRows="False"
+           AutoGenerateColumns="False">
+                                    <DataGrid.Resources>
+                                        <Style TargetType="{x:Type DataGridColumnHeader}" BasedOn="{StaticResource MaterialDesignDataGridColumnHeader}">
+                                            <Setter Property="Background" Value="#31ccec" />
+                                            <Setter Property="Foreground" Value="white" />
+                                            <Setter Property="Height" Value="56" />
+                                            <Setter Property="BorderBrush" Value="white"/>
+                                            <Setter Property="BorderThickness" Value="0.6"/>
+                                            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+
+                                        </Style>
+                                        <Style TargetType="{x:Type DataGridCell}" BasedOn="{StaticResource MaterialDesignDataGridCell}">
+                                            <Style.Triggers>
+                                                <Trigger Property="IsReadOnly" Value="True">
+                                                    <Setter Property="BorderBrush" Value="Transparent" />
+                                                    <Setter Property="HorizontalAlignment" Value="Center"/>
+                                                </Trigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </DataGrid.Resources>
+                                    <DataGrid.Columns>
+                                        <!--<DataGridTemplateColumn Width="200" IsReadOnly="True"
+                   Header="批次">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <ComboBox
+                               Style="{StaticResource MaterialDesignDataGridComboBox}"                  
+                               ItemsSource="{Binding DrugInfo.DrugManuNos}"
+                               SelectedItem="{Binding drugManuNo,UpdateSourceTrigger=PropertyChanged}"
+                               DisplayMemberPath="ManuNo" >
+
+
+                                                    </ComboBox>
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>-->
+
+                                        <DataGridTextColumn Width="100"
+                   Binding="{Binding drugManuNo.ManuNo}"
+                   Header="批次"
+                   IsReadOnly="True"
+                   ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTextColumn Width="100"
+                   Binding="{Binding drugManuNo.EffDate}"
+                   Header="效期"
+                   IsReadOnly="True"
+                   ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTextColumn Width="100"
+                   Binding="{Binding Quantity}"
+                   Header="取药数量"
+                   IsReadOnly="True"
+                   ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTextColumn Width="100"
+                   Binding="{Binding CanReturnQuantity}"
+                   Header="可还空瓶数"
+                   IsReadOnly="True"
+                   ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
+                                        <DataGridTemplateColumn Width="100"
+                   Header="还空瓶数量">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <TextBox Style="{StaticResource MaterialDesignDataGridTextColumnEditingStyle}">
+                                                        <TextBox.Text>
+                                                            <Binding Path="CurrentReturn" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
+                                                                <Binding.ValidationRules>
+                                                                    <ExceptionValidationRule />
+                                                                </Binding.ValidationRules>
+                                                            </Binding>
+                                                        </TextBox.Text>
+                                                    </TextBox>
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </Grid>
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+            </ScrollViewer>
+        </Grid>
+    </Grid>
+</UserControl>

DM_Weight/Views/ReturnWithOrderWindow.xaml.cs

@@ -0,0 +1,40 @@
+using DM_Weight.Models;
+using DM_Weight.msg;
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DM_Weight.Views
+{
+    /// <summary>
+    /// ReturnWithOrderWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class ReturnWithOrderWindow : UserControl
+    {
+        //IEventAggregator _eventAggregator;
+        public ReturnWithOrderWindow()
+        {
+            InitializeComponent();
+            //_eventAggregator = eventAggregator;
+        }
+        //private void Button_Click(object sender, RoutedEventArgs e)
+        //{
+        //    Button btn = (Button)sender;
+        //    OrderDetail od = (OrderDetail)btn.CommandParameter;
+        //    //vms.AddAction(cls);
+        //    _eventAggregator.GetEvent<ReturnEmptyEvent>().Publish(od);
+        //}
+    }
+}

DM_Weight/Views/SelfAddWindow.xaml

@@ -128,7 +128,7 @@
                         Header="库位"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                <!--<DataGridTextColumn Width="210"
+                <DataGridTextColumn Width="210"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
@@ -137,7 +137,7 @@
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                 <DataGridTextColumn Width="210"
                         Binding="{Binding Quantity}"
                         Header="库存"

DM_Weight/Views/SelfTakeDrugWindow.xaml

@@ -127,7 +127,7 @@
                         Header="库位"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                <!--<DataGridTextColumn Width="260"
+                <DataGridTextColumn Width="260"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
@@ -136,7 +136,7 @@
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                 <DataGridTextColumn Width="160"
                         Binding="{Binding Quantity}"
                         Header="库存"

DM_Weight/Views/StockListWindow.xaml

@@ -130,7 +130,7 @@
                         Header="库位"
                         IsReadOnly="True"
                         ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
-                <!--<DataGridTextColumn Width="250"
+                <DataGridTextColumn Width="250"
                         Binding="{Binding ManuNo}"
                         Header="批次"
                         IsReadOnly="True"
@@ -139,7 +139,7 @@
                         Binding="{Binding EffDate}"
                         Header="效期"
                         IsReadOnly="True"
-                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>-->
+                        ElementStyle="{StaticResource MaterialDesignDataGridTextColumnStyle}"/>
                 <DataGridTextColumn Width="241"
                         Binding="{Binding Quantity}"
                         Header="库存"

DM_Weight/msg/FridgeEvent.cs

@@ -0,0 +1,13 @@
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.msg
+{
+    public class FridgeEvent:PubSubEvent
+    {
+    }
+}

DM_Weight/msg/ReturnEmptyEvent.cs

@@ -0,0 +1,14 @@
+using DM_Weight.Models;
+using Prism.Events;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DM_Weight.msg
+{
+    public class ReturnEmptyEvent:PubSubEvent<OrderDetail>
+    {
+    }
+}

DM_Weight/util/PromiseUtil.cs

@@ -0,0 +1,41 @@
+using SharpPromise;
+using System;
+using System.Threading.Tasks;
+
+namespace DM_Weight.util
+{
+    public class PromiseUtil<T>
+    {
+
+        public int _delay { get; set; }
+
+        public T? _data { get; set; }
+
+        public async Task taskAsyncLoop(int delay, T data, Action<PromiseUtil<T>, Action, Action> action)
+        {
+            _data = data;
+            _delay = 0;
+            while (_delay >= 0)
+            {
+                await new Promise(async (Action onResolve, Action onReject) =>
+                {
+                    await Task.Delay(_delay);
+                    try
+                    {
+                        await Task.Run(() => action(this, onResolve, onReject));
+                    }
+                    catch (Exception ex)
+                    {
+                        onReject();
+                    }
+                }).Then(() =>
+                {
+                    _delay = delay;
+                }).Catch((Exception e) =>
+                {
+                    _delay = -1;
+                });
+            }
+        }
+    }
+}