diff --git a/src/main/java/com/glxp/api/controller/basic/UdiProductController.java b/src/main/java/com/glxp/api/controller/basic/UdiProductController.java index 392102f..9752e80 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiProductController.java +++ b/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 productInfoEntities = productInfoService.filterCpmctymc(productInfoFilterRequest); + PageInfo pageInfo = new PageInfo<>(productInfoEntities); + PageSimpleResponse 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 productInfoEntities = productInfoService.filterGgxh(productInfoFilterRequest); + PageInfo pageInfo = new PageInfo<>(productInfoEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(productInfoEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + + } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index 8d06d76..1119c63 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/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) { diff --git a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java index 7ecdc88..3410c87 100644 --- a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java +++ b/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 userCompanyEntities = userCompanyService.filterCompanyName(filterUserComapanyRequest); + PageInfo pageInfo = new PageInfo<>(userCompanyEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(userCompanyEntities); + return ResultVOUtils.success(pageSimpleResponse); + } } diff --git a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java index 2602fb9..2128b52 100644 --- a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java +++ b/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 traceProductRecordResponses = traceOrderService.filterBatchNo(traceProductRecordRequest); + PageInfo pageInfo = new PageInfo<>(traceProductRecordResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(traceProductRecordResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + } diff --git a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java index a793208..e0eb439 100644 --- a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java +++ b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java @@ -17,6 +17,8 @@ public interface ProductInfoDao { List filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); + List filterGgxh(ProductInfoFilterRequest productInfoFilterRequest); + List filterUdiByTyshxydm(ProductInfoFilterRequest productInfoFilterRequest); List filterUdiByCreditNo(ProductInfoFilterRequest productInfoFilterRequest); diff --git a/src/main/java/com/glxp/api/dao/sup/UserCompanyMapper.java b/src/main/java/com/glxp/api/dao/sup/UserCompanyMapper.java index 664dc62..bd371ff 100644 --- a/src/main/java/com/glxp/api/dao/sup/UserCompanyMapper.java +++ b/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 { + + List filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest); } diff --git a/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java b/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java index 884ee7b..9512ffa 100644 --- a/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java +++ b/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 { List queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest); + + List filterBatchNo(TraceProductRecordRequest traceProductRecordRequest); } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java index ed9d2b8..1a58c1d 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiCompanyEntity.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/req/auth/FilterUserComapanyRequest.java b/src/main/java/com/glxp/api/req/auth/FilterUserComapanyRequest.java index a6be375..4e72bbf 100644 --- a/src/main/java/com/glxp/api/req/auth/FilterUserComapanyRequest.java +++ b/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; } diff --git a/src/main/java/com/glxp/api/req/trace/TraceProductRecordRequest.java b/src/main/java/com/glxp/api/req/trace/TraceProductRecordRequest.java new file mode 100644 index 0000000..a0c3484 --- /dev/null +++ b/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; + +} diff --git a/src/main/java/com/glxp/api/res/trace/TraceProductRecordResponse.java b/src/main/java/com/glxp/api/res/trace/TraceProductRecordResponse.java new file mode 100644 index 0000000..7bd928f --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/glxp/api/service/basic/ProductInfoService.java b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java index 0765c15..2367367 100644 --- a/src/main/java/com/glxp/api/service/basic/ProductInfoService.java +++ b/src/main/java/com/glxp/api/service/basic/ProductInfoService.java @@ -13,6 +13,8 @@ public interface ProductInfoService { //获取产品名称通用名称 List filterCpmctymc(ProductInfoFilterRequest productInfoFilterRequest); + List filterGgxh(ProductInfoFilterRequest productInfoFilterRequest); + List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest); List filterProductGroup(ProductInfoFilterRequest productInfoFilterRequest); diff --git a/src/main/java/com/glxp/api/service/basic/SyncUdiService.java b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java index 9ffa192..743f07a 100644 --- a/src/main/java/com/glxp/api/service/basic/SyncUdiService.java +++ b/src/main/java/com/glxp/api/service/basic/SyncUdiService.java @@ -111,4 +111,5 @@ public class SyncUdiService { List udiCompanyEntities = udiCompanyService.filterUdiCompany(udiCompanyRequest); return ResultVOUtils.success(udiCompanyEntities); } + } diff --git a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index 4fef3ba..6be14df 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java +++ b/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 filterGgxh(ProductInfoFilterRequest productInfoFilterRequest) { + if (productInfoFilterRequest == null) { + return Collections.emptyList(); + } + int offset = (productInfoFilterRequest.getPage() - 1) * productInfoFilterRequest.getLimit(); + PageHelper.offsetPage(offset, productInfoFilterRequest.getLimit()); + List data = productInfoDao.filterGgxh(productInfoFilterRequest); + return data; + } + @Override public List filterProductInfo(ProductInfoFilterRequest productInfoFilterRequest) { if (productInfoFilterRequest == null) { diff --git a/src/main/java/com/glxp/api/service/sup/UserCompanyService.java b/src/main/java/com/glxp/api/service/sup/UserCompanyService.java index 85b451d..480e0a4 100644 --- a/src/main/java/com/glxp/api/service/sup/UserCompanyService.java +++ b/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{ int insert(UserCompanyEntity userCompany); boolean update(UserCompanyEntity userCompany); + List filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest); + } diff --git a/src/main/java/com/glxp/api/service/sup/impl/UserCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/sup/impl/UserCompanyServiceImpl.java index 10da280..eb7603c 100644 --- a/src/main/java/com/glxp/api/service/sup/impl/UserCompanyServiceImpl.java +++ b/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 implements UserCompanyService{ @@ -23,4 +29,15 @@ public class UserCompanyServiceImpl extends ServiceImpl0; } + + @Override + public List filterCompanyName(FilterUserComapanyRequest filterUserComapanyRequest) { + if (filterUserComapanyRequest == null) { + return Collections.emptyList(); + } + int offset = (filterUserComapanyRequest.getPage() - 1) * filterUserComapanyRequest.getLimit(); + PageHelper.offsetPage(offset, filterUserComapanyRequest.getLimit()); + List data = userCompanyMapper.filterCompanyName(filterUserComapanyRequest); + return data; + } } diff --git a/src/main/java/com/glxp/api/service/trace/TraceOrderService.java b/src/main/java/com/glxp/api/service/trace/TraceOrderService.java index 0dfc4fb..6968a79 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceOrderService.java +++ b/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{ List queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest); + List filterBatchNo(TraceProductRecordRequest traceProductRecordRequest); + } diff --git a/src/main/java/com/glxp/api/service/trace/impl/TraceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/trace/impl/TraceOrderServiceImpl.java index a1c1b4a..b59d1dd 100644 --- a/src/main/java/com/glxp/api/service/trace/impl/TraceOrderServiceImpl.java +++ b/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 filterBatchNo(TraceProductRecordRequest traceProductRecordRequest) { + if (traceProductRecordRequest == null) { + return Collections.emptyList(); + } + int offset = (traceProductRecordRequest.getPage() - 1) * traceProductRecordRequest.getLimit(); + PageHelper.offsetPage(offset, traceProductRecordRequest.getLimit()); + List data = traceOrderMapper.filterBatchNo(traceProductRecordRequest); + return data; + } } diff --git a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index e67ccd2..3aaf737 100644 --- a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -72,14 +72,17 @@ + + - REPLACE INTO udicompany diff --git a/src/main/resources/mybatis/mapper/sup/UserCompanyMapper.xml b/src/main/resources/mybatis/mapper/sup/UserCompanyMapper.xml index 4886fcb..50ab20e 100644 --- a/src/main/resources/mybatis/mapper/sup/UserCompanyMapper.xml +++ b/src/main/resources/mybatis/mapper/sup/UserCompanyMapper.xml @@ -1,4 +1,15 @@ + diff --git a/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml index 652327c..735d8c7 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml @@ -35,4 +35,24 @@ + +