From 9dbc74c56fa54aedb1b1cc3cbb64d2c729c72893 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 6 Dec 2024 10:40:18 +0800 Subject: [PATCH] =?UTF-8?q?12/6=20=E7=8E=B0=E5=9C=BA=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=88=90=E5=8A=9F=E5=90=8E=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E8=A1=A5=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoCodeTempController.java | 42 ++++++++++++------- .../api/res/inout/AddEnterCodeResponse.java | 8 ++++ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 9 +++- 3 files changed, 43 insertions(+), 16 deletions(-) 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 00dce2bf0..62ba6582a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1,10 +1,6 @@ package com.glxp.api.controller.inout; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.thread.ThreadUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.constant.*; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; @@ -22,7 +18,6 @@ import com.glxp.api.service.collect.RelCodeDetailService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.vo.basic.InvProductNewVo; -import org.aspectj.weaver.ast.Var; import org.springframework.beans.BeanUtils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; @@ -43,7 +38,6 @@ import com.glxp.api.req.inout.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; @@ -332,10 +326,17 @@ public class IoCodeTempController extends BaseController { baseResponse.setData(originCode); return baseResponse; } + + UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); + if (checkUdi == null) { + return ResultVOUtils.error(500, "耗材字典不存在此产品！"); + } + if (IntUtil.value(udiEntity.getProductType()) == 2) { //药品 udiEntity.setCode(code); - return ResultVOUtils.success(udiEntity); + AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, checkUdi); + return ResultVOUtils.success(addEnterCodeResponse); } if (StrUtil.isNotEmpty(udiEntity.getBatchNo())) { @@ -344,10 +345,7 @@ public class IoCodeTempController extends BaseController { } } - UdiRelevanceResponse checkUdi = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); - if (checkUdi == null) { - return ResultVOUtils.error(500, "耗材字典不存在此产品！"); - } + boolean checkSuccess = true; String lostMsg = ""; //校验条码完整性 @@ -383,7 +381,8 @@ public class IoCodeTempController extends BaseController { code = code.substring(0, code.length() - "\u001D".length()); } udiEntity.setCode(code); - return ResultVOUtils.success(udiEntity); + AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, checkUdi); + return ResultVOUtils.success(addEnterCodeResponse); } else { if (newCode.startsWith("21") || (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && newCode.contains("21" + udiEntity.getSerialNo()))) { if (StrUtil.isEmpty(lostMsg)) { @@ -391,17 +390,32 @@ public class IoCodeTempController extends BaseController { } BaseResponse baseResponse = ResultVOUtils.error(503, "条码完整性错误,缺少" + lostMsg.substring(1) + "是否继续添加？"); udiEntity.setCode(code); - baseResponse.setData(udiEntity); + AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, checkUdi); + baseResponse.setData(addEnterCodeResponse); return baseResponse; } } BaseResponse baseResponse = ResultVOUtils.error(502, "校验未完成,缺少" + lostMsg.substring(1)); udiEntity.setCode(code); - baseResponse.setData(udiEntity); + AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, checkUdi); + baseResponse.setData(addEnterCodeResponse); return baseResponse; } + public AddEnterCodeResponse setAddEnterCodeResponse(UdiEntity udiEntity, UdiRelevanceResponse checkUdi) { + AddEnterCodeResponse addEnterCodeResponse = new AddEnterCodeResponse(); + BeanUtils.copyProperties(udiEntity, addEnterCodeResponse); + addEnterCodeResponse.setBzgg(checkUdi.getBzgg()); + addEnterCodeResponse.setCpmctymc(checkUdi.getCpmctymc()); + addEnterCodeResponse.setPrepnSpec(checkUdi.getPrepnSpec()); + addEnterCodeResponse.setPrepnUnit(checkUdi.getPrepnUnit()); + addEnterCodeResponse.setPackUnit(checkUdi.getPackUnit()); + addEnterCodeResponse.setGgxh(checkUdi.getGgxh()); + return addEnterCodeResponse; + } + + @AuthRuleAnnotation("") @PostMapping("warehouse/inout/batchVailCode") public BaseResponse batchVailCode(@RequestBody AddEnterCodeRequest addEnterCodeRequest) { diff --git a/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java b/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java index e32dd6995..412f4bf03 100644 --- a/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/AddEnterCodeResponse.java @@ -20,4 +20,12 @@ public class AddEnterCodeResponse { private String cpmctymc; private String bzgg; + private String ggxh; + private String prepnSpec; + private String prepnUnit; + private String packUnit; + + + + } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 47977f20e..a9bd403e9 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -58,8 +58,13 @@ basic_products.basicPrductRemak6, basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, - basic_products.bhltcjsl, basic_products.bhsycjsl, - basic_products.xjdw, basic_products.levelUnit, + basic_products.bhltcjsl, + basic_products.bhsycjsl, + basic_products.xjdw, + basic_products.levelUnit, + basic_products.bzgg, + basic_products.prepnUnit, + basic_products.prepnSpec, basic_corp.name as companyName FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid