| 
														
															@@ -346,8 +346,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						netWeight=netWeight.subtract(entity1.getNetWeight()); 
														 | 
														
														 | 
														
															 						netWeight=netWeight.subtract(entity1.getNetWeight()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						//syPackingListFabricItemMapper.updateById(entity1); 
														 | 
														
														 | 
														
															 						//syPackingListFabricItemMapper.updateById(entity1); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						if(netWeight.doubleValue()!=0){ 
														 | 
														
														 | 
														
															 						if(netWeight.doubleValue()!=0){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-							System.out.println("第"+i+"次修改出运明细"); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-							i++; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 							updateQuantity(netWeight.negate(),entity.getSyShippingDetailsItemId(),entity.getMasterMetering()); 
														 | 
														
														 | 
														
															 							updateQuantity(netWeight.negate(),entity.getSyShippingDetailsItemId(),entity.getMasterMetering()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						} 
														 | 
														
														 | 
														
															 						} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 					}else{//根据实际报关数量 
														 | 
														
														 | 
														
															 					}else{//根据实际报关数量 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -358,8 +356,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						actualDeclaredQuantity=actualDeclaredQuantity.subtract(entity1.getActualDeclaredQuantity()); 
														 | 
														
														 | 
														
															 						actualDeclaredQuantity=actualDeclaredQuantity.subtract(entity1.getActualDeclaredQuantity()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						//syPackingListFabricItemMapper.updateById(entity1); 
														 | 
														
														 | 
														
															 						//syPackingListFabricItemMapper.updateById(entity1); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						if(actualDeclaredQuantity.doubleValue()!=0){ 
														 | 
														
														 | 
														
															 						if(actualDeclaredQuantity.doubleValue()!=0){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-							System.out.println("第"+i+"次修改出运明细"); 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-							i++; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 							updateQuantity(actualDeclaredQuantity.negate(),entity.getSyShippingDetailsItemId(),entity.getMasterMetering()); 
														 | 
														
														 | 
														
															 							updateQuantity(actualDeclaredQuantity.negate(),entity.getSyShippingDetailsItemId(),entity.getMasterMetering()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 						} 
														 | 
														
														 | 
														
															 						} 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 					} 
														 | 
														
														 | 
														
															 					} 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -387,7 +383,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		queryWrapper.eq("sy_packing_list_fabric_id",id); 
														 | 
														
														 | 
														
															 		queryWrapper.eq("sy_packing_list_fabric_id",id); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.selectList(queryWrapper); 
														 | 
														
														 | 
														
															 		List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.selectList(queryWrapper); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 		for(SyPackingListFabricItem item : syPackingListFabricItems){ 
														 | 
														
														 | 
														
															 		for(SyPackingListFabricItem item : syPackingListFabricItems){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-			if(item.getNetWeight().equals("KG")){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+			if(item.getMasterMetering().equals("KG")){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				updateQuantity(item.getNetWeight().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 | 
														
														 | 
														
															 				updateQuantity(item.getNetWeight().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			}else{ 
														 | 
														
														 | 
														
															 			}else{ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				updateQuantity(item.getActualDeclaredQuantity().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 | 
														
														 | 
														
															 				updateQuantity(item.getActualDeclaredQuantity().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -409,7 +405,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			queryWrapper.eq("sy_packing_list_fabric_id",id); 
														 | 
														
														 | 
														
															 			queryWrapper.eq("sy_packing_list_fabric_id",id); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.selectList(queryWrapper); 
														 | 
														
														 | 
														
															 			List<SyPackingListFabricItem> syPackingListFabricItems=syPackingListFabricItemMapper.selectList(queryWrapper); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 			for(SyPackingListFabricItem item : syPackingListFabricItems){ 
														 | 
														
														 | 
														
															 			for(SyPackingListFabricItem item : syPackingListFabricItems){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-				if(item.getNetWeight().equals("KG")){ 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+				if(item.getMasterMetering().equals("KG")){ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 					updateQuantity(item.getNetWeight().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 | 
														
														 | 
														
															 					updateQuantity(item.getNetWeight().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 				}else{ 
														 | 
														
														 | 
														
															 				}else{ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 					updateQuantity(item.getActualDeclaredQuantity().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 | 
														
														 | 
														
															 					updateQuantity(item.getActualDeclaredQuantity().negate(),item.getSyShippingDetailsItemId(),item.getMasterMetering()); 
														 |