From 4f25b9ee578e11e96667a14c1eee2bf37e390691 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 17 Jul 2023 15:55:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E6=97=B6=E6=9F=A5=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E6=88=96=E7=97=85=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoOrderController.java | 16 ++--- .../glxp/api/entity/inout/IoOrderEntity.java | 6 ++ .../api/req/inout/FilterOrderRequest.java | 5 +- .../api/service/inout/IoGenInvService.java | 13 +++- .../mybatis/mapper/inout/IoOrderDao.xml | 69 +++++++++++-------- src/main/resources/schemas/schema_v2.1.sql | 5 ++ 6 files changed, 75 insertions(+), 39 deletions(-) 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 e3392e4f9..8014d161a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -133,10 +133,10 @@ public class IoOrderController extends BaseController { } if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) { //要是不存在要查询的单据类型就直接放回空 - if(orderService.setActions(filterOrderRequest) == null){ - PageInfo pageInfo = new PageInfo<>(new ArrayList<>()); - return ResultVOUtils.page(pageInfo); - } + if (orderService.setActions(filterOrderRequest) == null) { + PageInfo pageInfo = new PageInfo<>(new ArrayList<>()); + return ResultVOUtils.page(pageInfo); + } } @@ -162,7 +162,6 @@ public class IoOrderController extends BaseController { if (ioOrderResponse.getCheckStatus() == null) { ioOrderResponse.setCheckStatus(0 + ""); } - ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse); } PageInfo pageInfo = new PageInfo<>(list); @@ -1051,6 +1050,7 @@ public class IoOrderController extends BaseController { AuthAdmin userBean = customerService.getUserBean(); return ResultVOUtils.success(userBean); } + @AuthRuleAnnotation("") @GetMapping("/udiwms/inout/order/filterInvoiceList") public BaseResponse filterInvoiceList(FilterOrderRequest filterOrderRequest) { @@ -1058,12 +1058,12 @@ public class IoOrderController extends BaseController { //这个不等于空表示要查询发票对应的单据 if (filterOrderRequest.getInvoiceEncode() != null) { //查询发票详情 - QueryWrapper ew=new QueryWrapper(); - ew.eq("invoiceEncode",filterOrderRequest.getInvoiceEncode()); + QueryWrapper ew = new QueryWrapper(); + ew.eq("invoiceEncode", filterOrderRequest.getInvoiceEncode()); List ioOrderInvoiceEntity = orderInvoiceService.list(ew); List orderIds = ioOrderInvoiceEntity.stream().map(IoOrderInvoiceEntity::getOrderIdFk).collect(Collectors.toList()); filterOrderRequest.setOrderIds(orderIds); - if(CollectionUtils.isEmpty(orderIds)){ + if (CollectionUtils.isEmpty(orderIds)) { PageInfo pageInfo = new PageInfo<>(); return ResultVOUtils.page(pageInfo); } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java index 9053fd966..555c6bfe8 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderEntity.java @@ -265,5 +265,11 @@ public class IoOrderEntity { @TableField(value = "preCurSpaceCode") private String preCurSpaceCode; + /** + * 出库病人信息 + */ + @TableField(value = "outSickInfo") + private String outSickInfo; + } diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java index adbc1a42f..e9255d82b 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java @@ -136,7 +136,7 @@ public class FilterOrderRequest extends ListPageRequest { * 校验异常：checkedError * 已校验：checkSuccess * 已审核：audited - * * 预验收入库单 preInOrder + * * 预验收入库单 preInOrder */ private String statusType; @@ -192,4 +192,7 @@ public class FilterOrderRequest extends ListPageRequest { private String uploadKey; private String invoiceEncode; + + //联合备注字段查询 + private String unionRemark; } diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index cc5289f6a..9edc7ab2b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -1,14 +1,17 @@ package com.glxp.api.service.inout; import cn.hutool.core.util.StrUtil; +import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.basic.BasicBusTypePreEntity; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.*; import com.glxp.api.service.basic.IBasicBusTypePreService; +import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inv.*; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -42,7 +45,8 @@ public class IoGenInvService { InvUserProductService invUserProductService; @Resource InvUserProductDetailService invUserProductDetailService; - + @Resource + IBasicBussinessTypeService basicBussinessTypeService; @Resource IoChangeInoutService ioChangeInoutService; @@ -54,6 +58,13 @@ public class IoGenInvService { List orderDetailResultEntities = orderDetailResultService.findByOrderId(orderId); List codeEnttities = codeService.findByOrderId(orderId); + //补齐单据信息 + BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); + if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT && bussinessTypeEntity.isGenUnit()) { + orderEntity.setOutSickInfo(orderEntity.getFromCorp()); + orderService.update(orderEntity); + } + //生成库存产品表 for (IoOrderDetailResultEntity orderDetailResultEntity : orderDetailResultEntities) { InvProductEntity invProductEntity = invProductService.selectByUnique(orderDetailResultEntity.getBindRlFk(), orderDetailResultEntity.getBatchNo(), orderDetailResultEntity.getSupId(), orderEntity.getDeptCode(), orderEntity.getInvCode()); diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml index 3d9e2f404..31798e0fe 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml @@ -14,7 +14,7 @@ (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode) fromInvName, (select name from basic_corp bc where bc.erpId = io.fromCorp) fromCorpName, (select name from basic_corp bc where bc.erpId = io.customerId) customerName - from io_order as io + from io_order as io INNER JOIN io_unit_maintain_platform a2 on io.action = a2.sourceAction AND io.fromCorp = a2.unitId @@ -77,7 +77,10 @@ #{item} - + + AND (io.remark like concat('%', #{unionRemark}, '%') + or io.outSickInfo like concat('%', #{unionRemark}, '%')) + AND status in @@ -139,8 +142,8 @@ - - order by ${orderBy} ${sort} + + order by ${orderBy} ${sort} order by updateTime desc @@ -294,8 +297,8 @@ - - order by ${orderBy} ${sort} + + order by ${orderBy} ${sort} order by updateTime desc @@ -340,6 +343,10 @@ AND syncStatus = #{syncStatus} + + AND (io.remark like concat('%', #{unionRemark}, '%') + or io.outSickInfo like concat('%', #{unionRemark}, '%')) + AND busType = #{busType} @@ -441,7 +448,7 @@ AND t1.thirdSys = #{thirdSys} - + = DATE_FORMAT(#{orderStartTime}, '%Y-%m-%d %H:%i:%S') ]]> @@ -462,43 +469,43 @@ +