diff --git a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs index beba1c6..e2e505e 100644 --- a/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs +++ b/DM_Weight/ViewModels/AddToJiaoJieDialogViewModel.cs @@ -393,19 +393,19 @@ namespace DM_Weight.ViewModels { ChannelStock jStock = Jiaojie_ChannelStocks[j]; int totalBaseNum = SqlSugarHelper.Db.Queryable(). - Where(db => db.DrugId == jStock.DrugId && db.MachineId == jStock.MachineId).Select(db => db.BaseQuantity).First(); + Where(db => db.DrugId == jStock.DrugId && db.MachineId == (ConfigurationManager.AppSettings["machineId"] ?? "DM3")).Select(db => db.BaseQuantity).First(); string belognUser = SqlSugarHelper.Db.Queryable(). Where(cl => cl.DrawerNo == jStock.DrawerNo && cl.MachineId == jStock.MachineId).Select(cl => cl.BelongUser).First(); SqlSugarHelper.Db.Insertable(new RejectionReport() { - SendDate = System.DateTime.Now, + SendDate =DateTime.Parse(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm")), SendUser = HomeWindowViewModel.Operator?.Nickname, ReceiveUser = belognUser,//Jiaojie_ChannelStocks DrugId = jStock.DrugId, BaseNum = totalBaseNum + "支",//总基数 - DrawerNo = jStock.DrawerNo, + DrawerNo = jStock.DrawerNo }).ExecuteCommand(); } return true;