|  | @@ -396,21 +396,27 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 | 
											
												
													
														|  |  			throw new JeecgBootException("部分单据已提交,不允许删除!");
 |  |  			throw new JeecgBootException("部分单据已提交,不允许删除!");
 | 
											
												
													
														|  |  		}
 |  |  		}
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +		QueryWrapper<SyPreAssembledPackingListItem> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingListItem>();
 | 
											
												
													
														|  | 
 |  | +		queryWrapper1.in("sy_declaration_elements_item_id",itemIds).eq("del_flag",0);
 | 
											
												
													
														|  | 
 |  | +		int count1 = syPreAssembledPackingListItemService.count(queryWrapper1);
 | 
											
												
													
														|  | 
 |  | +		if(count1>0){
 | 
											
												
													
														|  | 
 |  | +			result.setSuccess(false);
 | 
											
												
													
														|  | 
 |  | +			result.setMessage("该单据被下游参照,不允许删除");
 | 
											
												
													
														|  | 
 |  | +			return result;
 | 
											
												
													
														|  | 
 |  | +		}
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +		//判断下游是否有装箱单-面辅料单据
 | 
											
												
													
														|  | 
 |  | +		QueryWrapper<SyPackingListFabricItem> queryWrapper2 = new QueryWrapper<SyPackingListFabricItem>();
 | 
											
												
													
														|  | 
 |  | +		queryWrapper2.in("sy_shipping_details_item_id",itemIds).eq("del_flag",0);
 | 
											
												
													
														|  | 
 |  | +		int count2 = syPackingListFabricItemService.count(queryWrapper2);
 | 
											
												
													
														|  | 
 |  | +		if(count2>0){
 | 
											
												
													
														|  | 
 |  | +			result.setSuccess(false);
 | 
											
												
													
														|  | 
 |  | +			result.setMessage("该单据被下游参照,不允许删除!");
 | 
											
												
													
														|  | 
 |  | +			return result;
 | 
											
												
													
														|  | 
 |  | +		}
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  		syShippingDetailsService.syShippingDetailsDelete(deduplicatedList,itemIds);
 |  |  		syShippingDetailsService.syShippingDetailsDelete(deduplicatedList,itemIds);
 | 
											
												
													
														|  | -//		int ii = 0;
 |  | 
 | 
											
												
													
														|  | -//		for(String str :syShippingDetails.getIds()){
 |  | 
 | 
											
												
													
														|  | -//
 |  | 
 | 
											
												
													
														|  | -//			List<String> itenIdList = new ArrayList<>();
 |  | 
 | 
											
												
													
														|  | -//
 |  | 
 | 
											
												
													
														|  | -//			List<String> strList = syShippingDetails.getItemId();
 |  | 
 | 
											
												
													
														|  | -//			String idIndex = strList.get(ii);
 |  | 
 | 
											
												
													
														|  | -//			String split[] = idIndex.split(",");
 |  | 
 | 
											
												
													
														|  | -//			for(String sr : split){
 |  | 
 | 
											
												
													
														|  | -//				itenIdList.add(sr);
 |  | 
 | 
											
												
													
														|  | -//			}
 |  | 
 | 
											
												
													
														|  | -//
 |  | 
 | 
											
												
													
														|  | -//			ii++;
 |  | 
 | 
											
												
													
														|  | -//		}
 |  | 
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  		result.setSuccess(true);
 |  |  		result.setSuccess(true);
 | 
											
												
													
														|  |  		result.setMessage("删除成功");
 |  |  		result.setMessage("删除成功");
 | 
											
												
													
														|  |  		result.setResult(1);
 |  |  		result.setResult(1);
 |