追溯查询模块代码提交

src/main/java/com/glxp/api/controller/basic/UdiProductController.java

@@ -11,11 +11,15 @@ import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.BasicUdiProductEntity;
 import com.glxp.api.entity.basic.ProductInfoEntity;
+import com.glxp.api.entity.basic.UdiCompanyEntity;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.req.basic.BasicDictSelectRequest;
 import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
+import com.glxp.api.req.basic.UdiCompanyRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.trace.TraceManuCodeRellResponse;
 import com.glxp.api.service.basic.BasicUdiProductService;
 import com.glxp.api.service.basic.ProductInfoService;
 import com.glxp.api.util.udi.FilterUdiUtils;
@@ -139,5 +143,30 @@ public class UdiProductController extends BaseController {
         return ResultVOUtils.success("更新成功！");
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/basic/dict/filterCpmctymc")
+    public BaseResponse filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        List<ProductInfoEntity> productInfoEntities = productInfoService.filterCpmctymc(productInfoFilterRequest);
+        PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
+        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(productInfoEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/basic/dict/filterGgxh")
+    public BaseResponse filterGgxh(ProductInfoFilterRequest productInfoFilterRequest) {
+
+        List<ProductInfoEntity> productInfoEntities = productInfoService.filterGgxh(productInfoFilterRequest);
+        PageInfo<ProductInfoEntity> pageInfo = new PageInfo<>(productInfoEntities);
+        PageSimpleResponse<ProductInfoEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(productInfoEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
 
 }

src/main/java/com/glxp/api/controller/basic/UdiSyncController.java

@@ -180,6 +180,8 @@ public class UdiSyncController {
     }
 
 
+
+
     //出入库同步下载
     @GetMapping("udidl/udiwms/syncUdi")
     public BaseResponse syncUdi(ProductInfoFilterRequest productInfoFilterRequest) {

src/main/java/com/glxp/api/controller/sup/UserComanyController.java

@@ -6,8 +6,10 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.req.auth.FilterUserComapanyRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.auth.registComPerResponse;
 import com.glxp.api.service.sup.UserCompanyService;
@@ -51,4 +53,16 @@ public class UserComanyController extends BaseController {
 
         return ResultVOUtils.success(pageSimpleResponse);
     }
+
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/auth/user/comapny/filterCompanyName")
+    public BaseResponse filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest) {
+
+        List<UserCompanyEntity> userCompanyEntities = userCompanyService.filterCompanyName(filterUserComapanyRequest);
+        PageInfo<UserCompanyEntity> pageInfo = new PageInfo<>(userCompanyEntities);
+        PageSimpleResponse<UserCompanyEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(userCompanyEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 }

src/main/java/com/glxp/api/controller/trace/TraceOrderController.java

@@ -9,11 +9,15 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.controller.BaseController;
 import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.entity.trace.TraceOrderEntity;
+import com.glxp.api.req.auth.FilterUserComapanyRequest;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
 import com.glxp.api.req.trace.TraceOrderUploadRequest;
+import com.glxp.api.req.trace.TraceProductRecordRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.trace.TraceOrderResponse;
+import com.glxp.api.res.trace.TraceProductRecordResponse;
 import com.glxp.api.service.trace.TraceOrderService;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -64,6 +68,18 @@ public class TraceOrderController extends BaseController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("udi/trace/order/filterBatchNo")
+    public BaseResponse filterCompanyName(TraceProductRecordRequest traceProductRecordRequest) {
+
+        List<TraceProductRecordResponse> traceProductRecordResponses = traceOrderService.filterBatchNo(traceProductRecordRequest);
+        PageInfo<TraceProductRecordResponse> pageInfo = new PageInfo<>(traceProductRecordResponses);
+        PageSimpleResponse<TraceProductRecordResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(traceProductRecordResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 
 
 }

src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java

@@ -17,6 +17,8 @@ public interface ProductInfoDao {
 
     List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
 
+    List<ProductInfoEntity> filterGgxh(ProductInfoFilterRequest productInfoFilterRequest);
+
     List<ProductInfoEntity> filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<ProductInfoEntity> filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest);

src/main/java/com/glxp/api/dao/sup/UserCompanyMapper.java

@@ -1,9 +1,16 @@
 package com.glxp.api.dao.sup;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.sup.UserCompanyEntity;
+import com.glxp.api.req.auth.FilterUserComapanyRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface UserCompanyMapper extends BaseMapper<UserCompanyEntity> {
+
+    List<UserCompanyEntity> filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest);
 }

src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java

@@ -1,10 +1,14 @@
 package com.glxp.api.dao.trace;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.entity.trace.TraceOrderEntity;
+import com.glxp.api.req.auth.FilterUserComapanyRequest;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
 import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.req.trace.TraceProductRecordRequest;
 import com.glxp.api.res.trace.TraceOrderResponse;
+import com.glxp.api.res.trace.TraceProductRecordResponse;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -13,4 +17,6 @@ import java.util.List;
 public interface TraceOrderMapper extends BaseMapper<TraceOrderEntity> {
 
     List<TraceOrderResponse> queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest);
+
+    List<TraceProductRecordResponse> filterBatchNo(TraceProductRecordRequest traceProductRecordRequest);
 }

src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java

@@ -16,5 +16,6 @@ public class UdiCompanyEntity {
     private String qylxryx;
     private String deviceRecordKey;
     private Date updateTime;
+    private String cpmctymc;
 
 }

src/main/java/com/glxp/api/req/auth/FilterUserComapanyRequest.java

@@ -7,5 +7,6 @@ import lombok.Data;
 public class FilterUserComapanyRequest extends ListPageRequest {
 
     private String searchKey;
+    private String companyName;
 
 }

src/main/java/com/glxp/api/req/trace/TraceProductRecordRequest.java

@@ -0,0 +1,14 @@
+package com.glxp.api.req.trace;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class TraceProductRecordRequest extends ListPageRequest {
+
+    private String ylqxzcrbarmc;
+    private String cpmctymc;
+    private String ggxh;
+    private String batchNo;
+
+}

src/main/java/com/glxp/api/res/trace/TraceProductRecordResponse.java

@@ -0,0 +1,9 @@
+package com.glxp.api.res.trace;
+
+import lombok.Data;
+
+@Data
+public class TraceProductRecordResponse {
+
+    private String batchNo;
+}

src/main/java/com/glxp/api/service/basic/ProductInfoService.java

@@ -13,6 +13,8 @@ public interface ProductInfoService {
     //获取产品名称通用名称
     List<ProductInfoEntity> filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest);
 
+    List<ProductInfoEntity> filterGgxh(ProductInfoFilterRequest productInfoFilterRequest);
+
     List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest);
 
     List<ProductInfoEntity> filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest);

src/main/java/com/glxp/api/service/basic/SyncUdiService.java

@@ -111,4 +111,5 @@ public class SyncUdiService {
         List<UdiCompanyEntity> udiCompanyEntities = udiCompanyService.filterUdiCompany(udiCompanyRequest);
         return ResultVOUtils.success(udiCompanyEntities);
     }
+
 }

src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java

@@ -31,6 +31,17 @@ public class ProductInfoServiceImpl implements ProductInfoService {
         return data;
     }
 
+    @Override
+    public List<ProductInfoEntity> filterGgxh(ProductInfoFilterRequest productInfoFilterRequest) {
+        if (productInfoFilterRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit();
+        PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit());
+        List<ProductInfoEntity> data = productInfoDao.filterGgxh(productInfoFilterRequest);
+        return data;
+    }
+
     @Override
     public List<ProductInfoEntity> filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest) {
         if (productInfoFilterRequest == null) {

src/main/java/com/glxp/api/service/sup/UserCompanyService.java

@@ -1,11 +1,18 @@
 package com.glxp.api.service.sup;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.entity.sup.UserRegisterEntity;
+import com.glxp.api.req.auth.FilterUserComapanyRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
+
+import java.util.List;
 
 public interface UserCompanyService extends IService<UserCompanyEntity>{
     int insert(UserCompanyEntity userCompany);
     boolean update(UserCompanyEntity userCompany);
 
+    List<UserCompanyEntity> filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest);
+
 }

src/main/java/com/glxp/api/service/sup/impl/UserCompanyServiceImpl.java

@@ -1,12 +1,18 @@
 package com.glxp.api.service.sup.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.glxp.api.entity.basic.ProductInfoEntity;
 import com.glxp.api.entity.sup.UserCompanyEntity;
+import com.glxp.api.req.auth.FilterUserComapanyRequest;
+import com.glxp.api.req.basic.ProductInfoFilterRequest;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.sup.UserCompanyMapper;
 import com.glxp.api.service.sup.UserCompanyService;
 
 import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
 
 @Service
 public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserCompanyEntity> implements UserCompanyService{
@@ -23,4 +29,15 @@ public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserC
     public boolean update(UserCompanyEntity userCompany) {
         return userCompanyMapper.updateById(userCompany)>0;
     }
+
+    @Override
+    public List<UserCompanyEntity> filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest) {
+        if (filterUserComapanyRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (filterUserComapanyRequest.getPage() - 1) * filterUserComapanyRequest.getLimit();
+        PageHelper.offsetPage(offset, filterUserComapanyRequest.getLimit());
+        List<UserCompanyEntity> data = userCompanyMapper.filterCompanyName(filterUserComapanyRequest);
+        return data;
+    }
 }

src/main/java/com/glxp/api/service/trace/TraceOrderService.java

@@ -1,10 +1,14 @@
 package com.glxp.api.service.trace;
 
+import com.glxp.api.entity.sup.UserCompanyEntity;
 import com.glxp.api.entity.trace.TraceOrderEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.glxp.api.req.auth.FilterUserComapanyRequest;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
 import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.req.trace.TraceProductRecordRequest;
 import com.glxp.api.res.trace.TraceOrderResponse;
+import com.glxp.api.res.trace.TraceProductRecordResponse;
 
 import java.util.List;
 
@@ -12,5 +16,7 @@ public interface TraceOrderService extends IService<TraceOrderEntity>{
 
     List<TraceOrderResponse> queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest);
 
+    List<TraceProductRecordResponse> filterBatchNo(TraceProductRecordRequest traceProductRecordRequest);
+
 
 }

src/main/java/com/glxp/api/service/trace/impl/TraceOrderServiceImpl.java

@@ -1,9 +1,14 @@
 package com.glxp.api.service.trace.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.sup.UserCompanyEntity;
+import com.glxp.api.req.auth.FilterUserComapanyRequest;
 import com.glxp.api.req.trace.TraceOrderDetailRequest;
 import com.glxp.api.req.trace.TraceOrderRequest;
+import com.glxp.api.req.trace.TraceProductRecordRequest;
 import com.glxp.api.res.trace.TraceOrderResponse;
+import com.glxp.api.res.trace.TraceProductRecordResponse;
 import com.glxp.api.service.trace.TraceOrderService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,4 +36,15 @@ public class TraceOrderServiceImpl extends ServiceImpl<TraceOrderMapper, TraceOr
         }
         return traceOrderMapper.queryTraceOrderList(traceOrderDetailRequest);
     }
+
+    @Override
+    public List<TraceProductRecordResponse> filterBatchNo(TraceProductRecordRequest traceProductRecordRequest) {
+        if (traceProductRecordRequest == null) {
+            return Collections.emptyList();
+        }
+        int offset = (traceProductRecordRequest.getPage() - 1) * traceProductRecordRequest.getLimit();
+        PageHelper.offsetPage(offset, traceProductRecordRequest.getLimit());
+        List<TraceProductRecordResponse> data = traceOrderMapper.filterBatchNo(traceProductRecordRequest);
+        return data;
+    }
 }

src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -72,14 +72,17 @@
 
     <select id="filterCpmctymc" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">
-        select *
+        select cpmctymc
         from productinfo
         <where>
             <if test="tyshxydm != '' and tyshxydm != null">
                 AND tyshxydm = #{tyshxydm}
             </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
             <if test="cpmctymc != '' and cpmctymc != null">
-                AND cpmctymc LIKE concat(#{cpmctymc}, '%')
+                AND cpmctymc LIKE concat('%',#{cpmctymc},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
                 AND nameCode LIKE concat(#{nameCode}, '%')
@@ -96,6 +99,38 @@
         GROUP BY cpmctymc
     </select>
 
+    <select id="filterGgxh" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
+            resultType="com.glxp.api.entity.basic.ProductInfoEntity">
+        select ggxh
+        from productinfo
+        <where>
+            <if test="tyshxydm != '' and tyshxydm != null">
+                AND tyshxydm = #{tyshxydm}
+            </if>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                AND ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                AND cpmctymc = #{cpmctymc}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                AND ggxh LIKE concat('%',#{ggxh},'%')
+            </if>
+            <if test="nameCode != '' and nameCode != null">
+                AND nameCode LIKE concat(#{nameCode}, '%')
+            </if>
+            <if test="uuid != '' and uuid != null">
+                AND uuid = #{uuid}
+            </if>
+            <if test="updateTime != null and updateTime != ''">
+                <![CDATA[
+                and updateTime >= DATE_FORMAT(#{updateTime}, '%Y-%m-%d %H:%i:%S')
+                ]]>
+            </if>
+        </where>
+        GROUP BY ggxh
+    </select>
+
 
     <select id="filterUdiByTyshxydm" parameterType="com.glxp.api.req.basic.ProductInfoFilterRequest"
             resultType="com.glxp.api.entity.basic.ProductInfoEntity">

src/main/resources/mybatis/mapper/basic/UdiCompanyDao.xml

@@ -36,7 +36,6 @@
 
     </select>
 
-
     <insert id="insertUdiCompany" keyProperty="id" parameterType="com.glxp.api.entity.basic.UdiCompanyEntity">
         REPLACE
         INTO udicompany

src/main/resources/mybatis/mapper/sup/UserCompanyMapper.xml

@@ -1,4 +1,15 @@
 <?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.sup.UserCompanyMapper">
+    <select id="filterCompanyName" parameterType="com.glxp.api.req.auth.FilterUserComapanyRequest"
+            resultType="com.glxp.api.entity.sup.UserCompanyEntity">
+        SELECT companyName
+        FROM user_company
+        <where>
+            <if test="companyName != '' and companyName != null">
+                AND companyName LIKE concat('%',#{companyName}, '%')
+            </if>
+        </where>
+        GROUP BY companyName
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml

@@ -35,4 +35,24 @@
             </if>
         </where>
     </select>
+
+    <select id="filterBatchNo" parameterType="com.glxp.api.req.trace.TraceProductRecordRequest"
+            resultType="com.glxp.api.res.trace.TraceProductRecordResponse">
+        SELECT batchNo
+        FROM trace_product_record
+        <where>
+            <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
+                and ylqxzcrbarmc = #{ylqxzcrbarmc}
+            </if>
+            <if test="cpmctymc != '' and cpmctymc != null">
+                and cpmctymc = #{cpmctymc}
+            </if>
+            <if test="ggxh != '' and ggxh != null">
+                and ggxh = #{ggxh}
+            </if>
+            <if test="batchNo != '' and batchNo != null">
+                AND batchNo LIKE CONCAT('%', #{batchNo}, '%')
+            </if>
+        </where>
+    </select>
 </mapper>