更新调拨入库取状态及查效期只查到日期
This commit is contained in:
		
							parent
							
								
									7c69b1dee2
								
							
						
					
					
						commit
						804643d035
					
				| 
						 | 
					@ -207,7 +207,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    List<ChannelStock> q = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
					                    List<ChannelStock> q = SqlSugarHelper.Db.Queryable<ChannelStock>()
 | 
				
			||||||
                    .Includes<DrugInfo>(cs => cs.DrugInfo)
 | 
					                    .Includes<DrugInfo>(cs => cs.DrugInfo)
 | 
				
			||||||
                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Equals(invoice.DrugEffDate))
 | 
					                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugEffDate), cs => cs.EffDate.Substring(0,10).Equals(invoice.DrugEffDate.Substring(0,10)))
 | 
				
			||||||
                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
 | 
					                    .WhereIF(!string.IsNullOrEmpty(invoice.DrugManuNo), cs => cs.ManuNo.Equals(invoice.DrugManuNo))
 | 
				
			||||||
                    .Where(cs => cs.DrugId == invoice.DrugId)
 | 
					                    .Where(cs => cs.DrugId == invoice.DrugId)
 | 
				
			||||||
                    .Where(cs => cs.DrawerType == 1)
 | 
					                    .Where(cs => cs.DrawerType == 1)
 | 
				
			||||||
| 
						 | 
					@ -334,7 +334,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            sb.Append(" and i.cancel_flag=@CancelFlag ");
 | 
					            sb.Append(" and i.cancel_flag=@CancelFlag ");
 | 
				
			||||||
            if (OrderDate != null)
 | 
					            if (OrderDate != null)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                sb.Append(" and i.invoice_date = @CreateTime ");
 | 
					                sb.Append(" and DATE_FORMAT(i.invoice_date,'%Y-%m-%d') = @CreateTime ");
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            if (!String.IsNullOrEmpty(SearchValue))
 | 
					            if (!String.IsNullOrEmpty(SearchValue))
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue