From e6a12a32747ff20ce59ef56117775cd4cc2d2810 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Mon, 5 Jun 2023 13:42:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E5=93=81=E7=A7=BB=E4=BA=A4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScmTransferRecordsDto.java | 45 +++++++++++++++++++ .../ScmTransferRecordsFeign.java | 14 +++++- .../ScmTransferRecordsQuery.java | 23 ++++++++++ .../ScmTransferRecordsVo.java | 9 ++-- .../ScmTransferRecordsMapper.java | 6 +++ .../ScmTransferRecordsMapper.xml | 13 ++++++ .../ScmTransferRecordsRest.java | 22 +++++++++ .../ScmTransferRecordsService.java | 40 +++++++++++++++++ 8 files changed, 167 insertions(+), 5 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java new file mode 100644 index 0000000000..a04aa56634 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsDto.java @@ -0,0 +1,45 @@ +package com.yxt.anrui.scm.api.scmtransferrecords; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Data +public class ScmTransferRecordsDto implements Dto { + private static final long serialVersionUID = 4444291069272893613L; + @ApiModelProperty("合同编号") + private String contractNo; + @ApiModelProperty("移交物品sid") + private String goodsSid; + @ApiModelProperty("移交物品名称") + private String goodsName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车辆sid") + private String vinSid; + @ApiModelProperty("移交数量") + private int transferNum; + @ApiModelProperty("物品单位") + private String goodsUnit; + @ApiModelProperty("移交人sid(userSid)") + private String transferSid; + @ApiModelProperty("移交人") + private String transferName; + @ApiModelProperty("移交部门sid") + private String transferDeptSid; + @ApiModelProperty("移交备注") + private String transferDept; + @ApiModelProperty("移交附件") + private List transferFiles; + @ApiModelProperty("使用组织sid") + private String useOrgSid; + @ApiModelProperty("使用组织名称") + private String useOrgName; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java index c5495d761d..0eec245926 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsFeign.java @@ -1,7 +1,13 @@ package com.yxt.anrui.scm.api.scmtransferrecords; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; /** * @description: 物品移交记录对外接口 @@ -16,7 +22,11 @@ import org.springframework.cloud.openfeign.FeignClient; fallback = ScmTransferRecordsFeignFallback.class) public interface ScmTransferRecordsFeign { - /* @ApiOperation("分页列表") + @ApiOperation("分页列表") @PostMapping("/pagerList") - public ResultBean> getSaleOrders(@RequestBody PagerQuery pq);*/ + public ResultBean> pagerList(@RequestBody PagerQuery pq); + + @ApiOperation("新增") + @PostMapping("/saveRecords") + ResultBean saveRecords(@RequestBody ScmTransferRecordsDto dto); } diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java new file mode 100644 index 0000000000..8573290c4c --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsQuery.java @@ -0,0 +1,23 @@ +package com.yxt.anrui.scm.api.scmtransferrecords; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/6/5 + **/ +@Data +public class ScmTransferRecordsQuery implements Query { + private static final long serialVersionUID = 1398412884121486811L; + + private String menuUrl; + + private String userSid; + + private String orgPath; + @ApiModelProperty("类型：0待接收，1已接收") + private int type; +} diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java index 890d06360e..b36a46714b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmtransferrecords/ScmTransferRecordsVo.java @@ -17,15 +17,18 @@ public class ScmTransferRecordsVo implements Vo { private String contractNo; @ApiModelProperty("创建时间") private String createTime; - - //车架号 @ApiModelProperty("车架号") private String vinNo; //开票单位 + private String invoiceTitle; //开票类型 + private String invoiceType; //开票名称 + private String invoicingName; //开票金额 + private String invoiceAmount; //发票号 + private String invoiceNo; //移交部门 @ApiModelProperty("移交部门") private String transferDept; @@ -33,6 +36,6 @@ public class ScmTransferRecordsVo implements Vo { private String transferName; @ApiModelProperty("移交备注") private String transferRemarks; - + @ApiModelProperty("sid") private String sid; } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java index 28de8c29e5..47e92fabdb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.java @@ -1,8 +1,13 @@ package com.yxt.anrui.scm.biz.scmtransferrecords; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * @description: @@ -11,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper; **/ @Mapper public interface ScmTransferRecordsMapper extends BaseMapper { + IPage pagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml index 27bcd4e7b1..59ba493251 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsMapper.xml @@ -1,4 +1,17 @@ + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java index 7e6c2318fd..239a824b76 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsRest.java @@ -1,7 +1,14 @@ package com.yxt.anrui.scm.biz.scmtransferrecords; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsDto; import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsFeign; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsQuery; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -14,4 +21,19 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("v1/ScmTransferRecords") public class ScmTransferRecordsRest implements ScmTransferRecordsFeign { + + @Autowired + private ScmTransferRecordsService scmTransferRecordsService; + + @Override + public ResultBean> pagerList(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = scmTransferRecordsService.pagerList(pq); + return rb.success().setData(pv); + } + + @Override + public ResultBean saveRecords(ScmTransferRecordsDto dto) { + return scmTransferRecordsService.saveRecords(dto); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java index 7bee0f160f..0930911aaf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmtransferrecords/ScmTransferRecordsService.java @@ -1,7 +1,17 @@ package com.yxt.anrui.scm.biz.scmtransferrecords; +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecords; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsDto; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsQuery; +import com.yxt.anrui.scm.api.scmtransferrecords.ScmTransferRecordsVo; import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; /** @@ -11,4 +21,34 @@ import org.springframework.stereotype.Service; **/ @Service public class ScmTransferRecordsService extends MybatisBaseService { + + public PagerVo pagerList(PagerQuery pq) { + QueryWrapper qw = new QueryWrapper<>(); + ScmTransferRecordsQuery pagerQuery = pq.getParams(); + if (pagerQuery != null) { + if (pagerQuery.getType() == 0) { + qw.eq("receiveState", 0); + } else if (pagerQuery.getType() == 1) { + qw.eq("receiveState", 0); + } + + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.pagerList(page, qw); + for (ScmTransferRecordsVo record : pagging.getRecords()) { + + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveRecords(ScmTransferRecordsDto dto) { + ResultBean rb = ResultBean.fireFail(); + ScmTransferRecords scmTransferRecords = new ScmTransferRecords(); + BeanUtil.copyProperties(dto, scmTransferRecords); + scmTransferRecords.setReceiveState(0); + scmTransferRecords.setCreateBySid(dto.getTransferSid()); + baseMapper.insert(scmTransferRecords); + return rb.success(); + } }