| 
														
															@@ -883,11 +883,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         SELECT * FROM ( 
														 | 
														
														 | 
														
															         SELECT * FROM ( 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                           select DISTINCT 
														 | 
														
														 | 
														
															                           select DISTINCT 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               db.BATCH_ID "batchId", 
														 | 
														
														 | 
														
															                               db.BATCH_ID "batchId", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              DBI2.BATCH_INFACOTRY_ID  "batchInfacoryId", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               db.result_foreign_ship_name "resultForeignShipName", 
														 | 
														
														 | 
														
															                               db.result_foreign_ship_name "resultForeignShipName", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              rm.material_name "materialName", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              adn.NOTICE_DELIVERY_TIME "dateOfLoans", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              adn.RESULT_NUMBER_OF_LOANS "numberOfLoans", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               rp.port_name "portName", 
														 | 
														
														 | 
														
															                               rp.port_name "portName", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               wgm.gm_tonnage-NVL(TIN."afterIn",0)+NVL(TOUT."afterOut",0) "gmTonnage", 
														 | 
														
														 | 
														
															                               wgm.gm_tonnage-NVL(TIN."afterIn",0)+NVL(TOUT."afterOut",0) "gmTonnage", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               NVL(ADN.RESULT_MEMO,'进口块矿') "type" 
														 | 
														
														 | 
														
															                               NVL(ADN.RESULT_MEMO,'进口块矿') "type" 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -949,11 +945,7 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                           union all 
														 | 
														
														 | 
														
															                           union all 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                           select DISTINCT 
														 | 
														
														 | 
														
															                           select DISTINCT 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               db.BATCH_ID "batchId", 
														 | 
														
														 | 
														
															                               db.BATCH_ID "batchId", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              DBI2.BATCH_INFACOTRY_ID  "batchInfacoryId", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               db.result_foreign_ship_name "resultForeignShipName", 
														 | 
														
														 | 
														
															                               db.result_foreign_ship_name "resultForeignShipName", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              rm.material_name "materialName", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              adn.NOTICE_DELIVERY_TIME "dateOfLoans", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-                              adn.RESULT_NUMBER_OF_LOANS "numberOfLoans", 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               rp.port_name "portName", 
														 | 
														
														 | 
														
															                               rp.port_name "portName", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               wgm.gm_tonnage - NVL( TIN."afterIn", 0 ) + NVL( TOUT."afterOut", 0 ) "gmTonnage", 
														 | 
														
														 | 
														
															                               wgm.gm_tonnage - NVL( TIN."afterIn", 0 ) + NVL( TOUT."afterOut", 0 ) "gmTonnage", 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                               NVL(ADN.RESULT_MEMO,'进口块矿') "type" 
														 | 
														
														 | 
														
															                               NVL(ADN.RESULT_MEMO,'进口块矿') "type" 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -1027,6 +1019,6 @@ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                           ) 
														 | 
														
														 | 
														
															                           ) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															                       ) 
														 | 
														
														 | 
														
															                       ) 
														 | 
													
												
											
												
													
														| 
														 | 
														
															         WHERE "gmTonnage" > 0 
														 | 
														
														 | 
														
															         WHERE "gmTonnage" > 0 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-        ORDER BY DECODE("type",'低富粉',1,'中富粉',2,'高富粉',3,'机精粉',4 ,'进口块矿',5,6),"batchId","batchInfacoryId" DESC 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+        ORDER BY DECODE("type",'低富粉',1,'中富粉',2,'高富粉',3,'机精粉',4 ,'进口块矿',5,6),"batchId" DESC 
														 | 
													
												
											
												
													
														| 
														 | 
														
															     </select> 
														 | 
														
														 | 
														
															     </select> 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 </mapper> 
														 | 
														
														 | 
														
															 </mapper> 
														 |