From a5d5a4aa400124c22ad6c8e1b02323d95b62889a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E5=B7=A7?= <625215135@qq.com>
Date: Fri, 4 Jul 2025 10:56:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=97=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=8D=AF=E5=93=81=E4=B8=AD=E6=89=B9=E6=AC=A1=E5=BA=93=E5=AD=98?=
 =?UTF-8?q?=E4=B8=BA0=E7=9A=84=E8=AE=B0=E5=BD=95channel=5Fstock=E4=B8=8Ech?=
 =?UTF-8?q?annel=5Flist.=20=E7=A7=BB=E5=87=BA=E8=8D=AF=E7=AE=B1=E8=8D=AF?=
 =?UTF-8?q?=E5=93=81=E6=97=B6=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=8F=8A?=
 =?UTF-8?q?=E6=8F=92=E5=85=A5=E5=AD=97=E6=AE=B5=E4=BF=A1=E6=81=AF=E3=80=82?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E8=8D=AF=E5=93=81=E5=9F=BA=E6=95=B0?=
 =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0channel=5Fstock=E4=B8=8B=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=8D=AF=E5=93=81=E7=9A=84=E5=9F=BA=E6=95=B0=E5=8F=8A?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=8A=A0=E8=8D=AF=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                          |  2 +-
 .../BindBoxPackageWindowViewModel.cs          |  9 +++--
 .../ViewModels/CheckStockWindowViewModel.cs   | 24 ++++++++++---
 DM_Weight/ViewModels/RemoveDialogViewModel.cs | 34 ++++++++++++++++---
 DM_Weight/Views/BindBoxPackageWindow.xaml     |  2 +-
 5 files changed, 57 insertions(+), 14 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index b6086a3..3c9c33c 100644
--- a/DM_Weight/App.config
+++ b/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=xiangtan_mazuike_xx;userid=root;password=root" />
+	<add name="database" connectionString="server=192.168.50.84;port=3306;database=xiangtanTest;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
diff --git a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
index 737fd54..7724093 100644
--- a/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
+++ b/DM_Weight/ViewModels/BindBoxPackageWindowViewModel.cs
@@ -455,7 +455,7 @@ namespace DM_Weight.ViewModels
                     if (baseQty > _ChannelList.BaseQuantity)
                     {
                         //基数变大，需要补药
-                        _ChannelList.channelStocks[0].NeedNum = baseQty - _ChannelList.BaseQuantity;
+                        _ChannelList.channelStocks[0].NeedNum = _ChannelList.channelStocks[0].NeedNum+ baseQty - _ChannelList.BaseQuantity;
                     }
                     else
                     {
@@ -466,8 +466,11 @@ namespace DM_Weight.ViewModels
                     //_ChannelList.channelStocks[0].BaseQuantity = baseQty;
                     //int iUpdate = SqlSugarHelper.Db.Updateable<ChannelStock>(_ChannelList.channelStocks[0]).ExecuteCommand();
                     _ChannelList.channelStocks.ForEach(cs => cs.BaseQuantity = baseQty);
-                    int iBaseUpdate = SqlSugarHelper.Db.Updateable(_ChannelList.channelStocks).UpdateColumns(cs => new { cs.BaseQuantity, cs.NeedNum }).ExecuteCommand();
-
+                    int iBaseUpdate = SqlSugarHelper.Db.Updateable<ChannelStock>().SetColumns(cs => new ChannelStock(){ BaseQuantity= _ChannelList.channelStocks[0].BaseQuantity }).Where(cs=>cs.Chnguid==_ChannelList.Id).ExecuteCommand();
+                    if (iBaseUpdate > 0)
+                    {
+                        iBaseUpdate = SqlSugarHelper.Db.Updateable(_ChannelList.channelStocks[0]).UpdateColumns(cs => new { cs.NeedNum }).ExecuteCommand();
+                    }
                     //更新ChannelList表中的BaseQuantity
                     int iUpdateChannelList = SqlSugarHelper.Db.Updateable<ChannelList>()
                         .SetColumns(it => new ChannelList() { BaseQuantity = baseQty })
diff --git a/DM_Weight/ViewModels/CheckStockWindowViewModel.cs b/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
index a0ea27c..5618b24 100644
--- a/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckStockWindowViewModel.cs
@@ -93,6 +93,20 @@ namespace DM_Weight.ViewModels
         public void OnNavigatedTo(NavigationContext navigationContext)
         {
             logger.Info("进入OnNavigatedTo");
+            //删除药品有批次但是库存为0的药品
+            List<ChannelStock> csList = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cs.Quantity <= 0 && !string.IsNullOrEmpty(cs.ManuNo)).ToList();
+            if (csList != null && csList.Count > 0)
+            {
+                SqlSugarHelper.Db.Deleteable<ChannelStock>().Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cs.Quantity <= 0 && !string.IsNullOrEmpty(cs.ManuNo)).ExecuteCommand();
+                for (int i = 0; i < csList.Count; i++)
+                {
+                    //如果channel_stock下无数据则channel_list同步删除
+                    int iListCount= SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cs.DrawerNo==csList[i].DrawerNo&& cs.DrugId == csList[i].DrugId).Count();
+                    if (iListCount <=0)
+                        SqlSugarHelper.Db.Deleteable<ChannelList>().Where(cl => cl.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5") && cl.Id == csList[i].Chnguid).ExecuteCommand();
+                }
+
+            }
             RequestData();
             logger.Info("结束RequestData");
         }
@@ -167,9 +181,9 @@ namespace DM_Weight.ViewModels
                                     ManuNo = it.ManuNo,
                                     EffDate = it.EffDate,
                                     Id = it.Id,
-                                    NeedNum=0,
-                                    AddToJJNum=0
-                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate,it.NeedNum,it.AddToJJNum }).ExecuteCommand();
+                                    NeedNum = 0,
+                                    AddToJJNum = 0
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate, it.NeedNum, it.AddToJJNum }).ExecuteCommand();
 
                                 SqlSugarHelper.Db.Updateable(new ChannelList()
                                 {
@@ -191,7 +205,7 @@ namespace DM_Weight.ViewModels
                                     OperationTime = DateTime.Now,
                                     Quantity = it.CheckQuantity - it.Quantity,
                                     Type = 4,
-                                    InvoiceId = InvoiceId
+                                    InvoiceId = $"{it.DrawerNo}{it.DrugInfo.DrugName}盘前库存{it.Quantity}，后{it.CheckQuantity}"  // InvoiceId
                                     //,StockQuantity = nowChannels.Sum(it => it.Quantity),
                                     //CheckQuantity = it.CheckQuantity
                                 }).ExecuteCommand();
@@ -257,7 +271,7 @@ namespace DM_Weight.ViewModels
             {
                 if (_channelStock != null)
                 {
-                    
+
                 }
             });
         }
diff --git a/DM_Weight/ViewModels/RemoveDialogViewModel.cs b/DM_Weight/ViewModels/RemoveDialogViewModel.cs
index c50df21..e0930c1 100644
--- a/DM_Weight/ViewModels/RemoveDialogViewModel.cs
+++ b/DM_Weight/ViewModels/RemoveDialogViewModel.cs
@@ -317,7 +317,7 @@ namespace DM_Weight.ViewModels
 
                             string csId = Guid.NewGuid().ToString();
                             //查询要移动的药箱是否有该批次
-                            ChannelStock removeChannelStock = RemoveChannelStockList.Where(it => it.ManuNo == _ChannelStock.ManuNo).First();
+                            ChannelStock removeChannelStock = RemoveChannelStockList.Where(it => it.ManuNo == _ChannelStock.ManuNo).FirstOrDefault();
                             //有该药品且有该批次
                             if (removeChannelStock != null)
                             {
@@ -328,7 +328,7 @@ namespace DM_Weight.ViewModels
                             else
                             {
                                 //有该药品但没有该批次
-                                SqlSugarHelper.Db.Insertable(new ChannelStock()
+                               int iInsertResult=  SqlSugarHelper.Db.Insertable(new ChannelStock()
                                 {
                                     MachineId = _ChannelStock.MachineId,
                                     DrawerNo = Convert.ToInt32(SelectedItem.Code),
@@ -338,13 +338,29 @@ namespace DM_Weight.ViewModels
                                     EffDate=_ChannelStock.EffDate,
                                     Quantity = RemoveQuantity,
                                     DrawerType = 1,
-                                    Chnguid = _ChannelStock.Chnguid,
+                                    Chnguid = RemoveChannelStockList[0].Chnguid,
+                                    CheckQuantity= RemoveChannelStockList[0].CheckQuantity,
                                     Id = csId,
                                 }).ExecuteCommand();
+                                if (iInsertResult > 0)
+                                {
+                                    //删除没有批次的数据
+                                    SqlSugarHelper.Db.Deleteable<ChannelStock>(RemoveChannelStockList.Where(cs => cs.ManuNo == null)).ExecuteCommand();
+                                }
+                                else
+                                {
+                                    AlertMsg alertMsg = new AlertMsg
+                                    {
+                                        Message = "移入失败",
+                                        Type = MsgType.ERROR,
+                                    };
+                                    _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                    return false;
+                                }
                             }
 
                             // 保存数据 药品移出记录
-                            SqlSugarHelper.Db.Insertable(new MachineRecord()
+                            int iInsertRecord= SqlSugarHelper.Db.Insertable(new MachineRecord()
                             {
                                 MachineId = _ChannelStock.MachineId,
                                 DrawerNo = _ChannelStock.DrawerNo,
@@ -359,6 +375,16 @@ namespace DM_Weight.ViewModels
                                 InvoiceId = _ChannelStock.Id,
                                 DepartmentId = csId  //要移入的药箱的channelStock的id
                             }).ExecuteCommand();
+                            if(iInsertRecord<=0)
+                            {
+                                AlertMsg alertMsg = new AlertMsg
+                                {
+                                    Message = "添加记录失败",
+                                    Type = MsgType.ERROR,
+                                };
+                                _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
+                                return false;
+                            }
                         }
                         else
                         {
diff --git a/DM_Weight/Views/BindBoxPackageWindow.xaml b/DM_Weight/Views/BindBoxPackageWindow.xaml
index 1d0e866..95f648c 100644
--- a/DM_Weight/Views/BindBoxPackageWindow.xaml
+++ b/DM_Weight/Views/BindBoxPackageWindow.xaml
@@ -142,7 +142,7 @@
         <Grid Grid.Column="1" Margin="6">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
+                <RowDefinition Height="550" />
             </Grid.RowDefinitions>
             <StackPanel HorizontalAlignment="Right" Orientation="Horizontal" Grid.ColumnSpan="2">
                 <ComboBox