发运明细查询订单接口

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -257,47 +257,6 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   }
 
 
-	 /**
-	  * 发运明细查询订单
-	  * @param orderNumber
-	  * @param pkOrg
-	  * @param pageNo
-	  * @param pageSize
-	  * @param request
-	  * @param response
-	  * @return
-	  */
-	  @AutoLog(value = "发运明细查询订单")
-	  @ApiOperation(value="发运明细查询订单", notes="发运明细查询订单")
-	  @GetMapping(value = "/queryOrderData")
-	  public Result<IPage<OrderDataVo>> queryOrderData(String orderNumber,String pkOrg,
-												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-												   HttpServletRequest request, HttpServletResponse response){
-
-  	Result<IPage<OrderDataVo>> result = new Result<IPage<OrderDataVo>>();
-
-  	QueryWrapper<OrderDataVo> queryWrapper = new QueryWrapper<>();
-
-  	Page<OrderDataVo> page = new Page<OrderDataVo>(pageNo, pageSize);
-  	  if(oConvertUtils.isNotEmpty(orderNumber)){
-			queryWrapper.eq("a.order_number",orderNumber);
-  	  }
-	  if(oConvertUtils.isNotEmpty(pkOrg)){
-		  queryWrapper.eq("a.pk_org",pkOrg);
-	  }
-	  queryWrapper.eq("a.del_flag",0);
-	  queryWrapper.orderByDesc("a.order_number");
-
-	  IPage<OrderDataVo> pageList = syShippingDetailsService.queryOrderData(page,queryWrapper);
-
-	  result.setSuccess(true);
-	  result.setResult(pageList);
-	  result.setMessage("查询成功！");
-
-	  return result;
-  }
-
 
   @AutoLog(value = "发运明细提交")
   @ApiOperation(value = "发运明细提交",notes="发运明细提交")
@@ -335,4 +294,46 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 	  return  result;
   }
+
+
+	 /**
+	  * 发运明细查询订单接口
+	  * @param orderNumber
+	  * @param pkOrg
+	  * @param pageNo
+	  * @param pageSize
+	  * @param request
+	  * @param response
+	  * @return
+	  */
+  @AutoLog(value = "发运明细查询订单")
+  @ApiOperation(value="发运明细查询订单", notes="发运明细查询订单")
+  @GetMapping(value = "/queryOrderData")
+  public Result<IPage<OrderDataVo>> queryOrderData(String orderNumber,String pkOrg,
+												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+												   HttpServletRequest request, HttpServletResponse response) {
+
+	  Result<IPage<OrderDataVo>> result = new Result<IPage<OrderDataVo>>();
+
+	  QueryWrapper<OrderDataVo> queryWrapper = new QueryWrapper<>();
+
+	  Page<OrderDataVo> page = new Page<OrderDataVo>(pageNo, pageSize);
+	  if (oConvertUtils.isNotEmpty(orderNumber)) {
+		  queryWrapper.eq("a.order_number", orderNumber);
+	  }
+	  if (oConvertUtils.isNotEmpty(pkOrg)) {
+		  queryWrapper.eq("a.pk_org", pkOrg);
+	  }
+	  queryWrapper.eq("a.del_flag", 0);
+	  queryWrapper.orderByDesc("a.order_number");
+
+	  IPage<OrderDataVo> pageList = syShippingDetailsService.queryOrderData(page, queryWrapper);
+
+	  result.setSuccess(true);
+	  result.setResult(pageList);
+	  result.setMessage("查询成功！");
+
+	  return result;
+  }
 }