diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index e851cfeab..25c3348d5 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -115,7 +115,7 @@ public class UdiContrastController { if (udiContrastService.isExit(null, thirdId, null)) { buffer.append(thirdId).append(","); } else { - BasicProductsCreateDto basicProductsCreateDto =new BasicProductsCreateDto(); + BasicProductsCreateDto basicProductsCreateDto = new BasicProductsCreateDto(); basicProductsCreateDto.setMainId(thirdId); basicProductsCreateDto.setAddCodeRelMark(false); udiContrastService.createOnlyMainId(basicProductsCreateDto); @@ -356,11 +356,11 @@ public class UdiContrastController { udiProductService.saveOrUpadateLevelDrug(updateLevelDrugRequest); return ResultVOUtils.success("更新成功"); } + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/updateLevelDrugAli") public BaseResponse updateLevelDrugAli(@RequestBody ThirdAliDrugRequest thirdAliDrug) { - udiProductService.saveOrUpadateLevelDrugAli(thirdAliDrug); - return ResultVOUtils.success("更新成功"); + return udiProductService.saveOrUpadateLevelDrugAli(thirdAliDrug); } @@ -383,11 +383,12 @@ public class UdiContrastController { @Resource private SpGetHttpClient spGetHttpClient; + @AuthRuleAnnotation("") @PostMapping("/udi/udirel/drug/delLevel") public BaseResponse delLevel(@RequestBody AddProductRequest addProductRequest) { boolean b = udiProductService.deleteByNameCode(addProductRequest.getNameCode()); - if( b && StrUtil.isNotEmpty(addProductRequest.getYbbm()) && StrUtil.isNotEmpty(addProductRequest.getNameCode())){ + if (b && StrUtil.isNotEmpty(addProductRequest.getYbbm()) && StrUtil.isNotEmpty(addProductRequest.getNameCode())) { CodeRel codeRel = new CodeRel(); codeRel.setYbbm(addProductRequest.getYbbm()); codeRel.setDrugCode(addProductRequest.getNameCode()); 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 786a7f457..7af3e598e 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -147,8 +147,7 @@ public class IoOrderDetailBizController extends BaseController { AuthAdmin authAdmin = getUser(); if (addBizProductReqeust.getRelId() == null && CollUtil.isEmpty(addBizProductReqeust.getDatas())) return ResultVOUtils.error(500, "未选择产品信息"); - if (addBizProductReqeust.getOrderEntity() == null) - return ResultVOUtils.error(500, "未指定订单"); + if (addBizProductReqeust.getOrderEntity() == null) return ResultVOUtils.error(500, "未指定订单"); IoOrderEntity orderEntity = addBizProductReqeust.getOrderEntity(); IoOrderEntity isExit = orderService.findByBillNo(orderEntity.getBillNo()); if (StrUtil.isEmpty(orderEntity.getBillNo()) || isExit == null) { @@ -304,16 +303,14 @@ public class IoOrderDetailBizController extends BaseController { outInvCode = invWarehouseEntity.getCode(); } Boolean vailBatchNo = true; - if (IntUtil.value(bussinessTypeEntity.getVailInvBatchNo())) - vailBatchNo = false; + if (IntUtil.value(bussinessTypeEntity.getVailInvBatchNo())) vailBatchNo = false; Integer count = invProductServiceNew.vailStockCount(orderDetailBizEntity.getBindRlFk(), orderDetailBizEntity.getBatchNo(), orderDetailBizEntity.getSupId(), null, outInvCode, null, vailBatchNo); count = IntUtil.value(count) - orderDetailBizEntity.getCount(); if (count < 0) { if (count == -1) { return ResultVOUtils.error(500, "该产品未入库"); - } else - return ResultVOUtils.error(500, "当前库存不足"); + } else return ResultVOUtils.error(500, "当前库存不足"); } } @@ -459,8 +456,7 @@ public class IoOrderDetailBizController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addReceiveOrder") @Log(title = "单据管理", businessType = BusinessType.INSERT) - public BaseResponse addReceiveOrder(@RequestBody PurReceiveEntity purReceiveEntity, - BindingResult bindingResult) { + public BaseResponse addReceiveOrder(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -531,8 +527,7 @@ public class IoOrderDetailBizController extends BaseController { @AuthRuleAnnotation("") @PostMapping("/udiwms/inout/order/addPurOrder") @Log(title = "单据管理", businessType = BusinessType.INSERT) - public BaseResponse addPurOrder(@RequestBody PurOrderEntity purOrderEntity, - BindingResult bindingResult) { + public BaseResponse addPurOrder(@RequestBody PurOrderEntity purOrderEntity, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -628,9 +623,7 @@ public class IoOrderDetailBizController extends BaseController { } String value = systemParamConfigService.selectValueByParamKey("order_detail_visible"); if (IntUtil.value(value) == 1) { - list = list.stream() - .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)) - .collect(Collectors.toList()); + list = list.stream().sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)).collect(Collectors.toList()); } @@ -679,9 +672,7 @@ public class IoOrderDetailBizController extends BaseController { String value = systemParamConfigService.selectValueByParamKey("order_detail_visible"); if (IntUtil.value(value) == 1) { - list = list.stream() - .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)) - .collect(Collectors.toList()); + list = list.stream().sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)).collect(Collectors.toList()); } if (CollUtil.isEmpty(list)) { PageInfo pageInfo = new PageInfo<>(list); @@ -872,8 +863,7 @@ public class IoOrderDetailBizController extends BaseController { String msg = ""; BigDecimal invoiceAmount = BigDecimal.ZERO; for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) { - if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo())) - && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) { + if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo())) && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) { if (StrUtil.isNotEmpty(orderInvoiceEntity.getPrice())) { BigDecimal price = new BigDecimal(orderInvoiceEntity.getPrice()); invoiceAmount = invoiceAmount.add(price); @@ -911,8 +901,7 @@ public class IoOrderDetailBizController extends BaseController { * @return */ @GetMapping("/udiwms/inout/bizDetail/orderOutRecordPage") - public BaseResponse orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest, - BindingResult bindingResult) { + public BaseResponse orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest, BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } @@ -930,12 +919,10 @@ public class IoOrderDetailBizController extends BaseController { //录入阳光采购的追溯码 @PostMapping("/udiwms/inout/order/yc/fileUpload") @CusRedissonAnnotation(cacheName = RedissonCacheKey.XML_UPLOAD, key = {"#billNo"}, timeOutMsg = "系统正在处理，请勿重复上传") - public BaseResponse ycFileUpload(@RequestParam("billNo") String billNo, @RequestParam("file") MultipartFile file) { - alihealthBusService.ycFileUpload(billNo, file); - return ResultVOUtils.successMsg("上传成功！"); + public BaseResponse ycCodeFileUpload(@RequestParam("billNo") String billNo, @RequestParam("file") MultipartFile file, AuthAdmin authAdmin) { + return alihealthBusService.ycFileUpload(billNo, file, authAdmin); } - //录入阳光采购的采购订单明细 @PostMapping("/udiwms/inout/order/yc/orderFileUpload") @CusRedissonAnnotation(cacheName = RedissonCacheKey.XML_UPLOAD, key = {"#billNoJson"}, timeOutMsg = "系统正在处理，请勿重复上传") @@ -1079,7 +1066,7 @@ public class IoOrderDetailBizController extends BaseController { //匹配biz IoOrderDetailCodeEntity byRelId = orderDetailCodeService.findByRelNameCode(addOrderRequest.getBillNo(), nameCode, aliYljgBillDetailDrug.getProduceBatchNo()); - if (byRelId!=null){ + if (byRelId != null) { codeLostEntity.setBizId(byRelId.getId()); } diff --git a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java index aa49b5ae6..49ed68e84 100644 --- a/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthAdmin.java @@ -3,12 +3,18 @@ package com.glxp.api.entity.auth; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.glxp.api.constant.Constant; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; import java.util.List; @Data +@Builder +@AllArgsConstructor +@NoArgsConstructor @TableName("auth_user") public class AuthAdmin { diff --git a/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java b/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java index fb941f8d2..3d81fb1b0 100644 --- a/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java +++ b/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.alihealth; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgSearchbill; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; import org.springframework.web.multipart.MultipartFile; @@ -14,7 +15,7 @@ public interface AlihealthBusService { AliYljgBillDetail aliYljgBillDetail(AliYljgSearchbillReqeust aliYljgSearchbillReqeust); - void ycFileUpload(String billNo, MultipartFile file); + BaseResponse ycFileUpload(String billNo, MultipartFile file, AuthAdmin authAdmin); BaseResponse ycOrderFileUpload(String billNoJson, MultipartFile file); } 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 699a4ef6b..5aa9a0693 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 @@ -15,6 +15,7 @@ import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgSearchbill; import com.glxp.api.entity.alihealth.YcFileCodeUploadVo; import com.glxp.api.entity.alihealth.YcFileOrderUploadVo; +import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoCodeLostEntity; @@ -25,16 +26,14 @@ import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust; import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust; import com.glxp.api.req.inout.AddBizProductReqeust; +import com.glxp.api.req.inout.AddOrderCodeRequest; import com.glxp.api.req.inout.AddOrderRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.alihealth.AlihealthBusService; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.inout.IoCodeLostService; -import com.glxp.api.service.inout.IoOrderDetailBizService; -import com.glxp.api.service.inout.IoOrderDetailCodeService; -import com.glxp.api.service.inout.IoOrderService; +import com.glxp.api.service.inout.*; import com.glxp.api.util.IntUtil; import com.glxp.api.util.StringUtils; import com.glxp.api.util.alihealth.AlihealthYljgUtils; @@ -118,8 +117,8 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { IoOrderDetailCodeService orderDetailCodeService; @Override - @Transactional(rollbackFor = Exception.class) - public void ycFileUpload(String billNo, MultipartFile file) { +// @Transactional(rollbackFor = Exception.class) + public BaseResponse ycFileUpload(String billNo, MultipartFile file, AuthAdmin authAdmin) { try { String fileName = file.getOriginalFilename(); String suffix = FileUtil.getSuffix(fileName); @@ -149,12 +148,12 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { AddOrderRequest addOrderRequest = new AddOrderRequest(); BeanUtils.copyProperties(ioOrderEntity, addOrderRequest); String ycBillNo = ioOrderEntity.getYcBillNo(); - + List codeList = new ArrayList<>(); for (int j = 0; j < list.size(); j++) { YcFileCodeUploadVo ycFileCodeUploadVo = list.get(j); //第一条进行 阳采单号的校验 - if (j == 0 && StringUtils.isNotEmpty(ycBillNo)){ + if (j == 0 && StringUtils.isNotEmpty(ycBillNo)) { String ycBillNo1 = ycFileCodeUploadVo.getYcBillNo(); if (!ycBillNo1.equals(ycBillNo)) { throw new JsonException("导入订单编号错误：当前绑定阳采业务单号【" + ycBillNo + "】 ， 导入阳采业务单号【" + ycBillNo1 + "】 "); @@ -197,16 +196,19 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { if (id == null) codeLostEntity.setId(IdUtil.getSnowflakeNextId()); } ioCodeLostService.insertOrUpdate(codeLostEntity); - - UdiEntity udiEntityy = FilterUdiUtils.getUdi(addOrderRequest.getCode()); - BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest, udiEntityy, addOrderRequest.getCode()); - - if (response2.getCode() != 20000) { - throw new JsonException(response2.getMessage()); - } + codeList.add(code); } + + AddOrderCodeRequest addOrderCodeRequest = new AddOrderCodeRequest(); + addOrderCodeRequest.setCodeList(codeList); + addOrderCodeRequest.setBillNo(billNo); + BeanUtils.copyProperties(ioOrderEntity, addOrderCodeRequest); + return addCoodeService.batchProcessDrugCodes(addOrderCodeRequest, authAdmin); } + @Resource + AddCoodeService addCoodeService; + @Resource private UdiRelevanceService udiRelevanceService; @Resource @@ -265,7 +267,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { UdiRelevanceResponse udiRelevance = udiRelevanceService.selectByMainIdOne(orderUploadVo.getDrugUnifiedCode()); if (udiRelevance == null) { - throw new JsonException(500, "文件中的药品统一编码：【"+orderUploadVo.getDrugUnifiedCode() + "】" +"没有维护产品信息！"); + throw new JsonException(500, "文件中的药品统一编码：【" + orderUploadVo.getDrugUnifiedCode() + "】" + "没有维护产品信息！"); } Long id = udiRelevance.getId(); @@ -273,7 +275,7 @@ public class AlihealthBusServiceImpl implements AlihealthBusService { .eq(CompanyProductRelevanceEntity::getUdiRlIdFk, id) .eq(CompanyProductRelevanceEntity::getCustomerId, fromCorp)); if (CollUtil.isEmpty(companyProductRelevanceEntities)) { - throw new JsonException(500, "产品名称:【" + orderUploadVo.getProductName() + "】未添加文件中供应商配送服务！"); + throw new JsonException(500, "产品名称:【" + orderUploadVo.getProductName() + "】未添加文件中供应商配送服务！"); } AddBizProductReqeust productRequest = new AddBizProductReqeust(); diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java index f4bed99c4..f36639db1 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java @@ -114,7 +114,7 @@ public class SysWorkplaceLayerService extends ServiceImpl udiRelevanceEntities = udiRelevanceService.selectDrugsByNameCode(codeEnttity, unitFk); @@ -989,7 +993,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } - public List isExitLocalList(String code, List codeEnttityList) { UdiEntity udiEntity = FilterUdiUtils.getUdi(code); List codeTempEntities = codeEnttityList.stream() @@ -1022,5 +1025,4 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService { } - } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 69a664de9..2954f83e4 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_yxfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_hlfy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: