From 3f2cfe83aaa144ce09c940ee0e123ebfcea09d9f Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 8 Nov 2024 17:18:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan/controller/PlanOutController.java | 23 ++++++++----- .../business/plan/entity/OutDetailInfoVo.java | 13 ++++++++ .../plan/entity/ProAddInfoDetails.java | 2 ++ .../business/plan/entity/ProNeedInfo.java | 12 +++++++ .../business/plan/entity/ProOutDetail.java | 2 +- .../business/plan/mapper/PlanOutMapper.java | 14 ++++++++ .../business/plan/service/PlanOutService.java | 14 +++++++- .../plan/service/PlanOutServiceImpl.java | 32 +++++++++++++++---- .../resources/mappers/plan/PlanOutMapper.xml | 13 +++++++- 9 files changed, 108 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/bonus/gzgqj/business/plan/entity/OutDetailInfoVo.java 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 50cc466..e0b809b 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 @@ -63,7 +63,7 @@ public class PlanOutController { @GetMapping("getPorInfoDetail") @DecryptAndVerify(decryptedClass = ProNeedInfo.class) public PageInfo getPorInfoDetail(EncryptedReq dto) { - PageHelper.startPage(dto.getData().getPageNum(),dto.getData().getPageSize()); + PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); PageInfo pageInfo = service.getPorInfoDetail(dto.getData());; return pageInfo; } @@ -94,19 +94,26 @@ public class PlanOutController { /** - * 发货接口 + * 查询批次数量 + * @return + */ + @PostMapping("getOutTimes") + @DecryptAndVerify(decryptedClass = ProNeedInfo.class) + public ServerResponse getOutTimes(EncryptedReq dto) { + return service.getOutTimes(dto.getData()); + } + + + /** + * 查询批次详情 * @return */ @PostMapping("getOutDetails") @DecryptAndVerify(decryptedClass = ProNeedInfo.class) - public PageInfo getOutDetails(EncryptedReq dto) { - PageHelper.startPage(dto.getPageNum(),dto.getPageSize()); - PageInfo pageInfo = service.getOutDetails(dto.getData());; - return pageInfo; + public ServerResponse getOutDetails(EncryptedReq dto) { + return service.getOutDetails(dto.getData()); } - - } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/OutDetailInfoVo.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/OutDetailInfoVo.java new file mode 100644 index 0000000..9e07220 --- /dev/null +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/OutDetailInfoVo.java @@ -0,0 +1,13 @@ +package com.bonus.gzgqj.business.plan.entity; + +import lombok.Data; + +/** + * 出货详情查询 + */ +@Data +public class OutDetailInfoVo { + + private String userName; + +} diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProAddInfoDetails.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProAddInfoDetails.java index edbe92d..8938203 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProAddInfoDetails.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProAddInfoDetails.java @@ -43,4 +43,6 @@ public class ProAddInfoDetails { */ private String remark; + + } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java index 4269808..a59cc29 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProNeedInfo.java @@ -35,6 +35,11 @@ public class ProNeedInfo extends PageInfo { * 需求类型 1计划 2新增 */ private String needType; + /** + * 计划内外 + */ + private String typeName; + /** * 单位 */ @@ -69,4 +74,11 @@ public class ProNeedInfo extends PageInfo { * 数据源 1 计划 2 新增 */ private String dataType; + + /** + * 进度 + */ + private String progress; + + } diff --git a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProOutDetail.java b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProOutDetail.java index d372b6a..ad3661f 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/entity/ProOutDetail.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/entity/ProOutDetail.java @@ -14,7 +14,7 @@ public class ProOutDetail { /** * 发货数量 */ - private int fhNum; + private int num; /** * 挺住数量 */ diff --git a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java index a086c5d..af820b5 100644 --- a/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java +++ b/src/main/java/com/bonus/gzgqj/business/plan/mapper/PlanOutMapper.java @@ -98,4 +98,18 @@ public interface PlanOutMapper { * @return */ StatisticsVo getOverNum(); + + /** + * 查询分页详情 + * @param data + * @return + */ + List getOutDetails(ProNeedInfo data); + + /** + * 获取 发货批次 + * @param data + * @return + */ + List getOutTimes(ProNeedInfo data); } 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 c7207c9..f97af83 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 @@ -46,5 +46,17 @@ public interface PlanOutService { ServerResponse getStatistics(); - PageInfo getOutDetails(ProNeedInfo data); + /** + * 查询 发货批次接口 + * @param data + * @return + */ + ServerResponse getOutTimes(ProNeedInfo data); + + /** + * 查询发货 详情 + * @param data + * @return + */ + ServerResponse getOutDetails(ProNeedInfo 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 a33d8a6..36a74aa 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,8 +188,28 @@ public class PlanOutServiceImpl implements PlanOutService{ return ServerResponse.createSuccess(map); } + /** + * 查询 发货批次接口 + * @param data + * @return + */ @Override - public PageInfo getOutDetails(ProNeedInfo data) { + public ServerResponse getOutTimes(ProNeedInfo data) { + List list=new ArrayList<>(); + try{ + list=mapper.getOutTimes(data); + }catch (Exception e){ + list=new ArrayList<>(); + log.error(e.toString(),e); + } + return ServerResponse.createSuccess(list); + + + + } + + @Override + public ServerResponse getOutDetails(ProNeedInfo data) { return null; } @@ -197,7 +217,7 @@ public class PlanOutServiceImpl implements PlanOutService{ public boolean planOutInfo(List list,ProOutInfoVo vo,int allFhNum, int allTzNum){ try { for (ProOutDetail details:list){ - allFhNum=allFhNum+details.getFhNum(); + allFhNum=allFhNum+details.getNum(); allTzNum=allTzNum+details.getTzNum(); //获取 计划数据 ProNeedInfo data=mapper.getProNeedInfo(details); @@ -210,17 +230,17 @@ public class PlanOutServiceImpl implements PlanOutService{ BeanUtils.copyProperties(insertObj,data); insertObj.setOutId(vo.getId()); insertObj.setDataType("1"); - insertObj.setFhNum(details.getFhNum()); + insertObj.setFhNum(details.getNum()); insertObj.setTzNum(details.getTzNum()); insertObj.setRemarks(details.getRemarks()); int num2=mapper.insertProNeedDetails(insertObj); if(num2>=0){ //更新 工程-计划-发货 清单表 int fhNum=data.getFhNum(); - int tzNum=data.getFhNum(); + int tzNum=data.getTzNum(); data.setRemarks(details.getRemarks()); - int fhNum2=details.getFhNum(); - int tzNum2=details.getFhNum(); + int fhNum2=details.getNum(); + int tzNum2=details.getTzNum(); data.setFhNum(fhNum+fhNum2); data.setTzNum(tzNum+tzNum2); diff --git a/src/main/resources/mappers/plan/PlanOutMapper.xml b/src/main/resources/mappers/plan/PlanOutMapper.xml index d3cfd5a..a864f45 100644 --- a/src/main/resources/mappers/plan/PlanOutMapper.xml +++ b/src/main/resources/mappers/plan/PlanOutMapper.xml @@ -50,7 +50,9 @@ + + \ No newline at end of file