交接柜补药页面添加药品分组

DM_Weight/Port/ModbusHelper.cs

@@ -25,11 +25,14 @@ namespace DM_Weight.Port
         private static readonly object objLock = new object();
         private readonly ILog logger = LogManager.GetLogger(typeof(CheckOrderNewWindowViewModel));
         public ModbusHelper()
+        {
+            if (ConfigurationManager.AppSettings["test"] == null || !(ConfigurationManager.AppSettings["test"].ToString().Equals("Y")))
             {
                 socket = MakeKeepALiveSocket();
                 client = new TcpClient();
                 client.Client = socket;
                 master = ModbusIpMaster.CreateIp(client);
+            }
 
         }
         public static ModbusHelper GetInstance()

DM_Weight/ViewModels/AdditionWindowViewModel.cs

@@ -75,6 +75,13 @@ namespace DM_Weight.ViewModels
                 .OrderBy(cs => cs.Chnguid)
                 .OrderBy(cs => cs.DrawerNo)
                 .ToList();
+            ChannelStocks= ChannelStocks.GroupBy(it=>new {it.DrawerNo,it.DrugId})
+                .Select(it=>
+                {
+                    var ret = it.First();
+                    ret.Quantity = it.Sum(itx => itx.Quantity);
+                    return ret;
+                }).ToList();
             ChannelStocks.ForEach(cs => cs.AddQuantity = cs.BaseQuantity - cs.Quantity);
         }
         //开药箱放入药品
@@ -129,8 +136,11 @@ namespace DM_Weight.ViewModels
                                 Quantity = jiaojie_it.BaseQuantity,
                                 //ManuNo = it.ManuNo,
                                 //EffDate = it.EffDate,
-                                Id = jiaojie_it.Id,
-                            }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).ExecuteCommand();
+                                //Id = jiaojie_it.Id,
+                                DrugId=jiaojie_it.DrugId,
+                                DrawerNo=jiaojie_it.DrawerNo,
+                                MachineId=jiaojie_it.MachineId,
+                            }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).WhereColumns(jiaojie_it=>new { jiaojie_it.DrugId, jiaojie_it.DrawerNo, jiaojie_it.MachineId }).ExecuteCommand();
                         }
 
                         List<ChannelStock> jiaojie = selectedStock.GroupBy(cs => cs.DrawerNo).Select(cs => cs.FirstOrDefault()).ToList();