From 819bd73e69435aa3d280fa5c1d00e8cfec9879f7 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 22 Mar 2023 15:35:03 +0800 Subject: [PATCH] =?UTF-8?q?UDI=E7=A0=81=E8=A1=A5=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeLostController.java | 39 ++++++++++ .../glxp/api/dao/inout/IoCodeLostMapper.java | 5 ++ .../api/entity/inout/IoCodeLostEntity.java | 14 ++++ .../api/res/inout/IoCodeLostResponse.java | 72 +++++++++++++++++++ .../api/service/inout/IoCodeLostService.java | 6 ++ .../inout/impl/IoCodeLostServiceImpl.java | 8 +++ .../mybatis/mapper/inout/IoCodeLostMapper.xml | 25 +++++++ 7 files changed, 169 insertions(+) create mode 100644 src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java index 0ca40054..ca78ec55 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeLostController.java @@ -1,6 +1,7 @@ package com.glxp.api.controller.inout; import cn.hutool.core.util.StrUtil; +import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -8,14 +9,19 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.IoCodeLostResponse; import com.glxp.api.service.inout.IoCodeLostService; +import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import javax.validation.Valid; import java.util.Date; +import java.util.List; @RestController public class IoCodeLostController extends BaseController { @@ -24,6 +30,39 @@ public class IoCodeLostController extends BaseController { @Resource IoCodeLostService codeLostService; + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/getCodeLost") + public BaseResponse getCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List list = codeLostService.selectLost(ioCodeLostEntity); + PageInfo pageInfo; + pageInfo= new PageInfo<>(list); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(list); + return ResultVOUtils.success(pageSimpleResponse); + } + + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/updateCodeLost") + public BaseResponse updateCodeLost(@RequestBody @Valid IoCodeLostEntity ioCodeLostEntity, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + + codeLostService.update(ioCodeLostEntity); + + return ResultVOUtils.success("成功"); + } + + + + + + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/saveTabCode") public BaseResponse saveCode(@RequestBody IoCodeTempEntity codeTempEntity) { diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java index 9e2bd7b6..6cc812be 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeLostMapper.java @@ -2,8 +2,13 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoCodeLostEntity; +import com.glxp.api.res.inout.IoCodeLostResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface IoCodeLostMapper extends BaseMapperPlus { + List selectLost(IoCodeLostEntity ioCodeLostEntity); } + diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java index bcd1a46a..e00c201b 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java @@ -76,6 +76,20 @@ public class IoCodeLostEntity { @TableField(value = "nameCode") private String nameCode; + @TableField(exist = false) + private String cpmctymc; + + @TableField(exist = false) + private String ggxh; + + @TableField(exist = false) + private String startTime; + + @TableField(exist = false) + private String endTime; + + + public static final String COL_ID = "id"; public static final String COL_CODE = "code"; diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java new file mode 100644 index 00000000..cd5238c8 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java @@ -0,0 +1,72 @@ +package com.glxp.api.res.inout; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import lombok.Data; + +import java.util.Date; + +/** + * @author : zhangsan + * @date : 2023/3/22 11:08 + * @modyified By : + */ +@Data +public class IoCodeLostResponse { + + private Integer id; + + private String code; + + + private String batchNo; + + + private String produceDate; + + + private String expireDate; + + + private String serialNo; + + + private String supId; + + + private Date createTime; + + + private Date updateTime; + + + private String remark; + + //产品名称 + private String cpmctymc; + //规格型号 + private String ggxh; + + public static final String COL_ID = "id"; + + public static final String COL_CODE = "code"; + + public static final String COL_BATCHNO = "batchNo"; + + public static final String COL_PRODUCEDATE = "produceDate"; + + public static final String COL_EXPIREDATE = "expireDate"; + + public static final String COL_SERIALNO = "serialNo"; + + public static final String COL_SUPID = "supId"; + + public static final String COL_CREATETIME = "createTime"; + + public static final String COL_UPDATETIME = "updateTime"; + + public static final String COL_REMARK = "remark"; + + +} diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeLostService.java b/src/main/java/com/glxp/api/service/inout/IoCodeLostService.java index dd4cc411..aafe62e7 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeLostService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeLostService.java @@ -1,9 +1,15 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.IoCodeLostEntity; +import com.glxp.api.res.inout.IoCodeLostResponse; + +import java.util.List; public interface IoCodeLostService { + List selectLost(IoCodeLostEntity ioCodeLostEntity); + + IoCodeLostEntity findByCode(String code); int insert(IoCodeLostEntity ioCodeLostEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java index cb07be0f..aeb5e9ab 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -1,6 +1,7 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.glxp.api.res.inout.IoCodeLostResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -9,6 +10,8 @@ import com.glxp.api.dao.inout.IoCodeLostMapper; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.service.inout.IoCodeLostService; +import java.util.List; + @Service public class IoCodeLostServiceImpl implements IoCodeLostService { @@ -16,6 +19,11 @@ public class IoCodeLostServiceImpl implements IoCodeLostService { IoCodeLostMapper codeLostEntityMapper; + @Override + public List selectLost(IoCodeLostEntity ioCodeLostEntity) { + return codeLostEntityMapper.selectLost(ioCodeLostEntity); + } + @Override public IoCodeLostEntity findByCode(String code) { diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml b/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml index 71ff7cf1..a3fdbf38 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml @@ -1,4 +1,29 @@ + +