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/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index 6580c5dda..3a81a024a 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -13,6 +13,7 @@ import java.util.List; public interface UdiRelevanceDao extends BaseMapperPlus { List filterUdiRelevance(FilterUdiRelRequest filterUdiRelRequest); + String selectPackLevel(@Param("nameCode") String nameCode); List filterUdiJoinSup(FilterUdiRelRequest filterUdiRelRequest); diff --git a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java index e4f317735..d72b3d591 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvInnerOrderPrintDao.java @@ -12,4 +12,5 @@ public interface InvInnerOrderPrintDao extends BaseMapper filterOrderPrintList(FilterinnerOrderprintRequest filterinnerOrderprintRequest); List filterJoinInnerPrint(FilterinnerOrderprintRequest filterinnerOrderprintRequest); + } diff --git a/src/main/java/com/glxp/api/entity/basic/UdiEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java index af3d42ecb..6c7fd40e5 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiEntity.java @@ -1,5 +1,7 @@ package com.glxp.api.entity.basic; +import cn.hutool.core.util.StrUtil; + /** * @author 彭于晏 * @date 2020/9/22. diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index e54995426..2e489e972 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -171,6 +171,5 @@ public class UdiRelevanceEntity { @TableField(value = "certIdFk") private String certIdFk; - @TableField(value = "zdcfsycs") - private Integer zdcfsycs ; -} \ No newline at end of file + +} 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/entity/inv/InnerOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java index cd135c6a3..ab6cb839d 100644 --- a/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/inv/InnerOrderDetailEntity.java @@ -9,6 +9,7 @@ public class InnerOrderDetailEntity { private String orderIdFk; private String productId; private String productName; + private String nameCode; private Integer count; private String productDate; private String expireDate; diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 27e3f3c6c..2b28d185c 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -30,6 +30,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String lastUpdateTime; private String zczbhhzbapzbh; + private String packLevel; private Integer diType; 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..53633f2d7 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,9 @@ public class FilterOrderRequest extends ListPageRequest { private String uploadKey; private String invoiceEncode; + + //联合备注字段查询 + private String unionRemark; + + private String remark; } diff --git a/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java b/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java index 6c02066d2..1ff8b90ed 100644 --- a/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/inv/innerOrderDetailResponse.java @@ -45,6 +45,7 @@ public class innerOrderDetailResponse { private int acceptCount; private String measname; private String supId; + private String nameCode; private String supName; } 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/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 2e2b389e2..bd4e749bc 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -113,8 +113,11 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService innerOrderPrintEntity.setUpdateUser(customerService.getUserId() + ""); FilterUdiRelRequest filterUdiRelRequest = new FilterUdiRelRequest(); filterUdiRelRequest.setId(Long.valueOf(obj.getProductId())); + filterUdiRelRequest.setPackLevel(udiRelevanceDao.selectPackLevel(obj.getNameCode())); + System.out.println(filterUdiRelRequest.getPackLevel()); //查询耗材字典信息 - UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); +// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0); + UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(Integer.parseInt(filterUdiRelRequest.getPackLevel())-1); //查询产品信息 UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode()); diff --git a/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java b/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java index 05f50f7b8..69f602f19 100644 --- a/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java +++ b/src/main/java/com/glxp/api/util/udi/FilterUdiUtils.java @@ -109,7 +109,7 @@ public class FilterUdiUtils { String expireDate = ""; String serialNo = null; String udi = ""; - String[] spilts = data.split("#",data.length()); + String[] spilts = data.split("#", data.length()); if (spilts != null && spilts.length >= 5) { udi = spilts[1]; produceDate = spilts[2]; @@ -117,9 +117,13 @@ public class FilterUdiUtils { batchNo = spilts[4]; if (spilts.length > 6) { serialNo = spilts[5]; - if (serialNo != null && serialNo.equals("")) { - serialNo = null; - } + } + + if (StrUtil.isEmpty(batchNo)) { + batchNo = null; + } + if (StrUtil.isEmpty(serialNo)) { + serialNo = null; } } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index bba16a3e9..4569d2fce 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -121,7 +121,20 @@ ORDER BY modifyTime DESC + SELECT billNo - FROM io_order - LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action + FROM io_order + LEFT JOIN basic_bussiness_type ON io_order.action = basic_bussiness_type.action WHERE basic_bussiness_type.inStock = 1 and io_order.`status` = 7 - AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data},'%Y-%m-%d') + AND date_format(io_order.updateTime, '%Y-%m-%d') = date_format(#{data}, '%Y-%m-%d')