oms与wms修改

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/businessDocumentOrder/BusinessDocumentOrderDTO.java

@@ -768,6 +768,9 @@ public class BusinessDocumentOrderDTO extends BaseVOEntity{
     @ApiModelProperty("预计出发日期")
     private Date layDate;
 
+    @ApiModelProperty("入库单号")
+    private String inOrderNumber;
+
     @ApiModelProperty("业务单地址集合")
     private List<BusinessDocumentAddressMultiDTO>  businessDocumentAddressMultiDTOList;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/businessDocumentOrder/BusinessDocumentOrderApi.java

@@ -42,7 +42,6 @@ public class BusinessDocumentOrderApi extends BaseController{
     {
         //转换实体
         BusinessDocumentOrderDO businessDocumentOrderDO = businessDocumentOrderAssembler.toDO(businessDocumentOrderDTO);
-        // 使用 PageHelper 手动分页，支持 pageNo 参数
         PageHelper.startPage(pageNo, pageSize);
         List<BusinessDocumentOrderPO> list = businessDocumentOrderApplicationService.queryList(businessDocumentOrderDO);
         return getDataTable(list);

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executeOrder/ExecuteOrderApi.java

@@ -2,6 +2,7 @@ package com.mhd.oms.interfaces.facade.executeOrder;
 
 import java.util.List;
 
+import com.github.pagehelper.PageHelper;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
 import io.swagger.annotations.ApiOperation;
@@ -37,11 +38,13 @@ public class ExecuteOrderApi extends BaseController{
      */
     @ApiOperation("查询【执行单】列表")
     @GetMapping("/list")
-    public TableDataInfo list(ExecuteOrderDTO executeOrderDTO)
+    public TableDataInfo list(ExecuteOrderDTO executeOrderDTO,
+                              @RequestParam(value = "pageNo", required = false, defaultValue = "1") Integer pageNo,
+                              @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer pageSize)
     {
         //转换实体
         ExecuteOrderDO executeOrderDO = executeOrderAssembler.toDO(executeOrderDTO);
-        startPage();
+        PageHelper.startPage(pageNo, pageSize);
         List<ExecuteOrderPO> list = executeOrderApplicationService.queryList(executeOrderDO);
         return getDataTable(list);
     }