From af07643adf2fe4a0b15d4da2a8e436f5b7fd3976 Mon Sep 17 00:00:00 2001 From: yewj Date: Sun, 29 Sep 2024 10:22:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicCorpImportLogController.java | 1 - .../basic/BasicSickPrescribeDiController.java | 4 -- .../basic/BasicSickerController.java | 4 -- .../inout/IoCodeTempController.java | 56 +++++++++++++------ .../purchase/PurApplyArgumentController.java | 4 +- .../collect/IoCollectOrderCodeManService.java | 20 +++++++ 6 files changed, 61 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java index 648af4b3a..139312632 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java @@ -38,7 +38,6 @@ public class BasicCorpImportLogController { @Resource CustomerService customerService; - @GetMapping("/udiwms/corps/importLog/filter") public BaseResponse filter(FilterCorpImportLogRequest filterCorpImportLogRequest, BindingResult bindingResult) { diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java index f29e501e5..884ecc85e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickPrescribeDiController.java @@ -37,7 +37,6 @@ public class BasicSickPrescribeDiController { @Resource IoCheckInoutService checkInoutService; - /** * 获取处方使用耗材详情 * @@ -53,7 +52,6 @@ public class BasicSickPrescribeDiController { return ResultVOUtils.success(pageSimpleResponse); } - /** * 获取处方校验详情 * @@ -76,11 +74,9 @@ public class BasicSickPrescribeDiController { @Resource IoOrderDetailCodeService orderDetailCodeService; - @Resource IoOrderService orderService; - /** * 下载并返回处方信息 */ diff --git a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java index cf54f17dd..a7a2f0adc 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicSickerController.java @@ -51,7 +51,6 @@ public class BasicSickerController extends BaseController { return ResultVOUtils.success(pageSimpleResponse); } - @GetMapping("/udiwms/basic/sk/sicker/filter/noPage") public BaseResponse filterSickerNoPage(BasicSkSickerRequest basicSkSickerRequest) { List basicSkSickerResponses = basicSkSickerService.filterNoList(basicSkSickerRequest); @@ -90,7 +89,6 @@ public class BasicSickerController extends BaseController { } } - /** * 在线实时获取患者信息 * @@ -101,7 +99,6 @@ public class BasicSickerController extends BaseController { return erpBasicClient.getSicker(getSickRequest); } - /** * 在线实时获取处方信息 * @@ -112,7 +109,6 @@ public class BasicSickerController extends BaseController { return erpBasicClient.getSickPrescribe(getSickRequest); } - @CusRedissonAnnotation(cacheName = RedissonCacheKey.DL_SICKER, key = {"#getSickRequest.thirdSys"}, waitTime = 3, timeOutMsg = "后台正在下载，请勿重复提交") @PostMapping("/udiwms/basic/sk/sicker/download") public BaseResponse sickerDl(@RequestBody GetSickRequest getSickRequest, BindingResult bindingResult) { 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 5b6043811..a6941b15a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -498,7 +498,7 @@ public class IoCodeTempController extends BaseController { } if (IntUtil.value(udiEntity.getProductType()) == 2) { - baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code); + baseResponse = addDrugOrder(addOrderRequest, udiEntity, code); } else { baseResponse = addMaterOrder(addOrderRequest, udiEntity, code); } @@ -584,7 +584,7 @@ public class IoCodeTempController extends BaseController { //ioSplitFifoInvService.getOne(new LambdaQueryWrapper().eq(IoSplitFifoInv::getInvCode,"").last("limit 1")); } if (IntUtil.value(udiEntity.getProductType()) == 2) { - return adddGrugOrder(addOrderRequest, udiEntity, code); + return addDrugOrder(addOrderRequest, udiEntity, code); } else { return addMaterOrder(addOrderRequest, udiEntity, code); } @@ -655,15 +655,6 @@ public class IoCodeTempController extends BaseController { return ResultVOUtils.error(500, "单据只允许录入" + msg + ",当前录入产品为" + msg2 + ",请检查后重试！"); } -// if (bussinessTypeEntity.getRequireScanCode() == 1) { -// if (udiInfoEntity.getRequireScanCode() != 1){ -// return ResultVOUtils.error(500, "单据只允许录入需要扫码耗材" + ",请检查后重试！"); -// } -// }else if (bussinessTypeEntity.getRequireScanCode() == 0){ -// if (udiInfoEntity.getRequireScanCode() != 0){ -// return ResultVOUtils.error(500, "单据只允许录入不需要扫码耗材" + ",请检查后重试！"); -// } -// } if (bussinessTypeEntity != null && udiInfoEntity != null) { //是否校验耗材材质 1：高值耗材；2.普通耗材 if (IntUtil.value(bussinessTypeEntity.getVailHcType()) == 1) { @@ -757,7 +748,23 @@ public class IoCodeTempController extends BaseController { } } UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); + //判断层级标识是否正确 + if (bussinessTypeEntity.isUse()) { + if (IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + } else { + if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + } //近效期提醒 long recent = 0; if (udiRelevanceResponse.getRecentDateTime() != null) @@ -1185,7 +1192,7 @@ public class IoCodeTempController extends BaseController { } @Transactional(rollbackFor = Exception.class) - public BaseResponse adddGrugOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code) { + public BaseResponse addDrugOrder(AddOrderRequest addOrderRequest, UdiEntity udiEntity, String code) { AddCodeResult addCodeResult = new AddCodeResult(); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode()); @@ -1227,6 +1234,25 @@ public class IoCodeTempController extends BaseController { } UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi()); + //判断层级标识是否正确 + if (bussinessTypeEntity.isUse()) { + if (IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + + } else { + if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) { + return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！"); + } + } + + //近效期提醒 long recent = 0; if (udiRelevanceResponse.getRecentDateTime() != null) @@ -1263,7 +1289,6 @@ public class IoCodeTempController extends BaseController { } } - //校验工位存量是否存在 if (bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT)) { IoSplitFifoCodeEntity fifoCodeEntity = fifoCodeService.findByCode(code, null); @@ -1272,7 +1297,6 @@ public class IoCodeTempController extends BaseController { } } - if (addOrderRequest.getFromCorp() == null || StrUtil.isNotEmpty(addOrderRequest.getSickerAdNum())) { String fromCorp = ioAddInoutService.updateCorp(bussinessTypeEntity, addOrderRequest.getFromCorp(), addOrderRequest.getSickerAdNum()); addOrderRequest.setFromCorp(fromCorp); @@ -1634,7 +1658,7 @@ public class IoCodeTempController extends BaseController { if (ioOrderEntity != null) { addOrderRequest.setBillNo(ioOrderEntity.getBillNo()); } - return adddGrugOrder(addOrderRequest, udiEntity, code); + return addDrugOrder(addOrderRequest, udiEntity, code); } public void checkPrice(IoCodeTempEntity codeTempEntity, BasicBussinessTypeEntity bussinessTypeEntity, String @@ -2623,7 +2647,7 @@ public class IoCodeTempController extends BaseController { BaseResponse baseResponse = null; addOrderRequest.setCode(code); if (IntUtil.value(udiEntity.getProductType()) == 2) { - baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code); + baseResponse = addDrugOrder(addOrderRequest, udiEntity, code); } else { baseResponse = addMaterOrder(addOrderRequest, udiEntity, code); } diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java index 254e3ce22..d54f76ea9 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyArgumentController.java @@ -60,7 +60,6 @@ public class PurApplyArgumentController { return ResultVOUtils.success(pageSimpleResponse); } - /** * 修改 */ @@ -70,7 +69,6 @@ public class PurApplyArgumentController { return ResultVOUtils.success("修改成功"); } - /** * 论证单明细打印 * @@ -113,7 +111,7 @@ public class PurApplyArgumentController { */ @GetMapping("/purchase/purApplyArgument/argAllPass/{id}") public BaseResponse argAllPass(@NotNull(message = "主键不能为空") - @PathVariable Long id) { + @PathVariable Long id) { int data = purApplyArgumentService.argAllPass(id); return ResultVOUtils.success(data); } diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java index 4024de102..0eaedbfca 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.WorkOperType; import com.glxp.api.dao.collect.IoCollectOrderCodeManMapper; @@ -128,6 +129,24 @@ public class IoCollectOrderCodeManService extends ServiceImpl udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(udiEntity.getUdi(), null); if (CollUtil.isEmpty(udiRelevanceResponses)) throw new JsonException(500, "耗材字典不存在此产品！"); else udiRelevanceResponse = udiRelevanceResponses.get(0); + //判断层级标识是否正确 + if (IntUtil.value(sysWorkplaceDocumentEntity.getOrderCirType()) == 2) { + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) { + throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) { + throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + } + + } else { + if (IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) <= IntUtil.value(udiRelevanceResponse.getPackLevel())) { + throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) { + throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + } + } + IoCollectOrderCodeMan exitCode = this.findByCode(addTagCodeReqeust.getBillNo(), code); if (StrUtil.isNotEmpty(udiEntity.getSerialNo()) && exitCode != null) { @@ -150,6 +169,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl