From 19362f703252c881c2a562b3127c39a3f1b106d6 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 25 Sep 2024 17:28:36 +0800 Subject: [PATCH] =?UTF-8?q?9/25=20=E8=8D=AF=E5=93=81=E5=B1=82=E7=BA=A7?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicCollectUserController.java | 16 ++++++++++++++ .../basic/UdiRelevanceController.java | 1 + .../collect/IoCollectOriginController.java | 2 +- .../inout/IoCodeTempController.java | 1 + .../api/req/basic/UpdateLevelDrugRequest.java | 1 + .../api/res/basic/UdiRelevanceResponse.java | 5 +++++ .../glxp/api/res/inout/IoOrderResponse.java | 6 +++++ .../api/service/basic/UdiProductService.java | 22 ++++++++----------- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 1 + 9 files changed, 41 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java index a0d6a27cd..f480da748 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java @@ -1,5 +1,6 @@ package com.glxp.api.controller.basic; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -67,4 +68,19 @@ public class BasicCollectUserController extends BaseController { } + @GetMapping("/udiwms/sysWorkplace/getUserWorkByWorkplaceCode") + public BaseResponse getUserWorkByWorkplaceCode(BasicCollectUserRequest request) { + if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1) { + request.setUserId(String.valueOf(getUserId())); + } + BasicCollectUserEntity user = basicCollectUserService.getOne(new LambdaQueryWrapper() + .eq(BasicCollectUserEntity::getWorkplaceCode,request.getWorkplaceCode()) + .eq(BasicCollectUserEntity::getUserId,request.getUserId())); + if (user == null){ + return ResultVOUtils.error(500,"当前用户工位已被移除"); + } + return ResultVOUtils.success(); + } + + } diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 48abd3534..c91b0d257 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -257,6 +257,7 @@ public class UdiRelevanceController extends BaseController { BeanUtils.copyProperties(udiProductEntity, udiRelevanceResponse); BeanUtil.copyProperties(udiRelevanceEntity, udiRelevanceResponse); udiRelevanceResponse.setFlbm(udiProductEntity.getFlbm()); + udiRelevanceResponse.setProductId(udiProductEntity.getId()); udiRelevanceResponses.add(udiRelevanceResponse); } } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java index af2211595..f69f6963e 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOriginController.java @@ -71,7 +71,7 @@ public class IoCollectOriginController extends BaseController { @PostMapping("/udiwms/basic/collect/origin/order/getThrOrderPage") public BaseResponse getThrOrders(@RequestBody CollectOrderRequest collectOrderRequest) { String busType = collectOrderRequest.getBusType(); - if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务类型"); + if (StrUtil.isBlank(busType)) return ResultVOUtils.error("请选择业务名称"); if (busType.equals(BusTypeConstant.YPCF002.getBusType())) { GetSickPrescribeRequest getSickPrescribeRequest = new GetSickPrescribeRequest(); 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 45b0ef634..c02686ae1 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1484,6 +1484,7 @@ public class IoCodeTempController extends BaseController { orderEntity.setWorkPlaceCode(addOrderRequest.getWorkPlaceCode()); orderEntity.setSplitBusType(addOrderRequest.getSplitBusType()); orderEntity.setFifoSplit(addOrderRequest.getFifoSplit()); + orderEntity.setSplitBusType(addOrderRequest.getSplitBusType()); orderEntity.setProductType(2); orderService.insertOrder(orderEntity); } diff --git a/src/main/java/com/glxp/api/req/basic/UpdateLevelDrugRequest.java b/src/main/java/com/glxp/api/req/basic/UpdateLevelDrugRequest.java index 4fbd0d0ad..3ca114098 100644 --- a/src/main/java/com/glxp/api/req/basic/UpdateLevelDrugRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UpdateLevelDrugRequest.java @@ -31,6 +31,7 @@ public class UpdateLevelDrugRequest { */ private Integer bhxjsl; private Long relId; + private Long productId; private String uuid; public Integer getMyBhxjsl() { diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java index 95df31770..191702025 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java @@ -255,6 +255,11 @@ public class UdiRelevanceResponse { */ private Integer bhsycjsl; + /** + * 当前层级包含使用层级数量 + */ + private Long productId; + /** * 工位预警数量 */ 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 dc2c8c00d..76aa51127 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -283,6 +283,12 @@ public class IoOrderResponse { private String splitBusTypeName; + + /** + * 业务类型名称 + */ + private String busName; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index ff2db8fd6..680d8ac21 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -466,20 +466,16 @@ public class UdiProductService extends ServiceImpl byUuids = udiProductDao.findByUuids(updateLevelDrugRequest.getUuid()); UdiProductEntity udiProductEntity1 = null; - if (byUuids.size() == 1) { - //只有一条药品数据 + if (updateLevelDrugRequest.getProductId() != null){ udiProductEntity1 = byUuids.get(0); - if (udiProductEntity1 != null && udiProductEntity1.getNameCode() == null) { - //更新 - udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode()); - udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + ""); - udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit()); - udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm()); - udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm()); - udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl()); - udiProductDao.updateById(udiProductEntity1); - return; - } + udiProductEntity1.setNameCode(updateLevelDrugRequest.getNameCode()); + udiProductEntity1.setPackLevel(updateLevelDrugRequest.getPackLevel() + ""); + udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit()); + udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm()); + udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm()); + udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl()); + udiProductDao.updateById(udiProductEntity1); + return; } udiProductEntity1 = udiProductDao.findByNameCode(updateLevelDrugRequest.getNameCode()); //有药品数据 但是nameCode如果为空的话 院内新增的 更改nameCode diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 69916afbc..a7f56a1a6 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -568,6 +568,7 @@ basic_products.syqsfxyjxmj, basic_products.mjfs, basic_products.bzgg, + basic_products.id as productId, basic_products.categoryName, basic_products.catalogname1, basic_products.catalogname2,