From 6a4aac2a013cfd00cd98d62b79026c0a3c9338bc Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Fri, 29 Nov 2024 14:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E6=9F=9C=E8=A1=A5=E8=8D=AF?=
 =?UTF-8?q?=20=E6=B7=BB=E5=8A=A0=E2=80=9C=E6=9B=B4=E6=96=B0=20=E4=BA=A4?=
 =?UTF-8?q?=E6=8E=A5=E6=9F=9C=20=E6=89=B9=E6=AC=A1=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                          |  2 +-
 DM_Weight/DM_Weight.csproj                    |  2 +-
 .../ViewModels/AddToJiaoJieDialogViewModel.cs | 34 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 4d847a7..72253dd 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -56,7 +56,7 @@
 		<!-- 抽屉串口的串口号 -->
 		<add key="DrawerPortPath" value="COM3" />
 		<!-- can总线串口的串口号 -->
-		<add key="CanBusPortPath" value="COM17" />
+		<add key="CanBusPortPath" value="COM9" />
 		<!-- 条码枪串口的串口号 -->
 		<add key="ScanCodePortPath" value="COM8" />
 		
diff --git a/DM_Weight/DM_Weight.csproj b/DM_Weight/DM_Weight.csproj
index c96bcf0..b35d455 100644
--- a/DM_Weight/DM_Weight.csproj
+++ b/DM_Weight/DM_Weight.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <OutputType>Exe</OutputType>
+    <OutputType>WinExe</OutputType>
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index 114b89b..9cf1f98 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -351,23 +351,23 @@ namespace DM_Weight.ViewModels
                                     Id = it.Id,
                                 }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
 
-                                ////更新 交接柜 库存信息
-                                //List<ChannelStock> jiaojie = Jiaojie_ChannelStocks.Where(cs => cs.DrugId == it.DrugId).ToList();
-                                //if (jiaojie != null && jiaojie.Count > 0)
-                                //{
-                                //    for (int j = 0; j < jiaojie.Count; j++)
-                                //    {
-                                //        // 更新数据 交接柜 库存信息
-                                //        ChannelStock jiaojie_it = jiaojie[j];
-                                //        SqlSugarHelper.Db.Updateable(new ChannelStock()
-                                //        {
-                                //            Quantity = jiaojie_it.BaseQuantity,
-                                //            //ManuNo = it.ManuNo,
-                                //            //EffDate = it.EffDate,
-                                //            Id = jiaojie_it.Id,
-                                //        }).UpdateColumns(jiaojie_it => new { jiaojie_it.Quantity }).ExecuteCommand();
-                                //    }
-                                //}
+                                //更新 交接柜 批次信息
+                                List<ChannelStock> jiaojieStock = Jiaojie_ChannelStocks.Where(cs => cs.DrugId == it.DrugId).ToList();
+                                if (jiaojieStock != null && jiaojieStock.Count > 0)
+                                {
+                                    for (int j = 0; j < jiaojieStock.Count; j++)
+                                    {
+                                        // 更新数据 交接柜 库存信息
+                                        ChannelStock jiaojie_it = jiaojieStock[j];
+                                        SqlSugarHelper.Db.Updateable(new ChannelStock()
+                                        {
+                                            //Quantity = jiaojie_it.BaseQuantity,
+                                            ManuNo = it.ManuNo,
+                                            //EffDate = it.EffDate,
+                                            Id = jiaojie_it.Id,
+                                        }).UpdateColumns(jiaojie_it => new { jiaojie_it.ManuNo }).ExecuteCommand();
+                                    }
+                                }
 
 
                                 // 保存数据 出库记录