diff --git a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs index c09c36f..9d2fc28 100644 --- a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs +++ b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs @@ -126,11 +126,11 @@ namespace DM_Weight.ViewModels //.Includes(cl => cl.channelStocks, cs => cs.DrugInfo,di=>di.drugBase) .Includes(cs => cs.DrugInfo) .Where(cs => cs.MachineId.Equals("DM5")) - .Where(cs => cs.DrawerNo == DrawerNo+1).ToList(); + .Where(cs => cs.DrawerNo == DrawerNo + 1).ToList(); if (list != null && list.Count > 0) { - Channels=list.GroupBy(cs =>cs.DrugId).Select(cs => + Channels = list.GroupBy(cs => cs.DrugId).Select(cs => { var ret = cs.First(); ret.Quantity = cs.Sum(itx => itx.Quantity); @@ -215,23 +215,23 @@ namespace DM_Weight.ViewModels } var f = SqlSugarHelper.Db.UseTran(() => { - string chnguid = SqlSugarHelper.Db.Queryable().Where(cs => cs.MachineId == ConfigurationManager.AppSettings["machineId"].ToString() && cs.DrawerNo == DrawerNo+1).Select(cs => cs.Id).First(); + string chnguid = SqlSugarHelper.Db.Queryable().Where(cs => cs.MachineId == ConfigurationManager.AppSettings["machineId"].ToString() && cs.DrawerNo == DrawerNo + 1).Select(cs => cs.Id).First(); SqlSugarHelper.Db.Insertable(new ChannelStock() { Chnguid = chnguid, - DrawerNo = DrawerNo+ 1, + DrawerNo = DrawerNo + 1, DrugId = DrugInfo.DrugId.ToString(), BaseQuantity = baseQuantity, Id = Guid.NewGuid().ToString(), MachineId = "DM5", - AddToJJNum=0, - NeedNum=baseQuantity + AddToJJNum = 0, + NeedNum = baseQuantity }).ExecuteCommand(); // 保存数据 入库记录 SqlSugarHelper.Db.Insertable(new MachineRecord() { MachineId = "DM5", - DrawerNo = DrawerNo+1, + DrawerNo = DrawerNo + 1, DrugId = DrugInfo.DrugId.ToString(), Operator = HomeWindowViewModel.Operator?.Id, OperationTime = DateTime.Now, @@ -350,8 +350,14 @@ namespace DM_Weight.ViewModels int baseQty = 0; if (int.TryParse(BaseQuantity, out baseQty)) { - Channel.BaseQuantity = Convert.ToInt32(baseQty); - int iUpdate= SqlSugarHelper.Db.Updateable(Channel).ExecuteCommand(); + logger.Info($"修改药品基数{Channel.BaseQuantity}改为{baseQty}"); + if (baseQty > Channel.BaseQuantity) + { + //基数变大,需要补药 + Channel.NeedNum = baseQty - Channel.BaseQuantity; + } + Channel.BaseQuantity = baseQty; + int iUpdate = SqlSugarHelper.Db.Updateable(Channel).ExecuteCommand(); if (iUpdate > 0) {