From 67300df2977612fee375a4f4e5836902f5091053 Mon Sep 17 00:00:00 2001 From: yewj Date: Tue, 25 Feb 2025 18:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8D=95=E6=8D=AE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthUserController.java | 2 +- .../inout/IoOrderDetailBizController.java | 2 +- .../impl/AlihealthBusServiceImpl.java | 8 ++-- .../collect/IoCollectOrderCodeManService.java | 44 +++++++++++-------- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index d2f89a9e5..93fb9bec3 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -179,7 +179,7 @@ public class AuthUserController extends BaseController { } -// @AuthRuleAnnotation("") + // @AuthRuleAnnotation("") // @PostMapping("/admin/auth/admin/force/updateUser") // public BaseResponse forceUpdateUser(@RequestBody @Valid UpdateUserRequset updateUserRequset, BindingResult bindingResult) { // if (bindingResult.hasErrors()) { diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index e57b3b20f..5fbc9d3f5 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -1067,7 +1067,7 @@ public class IoOrderDetailBizController extends BaseController { if (i == 0) { addBizProductReqeust.setOrderEntity(ioOrderEntity); } - addBizProductReqeust.setProductType(udiRelevanceResponse.getProductType()); + addBizProductReqeust.setProductType(udiRelevanceResponse.getProductsType()); BaseResponse response = orderDetailBizService.addBizProduct(addBizProductReqeust); if (response.getCode() != 20000) { return response; diff --git a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java index af1c2f164..bdc491c53 100644 --- a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java @@ -186,7 +186,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { ioCodeLostService.insertOrUpdate(codeLostEntity); UdiEntity udiEntityy = FilterUdiUtils.getUdi(addOrderRequest.getCode()); - BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest,udiEntityy,addOrderRequest.getCode()); + BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest, udiEntityy, addOrderRequest.getCode()); if (response2.getCode() != 20000) { throw new JsonException(response2.getMessage()); @@ -263,8 +263,8 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { List companyProductRelevanceEntities = companyProductRelevanceDao.selectList(new LambdaQueryWrapper() .eq(CompanyProductRelevanceEntity::getUdiRlIdFk, id) .eq(CompanyProductRelevanceEntity::getCustomerId, userId)); - if (CollUtil.isEmpty(companyProductRelevanceEntities)){ - throw new JsonException(500, "当前产品标识:【"+ udiRelevance.getNameCode()+"】未添加文件中供应商配送服务！"); + if (CollUtil.isEmpty(companyProductRelevanceEntities)) { + throw new JsonException(500, "当前产品标识:【" + udiRelevance.getNameCode() + "】未添加文件中供应商配送服务！"); } AddBizProductReqeust productRequest = new AddBizProductReqeust(); @@ -274,7 +274,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { productRequest.setDatas(null); productRequest.setCount(IntUtil.value(orderUploadVo.getShipmentQuantity())); productRequest.setBatchNo(orderUploadVo.getBatchNumber()); - productRequest.setProductType(udiRelevance.getProductType()); + productRequest.setProductType(udiRelevance.getProductsType()); productRequest.setYcBizNo(orderUploadVo.getShipmentDetailId()); productRequest.setPrice(orderUploadVo.getPurchasePrice()); productRequest.setSupId(fromCorp); 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 bc27c7078..cb59f0529 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java @@ -161,16 +161,22 @@ public class IoCollectOrderCodeManService extends ServiceImpl IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) { - throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); - } - if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) { - throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); - } - if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) { - throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + + if(IntUtil.value(udiRelevanceResponse.getProductsType()) == 1){ + + }else { + if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > IntUtil.value(udiRelevanceResponse.getUseMaxLevel())) { + throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) { + throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + } + if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) { + throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); + } } + } else { if (udiRelevanceResponse.getDistributeMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) { throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！"); @@ -185,17 +191,17 @@ public class IoCollectOrderCodeManService extends ServiceImpl() - .eq(IoCollectCodeBackup::getCode, code) - .eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType())); - if (collectCodeBackup == null) { - String PurTypeName = IntUtil.value(udiRelevanceResponse.getPurType()) == 2 ? "预验收" : "寄售"; - throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库"); - } - } - } +// if (IntUtil.value(collectSet.getIsScanCodeCheck())) { +// if (IntUtil.value(udiRelevanceResponse.getPurType()) != 1 && IntUtil.value(udiRelevanceResponse.getPurType()) != 0) { +// IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper() +// .eq(IoCollectCodeBackup::getCode, code) +// .eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType())); +// if (collectCodeBackup == null) { +// String PurTypeName = IntUtil.value(udiRelevanceResponse.getPurType()) == 2 ? "预验收" : "寄售"; +// throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库"); +// } +// } +// } //流通数量 Integer circleCount = calCountUtil.getCirActCount(udiRelevanceResponse);