diff --git a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java index 8998210..c997bde 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/controller/PlanOutController.java @@ -1,10 +1,12 @@ package com.bonus.gzgqj.business.plan.controller; +import cn.hutool.core.convert.Convert; import com.bonus.gzgqj.business.plan.entity.ProDevSelect; import com.bonus.gzgqj.business.plan.entity.ProNeedInfo; import com.bonus.gzgqj.business.plan.entity.ProPlanInfoVo; import com.bonus.gzgqj.business.plan.service.PlanOutService; import com.bonus.gzgqj.manager.annotation.DecryptAndVerify; +import com.bonus.gzgqj.manager.common.util.ServletUtils; import com.bonus.gzgqj.manager.core.entity.EncryptedReq; import com.bonus.gzgqj.manager.webResult.ServerResponse; import com.github.pagehelper.PageHelper; @@ -48,7 +50,7 @@ public class PlanOutController { @GetMapping("getProPlanPage") @DecryptAndVerify(decryptedClass = ProPlanInfoVo.class) public PageInfo getProPlanPage(EncryptedReq dto) { - PageHelper.startPage(dto.getData().getPageNum(),dto.getData().getPageSize()); + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); PageInfo pageInfo = service.getProPlanPage(dto.getData());; return pageInfo; } @@ -91,5 +93,20 @@ public class PlanOutController { +// /** +// * 发货接口 +// * @return +// */ +// @PostMapping("getOutDetails") +// @DecryptAndVerify(decryptedClass = ProNeedInfo.class) +// public PageInfo getOutDetails(EncryptedReq dto) { +// PageHelper.startPage(dto.getData().getPageNum(),dto.getData().getPageSize()); +// PageInfo pageInfo = service.getProPlanPage(dto.getData());; +// return pageInfo; +// } +// + + + } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java index a285d98..f18b35e 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutService.java @@ -44,4 +44,11 @@ public interface PlanOutService { * @return */ ServerResponse getStatistics(); + + /** + * 查看发货详情接口 + * @param data + * @return + */ + ServerResponse getOutDetails(String data); } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java index 6ec30a6..eacbfe2 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/service/PlanOutServiceImpl.java @@ -188,6 +188,20 @@ public class PlanOutServiceImpl implements PlanOutService{ return ServerResponse.createSuccess(map); } + /** + * 查询出库货单详情 + * @param data + * @return + */ + @Override + public ServerResponse getOutDetails(String data) { + try{ + + }catch (Exception e){ + + } + } + public boolean planOutInfo(List list,ProOutInfoVo vo,int allFhNum, int allTzNum){ try { for (ProOutDetail details:list){ diff --git a/src/main/java/com/bonus/gzgqj/manager/core/entity/EncryptedReq.java b/src/main/java/com/bonus/gzgqj/manager/core/entity/EncryptedReq.java index 88131a3..5ce9702 100644 --- a/src/main/java/com/bonus/gzgqj/manager/core/entity/EncryptedReq.java +++ b/src/main/java/com/bonus/gzgqj/manager/core/entity/EncryptedReq.java @@ -5,7 +5,6 @@ import lombok.Data; @Data public class EncryptedReq { /** 签名 */ - private String sign; /** 加密请求数据 */ @@ -15,5 +14,15 @@ public class EncryptedReq { /** 请求的时间戳 */ private Long timestamp; + + /** 请求的时间戳 */ + + private Integer pageNum =1; + /** 请求的时间戳 */ + + private Integer pageSize=10; + + + }