上传医保

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 udiProductService.saveOrUpadateLevelDrugAli(thirdAliDrug);
-        return ResultVOUtils.success("更新成功");
     }
 
 
@@ -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());

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)
+        if (addBizProductReqeust.getOrderEntity() == null) return ResultVOUtils.error(500, "未指定订单");
-            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()))
+            if (IntUtil.value(bussinessTypeEntity.getVailInvBatchNo())) vailBatchNo = false;
-                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
+                } else return ResultVOUtils.error(500, "当前库存不足");
-                    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,
+    public BaseResponse addReceiveOrder(@RequestBody PurReceiveEntity purReceiveEntity, BindingResult bindingResult) {
-                                        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,
+    public BaseResponse addPurOrder(@RequestBody PurOrderEntity purOrderEntity, BindingResult bindingResult) {
-                                    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()
+            list = list.stream().sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)).collect(Collectors.toList());
-                    .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()
+            list = list.stream().sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode)).collect(Collectors.toList());
-                    .sorted(Comparator.comparing(IoOrderDetailBizResponse::getNameCode))
-                    .collect(Collectors.toList());
         }
         if (CollUtil.isEmpty(list)) {
             PageInfo<IoOrderDetailBizResponse> 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()))
+                if (StrUtil.trimToEmpty(orderInvoiceEntity.getBatchNo()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBatchNo())) && StrUtil.trimToEmpty(orderInvoiceEntity.getBindRlFk()).equals(StrUtil.trimToEmpty(orderDetailCodeEntity.getBindRlFk() + ""))) {
-                        && 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,
+    public BaseResponse orderOutRecordPage(FilterOrderDetailBizRequest orderDetailBizRequest, BindingResult bindingResult) {
-                                           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) {
+    public BaseResponse ycCodeFileUpload(@RequestParam("billNo") String billNo, @RequestParam("file") MultipartFile file, AuthAdmin authAdmin) {
-        alihealthBusService.ycFileUpload(billNo, file);
+        return alihealthBusService.ycFileUpload(billNo, file, authAdmin);
-        return ResultVOUtils.successMsg("上传成功！");
     }
 
-
     //录入阳光采购的采购订单明细
     @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());
                 }
 

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 {
 

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);
 }

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.*;
-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.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)
+//    @Transactional(rollbackFor = Exception.class)
-    public void ycFileUpload(String billNo, MultipartFile file) {
+    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<String> 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);
-
+            codeList.add(code);
-            UdiEntity udiEntityy = FilterUdiUtils.getUdi(addOrderRequest.getCode());
-            BaseResponse response2 = ioOrderDetailBizService.adddDrugOrder(addOrderRequest, udiEntityy, addOrderRequest.getCode());
-
-            if (response2.getCode() != 20000) {
-                throw new JsonException(response2.getMessage());
-            }
         }
+
+        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();

src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java

@@ -114,7 +114,7 @@ public class SysWorkplaceLayerService extends ServiceImpl<SysWorkplaceLayerMappe
             initLayer(sysWorkplaceLayer, userId);
             sysWorkplaceLayer.setHeight(50);
             if (StrUtil.isNotEmpty(request.getLayerName())){
-                workplaceLayer.setName(request.getLayerName());
+                sysWorkplaceLayer.setName(request.getLayerName());
             }
             sysWorkplaceLayerMapper.insert(sysWorkplaceLayer);
             //增加卡槽

src/main/java/com/glxp/api/service/inout/AddCoodeService.java

@@ -310,8 +310,6 @@ public class AddCoodeService {
                         } else {
                             addOrderRequest.setAction(ConstantType.SPLIT_OUT);
                         }
-
-
                         // 设置批次信息
                         if (StrUtil.isNotEmpty(addOrderRequest.getBatchNo())) {
                             udiEntity.setBatchNo(addOrderRequest.getBatchNo());
@@ -389,7 +387,7 @@ public class AddCoodeService {
             return ResultVOUtils.error(500, "无效条码");
         }
 
-        if (IntUtil.value(udiRelevanceResponse.getNotCodeType()) != 0) {
+        if (IntUtil.value(udiRelevanceResponse.getNotCodeType()) != 0  && (  bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_OUT) || bussinessTypeEntity.getAction().equals(ConstantType.SPLIT_RETURN))) {
             return ResultVOUtils.error(500, "当前为无码类型产品，无需扫码！");
         }
 

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -406,8 +406,13 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         }
         for (AddBizProductReqeust item : datas) {
             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectSupGroupById(item.getRelId(), addBizProductReqeust.getSupId());
+            if (StrUtil.isEmpty(udiRelevanceResponse.getNameCode())) {
+                return ResultVOUtils.error(500, udiRelevanceResponse.getCpmctymc() + "层级标识未维护！");
+            }
+
             BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
 
+
             //是否校验产品采购类型 ：1：校验；2.无需校验
             if (IntUtil.value(bussinessTypeEntity.getVailProductAttributes()) == 1) {
                 Integer purType = IntUtil.value(udiRelevanceResponse.getPurType()); //1：普通入账产品；2.预验收产品。3：寄售产品
@@ -510,14 +515,14 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             ioOrderDetailBizEntity.setYcBizNo(item.getYcBizNo());
             if (item.getCount() != null) ioOrderDetailBizEntity.setCount(item.getCount());
             String salesInvoiceNumberSecondTicket = item.getSalesInvoiceNumberSecondTicket();
-            if (StrUtil.isNotEmpty(salesInvoiceNumberSecondTicket)){
+            if (StrUtil.isNotEmpty(salesInvoiceNumberSecondTicket)) {
                 ioOrderDetailBizEntity.setRegStatus(true);
             }
             this.insert(ioOrderDetailBizEntity);
 
             //补充发票号
 
-            if (StrUtil.isNotEmpty(salesInvoiceNumberSecondTicket)){
+            if (StrUtil.isNotEmpty(salesInvoiceNumberSecondTicket)) {
 
                 IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
                 ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailBizEntity.getOrderIdFk());
@@ -689,7 +694,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             }
         }
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
-        if (udiRelevanceResponse == null){
+        if (udiRelevanceResponse == null) {
             return ResultVOUtils.error(604, "当前产品未维护！");
         }
         //近效期提醒
@@ -786,7 +791,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
 
                 //匹配biz
                 IoOrderDetailCodeEntity byRelId = orderDetailCodeService.findByRelNameCode(addOrderRequest.getBillNo(), udiEntity.getUdi(), udiEntity.getBatchNo());
-                if (byRelId!=null){
+                if (byRelId != null) {
                     exitLocalEntity.setBizId(byRelId.getId());
                 }
 
@@ -819,7 +824,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
 
             //匹配biz
             IoOrderDetailCodeEntity byRelId = ioOrderDetailCodeService.findByRelNameCode(addOrderRequest.getBillNo(), udiEntity.getUdi(), udiEntity.getBatchNo());
-            if (byRelId!=null){
+            if (byRelId != null) {
                 codeEnttity.setBizId(byRelId.getId());
             }
 
@@ -953,7 +958,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
 
-
     public BaseResponse checkDrugRelId(IoCodeTempEntity codeEnttity, String unitFk) {
 
         List<UdiRelevanceResponse> udiRelevanceEntities = udiRelevanceService.selectDrugsByNameCode(codeEnttity, unitFk);
@@ -989,7 +993,6 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
 
-
     public List<IoCodeTempEntity> isExitLocalList(String code, List<IoCodeTempEntity> codeEnttityList) {
         UdiEntity udiEntity = FilterUdiUtils.getUdi(code);
         List<IoCodeTempEntity> codeTempEntities = codeEnttityList.stream()
@@ -1022,5 +1025,4 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
 
-
 }

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: