From a7b199f6bd7c1640f0451f9e2b77f7b116a27fa9 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 2 Mar 2023 10:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=82=A3=E8=80=85=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=BA=AF=E6=BA=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 19 +++---- .../inv/InvSickTraceController.java | 52 +++++++++++++++++++ .../api/req/inv/FilterSickTraceRequest.java | 9 ++++ .../glxp/api/res/inout/IoCodeResponse.java | 6 +++ .../mybatis/mapper/inout/IoCodeDao.xml | 26 +++++----- 5 files changed, 88 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java create mode 100644 src/main/java/com/glxp/api/req/inv/FilterSickTraceRequest.java diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index 6e806dc48..8af6002f4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -8,9 +8,12 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderEntity; +import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; +import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.inout.IoCodeService; import com.glxp.api.service.inout.IoOrderDetailResultService; import com.glxp.api.service.inout.IoOrderService; import org.springframework.validation.BindingResult; @@ -31,6 +34,8 @@ public class IoOrderDetailResultController { private IoOrderDetailResultService orderDetailResultService; @Resource IBasicBussinessTypeService basicBussinessTypeService; + @Resource + IoCodeService codeService; /** * 查询单据扫码明细列表 @@ -59,21 +64,11 @@ public class IoOrderDetailResultController { if (StrUtil.isEmpty(filterErpOrderRequest.getOrderIdFk())) { return ResultVOUtils.error(500, "单据号不能为空！"); } + IoOrderEntity orderEntity = orderService.findByBillNo(filterErpOrderRequest.getOrderIdFk()); + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); filterErpOrderRequest.setPage(null); filterErpOrderRequest.setLimit(null); - - IoOrderEntity orderEntity = orderService.findByBillNo(filterErpOrderRequest.getOrderIdFk()); List list = orderDetailResultService.filterList(filterErpOrderRequest); - - - - - BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); - if ((bussinessTypeEntity.getOrderVisibleType() == 1 && orderEntity.getStatus() == 4) || filterErpOrderRequest.getShowType() == 1) { - //todo使用关联查 -// erpOrderEntities = transferSerList(erpOrderEntities, filterErpOrderRequest.getOrderId()); - } - return ResultVOUtils.success(list); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java b/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java new file mode 100644 index 000000000..0b3a00145 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/inv/InvSickTraceController.java @@ -0,0 +1,52 @@ +package com.glxp.api.controller.inv; + +import cn.hutool.core.util.StrUtil; +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.entity.basic.BasicCorpEntity; +import com.glxp.api.req.inout.FilterOrderRequest; +import com.glxp.api.req.inv.FilterSickTraceRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.service.basic.BasicCorpService; +import com.glxp.api.service.inout.IoOrderService; +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 InvSickTraceController { + + @Resource + IoOrderService orderService; + @Resource + BasicCorpService basicCorpService; + + + @AuthRuleAnnotation("") + @GetMapping("spms/inv/sick/order/trace") + public BaseResponse filterSickTrace(FilterSickTraceRequest filterSickTraceRequest) { + + if (StrUtil.isEmpty(filterSickTraceRequest.getSickAd())) { + return ResultVOUtils.error(500, "病人住院号不能为空！"); + } + BasicCorpEntity basicCorpEntity = basicCorpService.selectByName(filterSickTraceRequest.getSickAd()); + if (basicCorpEntity == null) { + return ResultVOUtils.error(500, "未查询到病人信息"); + } + + FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); + orderFilterRequest.setFromCorp(basicCorpEntity.getErpId()); + List orderEntityList = orderService.filterList(orderFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(orderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(orderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } +} diff --git a/src/main/java/com/glxp/api/req/inv/FilterSickTraceRequest.java b/src/main/java/com/glxp/api/req/inv/FilterSickTraceRequest.java new file mode 100644 index 000000000..f82cf263b --- /dev/null +++ b/src/main/java/com/glxp/api/req/inv/FilterSickTraceRequest.java @@ -0,0 +1,9 @@ +package com.glxp.api.req.inv; + +import lombok.Data; + +@Data +public class FilterSickTraceRequest { + + private String sickAd; //病人住院号 +} 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 96aff7f70..6472ee4a8 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java @@ -142,4 +142,10 @@ public class IoCodeResponse { * 货位名称 */ private String warehouseName; + + + private String ggxh; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String manufactory; } diff --git a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml index 449119b43..07c4936ad 100644 --- a/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoCodeDao.xml @@ -50,18 +50,20 @@ - \ No newline at end of file +