| 
					
				 | 
			
			
				@@ -817,13 +817,14 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						item1.setActualPackingQty(size.getQuantity());//获取该尺码计划装箱数量 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						item1.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						item1.setSort(size.getNum());//获取序号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						item1.setId(oConvertUtils.id());//获取到随机id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						item1.setId(oConvertUtils.id());//获取到随机iddistributionPoint 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						//item1.setRemainingQuantity(boxNumber);//剩余数量 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						//获取发育明细数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						//SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						SyShippingDetailsItem syItem=mapItems.get(size.getItemId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						if(syItem!=null){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setPackId(syItem.getPackId()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							item1.setDistributionPoint(syItem.getDistributionPoint()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setUnitPrice(syItem.getSalesUnitPrice());//获取销售单价 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setFactoryUnitPrice(new BigDecimal(syItem.getFactoryUnitPrice()==null?"0":syItem.getFactoryUnitPrice()));//工厂单价 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setInventoryName(syItem.getInventoryName());//存货名称 
			 |