From 446364f4519bb5c65ee1cdce42ebd308e001b36d Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 20 Aug 2024 17:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E7=A9=BA=E7=93=B6=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE=E6=B7=BB=E5=8A=A0=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87id=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
index 9af67e8..f7ef66f 100644
--- a/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnEmptyWindowViewModel.cs
@@ -11,6 +11,7 @@ using System.Threading.Tasks;
 using DM_Weight.Models;
 using DM_Weight.util;
 using DM_Weight.Common;
+using System.Configuration;
 
 namespace DM_Weight.ViewModels
 {
@@ -100,7 +101,7 @@ namespace DM_Weight.ViewModels
 
             Channels = SqlSugarHelper.Db.Queryable<ChannelStock>()
                 .LeftJoin<DrugInfo>((cs,di) => cs.DrugId == di.DrugId.ToString())
-                .Where((cs) => cs.DrawerType != (Int32)DrawerTypeEnum.drawerTypeOne)
+                .Where((cs) => cs.DrawerType != (Int32)DrawerTypeEnum.drawerTypeOne && cs.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
                 .Select((cs, di) => new ChannelStock{
                     CanReturnQuantity = SqlFunc.Subqueryable<MachineRecord>().Where(mr => mr.DrugId == cs.DrugId).Where(mr => mr.Type == 2).Where(mr => mr.Status != 2).Select(mr => SqlFunc.IsNull(SqlFunc.AggregateSumNoNull(mr.Quantity - mr.ReturnQuantity1 - mr.ReturnQuantity2), 0)) ,
                     DrugInfo = new DrugInfo