From 1d27a080fa209254210f8f7374d17f913bff9f2d Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Sat, 22 Mar 2025 14:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8D=AF=E5=93=81=E5=9F=BA?=
 =?UTF-8?q?=E6=95=B0=E6=97=B6=E5=A6=82=E6=9E=9C=E6=96=B0=E5=9F=BA=E6=95=B0?=
 =?UTF-8?q?=E5=A4=A7=E4=BA=8E=E5=8E=9F=E5=88=99=E9=9C=80=E8=A6=81=E8=A1=A5?=
 =?UTF-8?q?=E8=8D=AF=E6=95=B0=E9=87=8F=E4=B8=BA=E6=96=B0=E5=9F=BA=E6=95=B0?=
 =?UTF-8?q?=E5=87=8F=E5=8E=BB=E5=8E=9F=E5=9F=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BindBoxPackageWindowViewModel.cs          | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

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<ChannelList>().Where(cs => cs.MachineId == ConfigurationManager.AppSettings["machineId"].ToString() && cs.DrawerNo == DrawerNo+1).Select(cs => cs.Id).First();
+                string chnguid = SqlSugarHelper.Db.Queryable<ChannelList>().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<ChannelStock>(Channel).ExecuteCommand();
+                    logger.Info($"修改药品基数{Channel.BaseQuantity}改为{baseQty}");
+                    if (baseQty > Channel.BaseQuantity)
+                    {
+                        //基数变大，需要补药
+                        Channel.NeedNum = baseQty - Channel.BaseQuantity;
+                    }
+                    Channel.BaseQuantity = baseQty;
+                    int iUpdate = SqlSugarHelper.Db.Updateable<ChannelStock>(Channel).ExecuteCommand();
                     if (iUpdate > 0)
                     {