diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index 2d197d4..f531eaf 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -359,7 +359,11 @@ namespace DM_Weight.ViewModels
                                     for (int j = 0; j < jiaojieStock.Count; j++)
                                     {
                                         List<ChannelStock> searchStock = SqlSugarHelper.Db.Queryable<ChannelStock>()
-                                                                                          .Where(cs => cs.DrawerNo == jiaojieStock[j].DrawerNo && cs.DrugId == jiaojieStock[j].DrugId && cs.DrugId == it.DrugId && cs.ManuNo == it.ManuNo)
+                                                                                          .Where(cs => cs.DrawerNo == jiaojieStock[j].DrawerNo 
+                                                                                          && cs.DrugId == jiaojieStock[j].DrugId
+                                                                                          && cs.DrugId == it.DrugId
+                                                                                          && cs.ManuNo == it.ManuNo
+                                                                                          &&cs.MachineId==(ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5"))
                                                                                           .ToList();
                                         //List<ChannelStock> stockManuList = jiaojieStock.Where(cs => cs.ManuNo == it.ManuNo).ToList();
                                         if (searchStock == null || searchStock.Count <= 0)