From 24a123668581402a5d9e93a806e7c7a39f04c70f Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 6 Feb 2023 16:08:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=8D=95=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=E7=9B=B8=E5=85=B3=E7=9A=84=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoCodeController.java | 40 +++++ .../inout/IoCodeTempController.java | 8 +- .../controller/inout/IoOrderController.java | 8 +- .../inout/IoOrderDetailController.java | 18 ++- .../glxp/api/dao/basic/UdiRelevanceDao.java | 4 +- .../com/glxp/api/dao/inout/IoCodeDao.java | 15 +- .../com/glxp/api/dao/inout/IoOrderDao.java | 20 +++ .../{IoCodeEnttity.java => IoCodeEntity.java} | 5 +- .../api/req/inout/FilterIoCodeRequest.java | 53 ++++++- .../req/inout/FilterOrderDetailRequest.java | 10 ++ .../glxp/api/res/inout/IoCodeResponse.java | 147 ++++++++++++++++++ .../res/inout/IoOrderDetailBizResponse.java | 10 ++ .../api/res/inout/IoOrderDetailResponse.java | 11 ++ .../inout/IoOrderDetailResultResponse.java | 11 ++ .../glxp/api/res/inout/IoOrderResponse.java | 39 ++++- .../api/service/inout/IoAddInoutService.java | 12 +- .../service/inout/IoCheckInoutService.java | 3 +- .../glxp/api/service/inout/IoCodeService.java | 36 ++++- .../api/service/inout/IoOrderService.java | 18 +++ .../service/inout/impl/IoCodeServiceImpl.java | 45 ++++-- .../inout/impl/IoOrderServiceImpl.java | 30 +++- .../mybatis/mapper/inout/IoCodeDao.xml | 105 ++++++++++++- .../mybatis/mapper/inout/IoOrderDao.xml | 84 ++++++++++ 23 files changed, 676 insertions(+), 56 deletions(-) rename src/main/java/com/glxp/api/entity/inout/{IoCodeEnttity.java => IoCodeEntity.java} (97%) create mode 100644 src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/res/inout/IoCodeResponse.java create mode 100644 src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java create mode 100644 src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java create mode 100644 src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java index a3510c9bd..732077758 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java @@ -1,14 +1,54 @@ package com.glxp.api.controller.inout; +import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; +import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.res.inout.IoCodeResponse; +import com.glxp.api.service.inout.IoCodeService; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; +import java.util.List; + /** * 单据正式码表接口 */ @RestController public class IoCodeController extends BaseController { + @Resource + private IoCodeService ioCodeService; + + /** + * 查询单据正式码表数据 + * + * @param filterIoCodeRequest + * @return + */ + @GetMapping("/udiwms/inout/code/filterList") + public BaseResponse filterList(FilterIoCodeRequest filterIoCodeRequest) { + List list = ioCodeService.filterList(filterIoCodeRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); + } + + /** + * 根据单据号查询正式码表数据 + * + * @param orderId + * @return + */ + @GetMapping("/udiwms/inout/code/findByOrderId") + public BaseResponse findAllByOrderId(String orderId) { + FilterIoCodeRequest filterIoCodeRequest = new FilterIoCodeRequest(); + filterIoCodeRequest.setOrderId(orderId); + List list = ioCodeService.filterList(filterIoCodeRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.success(pageInfo); + } } diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index d5ec7184c..5e64c819f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -15,7 +15,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -695,9 +695,9 @@ public class IoCodeTempController extends BaseController { codeEnttity.setSupId(originSupId); } else { - IoCodeEnttity ioCodeEnttity = new IoCodeEnttity(); - BeanUtils.copyProperties(codeEnttity, ioCodeEnttity); - String supId = transInoutService.checkInvExitSup(ioCodeEnttity); + IoCodeEntity ioCodeEntity = new IoCodeEntity(); + BeanUtils.copyProperties(codeEnttity, ioCodeEntity); + String supId = transInoutService.checkInvExitSup(ioCodeEntity); if (supId == null) { supId = transInoutService.checkExitSup(codeEnttity.getRelId()); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 6d318ee64..35211fe53 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.inout; +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; @@ -7,6 +8,7 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.inout.IoOrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; @@ -36,9 +38,9 @@ public class IoOrderController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - - - return ResultVOUtils.success(); + List list = orderService.filterList(filterOrderRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); } @AuthRuleAnnotation("") diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java index 918c86035..e75b059f3 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java @@ -4,14 +4,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.dao.inout.IoOrderDetailCodeDao; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; -import com.glxp.api.req.basic.UdiCombineRequest; -import com.glxp.api.req.inout.AddBizProductReqeust; +import com.glxp.api.req.inout.FilterOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; 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; @@ -24,6 +20,7 @@ public class IoOrderDetailController { @Resource IoOrderDetailCodeDao ioOrderDetailCodeDao; + //获取新增扫码单据详情---临时接口查询 @AuthRuleAnnotation("") @GetMapping("udiwms/inout/order/draft/detailCode") @@ -35,7 +32,16 @@ public class IoOrderDetailController { return ResultVOUtils.success(pageSimpleResponse); } - + /** + * 查询单据详情 + * + * @param filterOrderDetailRequest + * @return + */ + @GetMapping("udiwms/inout/order/filterList") + public BaseResponse filterList(FilterOrderDetailRequest filterOrderDetailRequest) { + return ResultVOUtils.success(); + } } diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index c3ab94491..d2eeae02a 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -3,7 +3,7 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface UdiRelevanceDao extends BaseMapperPlus { +public interface UdiRelevanceDao extends BaseMapperPlus { List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest); diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java b/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java index ec88510ec..2b0ea3bea 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java @@ -1,12 +1,13 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.res.inout.IoCodeResponse; import java.util.List; -public interface IoCodeDao extends BaseMapperPlus { +public interface IoCodeDao extends BaseMapperPlus { /** * 查询单据码明细 @@ -14,5 +15,13 @@ public interface IoCodeDao extends BaseMapperPlus filterCodeList(FilterIoCodeRequest filterIoCodeRequest); + List filterCodeList(FilterIoCodeRequest filterIoCodeRequest); + + /** + * 查询单据码明细VO数据 + * + * @param filterIoCodeRequest + * @return + */ + List filterList(FilterIoCodeRequest filterIoCodeRequest); } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java index 22c5b55b6..11c2aa554 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDao.java @@ -2,6 +2,26 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.res.inout.IoOrderResponse; + +import java.util.List; public interface IoOrderDao extends BaseMapperPlus { + + /** + * 查询单据VO列表 + * + * @param filterOrderRequest + * @return + */ + List filterList(FilterOrderRequest filterOrderRequest); + + /** + * 查询单据实体列表 + * + * @param filterOrderRequest + * @return + */ + List filterOrderList(FilterOrderRequest filterOrderRequest); } \ No newline at end of file diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeEnttity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inout/IoCodeEnttity.java rename to src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java index 18b7f474f..421cc6b08 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeEnttity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java @@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; import java.io.Serializable; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "io_code") -public class IoCodeEnttity implements Serializable { +public class IoCodeEntity implements Serializable { @TableId(value = "id", type = IdType.AUTO) private Integer id; diff --git a/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java b/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java index 5fb0322db..c87204ccf 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java @@ -7,15 +7,64 @@ import java.util.List; @Data public class FilterIoCodeRequest extends ListPageRequest { + + /** + * 手持终端订单号 + */ private String corpOrderId; + + /** + * UDI码 + */ private String code; - private String udi; + + /** + * 批次号 + */ private String batchNo; + + /** + * 单据号 + */ private String orderId; + + /** + * DI标识 + */ private String nameCode; + + /** + * 供应商ID + */ private String supId; - private String locStorageCode; + + /** + * 耗材字典ID + */ private String relId; + /** + * 部门编码 + */ + private String deptCode; + + /** + * 仓库编码 + */ + private String invCode; + + /** + * 货位编码 + */ + private String warehouseCode; + + /** + * 包装级别 + */ + private String packageLevel; + + /** + * 单据类型集合 + */ List actions; } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java new file mode 100644 index 000000000..0d128ce14 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.req.inout; + +import lombok.Data; + +/** + * + */ +@Data +public class FilterOrderDetailRequest { +} diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java new file mode 100644 index 000000000..719c5f1e6 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java @@ -0,0 +1,147 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 单据正式码表VO类 + */ +@Data +public class IoCodeResponse implements Serializable { + + private static final long serialVersionUID = -3436984812709186027L; + + private Integer id; + + /** + * UDI码 + */ + private String code; + + /** + * 主单据类型（入库，出库） + */ + private String mainAction; + + /** + * 单据类型 + */ + private String action; + + /** + * 订单号外键 + */ + private String orderId; + + /** + * 手持终端订单号 + */ + private String corpOrderId; + + /** + * DI标识 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String produceDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 序列号 + */ + private String serialNo; + + /** + * 包装级别 + */ + private String packageLevel; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 耗材字典ID外键 + */ + private Long relId; + + /** + * 扫码数量 + */ + private Integer count; + + /** + * 实际数量 + */ + private Integer reCount; + + /** + * 部门编码外键 + */ + private String deptCode; + + /** + * 仓库编码外键 + */ + private String invCode; + + /** + * 货位编码外键 + */ + private String warehouseCode; + + /** + * 更新日期 + */ + private Date updateTime; + + /** + * 创建日期 + */ + private Date createTime; + + /** + * 条码校验状态 + */ + private Integer status; + + /** + * 产品名称 + */ + private String productName; + + /** + * 供应商名称 + */ + private String supName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 仓库名称 + */ + private String invName; + + /** + * 货位名称 + */ + private String warehouseName; +} \ No newline at end of file diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java new file mode 100644 index 000000000..a4f6ab521 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -0,0 +1,10 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +/** + * 单据业务详情VO + */ +@Data +public class IoOrderDetailBizResponse { +} diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java new file mode 100644 index 000000000..964870e2d --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java @@ -0,0 +1,11 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +/** + * 单据详情VO + */ +@Data +public class IoOrderDetailResponse { + +} diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java new file mode 100644 index 000000000..5149559c6 --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -0,0 +1,11 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +/** + * 单据扫码明细VO + */ +@Data +public class IoOrderDetailResultResponse { + +} diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index 3c4bbf854..848c72563 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -1,9 +1,6 @@ package com.glxp.api.res.inout; import cn.hutool.core.util.StrUtil; -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; @@ -34,6 +31,11 @@ public class IoOrderResponse { */ private String action; + /** + * 单据类型名称 + */ + private String billTypeName; + /** * 往来单位 */ @@ -149,10 +151,41 @@ public class IoOrderResponse { */ private String remark; + /** + * 创建人名称 + */ + private String createUserName; + + /** + * 更新人名称 + */ + private String updateUserName; + + /** + * 审核人名称 + */ + private String reviewUserName; + private static final long serialVersionUID = 1L; + /** + * 往来单位名称 + */ private String fromCorpName; + + /** + * 往来仓库名称 + */ private String fromInvName; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 往来名称 + */ private String fromName; diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index 1372c75e1..8caef060c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -6,7 +6,7 @@ import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; -import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -82,10 +82,10 @@ public class IoAddInoutService { //写入条码 - List ioCodeEnttities = new ArrayList<>(); + List ioCodeEnttities = new ArrayList<>(); for (int index = 0; index < pdaCodeEntities.size(); index++) { pdaCodeEntities.get(index).setOrderId(orderNo); - IoCodeEnttity codeEnttity = new IoCodeEnttity(); + IoCodeEntity codeEnttity = new IoCodeEntity(); BeanUtils.copyProperties(pdaCodeEntities.get(index), codeEnttity); ioCodeEnttities.add(codeEnttity); } @@ -124,7 +124,7 @@ public class IoAddInoutService { return null; } - public String checkInvExitSup(IoCodeEnttity codeEnttity) { + public String checkInvExitSup(IoCodeEntity codeEnttity) { String supId = checkNorInv(codeEnttity); if (supId == null) { @@ -134,7 +134,7 @@ public class IoAddInoutService { } //查普通库存 todo - public String checkNorInv(IoCodeEnttity codeEnttity) { + public String checkNorInv(IoCodeEntity codeEnttity) { // FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); // filterInvWarehouseRequest.setLevel(1); @@ -168,7 +168,7 @@ public class IoAddInoutService { } //查寄售库存 todo - public String checkPreInv(IoCodeEnttity codeEnttity) { + public String checkPreInv(IoCodeEntity codeEnttity) { // FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest(); // filterInvWarehouseRequest.setLevel(1); // filterInvWarehouseRequest.setAdvanceType(true); diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index b7baa843b..d1383a2bd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.*; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -206,7 +205,7 @@ public class IoCheckInoutService { //临时表转正式表 List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { - IoCodeEnttity codeEnttity = new IoCodeEnttity(); + IoCodeEntity codeEnttity = new IoCodeEntity(); BeanUtils.copyProperties(codeTempEntity, codeEnttity); codeService.insert(codeEnttity); } diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeService.java b/src/main/java/com/glxp/api/service/inout/IoCodeService.java index 621572422..3cfb9cfdf 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeService.java @@ -1,22 +1,44 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.res.inout.IoCodeResponse; import java.util.List; public interface IoCodeService { - int insert(IoCodeEnttity codeEnttity); + int insert(IoCodeEntity codeEnttity); - boolean insertBatch(List codeEnttities); + boolean insertBatch(List codeEnttities); - List findByOrderId(String billNo); + List findByOrderId(String billNo); - int updateById(IoCodeEnttity codeEnttity); + int updateById(IoCodeEntity codeEnttity); - public IoCodeEnttity findByUnique(String orderId, String code); + public IoCodeEntity findByUnique(String orderId, String code); + + /** + * 查询正式码表实体数据 + * + * @param filterIoCodeRequest + * @return + */ + List filterCodeList(FilterIoCodeRequest filterIoCodeRequest); + + /** + * 查询正式码表VO数据 + */ + List filterList(FilterIoCodeRequest filterIoCodeRequest); + + /** + * 根据单号删除正式码表数据 + * + * @param orderId + * @return + */ + BaseResponse deleteCodeByOrderId(String orderId); - List filterCodeList(FilterIoCodeRequest filterIoCodeRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 21a0a059d..33703b8a2 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -1,6 +1,8 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.res.inout.IoOrderResponse; import java.util.List; @@ -18,4 +20,20 @@ public interface IoOrderService { int insertOrUpdate(IoOrderEntity orderEntity); int update(IoOrderEntity orderEntity); + + /** + * 查询单据列表 + * + * @param filterOrderRequest + * @return + */ + List filterList(FilterOrderRequest filterOrderRequest); + + /** + * 查询单据列表 + * + * @param filterOrderRequest + * @return + */ + List filterOrderList(FilterOrderRequest filterOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java index 4cf8dfbb3..a7e92b3a9 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java @@ -1,10 +1,15 @@ package com.glxp.api.service.inout.impl; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.inout.IoCodeDao; -import com.glxp.api.entity.inout.IoCodeEnttity; +import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.service.inout.IoCodeService; import org.springframework.stereotype.Service; @@ -16,35 +21,35 @@ import java.util.List; public class IoCodeServiceImpl implements IoCodeService { @Resource - IoCodeDao ioCodeDao; + private IoCodeDao ioCodeDao; @Override - public int insert(IoCodeEnttity codeEnttity) { + public int insert(IoCodeEntity codeEnttity) { return ioCodeDao.insert(codeEnttity); } @Override - public boolean insertBatch(List codeEnttities) { + public boolean insertBatch(List codeEnttities) { return ioCodeDao.insertBatch(codeEnttities); } @Override - public List findByOrderId(String billNo) { - return ioCodeDao.selectList(new QueryWrapper().eq("orderId", billNo)); + public List findByOrderId(String billNo) { + return ioCodeDao.selectList(new QueryWrapper().eq("orderId", billNo)); } @Override - public int updateById(IoCodeEnttity codeEnttity) { + public int updateById(IoCodeEntity codeEnttity) { return ioCodeDao.updateById(codeEnttity); } @Override - public IoCodeEnttity findByUnique(String orderId, String code) { - return ioCodeDao.selectOne(new QueryWrapper().eq("orderId", orderId).eq("code", code)); + public IoCodeEntity findByUnique(String orderId, String code) { + return ioCodeDao.selectOne(new QueryWrapper().eq("orderId", orderId).eq("code", code)); } @Override - public List filterCodeList(FilterIoCodeRequest filterIoCodeRequest) { + public List filterCodeList(FilterIoCodeRequest filterIoCodeRequest) { if (null == filterIoCodeRequest) { return Collections.emptyList(); } @@ -54,5 +59,25 @@ public class IoCodeServiceImpl implements IoCodeService { return ioCodeDao.filterCodeList(filterIoCodeRequest); } + @Override + public List filterList(FilterIoCodeRequest filterIoCodeRequest) { + if (null == filterIoCodeRequest) { + return Collections.emptyList(); + } + if (null != filterIoCodeRequest.getPage() && null != filterIoCodeRequest.getLimit()) { + PageHelper.offsetPage((filterIoCodeRequest.getPage() - 1) * filterIoCodeRequest.getLimit(), filterIoCodeRequest.getLimit()); + } + return ioCodeDao.filterList(filterIoCodeRequest); + } + + @Override + public BaseResponse deleteCodeByOrderId(String orderId) { + if (StrUtil.isBlank(orderId)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空"); + } + ioCodeDao.delete(new QueryWrapper().eq("orderId", orderId)); + return ResultVOUtils.success("删除成功"); + } + } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 9423fd817..9fde4a726 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -1,20 +1,23 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDao; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.inout.IoOrderService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; @Service public class IoOrderServiceImpl implements IoOrderService { @Resource - IoOrderDao orderDao; + private IoOrderDao orderDao; @Override public List selectAll() { @@ -51,4 +54,27 @@ public class IoOrderServiceImpl implements IoOrderService { public int update(IoOrderEntity orderEntity) { return orderDao.updateById(orderEntity); } + + @Override + public List filterList(FilterOrderRequest filterOrderRequest) { + if (null == filterOrderRequest) { + return Collections.emptyList(); + } + if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { + PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); + } + return orderDao.filterList(filterOrderRequest); + } + + @Override + public List filterOrderList(FilterOrderRequest filterOrderRequest) { + if (null == filterOrderRequest) { + return Collections.emptyList(); + } + if (null != filterOrderRequest.getPage() && null != filterOrderRequest.getLimit()) { + PageHelper.offsetPage((filterOrderRequest.getPage() - 1) * filterOrderRequest.getLimit(), filterOrderRequest.getLimit()); + } + return orderDao.filterOrderList(filterOrderRequest); + } + } diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml index 6b1ca0123..bd628abf1 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml @@ -1,8 +1,107 @@ + - + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index d9899ffed..0e8516e06 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -1,4 +1,88 @@ + + + \ No newline at end of file