| 
					
				 | 
			
			
				@@ -481,12 +481,22 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 li.setTheDocumentsState("1"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 updateById(li); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                UpdateWrapper updateWrapper=new UpdateWrapper(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                updateWrapper.set("push_State","3"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                updateWrapper.ne("push_State","4");//不等于4 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                updateWrapper.ne("push_State","1");//不等于4 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                updateWrapper.in("shipping_order_number", li.getShippingOrderNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                syShippingOrderItemService.update(updateWrapper); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                if(li.getReadyFabric().equals("成衣")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    UpdateWrapper updateWrapper=new UpdateWrapper(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.set("push_State","3"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.ne("push_State","4");//不等于4 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.ne("push_State","1");//不等于4 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.in("shipping_order_number", li.getShippingOrderNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    syPackingListTailoringService.update(updateWrapper); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    UpdateWrapper updateWrapper=new UpdateWrapper(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.set("push_State","3"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.ne("push_State","4");//不等于4 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.ne("push_State","1");//不等于4 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    updateWrapper.in("shipping_order_number", li.getShippingOrderNumber()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    syPackingListFabricService.update(updateWrapper); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             i = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }else if(entityList.size()!=0 && type.equals("2")){ 
			 |