From c33195f3a0a9f79fddfcbd49ecfcf85f38f436ef Mon Sep 17 00:00:00 2001 From: fkf <1475794025@qq.com> Date: Mon, 29 May 2023 11:16:44 +0800 Subject: [PATCH] =?UTF-8?q?5-29=20=E6=88=90=E5=93=81=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinisProdInvenRecord.java | 22 ++++++ .../FinisProdInvenRecordDto.java | 22 ++++++ .../FinisProdInvenRecordQuery.java | 25 ++++++ .../FinisProdInvenRecordVo.java | 28 +++++++ .../FinisProdInvenRecordMapper.java | 22 ++++++ .../FinisProdInvenRecordMapper.xml | 16 ++++ .../FinisProdInvenRecordRest.java | 51 ++++++++++++ .../FinisProdInvenRecordService.java | 77 +++++++++++++++++++ 8 files changed, 263 insertions(+) create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecord.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordDto.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordQuery.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordVo.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.xml create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordRest.java create mode 100644 yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordService.java diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecord.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecord.java new file mode 100644 index 00000000..15833e22 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecord.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.api.finisprodinvenrecord; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-22-16:26 + */ +@Data +@ApiModel(value = "成品库记录信息", description = "成品库记录信息") +@TableName("finis_prod_inven_record") +public class FinisProdInvenRecord extends BaseEntity { + //库存记录 + private Double inventoryQuantity; + //记录日期 + private String recordDate; + //产品sid + private String prodSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordDto.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordDto.java new file mode 100644 index 00000000..b1c8ff0e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordDto.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.api.finisprodinvenrecord; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-22-16:30 + */ +@Data +@ApiModel(value = "成品库记录信息", description = "成品库记录信息") +public class FinisProdInvenRecordDto implements Dto { + private String id; + private String sid; + //库存记录 + private Double inventoryQuantity; + //记录日期 + private String recordDate; + //产品sid + private String prodSid; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordQuery.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordQuery.java new file mode 100644 index 00000000..f77a5469 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordQuery.java @@ -0,0 +1,25 @@ +package com.yxt.supervise.cyf.api.finisprodinvenrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-23-9:36 + */ +@Data +@ApiModel(value = "成品库记录信息 分页传输对象", description = "成品库记录信息 分页传输对象") +public class FinisProdInvenRecordQuery implements Query { + private String id; + private String sid; + + //库存记录 + private Double inventoryQuantity; + //记录日期 + private String recordDate; + //产品sid + private String prodSid; + + private String number; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordVo.java b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordVo.java new file mode 100644 index 00000000..5eb9321a --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-api/src/main/java/com/yxt/supervise/cyf/api/finisprodinvenrecord/FinisProdInvenRecordVo.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.cyf.api.finisprodinvenrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +/** + * @author feikefei + * @create 2023-05-23-9:36 + */ +@Data +@ApiModel(value = "成品库记录信息 返回视图对象字段", description = "成品库记录信息 返回视图对象字段") +public class FinisProdInvenRecordVo implements Vo { + private String id; + private String sid; + + //库存记录 + private Double inventoryQuantity; + //记录日期 + private String recordDate; + //产品sid + private String prodSid; + + //产品名称 + private String name; + //产品编码 + private String number; +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.java new file mode 100644 index 00000000..95a937c6 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.java @@ -0,0 +1,22 @@ +package com.yxt.supervise.cyf.biz.finisprodinvenrecord; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecord; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author feikefei + * @create 2023-05-23-9:51 + */ +@Mapper +public interface FinisProdInvenRecordMapper extends BaseMapper { + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + FinisProdInvenRecord selectByProdSid(@Param("prodSid") String prodSid); +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.xml b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.xml new file mode 100644 index 00000000..5e36fe0e --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordMapper.xml @@ -0,0 +1,16 @@ + + + + + + + \ No newline at end of file diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordRest.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordRest.java new file mode 100644 index 00000000..40791923 --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordRest.java @@ -0,0 +1,51 @@ +package com.yxt.supervise.cyf.biz.finisprodinvenrecord; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordDto; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordQuery; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author feikefei + * @create 2023-05-23-9:38 + */ +@Api(tags = "成品库记录信息") +@RestController +@RequestMapping("cyf/invenRecord") +public class FinisProdInvenRecordRest { + + @Autowired + private FinisProdInvenRecordService finisProdInvenRecordService; + + @ApiOperation("增加") + @PostMapping("/save") + public ResultBean save(@RequestBody FinisProdInvenRecordDto dto){ + return finisProdInvenRecordService.save(dto); + } + + @ApiOperation("删除") + @GetMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid){ + return finisProdInvenRecordService.delete(sid); + } + + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody FinisProdInvenRecordDto dto){ + return finisProdInvenRecordService.update(dto); + } + + @ApiOperation("成品库记录 分页查询") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo listPage = finisProdInvenRecordService.listPage(pq); + return rb.success().setData(listPage); + } +} diff --git a/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordService.java b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordService.java new file mode 100644 index 00000000..c94b335c --- /dev/null +++ b/yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/finisprodinvenrecord/FinisProdInvenRecordService.java @@ -0,0 +1,77 @@ +package com.yxt.supervise.cyf.biz.finisprodinvenrecord; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.domain.BaseEntity; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecord; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordDto; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordQuery; +import com.yxt.supervise.cyf.api.finisprodinvenrecord.FinisProdInvenRecordVo; +import org.springframework.stereotype.Service; + +import java.util.Date; + +/** + * @author feikefei + * @create 2023-05-23-9:50 + */ +@Service +public class FinisProdInvenRecordService extends MybatisBaseService { + + public ResultBean save(FinisProdInvenRecordDto dto){ + ResultBean rb = ResultBean.fireFail(); + FinisProdInvenRecord finisProdInvenRecord = baseMapper.selectByProdSid(dto.getProdSid()); + Date date = new Date(); + String dfmt = DateUtil.format(date, "yyyy-MM-dd"); + if (finisProdInvenRecord != null){ + if (finisProdInvenRecord.getRecordDate().equals(dfmt)){ + BeanUtil.copyProperties(dto,finisProdInvenRecord,"sid","id","prodSid"); + baseMapper.updateById(finisProdInvenRecord); + return rb.success().setMsg("添加成功"); + } + } + FinisProdInvenRecord record = new FinisProdInvenRecord(); + BeanUtil.copyProperties(dto,record,"id","sid"); + record.setRecordDate(dfmt); + baseMapper.insert(record); + return rb.success().setMsg("添加成功"); + } + + public ResultBean delete(String sid){ + ResultBean rb = ResultBean.fireFail(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } + + public ResultBean update(FinisProdInvenRecordDto dto){ + ResultBean rb = ResultBean.fireFail(); + FinisProdInvenRecord finisProdInvenRecord = fetchBySid(dto.getSid()); + BeanUtil.copyProperties(dto,finisProdInvenRecord,"id","sid"); + baseMapper.updateById(finisProdInvenRecord); + return rb.success().setMsg("修改成功"); + } + + public PagerVo listPage(PagerQuery pq){ + FinisProdInvenRecordQuery params = pq.getParams(); + QueryWrapper wq = new QueryWrapper<>(); + if (params != null){ + if (!params.getRecordDate().equals("")){ + wq.eq("r.recordDate",params.getRecordDate()); + } + if (!params.getNumber().equals("")){ + wq.eq("i.number",params.getNumber()); + } + } + IPage page = PagerUtil.queryToPage(pq); + IPage pageVo = baseMapper.selectPageVo(page, wq); + PagerVo pageToVo = PagerUtil.pageToVo(pageVo, null); + return pageToVo; + } +}