| 
					
				 | 
			
			
				@@ -188,16 +188,16 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		return result; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	/** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	 * 批量删除 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	 * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	 * @param id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	 * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	@AutoLog(value = "发运明细主表-批量删除") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	//@ApiOperation(value="发运明细主表-批量删除", notes="发运明细主表-批量删除") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	@DeleteMapping(value = "/deleteBatch") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	public Result<Integer> deleteBatch(@RequestParam(name="id",required=true) String id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	/** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	 * 批量删除 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	 * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	 * @param id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	 * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	 */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	@AutoLog(value = "发运明细主表-批量删除") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	//@ApiOperation(value="发运明细主表-批量删除", notes="发运明细主表-批量删除") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	@DeleteMapping(value = "/deleteBatch") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	public Result<Integer> deleteBatch(@RequestParam(name="id",required=true) String id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //		Result<Integer> result = new Result<>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -220,8 +220,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //			result.setMessage("删除成功"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //			result.setResult(size); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 //		} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//		return null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+//	} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	/** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	 * 通过id查询 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -277,9 +277,13 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	 /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  * 提交 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  * @param id 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+	  */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   @AutoLog(value = "发运明细提交") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  @ApiOperation(value = "发运明细提交",notes="发运明细提交") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  @ApiOperation(value = "发运明细提交", notes="发运明细提交") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   @PostMapping(value = "/syShippingDetailsSubmit") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   public Result<SyShippingDetails> syShippingDetailsSubmit(@RequestParam(name="id",required=true) String id) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -349,7 +353,6 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  queryWrapper.orderByDesc("a.order_number"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  IPage<OrderDataVo> pageList = syShippingDetailsService.queryOrderData(page, queryWrapper); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-	  System.out.println(""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  result.setSuccess(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  result.setResult(pageList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	  result.setMessage("查询成功!"); 
			 |