UDI码补齐

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<IoCodeLostResponse> list = codeLostService.selectLost(ioCodeLostEntity);
+        PageInfo<IoCodeLostResponse> pageInfo;
+        pageInfo= new PageInfo<>(list);
+        PageSimpleResponse<IoCodeLostResponse> 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) {

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<IoCodeLostMapper, IoCodeLostEntity, IoCodeLostEntity> {
+    List<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity);
 }
+

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";

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";
+
+
+}

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<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity);
+
+
     IoCodeLostEntity findByCode(String code);
 
     int insert(IoCodeLostEntity ioCodeLostEntity);

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<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity) {
+        return codeLostEntityMapper.selectLost(ioCodeLostEntity);
+    }
+
     @Override
     public IoCodeLostEntity findByCode(String code) {
 

src/main/resources/mybatis/mapper/inout/IoCodeLostMapper.xml

@@ -1,4 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoCodeLostMapper">
+
+    <select id="selectLost"    parameterType="com.glxp.api.entity.inout.IoCodeLostEntity"
+            resultType="com.glxp.api.res.inout.IoCodeLostResponse">
+        select io_code_lost.*,basic_products.cpmctymc ,basic_products.ggxh from  io_code_lost
+        LEFT JOIN basic_products on  io_code_lost.nameCode=basic_products.nameCode
+        <where>
+            <if test="code != '' and code != null">
+                and code like concat('%',#{code},'%')
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                and basic_products.cpmctymc like concat('%',#{cpmctymc},'%')
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                and basic_products.ggxh like concat('%',#{ggxh},'%')
+            </if>
+
+            <if test="batchNo != '' and batchNo != null">
+                and batchNo like concat('%',#{batchNo},'%')
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(io_code_lost.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
+
+        </where>
+    </select>
 </mapper>