From ea1311a7c30cf3cc7df53427823a2e13f1ba22b4 Mon Sep 17 00:00:00 2001 From: schry <2433098676@qq.com> Date: Wed, 24 May 2023 18:09:28 +0800 Subject: [PATCH] =?UTF-8?q?UDI=E6=9F=A5=E8=AF=A2=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 9 ++ .../trace/TraceOrderController.java | 41 +++++++ .../glxp/api/dao/trace/TraceOrderMapper.java | 7 ++ .../req/trace/TraceOrderDetailRequest.java | 16 +++ .../glxp/api/req/trace/TraceOrderRequest.java | 112 +++++++++++++++++ .../api/res/trace/TraceOrderResponse.java | 115 ++++++++++++++++++ .../api/service/trace/TraceOrderService.java | 8 ++ .../service/trace/TraceOrderServiceImpl.java | 22 ++++ .../mybatis/mapper/trace/TraceOrderMapper.xml | 35 ++++++ 9 files changed, 365 insertions(+) create mode 100644 src/main/java/com/glxp/api/controller/trace/TraceOrderController.java create mode 100644 src/main/java/com/glxp/api/req/trace/TraceOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java create mode 100644 src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java diff --git a/pom.xml b/pom.xml index 719f85d..c927ca7 100644 --- a/pom.xml +++ b/pom.xml @@ -371,6 +371,15 @@ bcprov-jdk15to18 1.68 + + + org.springframework.boot + spring-boot-starter-amqp + + + org.springframework.boot + spring-boot-starter-web + diff --git a/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java new file mode 100644 index 0000000..c434fc7 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/trace/TraceOrderController.java @@ -0,0 +1,41 @@ +package com.glxp.api.controller.trace; + +import com.github.pagehelper.PageInfo; +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.auth.AuthAdmin; +import com.glxp.api.req.trace.TraceOrderDetailRequest; +import com.glxp.api.req.trace.TraceOrderRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.trace.TraceOrderResponse; +import com.glxp.api.res.trace.TraceRecordResponse; +import com.glxp.api.service.trace.TraceOrderService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; + +import javax.annotation.Resource; +import java.util.List; + +@ApiIgnore +@RestController +@Slf4j +public class TraceOrderController extends BaseController { + + @Resource + TraceOrderService traceOrderService; + + @AuthRuleAnnotation("") + @GetMapping("udi/trace/order/filter") + public BaseResponse getTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest) { + List traceOrderResponses = traceOrderService.queryTraceOrderList(traceOrderDetailRequest); + PageInfo pageInfo = new PageInfo<>(traceOrderResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(traceOrderResponses); + return ResultVOUtils.success(pageSimpleResponse); + } +} 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 a1e6022..884ee7b 100644 --- a/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java +++ b/src/main/java/com/glxp/api/dao/trace/TraceOrderMapper.java @@ -2,8 +2,15 @@ package com.glxp.api.dao.trace; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.trace.TraceOrderEntity; +import com.glxp.api.req.trace.TraceOrderDetailRequest; +import com.glxp.api.req.trace.TraceOrderRequest; +import com.glxp.api.res.trace.TraceOrderResponse; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface TraceOrderMapper extends BaseMapper { + + List queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest); } diff --git a/src/main/java/com/glxp/api/req/trace/TraceOrderDetailRequest.java b/src/main/java/com/glxp/api/req/trace/TraceOrderDetailRequest.java new file mode 100644 index 0000000..b558dce --- /dev/null +++ b/src/main/java/com/glxp/api/req/trace/TraceOrderDetailRequest.java @@ -0,0 +1,16 @@ +package com.glxp.api.req.trace; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +@Data +public class TraceOrderDetailRequest extends ListPageRequest { + + private String udiCode; + private String ylqxzcrbarmc; + private String cpmctymc; + private String ggxh; + private String nameCode; + private String batchNo; + private String companyName; +} diff --git a/src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java b/src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java new file mode 100644 index 0000000..a1330c6 --- /dev/null +++ b/src/main/java/com/glxp/api/req/trace/TraceOrderRequest.java @@ -0,0 +1,112 @@ +package com.glxp.api.req.trace; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class TraceOrderRequest extends ListPageRequest { + + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据时间 + */ + private String billDate; + + /** + * 1:入库；2：出库 + */ + private Byte inOutType; + + /** + * 单据类型 + */ + private String billType; + + /** + * 发货企业 + */ + private String fromCorp; + + /** + * 发货企业统一社会信用号 + */ + private String fromCorpCreditNum; + + /** + * 收货企业 + */ + private String toCorp; + + /** + * 收货企业统一社会信用号 + */ + private String toCorpCreditNum; + + /** + * 单据创建者 + */ + private Long createUser; + + /** + * 企业信息ID外键 + */ + private Long companyIdFk; + + /** + * 客户端类型 + */ + private Byte clientType; + + /** + * 退货原因（退货时填写） + */ + private String returnReason; + + /** + * 销毁原因（销毁时填写） + */ + private String destoryReason; + + /** + * 执行销毁人（销毁时填写） + */ + private String excuseUser; + + /** + * 执行销毁人证件号（销毁时填写） + */ + private String excuseCode; + + /** + * 监督人姓名【销毁出库时填写】 + */ + private String superviserUser; + + /** + * 监督人证件号【销毁出库时填写】 + */ + private String superviserCode; + + /** + * 上传着ID + */ + private Long uploadUser; + + /** + * 备注 + */ + private String remark; + + /** + * 更新时间 + */ + private Date updateTime; +} diff --git a/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java b/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java new file mode 100644 index 0000000..53eaad7 --- /dev/null +++ b/src/main/java/com/glxp/api/res/trace/TraceOrderResponse.java @@ -0,0 +1,115 @@ +package com.glxp.api.res.trace; + +import lombok.Data; + +import java.util.Date; + +@Data +public class TraceOrderResponse { + private Long id; + + /** + * 单据号 + */ + private String billNo; + + /** + * 单据时间 + */ + private String billDate; + + /** + * 1:入库；2：出库 + */ + private Byte inOutType; + + /** + * 单据类型 + */ + private String billType; + + /** + * 发货企业 + */ + private String fromCorp; + + /** + * 发货企业统一社会信用号 + */ + private String fromCorpCreditNum; + + /** + * 收货企业 + */ + private String toCorp; + + /** + * 收货企业统一社会信用号 + */ + private String toCorpCreditNum; + + /** + * 单据创建者 + */ + private Long createUser; + + /** + * 企业信息ID外键 + */ + private Long companyIdFk; + + /** + * 企业名称 + */ + private String companyName; + + /** + * 客户端类型 + */ + private Byte clientType; + + /** + * 退货原因（退货时填写） + */ + private String returnReason; + + /** + * 销毁原因（销毁时填写） + */ + private String destoryReason; + + /** + * 执行销毁人（销毁时填写） + */ + private String excuseUser; + + /** + * 执行销毁人证件号（销毁时填写） + */ + private String excuseCode; + + /** + * 监督人姓名【销毁出库时填写】 + */ + private String superviserUser; + + /** + * 监督人证件号【销毁出库时填写】 + */ + private String superviserCode; + + /** + * 上传着ID + */ + private Long uploadUser; + + /** + * 备注 + */ + private String remark; + + /** + * 更新时间 + */ + private Date updateTime; +} 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 f12b9fb..0dfc4fb 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceOrderService.java +++ b/src/main/java/com/glxp/api/service/trace/TraceOrderService.java @@ -2,7 +2,15 @@ package com.glxp.api.service.trace; import com.glxp.api.entity.trace.TraceOrderEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.req.trace.TraceOrderDetailRequest; +import com.glxp.api.req.trace.TraceOrderRequest; +import com.glxp.api.res.trace.TraceOrderResponse; + +import java.util.List; + public interface TraceOrderService extends IService{ + List queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest); + } diff --git a/src/main/java/com/glxp/api/service/trace/TraceOrderServiceImpl.java b/src/main/java/com/glxp/api/service/trace/TraceOrderServiceImpl.java index b52bb89..b5342cd 100644 --- a/src/main/java/com/glxp/api/service/trace/TraceOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/trace/TraceOrderServiceImpl.java @@ -1,11 +1,33 @@ package com.glxp.api.service.trace; +import com.github.pagehelper.PageHelper; +import com.glxp.api.req.trace.TraceOrderDetailRequest; +import com.glxp.api.req.trace.TraceOrderRequest; +import com.glxp.api.res.trace.TraceOrderResponse; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.trace.TraceOrderMapper; import com.glxp.api.entity.trace.TraceOrderEntity; +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + @Service public class TraceOrderServiceImpl extends ServiceImpl implements TraceOrderService{ + @Resource + TraceOrderMapper traceOrderMapper; + + @Override + public List queryTraceOrderList(TraceOrderDetailRequest traceOrderDetailRequest) { + if (traceOrderDetailRequest == null) { + return Collections.emptyList(); + } + if (traceOrderDetailRequest.getPage() != null) { + int offset = (traceOrderDetailRequest.getPage() - 1) * traceOrderDetailRequest.getLimit(); + PageHelper.offsetPage(offset, traceOrderDetailRequest.getLimit()); + } + return traceOrderMapper.queryTraceOrderList(traceOrderDetailRequest); + } } diff --git a/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml b/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml index 665f682..9b42a9d 100644 --- a/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/trace/TraceOrderMapper.xml @@ -1,4 +1,39 @@ +