diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index 41a152a..df4a166 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -92,13 +92,14 @@ namespace DM_Weight.Report
             Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
             DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
             DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
-            string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
+            string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM3");
+            string jj_machine_id = (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5");
             string SQL = $@" SELECT ac.create_date as operationTime, ac.TYPE,
 	                     if(ac.type in(1,2),0,ac.yesterday_quantity) as YQuantity,if(ac.type in(3,4),0,ac.add_quantity) as inQuantity,if(ac.type in(3,4),0,ac.out_quantity) as outQuantity,
 	                     if(ac.type in(1,2),0,ac.manu_stock) as ManuStock,ac.total_stock AS stockQuantity, -- if(ac.type in(1,2),0,ac.total_stock) as TotalStock,
 	                     ac.invoice_no as invoiceId, ac.manu_no as manuNo,ac.eff_date as effDate,di.drug_id,di.drug_name as DrugName,di.drug_spec as DrugSpec,di.manufactory as manufactory,di.pack_unit AS packUnit,di.dosage,u1.user_name as operatorName,u2.user_name as reviewerName
 	                     FROM account_book_g2 ac left join drug_info di on ac.drug_id=di.drug_id left join user_list u1 on ac.user_id1=u1.id left join user_list u2 on ac.user_id2=u2.id
- 		                    WHERE ac.machine_id='{p_machine_id}' and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
+ 		                    WHERE ac.machine_id in('{p_machine_id}','{jj_machine_id}') and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
             if (!string.IsNullOrEmpty(drug_id))
             {
                 SQL += " AND ac.drug_id='" + drug_id + "' ";
diff --git a/DM_Weight/ViewModels/AccountWindowViewModel.cs b/DM_Weight/ViewModels/AccountWindowViewModel.cs
index f6c6cc6..5875ed5 100644
--- a/DM_Weight/ViewModels/AccountWindowViewModel.cs
+++ b/DM_Weight/ViewModels/AccountWindowViewModel.cs
@@ -323,12 +323,13 @@ namespace DM_Weight.ViewModels
             DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
             DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
             string p_machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM3");
+            string jj_machine_id = (ConfigurationManager.AppSettings["jj_machineId"] ?? "DM5");
             string SQL = $@" SELECT ac.create_date as CreateDate, ac.TYPE,
 	                     if(ac.type in(1,2),0,ac.yesterday_quantity) as YQuantity,if(ac.type in(3,4),0,ac.add_quantity) as AddQuantity,if(ac.type in(3,4),0,ac.out_quantity) as OutQuantity,
 	                     if(ac.type in(1,2),0,ac.manu_stock) as ManuStock,ac.total_stock, -- if(ac.type in(1,2),0,ac.total_stock) as TotalStock,
 	                     ac.invoice_no as InvoiceNo, ac.manu_no as ManuNo,ac.eff_date as EffDate,di.drug_id,di.drug_name as DrugName,di.drug_spec as DrugSpec,di.manufactory as Manufactory,di.pack_unit,di.dosage,u1.user_name as OperatorName,u2.user_name as ReviewerName
 	                     FROM account_book_g2 ac left join drug_info di on ac.drug_id=di.drug_id left join user_list u1 on ac.user_id1=u1.id left join user_list u2 on ac.user_id2=u2.id
- 		                    WHERE ac.machine_id='{p_machine_id}' and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
+ 		                    WHERE ac.machine_id in('{p_machine_id}','{jj_machine_id}') and create_time>'{p_startDate}' AND create_time<'{p_endDate}' ";
             //if (!string.IsNullOrEmpty(drug_id))
             //{
             //    SQL += " AND ac.drug_id='" + drug_id + "' ";
diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
index d2fcb45..d8439fd 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs
@@ -222,7 +222,7 @@ namespace DM_Weight.ViewModels
                 }
                 else
                 {
-                    msg.Add($"药品【{ChannelStocks[i].DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
+                    msg.Add($"药品【{HasQChannels[0].DrugInfo.DrugName}】库存不足，应取【{TakeQ}】库存【{total}】");
                 }
 
             }
diff --git a/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs
index 54a61b4..57ec199 100644
--- a/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs
+++ b/DM_Weight/ViewModels/AddToJiaoJieWindowViewModel.cs
@@ -165,7 +165,7 @@ namespace DM_Weight.ViewModels
                             Status = 3;
                         }
                         _portUtil.Operate = false;
-                        IsEnable=false;
+                        IsEnable=true;
                         CurrentNum = 0;
 
                         break;