| 
					
				 | 
			
			
				@@ -109,6 +109,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				item1.setSalesman(syItem.getSalesman());//获取业务员 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				item1.setSalesDepartment(syItem.getSalesDepartment());//获取销售部门 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				item1.setInventoryCode(syItem.getInventoryCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+				item1.setInventoryCcode(syItem.getInventoryCcode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				syPreAssembledPackingListItemMapper.insert(item1);//添加子表数据 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				//原剩余数量-预装箱单装箱数量=新剩余数量 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				syItem.setSurplusQuantity(syItem.getSurplusQuantity().subtract(item1.getTotal())); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -594,6 +595,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setSalesman(syItem.getSalesman());//获取业务员 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setSalesDepartment(syItem.getSalesDepartment());//获取销售部门 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setInventoryCode(syItem.getInventoryCode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+							item1.setInventoryCcode(syItem.getInventoryCcode()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setOrderNumber(syItem.getOrderNumber()); //销售订单号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setOmpoId(syItem.getOmpoId());//采购委外订单id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							item1.setOmpoAccount(syItem.getOmpoAccount());//采购委外账套号 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -655,7 +657,6 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					}else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 						throw new JeecgBootException("该单据在上游未找到"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					queryWrapper=new QueryWrapper(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					queryWrapper.in("sy_declaration_elements_item_id", Arrays.asList(ids.split(","))); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					queryWrapper.select("sum(total) as total"); 
			 |