调拨入库修改查询数据条件
This commit is contained in:
		
							parent
							
								
									a94b9f0f08
								
							
						
					
					
						commit
						ce3aa0bdd3
					
				| 
						 | 
					@ -324,7 +324,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
                    //ChannelStock stock = new ChannelStock();
 | 
					                    //ChannelStock stock = new ChannelStock();
 | 
				
			||||||
                    //查询每种药有多少个批次
 | 
					                    //查询每种药有多少个批次
 | 
				
			||||||
                    var invoicesManuNo = SqlSugarHelper.Db.Queryable<InOutInvoice>()
 | 
					                    var invoicesManuNo = SqlSugarHelper.Db.Queryable<InOutInvoice>()
 | 
				
			||||||
                               .Where(iManuNo => iManuNo.InvoiceNo == invoices[i].InvoiceNo && iManuNo.DrugId == invoices[i].DrugId && iManuNo.Status == 0 && iManuNo.Type != 2 && iManuNo.CancelFlag == 0).ToList();
 | 
					                               .Where(iManuNo => iManuNo.InvoiceNo == invoices[i].InvoiceNo && iManuNo.DrugId == invoices[i].DrugId && iManuNo.Status == 0 && iManuNo.Type == 2 && iManuNo.CancelFlag == 0).ToList();
 | 
				
			||||||
                    for (int j = 0; j < invoicesManuNo.Count; j++)
 | 
					                    for (int j = 0; j < invoicesManuNo.Count; j++)
 | 
				
			||||||
                    {
 | 
					                    {
 | 
				
			||||||
                        //查询是否有库存
 | 
					                        //查询是否有库存
 | 
				
			||||||
| 
						 | 
					@ -745,7 +745,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
            //sb.Append("select i.invoice_no as InvoiceNo, i.invoice_date as InvoiceDate, COUNT(i.id) as `Count`, SUM(i.quantity) as quantity, p1.pharmacy_name as PharmacyName1, p2.pharmacy_name as PharmacyName2 from in_out_invoice i");
 | 
					            //sb.Append("select i.invoice_no as InvoiceNo, i.invoice_date as InvoiceDate, COUNT(i.id) as `Count`, SUM(i.quantity) as quantity, p1.pharmacy_name as PharmacyName1, p2.pharmacy_name as PharmacyName2 from in_out_invoice i");
 | 
				
			||||||
            sb.Append(" SELECT count(1) as Count, i.InvoiceNo, i.InvoiceDate, sum(i.quantity) as quantity, p1.pharmacy_name as PharmacyName1, p2.pharmacy_name PharmacyName2 from ");
 | 
					            sb.Append(" SELECT count(1) as Count, i.InvoiceNo, i.InvoiceDate, sum(i.quantity) as quantity, p1.pharmacy_name as PharmacyName1, p2.pharmacy_name PharmacyName2 from ");
 | 
				
			||||||
            sb.Append(" (SELECT drug_id,in_pharmacy_id,out_pharmacy_id, invoice_no as InvoiceNo, DATE_FORMAT(Invoice_Date,'%Y-%m-%d')  as InvoiceDate, SUM(quantity) as quantity ");
 | 
					            sb.Append(" (SELECT drug_id,in_pharmacy_id,out_pharmacy_id, invoice_no as InvoiceNo, DATE_FORMAT(Invoice_Date,'%Y-%m-%d')  as InvoiceDate, SUM(quantity) as quantity ");
 | 
				
			||||||
            sb.Append(" FROM in_out_invoice where status=@Status  and type!=@type  and cancel_flag=@CancelFlag GROUP BY invoice_no,drug_id) i ");
 | 
					            sb.Append(" FROM in_out_invoice where status=@Status  and type=@type  and cancel_flag=@CancelFlag GROUP BY invoice_no,drug_id) i ");
 | 
				
			||||||
            sb.Append(" inner join ( select c.drug_id as drug_id from channel_list c where c.machine_id = '" + (ConfigurationManager.AppSettings["machineId"] ?? "DM1") + "' group by c.drug_id ) di on di.drug_id = i.drug_id");
 | 
					            sb.Append(" inner join ( select c.drug_id as drug_id from channel_list c where c.machine_id = '" + (ConfigurationManager.AppSettings["machineId"] ?? "DM1") + "' group by c.drug_id ) di on di.drug_id = i.drug_id");
 | 
				
			||||||
            sb.Append(" left join pharmacy_info p1 on p1.pharmacy = i.in_pharmacy_id");
 | 
					            sb.Append(" left join pharmacy_info p1 on p1.pharmacy = i.in_pharmacy_id");
 | 
				
			||||||
            sb.Append(" left join pharmacy_info p2 on p2.pharmacy = i.out_pharmacy_id where 1=1");
 | 
					            sb.Append(" left join pharmacy_info p2 on p2.pharmacy = i.out_pharmacy_id where 1=1");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue