From 1abb492345ac50d2b46d420051dae44f6d3c6b74 Mon Sep 17 00:00:00 2001 From: x_z Date: Mon, 6 Feb 2023 18:01:35 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E5=8D=95=E6=8D=AE=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E6=98=8E=E7=BB=86=E7=AD=89=E5=9F=BA=E7=A1=80=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoCodeController.java | 14 +- .../inout/IoCodeTempController.java | 4 +- ....java => IoOrderDetailCodeController.java} | 21 ++- .../inout/IoOrderDetailResultController.java | 13 ++ .../com/glxp/api/dao/inout/IoCodeDao.java | 10 +- .../api/dao/inout/IoOrderDetailBizDao.java | 14 +- .../api/dao/inout/IoOrderDetailCodeDao.java | 12 ++ .../api/dao/inout/IoOrderDetailResultDao.java | 14 +- ...odeRequest.java => FilterCodeRequest.java} | 2 +- .../api/req/inout/FilterOrderBizRequest.java | 10 -- .../inout/FilterOrderDetailBizRequest.java | 25 +++ .../inout/FilterOrderDetailCodeRequest.java | 37 ++++ .../req/inout/FilterOrderDetailRequest.java | 10 -- .../inout/FilterOrderDetailResultRequest.java | 31 ++++ .../glxp/api/res/inout/IoCodeResponse.java | 5 +- .../res/inout/IoOrderDetailBizResponse.java | 148 ++++++++++++++++ .../res/inout/IoOrderDetailCodeResponse.java | 158 ++++++++++++++++++ .../api/res/inout/IoOrderDetailResponse.java | 11 -- .../inout/IoOrderDetailResultResponse.java | 144 ++++++++++++++++ .../glxp/api/service/inout/IoCodeService.java | 8 +- .../api/service/inout/IoCodeTempService.java | 4 +- .../inout/IoOrderDetailCodeService.java | 18 ++ .../service/inout/impl/IoCodeServiceImpl.java | 22 +-- .../inout/impl/IoCodeTempServiceImpl.java | 8 +- .../impl/IoOrderDetailCodeServiceImpl.java | 30 +++- .../mybatis/mapper/inout/IoCodeDao.xml | 2 +- .../mapper/inout/IoOrderDetailBizDao.xml | 19 +++ .../mapper/inout/IoOrderDetailCodeDao.xml | 25 +++ .../mapper/inout/IoOrderDetailResultDao.xml | 22 +++ 29 files changed, 761 insertions(+), 80 deletions(-) rename src/main/java/com/glxp/api/controller/inout/{IoOrderDetailController.java => IoOrderDetailCodeController.java} (63%) create mode 100644 src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java rename src/main/java/com/glxp/api/req/inout/{FilterIoCodeRequest.java => FilterCodeRequest.java} (93%) delete mode 100644 src/main/java/com/glxp/api/req/inout/FilterOrderBizRequest.java create mode 100644 src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java create mode 100644 src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java delete mode 100644 src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java create mode 100644 src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java create mode 100644 src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java delete mode 100644 src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java create mode 100644 src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml create mode 100644 src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml create mode 100644 src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml 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 732077758..2f506ce5f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java @@ -4,7 +4,7 @@ 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.req.inout.FilterCodeRequest; import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.service.inout.IoCodeService; import org.springframework.web.bind.annotation.GetMapping; @@ -25,12 +25,12 @@ public class IoCodeController extends BaseController { /** * 查询单据正式码表数据 * - * @param filterIoCodeRequest + * @param filterCodeRequest * @return */ @GetMapping("/udiwms/inout/code/filterList") - public BaseResponse filterList(FilterIoCodeRequest filterIoCodeRequest) { - List list = ioCodeService.filterList(filterIoCodeRequest); + public BaseResponse filterList(FilterCodeRequest filterCodeRequest) { + List list = ioCodeService.filterList(filterCodeRequest); PageInfo pageInfo = new PageInfo<>(list); return ResultVOUtils.page(pageInfo); } @@ -43,9 +43,9 @@ public class IoCodeController extends BaseController { */ @GetMapping("/udiwms/inout/code/findByOrderId") public BaseResponse findAllByOrderId(String orderId) { - FilterIoCodeRequest filterIoCodeRequest = new FilterIoCodeRequest(); - filterIoCodeRequest.setOrderId(orderId); - List list = ioCodeService.filterList(filterIoCodeRequest); + FilterCodeRequest filterCodeRequest = new FilterCodeRequest(); + filterCodeRequest.setOrderId(orderId); + List list = ioCodeService.filterList(filterCodeRequest); 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 5e64c819f..d9627801a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -24,7 +24,7 @@ import com.glxp.api.http.SpsDirectClient; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.inout.AddEnterCodeRequest; import com.glxp.api.req.inout.AddOrderRequest; -import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.PostOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; @@ -752,7 +752,7 @@ public class IoCodeTempController extends BaseController { @AuthRuleAnnotation("") @GetMapping("admin/warehouse/inout/findErrorByOrderId") - public BaseResponse findErrorByOrderId(FilterIoCodeRequest warehouseQueryRequest) { + public BaseResponse findErrorByOrderId(FilterCodeRequest warehouseQueryRequest) { if (StrUtil.isEmpty(warehouseQueryRequest.getOrderId())) { return ResultVOUtils.error(500, "单据号不能为空!"); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java similarity index 63% rename from src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java rename to src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java index e75b059f3..ef7569b0f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailCodeController.java @@ -1,25 +1,34 @@ package com.glxp.api.controller.inout; +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.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; -import com.glxp.api.req.inout.FilterOrderDetailRequest; +import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.IoOrderDetailCodeResponse; +import com.glxp.api.service.inout.IoOrderDetailCodeService; 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 IoOrderDetailController { +public class IoOrderDetailCodeController { @Resource IoOrderDetailCodeDao ioOrderDetailCodeDao; + @Resource + private IoOrderDetailCodeService ioOrderDetailCodeService; + //获取新增扫码单据详情---临时接口查询 @AuthRuleAnnotation("") @@ -35,12 +44,14 @@ public class IoOrderDetailController { /** * 查询单据详情 * - * @param filterOrderDetailRequest + * @param detailCodeRequest * @return */ @GetMapping("udiwms/inout/order/filterList") - public BaseResponse filterList(FilterOrderDetailRequest filterOrderDetailRequest) { - return ResultVOUtils.success(); + public BaseResponse filterList(FilterOrderDetailCodeRequest detailCodeRequest) { + List list = ioOrderDetailCodeService.filterList(detailCodeRequest); + PageInfo pageInfo = new PageInfo<>(list); + return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java new file mode 100644 index 000000000..72b773e5b --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -0,0 +1,13 @@ +package com.glxp.api.controller.inout; + +import org.springframework.web.bind.annotation.RestController; + +/** + * 单据扫码明细查询接口 + */ +@RestController +public class IoOrderDetailResultController { + + + +} 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 2b0ea3bea..275fb88e4 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java @@ -2,7 +2,7 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.inout.IoCodeResponse; import java.util.List; @@ -12,16 +12,16 @@ public interface IoCodeDao extends BaseMapperPlus filterCodeList(FilterIoCodeRequest filterIoCodeRequest); + List filterCodeList(FilterCodeRequest filterCodeRequest); /** * 查询单据码明细VO数据 * - * @param filterIoCodeRequest + * @param filterCodeRequest * @return */ - List filterList(FilterIoCodeRequest filterIoCodeRequest); + List filterList(FilterCodeRequest filterCodeRequest); } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index c87dbed05..1e8d6171b 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -2,7 +2,19 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; +import com.glxp.api.req.inout.FilterOrderDetailBizRequest; +import com.glxp.api.res.inout.IoOrderDetailBizResponse; + +import java.util.List; public interface IoOrderDetailBizDao extends BaseMapperPlus { + + /** + * 查询单据业务详情VO列表 + * + * @param orderDetailBizRequest + * @return + */ + List filterList(FilterOrderDetailBizRequest orderDetailBizRequest); + } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java index 4204c4e94..6318dce75 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java @@ -2,6 +2,18 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; +import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; +import com.glxp.api.res.inout.IoOrderDetailCodeResponse; + +import java.util.List; public interface IoOrderDetailCodeDao extends BaseMapperPlus { + + /** + * 查询单据扫码详情 + * + * @param detailCodeRequest + * @return + */ + List filterList(FilterOrderDetailCodeRequest detailCodeRequest); } diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java index 2800a0d88..a0a94066d 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java @@ -1,8 +1,20 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; +import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; + +import java.util.List; public interface IoOrderDetailResultDao extends BaseMapperPlus { + + /** + * 查询单据扫码明细VO列表 + * + * @param orderDetailResultRequest + * @return + */ + List filterList(FilterOrderDetailResultRequest orderDetailResultRequest); + } diff --git a/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java b/src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java similarity index 93% rename from src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java rename to src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java index c87204ccf..eeaedce76 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterIoCodeRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterCodeRequest.java @@ -6,7 +6,7 @@ import lombok.Data; import java.util.List; @Data -public class FilterIoCodeRequest extends ListPageRequest { +public class FilterCodeRequest extends ListPageRequest { /** * 手持终端订单号 diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderBizRequest.java deleted file mode 100644 index 9e720b0f1..000000000 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderBizRequest.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.glxp.api.req.inout; - -import lombok.Data; - -@Data -public class FilterOrderBizRequest { - - private Long relId; - private String batchNo; -} diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java new file mode 100644 index 000000000..10da1a8a6 --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java @@ -0,0 +1,25 @@ +package com.glxp.api.req.inout; + +import lombok.Data; + +/** + * 单据业务详情查询参数 + */ +@Data +public class FilterOrderDetailBizRequest { + + /** + * 耗材字典产品ID + */ + private Long relId; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 单据号 + */ + private String orderIdFk; +} diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java new file mode 100644 index 000000000..735be055b --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailCodeRequest.java @@ -0,0 +1,37 @@ +package com.glxp.api.req.inout; + +import com.glxp.api.util.page.ListPageRequest; +import lombok.Data; + +/** + * 单据扫码详情查询参数 + */ +@Data +public class FilterOrderDetailCodeRequest extends ListPageRequest { + + /** + * 单据号 + */ + private String orderIdFk; + + /** + * 耗材字典ID + */ + private String relIdFk; + + /** + * DI标识 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * DI信息UUID外键 + */ + private String uuidFk; + +} diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java deleted file mode 100644 index 0d128ce14..000000000 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailRequest.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.glxp.api.req.inout; - -import lombok.Data; - -/** - * - */ -@Data -public class FilterOrderDetailRequest { -} diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java new file mode 100644 index 000000000..f225f85ba --- /dev/null +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java @@ -0,0 +1,31 @@ +package com.glxp.api.req.inout; + +import lombok.Data; + +/** + * 单据扫码明细查询参数 + */ +@Data +public class FilterOrderDetailResultRequest { + + /** + * 单据号 + */ + private String orderIdFk; + + /** + * 耗材字典ID + */ + private String relIdFk; + + /** + * DI标识 + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + +} diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java index 719c5f1e6..668502612 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java @@ -2,16 +2,13 @@ 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; +public class IoCodeResponse { private Integer id; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java index a4f6ab521..8e66d26da 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java @@ -2,9 +2,157 @@ package com.glxp.api.res.inout; import lombok.Data; +import java.math.BigDecimal; + /** * 单据业务详情VO */ @Data public class IoOrderDetailBizResponse { + + private Integer id; + + /** + * 订单号外键 + */ + private String orderIdFk; + + /** + * 耗材字典ID外键 + */ + private Long bindRlFk; + + /** + * DI信息UUID外键 + */ + private String uuidFk; + + /** + * DI + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 产品通用名称 + */ + private String coName; + + /** + * 注册证号 + */ + private String certCode; + + /** + * 医疗器械注册备案证号 + */ + private String ylqxzcrbarmc; + + /** + * 生产企业 + */ + private String manufacturer; + + /** + * 计量单位 + */ + private String measname; + + /** + * 规格型号 + */ + private String spec; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 销售清单号 + */ + private String secSalesListNo; + + /** + * 发票第一票 + */ + private String firstSalesInvNo; + + /** + * 发票第二票 + */ + private String secSalesInvNo; + + /** + * 发票有效期 + */ + private String invoiceDate; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 绑定供应商状态 + */ + private String bindSupStatus; + + /** + * 单据数量 + */ + private Integer count; + + /** + * 扫码数量 + */ + private Integer reCount; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段1 + */ + private String remark1; + + /** + * 扩展字段2 + */ + private String remark2; + + /** + * 扩展字段3 + */ + private String remark3; + + /** + * 扩展字段4 + */ + private String remark4; + + /** + * 扩展字段5 + */ + private String remark5; + + + private boolean checkSuccess; + } diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java new file mode 100644 index 000000000..c54d3f6bd --- /dev/null +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java @@ -0,0 +1,158 @@ +package com.glxp.api.res.inout; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 单据详情VO + */ +@Data +public class IoOrderDetailCodeResponse { + + private Integer id; + + /** + * 订单号外键 + */ + private String orderIdFk; + + /** + * 耗材字典ID外键 + */ + private Long bindRlFk; + + /** + * DI信息UUID外键 + */ + private String uuidFk; + + /** + * DI + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 产品通用名称 + */ + private String coName; + + /** + * 注册证号 + */ + private String certCode; + + /** + * 医疗器械注册备案证号 + */ + private String ylqxzcrbarmc; + + /** + * 生产企业 + */ + private String manufacturer; + + /** + * 计量单位 + */ + private String measname; + + /** + * 规格型号 + */ + private String spec; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 销售清单号 + */ + private String secSalesListNo; + + /** + * 发票第一票 + */ + private String firstSalesInvNo; + + /** + * 发票第二票 + */ + private String secSalesInvNo; + + /** + * 发票有效期 + */ + private String invoiceDate; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 绑定供应商状态 + */ + private String bindSupStatus; + + /** + * 单据数量 + */ + private Integer count; + + /** + * 扫码数量 + */ + private Integer reCount; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段1 + */ + private String remark1; + + /** + * 扩展字段2 + */ + private String remark2; + + /** + * 扩展字段3 + */ + private String remark3; + + /** + * 扩展字段4 + */ + private String remark4; + + /** + * 扩展字段5 + */ + private String remark5; + + private boolean checkSuccess; + + +} diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java deleted file mode 100644 index 964870e2d..000000000 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResponse.java +++ /dev/null @@ -1,11 +0,0 @@ -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 index 5149559c6..4a530c973 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailResultResponse.java @@ -2,10 +2,154 @@ package com.glxp.api.res.inout; import lombok.Data; +import java.math.BigDecimal; + /** * 单据扫码明细VO */ @Data public class IoOrderDetailResultResponse { + private Integer id; + + /** + * 订单号外键 + */ + private String orderIdFk; + + /** + * 耗材字典ID外键 + */ + private String bindRlFk; + + /** + * DI信息UUID外键 + */ + private String uuidFk; + + /** + * DI + */ + private String nameCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 生产日期 + */ + private String productDate; + + /** + * 失效日期 + */ + private String expireDate; + + /** + * 产品通用名称 + */ + private String coName; + + /** + * 注册证号 + */ + private String certCode; + + /** + * 医疗器械注册备案证号 + */ + private String ylqxzcrbarmc; + + /** + * 生产企业 + */ + private String manufacturer; + + /** + * 计量单位 + */ + private String measname; + + /** + * 规格型号 + */ + private String spec; + + /** + * 价格 + */ + private BigDecimal price; + + /** + * 销售清单号 + */ + private String secSalesListNo; + + /** + * 发票第一票 + */ + private String firstSalesInvNo; + + /** + * 发票第二票 + */ + private String secSalesInvNo; + + /** + * 发票有效期 + */ + private String invoiceDate; + + /** + * 供应商ID外键 + */ + private String supId; + + /** + * 绑定供应商状态 + */ + private String bindSupStatus; + + /** + * 单据数量 + */ + private Integer count; + + /** + * 扫码数量 + */ + private Integer reCount; + + /** + * 备注 + */ + private String remark; + + /** + * 扩展字段1 + */ + private String remark1; + + /** + * 扩展字段2 + */ + private String remark2; + + /** + * 扩展字段3 + */ + private String remark3; + + /** + * 扩展字段4 + */ + private String remark4; + + /** + * 扩展字段5 + */ + private String remark5; + } 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 3cfb9cfdf..7ef7b356e 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeService.java @@ -2,7 +2,7 @@ package com.glxp.api.service.inout; 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.req.inout.FilterCodeRequest; import com.glxp.api.res.inout.IoCodeResponse; import java.util.List; @@ -22,15 +22,15 @@ public interface IoCodeService { /** * 查询正式码表实体数据 * - * @param filterIoCodeRequest + * @param filterCodeRequest * @return */ - List filterCodeList(FilterIoCodeRequest filterIoCodeRequest); + List filterCodeList(FilterCodeRequest filterCodeRequest); /** * 查询正式码表VO数据 */ - List filterList(FilterIoCodeRequest filterIoCodeRequest); + List filterList(FilterCodeRequest filterCodeRequest); /** * 根据单号删除正式码表数据 diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index c0821493f..2fab2f8c5 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.IoCodeTempEntity; -import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.util.page.TableDataInfo; import java.util.List; @@ -23,7 +23,7 @@ public interface IoCodeTempService { List findByOrderId(String billNo); - TableDataInfo findByOrderId(FilterIoCodeRequest filterIoCodeRequest); + TableDataInfo findByOrderId(FilterCodeRequest filterCodeRequest); int deleteByBillNo(String orderId); diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index 643d0dda8..f4d3415d4 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -1,6 +1,9 @@ package com.glxp.api.service.inout; +import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; +import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; +import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import java.util.List; @@ -14,4 +17,19 @@ public interface IoOrderDetailCodeService { int deleteById(Integer id); + /** + * 查询单据扫码详情VO列表 + * + * @param detailCodeRequest + * @return + */ + List filterList(FilterOrderDetailCodeRequest detailCodeRequest); + + /** + * 根据单据号删除单据扫码详情 + * + * @param orderId + * @return + */ + BaseResponse deleteByOrderId(String orderId); } 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 a7e92b3a9..0fb58c43d 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 @@ -8,7 +8,7 @@ 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.IoCodeEntity; -import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.service.inout.IoCodeService; import org.springframework.stereotype.Service; @@ -49,25 +49,25 @@ public class IoCodeServiceImpl implements IoCodeService { } @Override - public List filterCodeList(FilterIoCodeRequest filterIoCodeRequest) { - if (null == filterIoCodeRequest) { + public List filterCodeList(FilterCodeRequest filterCodeRequest) { + if (null == filterCodeRequest) { return Collections.emptyList(); } - if (null != filterIoCodeRequest.getPage() && null != filterIoCodeRequest.getLimit()) { - PageHelper.offsetPage((filterIoCodeRequest.getPage() - 1) * filterIoCodeRequest.getLimit(), filterIoCodeRequest.getLimit()); + if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) { + PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit()); } - return ioCodeDao.filterCodeList(filterIoCodeRequest); + return ioCodeDao.filterCodeList(filterCodeRequest); } @Override - public List filterList(FilterIoCodeRequest filterIoCodeRequest) { - if (null == filterIoCodeRequest) { + public List filterList(FilterCodeRequest filterCodeRequest) { + if (null == filterCodeRequest) { return Collections.emptyList(); } - if (null != filterIoCodeRequest.getPage() && null != filterIoCodeRequest.getLimit()) { - PageHelper.offsetPage((filterIoCodeRequest.getPage() - 1) * filterIoCodeRequest.getLimit(), filterIoCodeRequest.getLimit()); + if (null != filterCodeRequest.getPage() && null != filterCodeRequest.getLimit()) { + PageHelper.offsetPage((filterCodeRequest.getPage() - 1) * filterCodeRequest.getLimit(), filterCodeRequest.getLimit()); } - return ioCodeDao.filterList(filterIoCodeRequest); + return ioCodeDao.filterList(filterCodeRequest); } @Override diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index 8cdc64e6c..d62c5535c 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -3,7 +3,7 @@ package com.glxp.api.service.inout.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.inout.IoCodeTempEntity; -import com.glxp.api.req.inout.FilterIoCodeRequest; +import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.service.inout.IoCodeTempService; import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.page.PageQuery; @@ -57,10 +57,10 @@ public class IoCodeTempServiceImpl implements IoCodeTempService { } @Override - public TableDataInfo findByOrderId(FilterIoCodeRequest filterIoCodeRequest) { + public TableDataInfo findByOrderId(FilterCodeRequest filterCodeRequest) { PageQuery pageQuery = new PageQuery(); - BeanCopyUtils.copy(filterIoCodeRequest, pageQuery); - Page page = ioCodeTempDao.selectPage(pageQuery.build(), new QueryWrapper().eq("orderId", filterIoCodeRequest.getOrderId())); + BeanCopyUtils.copy(filterCodeRequest, pageQuery); + Page page = ioCodeTempDao.selectPage(pageQuery.build(), new QueryWrapper().eq("orderId", filterCodeRequest.getOrderId())); return TableDataInfo.build(page); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java index f509ebff8..55543cc5b 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java @@ -1,13 +1,20 @@ 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.IoOrderDetailCodeDao; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; +import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; +import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.service.inout.IoOrderDetailCodeService; -import com.glxp.api.service.inout.IoOrderDetailResultService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; @Service @@ -35,4 +42,25 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService { public int deleteById(Integer id) { return ioOrderDetailCodeDao.deleteById(id); } + + @Override + public List filterList(FilterOrderDetailCodeRequest detailCodeRequest) { + if (null == detailCodeRequest) { + return Collections.emptyList(); + } + if (null != detailCodeRequest.getPage() && null != detailCodeRequest.getLimit()) { + PageHelper.offsetPage((detailCodeRequest.getPage() - 1) * detailCodeRequest.getLimit(), detailCodeRequest.getLimit()); + } + return ioOrderDetailCodeDao.filterList(detailCodeRequest); + } + + @Override + public BaseResponse deleteByOrderId(String orderId) { + if (StrUtil.isBlank(orderId)) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据号不能为空！"); + } + ioOrderDetailCodeDao.delete(new QueryWrapper().eq("orderIdFk", orderId)); + return ResultVOUtils.success("删除成功"); + } + } diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml index bd628abf1..d96ac23f2 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml @@ -2,7 +2,7 @@ + select * from io_order_detail_biz + + + AND orderIdFk = #{orderIdFk} + + + AND bindRlFk = #{relId} + + + AND batchNo = #{batchNo} + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml new file mode 100644 index 000000000..ebb2c44a4 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml new file mode 100644 index 000000000..4f5ae0e70 --- /dev/null +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file