核销处方时保存账册信息为DM3的账册数据
This commit is contained in:
		
							parent
							
								
									1ec7054a8c
								
							
						
					
					
						commit
						6cf9e18963
					
				| 
						 | 
					@ -249,7 +249,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                            });
 | 
					                            });
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        Expression<Func<ChannelStock, bool>> updateExp = it => it.ManuNo == oi._OrderDetail.SetManuNo && it.EffDate == oi._OrderDetail.SetEffDate;
 | 
					                        //Expression<Func<ChannelStock, bool>> updateExp = it => it.ManuNo == oi._OrderDetail.SetManuNo && it.EffDate == oi._OrderDetail.SetEffDate;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrugId == oi._OrderDetail.DrugId && cs.ManuNo == oi._OrderDetail.SetManuNo && cs.EffDate == oi._OrderDetail.SetEffDate && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5")&&cs.DrawerNo==DrawerNo).First();
 | 
					                        ChannelStock cs = SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrugId == oi._OrderDetail.DrugId && cs.ManuNo == oi._OrderDetail.SetManuNo && cs.EffDate == oi._OrderDetail.SetEffDate && cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM5")&&cs.DrawerNo==DrawerNo).First();
 | 
				
			||||||
                        if (cs == null)
 | 
					                        if (cs == null)
 | 
				
			||||||
| 
						 | 
					@ -266,7 +266,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                            SqlSugarHelper.Db.Insertable(new MachineRecord()
 | 
					                            SqlSugarHelper.Db.Insertable(new MachineRecord()
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
 | 
					                                MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
 | 
				
			||||||
                                DrawerNo = cs.DrawerNo,
 | 
					                                DrawerNo = cs.DrawerNo,
 | 
				
			||||||
                                ColNo = cs.ColNo,
 | 
					                                ColNo = cs.ColNo,
 | 
				
			||||||
                                DrugId = cs.DrugId,
 | 
					                                DrugId = cs.DrugId,
 | 
				
			||||||
| 
						 | 
					@ -293,7 +293,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                            OutQuantity = oi._OrderDetail.Quantity,
 | 
					                            OutQuantity = oi._OrderDetail.Quantity,
 | 
				
			||||||
                            UserId1 = HomeWindowViewModel.Operator?.Id,
 | 
					                            UserId1 = HomeWindowViewModel.Operator?.Id,
 | 
				
			||||||
                            UserId2 = HomeWindowViewModel.Reviewer?.Id,
 | 
					                            UserId2 = HomeWindowViewModel.Reviewer?.Id,
 | 
				
			||||||
                            MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
 | 
					                            MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
 | 
				
			||||||
                            CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
 | 
					                            CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
 | 
				
			||||||
                            CreateTime = DateTime.Now,
 | 
					                            CreateTime = DateTime.Now,
 | 
				
			||||||
                            InvoiceNo = oi.OrderNo
 | 
					                            InvoiceNo = oi.OrderNo
 | 
				
			||||||
| 
						 | 
					@ -301,7 +301,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                        }).ExecuteCommand();
 | 
					                        }).ExecuteCommand();
 | 
				
			||||||
                        //修改凌晨生成的日结存与总结存数据
 | 
					                        //修改凌晨生成的日结存与总结存数据
 | 
				
			||||||
                        AccountBookG2 accountBookG2Day = SqlSugarHelper.Db.Queryable<AccountBookG2>()
 | 
					                        AccountBookG2 accountBookG2Day = SqlSugarHelper.Db.Queryable<AccountBookG2>()
 | 
				
			||||||
                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["machineId"].ToString()))
 | 
					                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
 | 
				
			||||||
                        .Where(ab => ab.Type == 3)
 | 
					                        .Where(ab => ab.Type == 3)
 | 
				
			||||||
                        .Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
 | 
					                        .Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
 | 
				
			||||||
                        .Where(ab => ab.ManuNo == cs.ManuNo)
 | 
					                        .Where(ab => ab.ManuNo == cs.ManuNo)
 | 
				
			||||||
| 
						 | 
					@ -325,7 +325,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                                TotalStock = oi._OrderDetail.Quantity,
 | 
					                                TotalStock = oi._OrderDetail.Quantity,
 | 
				
			||||||
                                UserId1 = HomeWindowViewModel.Operator?.Id,
 | 
					                                UserId1 = HomeWindowViewModel.Operator?.Id,
 | 
				
			||||||
                                UserId2 = HomeWindowViewModel.Reviewer?.Id,
 | 
					                                UserId2 = HomeWindowViewModel.Reviewer?.Id,
 | 
				
			||||||
                                MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
 | 
					                                MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
 | 
				
			||||||
                                CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
 | 
					                                CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
 | 
				
			||||||
                                InvoiceNo = "日结存"
 | 
					                                InvoiceNo = "日结存"
 | 
				
			||||||
                            }).ExecuteCommand();
 | 
					                            }).ExecuteCommand();
 | 
				
			||||||
| 
						 | 
					@ -336,7 +336,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                        }
 | 
					                        }
 | 
				
			||||||
                        //修改凌晨生成的日结存与总结存数据
 | 
					                        //修改凌晨生成的日结存与总结存数据
 | 
				
			||||||
                        AccountBookG2 accountBookG2Total = SqlSugarHelper.Db.Queryable<AccountBookG2>()
 | 
					                        AccountBookG2 accountBookG2Total = SqlSugarHelper.Db.Queryable<AccountBookG2>()
 | 
				
			||||||
                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["machineId"].ToString()))
 | 
					                        .Where(ab => ab.MachineId.Equals(ConfigurationManager.AppSettings["dm_machineId"].ToString()))
 | 
				
			||||||
                        .Where(ab => ab.Type == 4)
 | 
					                        .Where(ab => ab.Type == 4)
 | 
				
			||||||
                        .Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
 | 
					                        .Where(ab => ab.DrugId == oi._OrderDetail.DrugId)
 | 
				
			||||||
                        .Where(ab => ab.CreateDate == DateTime.Now.ToString("yyyy-MM-dd")).First();
 | 
					                        .Where(ab => ab.CreateDate == DateTime.Now.ToString("yyyy-MM-dd")).First();
 | 
				
			||||||
| 
						 | 
					@ -357,7 +357,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                                TotalStock = oi._OrderDetail.Quantity,
 | 
					                                TotalStock = oi._OrderDetail.Quantity,
 | 
				
			||||||
                                UserId1 = HomeWindowViewModel.Operator?.Id,
 | 
					                                UserId1 = HomeWindowViewModel.Operator?.Id,
 | 
				
			||||||
                                UserId2 = HomeWindowViewModel.Reviewer?.Id,
 | 
					                                UserId2 = HomeWindowViewModel.Reviewer?.Id,
 | 
				
			||||||
                                MachineId = ConfigurationManager.AppSettings["machineId"].ToString(),
 | 
					                                MachineId = ConfigurationManager.AppSettings["dm_machineId"].ToString(),
 | 
				
			||||||
                                CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
 | 
					                                CreateDate = DateTime.Now.ToString("yyyy-MM-dd"),
 | 
				
			||||||
                                InvoiceNo = "总结存"
 | 
					                                InvoiceNo = "总结存"
 | 
				
			||||||
                            }).ExecuteCommand();
 | 
					                            }).ExecuteCommand();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue