|  | @@ -110,9 +110,9 @@ GROUP BY b.group_id
 | 
											
												
													
														|  |      b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId
 |  |      b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId
 | 
											
												
													
														|  |       from sy_shipping_details_item b
 |  |       from sy_shipping_details_item b
 | 
											
												
													
														|  |  left join sy_shipping_details a
 |  |  left join sy_shipping_details a
 | 
											
												
													
														|  | -on a.id = b.shipping_details_id and a.del_flag = 0 and b.del_flag = 0
 |  | 
 | 
											
												
													
														|  | 
 |  | +on a.id = b.shipping_details_id and a.del_flag = 0
 | 
											
												
													
														|  |  left join sy_declaration_elements e  on b.elements_id = e.id
 |  |  left join sy_declaration_elements e  on b.elements_id = e.id
 | 
											
												
													
														|  | -${ew.customSqlSegment} and  b.inventory_ccode LIKE '19%'
 |  | 
 | 
											
												
													
														|  | 
 |  | +${ew.customSqlSegment} and b.del_flag = 0 and  b.inventory_ccode LIKE '19%'
 | 
											
												
													
														|  |  GROUP BY b.group_id
 |  |  GROUP BY b.group_id
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  </select>
 |  |  </select>
 | 
											
										
											
												
													
														|  | @@ -163,9 +163,9 @@ GROUP BY b.group_id
 | 
											
												
													
														|  |      b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId
 |  |      b.garment_factory as garmentFactory,b.elements_id as elementsId,b.group_id as groupId
 | 
											
												
													
														|  |       from sy_shipping_details_item b
 |  |       from sy_shipping_details_item b
 | 
											
												
													
														|  |  left join sy_shipping_details a
 |  |  left join sy_shipping_details a
 | 
											
												
													
														|  | -on a.id = b.shipping_details_id and a.del_flag = 0 and b.del_flag = 0
 |  | 
 | 
											
												
													
														|  | 
 |  | +on a.id = b.shipping_details_id and a.del_flag = 0
 | 
											
												
													
														|  |  left join sy_declaration_elements e  on b.elements_id = e.id
 |  |  left join sy_declaration_elements e  on b.elements_id = e.id
 | 
											
												
													
														|  | -${ew.customSqlSegment}
 |  | 
 | 
											
												
													
														|  | 
 |  | +${ew.customSqlSegment} and b.del_flag = 0
 | 
											
												
													
														|  |   and b.inventory_ccode not LIKE '19%'
 |  |   and b.inventory_ccode not LIKE '19%'
 | 
											
												
													
														|  |  GROUP BY b.group_id order by a.create_time desc
 |  |  GROUP BY b.group_id order by a.create_time desc
 | 
											
												
													
														|  |  
 |  |  
 |