diff --git a/DM_Weight/ViewModels/AddDrugControlViewModel.cs b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
index ef1ef03..db25b18 100644
--- a/DM_Weight/ViewModels/AddDrugControlViewModel.cs
+++ b/DM_Weight/ViewModels/AddDrugControlViewModel.cs
@@ -148,6 +148,7 @@ namespace DM_Weight.ViewModels
                         if (Status == 2)
                         {
                             Status = 3;
+                            FinishContent = "完成";
                         }
                         break;
                     // 数量变化
@@ -302,13 +303,13 @@ namespace DM_Weight.ViewModels
                                         ColNo = it.ColNo,
                                         DrawerType = it.DrawerType,
                                         BoardType = it.BoardType,
-                                        FillTime=it.Quantity<=0?DateTime.Now:it.FillTime
-                                    }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate, it.DrugId }).ExecuteCommand();
+                                        FillTime=it.Quantity<=0 || it.FillTime == null ? DateTime.Now:it.FillTime
+                                    }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate, it.DrugId,it.FillTime }).ExecuteCommand();
                                 }
                                 else
                                 {
                                     //如果批号重复则不让添加
-                                    List<ChannelStock> csCount = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerNo == it.DrawerNo && cs.ManuNo == it.ManuNo && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).ToList();
+                                    List<ChannelStock> csCount = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerNo == it.DrawerNo&&cs.ColNo==it.ColNo && cs.ManuNo == it.ManuNo && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).ToList();
                                     if (csCount.Count > 0)
                                     {
                                         //repeatList.Add(it.ManuNo);
@@ -470,6 +471,7 @@ namespace DM_Weight.ViewModels
                     }
                     else
                     {
+                        FinishContent = "完成";
                         _isFinishClick = false;
                         AlertMsg alertMsg = new AlertMsg
                         {
@@ -488,6 +490,7 @@ namespace DM_Weight.ViewModels
             }
             catch (Exception ex)
             {
+                FinishContent = "完成";
                 logger.Info($"AddDrugControlViewModel异常：{ex.Message}");
                 _isFinishClick = false;
                 AlertMsg alertMsg = new AlertMsg
diff --git a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs
index ae0bc00..51bb403 100644
--- a/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs	
+++ b/DM_Weight/ViewModels/BindingChannelNewDialogViewModel .cs	
@@ -420,7 +420,7 @@ namespace DM_Weight.ViewModels
                            .Where(cs => cs.DrugId.Equals(DrugInfo.DrugId.ToString()))
                            .Where(cs => cs.DrawerType == 1)
                            .Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
-                           .Where(cs => cs.DrawerNo == item.DrawerNo)
+                           .Where(cs => cs.DrawerNo == item.DrawerNo&&cs.ColNo==item.ColNo)
                            .Count();
 
                             if (count > 0)
diff --git a/DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs b/DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs
index eb2007b..217a3f6 100644
--- a/DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs
+++ b/DM_Weight/ViewModels/InvoiceAddDialogViewModel.cs
@@ -317,8 +317,8 @@ namespace DM_Weight.ViewModels
                                     ManuNo = it.ManuNo,
                                     EffDate = it.EffDate,
                                     Id = it.Id,
-                                    FillTime=it.Quantity<=0?DateTime.Now:it.FillTime
-                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                                    FillTime=it.Quantity<=0 || it.FillTime == null ? DateTime.Now:it.FillTime
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate,it.FillTime }).ExecuteCommand();
                             }
                             else
                             {
@@ -348,7 +348,7 @@ namespace DM_Weight.ViewModels
                                         ManuNo = recordList[0].ManuNo,
                                         EffDate = recordList[0].EffDate,
                                         Id = recordList[0].Id,
-                                        FillTime = recordList[0].Quantity<=0?DateTime.Now: recordList[0].FillTime
+                                        FillTime = recordList[0].Quantity<=0 || recordList[0].FillTime == null ? DateTime.Now: recordList[0].FillTime
                                     }).Where(item => item.Id == item.Id).ExecuteCommand();
                                 }
                                 else
diff --git a/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs b/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
index ab6a525..091db9d 100644
--- a/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/InvoiceInNewWindowViewModel.cs
@@ -540,7 +540,8 @@ namespace DM_Weight.ViewModels
                                     ManuNo = it.ManuNo,
                                     EffDate = it.EffDate,
                                     Id = it.Id,
-                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate }).ExecuteCommand();
+                                    FillTime=it.Quantity<=0||it.FillTime==null?DateTime.Now:it.FillTime
+                                }).UpdateColumns(it => new { it.Quantity, it.ManuNo, it.EffDate,it.FillTime }).ExecuteCommand();
                             }
                             else
                             {
diff --git a/DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs b/DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs
index 847dcc9..f175ebc 100644
--- a/DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnDrugDialogViewModel.cs
@@ -284,9 +284,9 @@ namespace DM_Weight.ViewModels
                     SqlSugarHelper.Db.Updateable(new ChannelStock()
                     {
                         Quantity = ChannelStock.Quantity + ReturnQuantity,
-                        FillTime= ChannelStock.Quantity<=0 ? DateTime.Now : ChannelStock.FillTime,
+                        FillTime= ChannelStock.Quantity<=0 || ChannelStock.FillTime == null ? DateTime.Now : ChannelStock.FillTime,
                         Id = ChannelStock.Id,
-                    }).UpdateColumns(it => new { it.Quantity }).ExecuteCommand();
+                    }).UpdateColumns(it => new { it.Quantity,it.FillTime }).ExecuteCommand();
 
                     // 获取更新完库存后的药品库存
                     List<ChannelStock> nowChannels = SqlSugarHelper.Db.Queryable<ChannelStock>()