交接班报表中模板中单位改为small_unit as PackdUnit
This commit is contained in:
		
							parent
							
								
									79ae8c4a6a
								
							
						
					
					
						commit
						c9480a5c0d
					
				| 
						 | 
					@ -228,7 +228,7 @@ namespace DM_Weight.ViewModels
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                //交接班表里只显示值班柜(row_no:1,2)的不显示周转柜
 | 
					                //交接班表里只显示值班柜(row_no:1,2)的不显示周转柜
 | 
				
			||||||
                string strSql = @"SELECT di.drug_name as DrugName,di.drug_spec as DrugSpec,di.small_unit,sum(if(cs.drawer_type=1,cs.quantity,0)) stockQuantity,
 | 
					                string strSql = @"SELECT di.drug_name as DrugName,di.drug_spec as DrugSpec,di.small_unit as PackdUnit,sum(if(cs.drawer_type=1,cs.quantity,0)) stockQuantity,
 | 
				
			||||||
                                sum(if(cs.drawer_type=2,cs.quantity,0)) EmptyQuantity FROM channel_stock cs inner join drug_info di on cs.drug_id=di.drug_id 
 | 
					                                sum(if(cs.drawer_type=2,cs.quantity,0)) EmptyQuantity FROM channel_stock cs inner join drug_info di on cs.drug_id=di.drug_id 
 | 
				
			||||||
                                WHERE (row_no<=8 or drawer_type=2) and machine_id =@machineId GROUP BY cs.drug_id ORDER BY cs.Drug_ID";
 | 
					                                WHERE (row_no<=8 or drawer_type=2) and machine_id =@machineId GROUP BY cs.drug_id ORDER BY cs.Drug_ID";
 | 
				
			||||||
                List<ShiftsReport> shiftsReports = SqlSugarHelper.Db.SqlQueryable<dynamic>(strSql)
 | 
					                List<ShiftsReport> shiftsReports = SqlSugarHelper.Db.SqlQueryable<dynamic>(strSql)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue