修改盘点记录报表中pack_unit
This commit is contained in:
		
							parent
							
								
									d405184691
								
							
						
					
					
						commit
						4ebdcc4ac7
					
				| 
						 | 
					@ -83,7 +83,7 @@ namespace DM_Weight.Report
 | 
				
			||||||
            //});
 | 
					            //});
 | 
				
			||||||
            string machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
 | 
					            string machine_id = (ConfigurationManager.AppSettings["machineId"] ?? "DM1");
 | 
				
			||||||
            string SQL = $@"SELECT cl.`row_no` AS drawerNo,cl.`col_no` AS colNo,cl.`quantity` AS quantity,cl.`manu_no` AS manuNo,cl.`eff_date` AS effDate,
 | 
					            string SQL = $@"SELECT cl.`row_no` AS drawerNo,cl.`col_no` AS colNo,cl.`quantity` AS quantity,cl.`manu_no` AS manuNo,cl.`eff_date` AS effDate,
 | 
				
			||||||
                          `drug_name` AS drugName,`drug_spec` AS drugSpec,`pack_unit` AS smallUnit,`manufactory` AS manuFactory,`max_stock` AS baseQuantity,
 | 
					                          `drug_name` AS drugName,`drug_spec` AS drugSpec,`pack_unit` AS  packUnit,pack_unit  AS smallUnit,`manufactory` AS manuFactory,`max_stock` AS baseQuantity,
 | 
				
			||||||
                          cl.`drug_id` AS drugId,cl.manuquantity, cl.`optdate` FROM check_stock cl WHERE cl.`machine_id` =  '{machine_id}' AND cl.`optdate` > '{p_startDate}' AND cl.`optdate` < '{p_endDate}' ORDER BY cl.`optdate` desc, cl.`drug_id`";
 | 
					                          cl.`drug_id` AS drugId,cl.manuquantity, cl.`optdate` FROM check_stock cl WHERE cl.`machine_id` =  '{machine_id}' AND cl.`optdate` > '{p_startDate}' AND cl.`optdate` < '{p_endDate}' ORDER BY cl.`optdate` desc, cl.`drug_id`";
 | 
				
			||||||
            // 加载模板文件
 | 
					            // 加载模板文件
 | 
				
			||||||
            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "machine_log_check_new2.grf");
 | 
					            Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//" + "machine_log_check_new2.grf");
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue