修改bug

liujie

4 天以前 c3013bb5d539cf08e8faad076c8ad323f9b683ae

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpProcurementController.java

@@ -192,7 +192,7 @@
    public R<?> detailProcurementSend(@RequestBody DetailProcurementSendDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        String clinicSupplierId=null;
        List<String> clinicSupplierId=null;
        if(roleType == 6){

            TCrmWarehouse warehouse = crmWarehouseService.getOne(Wrappers.lambdaQuery(TCrmWarehouse.class)
@@ -200,10 +200,8 @@
                    .last("LIMIT 1"));

            // 供应商
            TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getWarehouseId, warehouse.getId())
                    .last("LIMIT 1"));
            clinicSupplierId=crmSupplier.getId();
            clinicSupplierId = crmSupplierService.list(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getWarehouseId, warehouse.getId())).stream().map(TCrmSupplier::getId).collect(Collectors.toList());
        }
        erpProcurementService.detailProcurementSend(clinicSupplierId, user, dto.getId(),dto.getLogisticsNumber());
        return R.ok();
@@ -269,7 +267,7 @@

    @ApiOperation(value = "采购详情入库")
    @PostMapping(value = "/updateStatusProcurement")
    public R<DetailProcurementVO> updateStatusProcurement(@RequestParam @Valid UpdateStatusProcurementLastDto dto) {
    public R<DetailProcurementVO> updateStatusProcurement(@RequestBody @Valid UpdateStatusProcurementLastDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        String clinicSupplierId=null;
@@ -289,6 +287,8 @@
            return R.fail("目前状态无法入库");
        }
        erpProcurement.setStatus(5);
        erpProcurement.setWarehousingUserId(user.getUserId().toString());
        erpProcurement.setWarehousingTime(LocalDateTime.now());
        erpProcurementService.updateById(erpProcurement);

        List<String> collect = dto.getList().stream().map(UpdateStatusProcurementDto::getId).collect(Collectors.toList());
@@ -309,6 +309,7 @@
        tErpClinicWarehousing.setWarehousingType(1);
        tErpClinicWarehousing.setType(1);
        tErpClinicWarehousing.setWarehouseNo("G"+ DateUtils.dateTimeNow());
        tErpClinicWarehousing.setProcurementId(erpProcurement.getId());
        erpClinicWarehousingService.save(tErpClinicWarehousing);
        // goodsId分组
        for (UpdateStatusProcurementDto updateStatusProcurementDto : dto.getList()) {
@@ -401,7 +402,7 @@
            tErpProcurementCommission.setProcurementId(erpProcurement.getId());
            tErpProcurementCommission.setCommissionType(1);
            tErpProcurementCommission.setBranchSalespersonId(branchId);
            tErpProcurementCommission.setMoney(commission.doubleValue());
            tErpProcurementCommission.setMoney(commission);
            erpProcurementCommissionService.save(tErpProcurementCommission);

        }
@@ -430,7 +431,7 @@
            tErpProcurementCommission.setProcurementId(erpProcurement.getId());
            tErpProcurementCommission.setCommissionType(2);
            tErpProcurementCommission.setBranchSalespersonId(salespersonId);
            tErpProcurementCommission.setMoney(commission.doubleValue());
            tErpProcurementCommission.setMoney(commission);
            erpProcurementCommissionService.save(tErpProcurementCommission);
        }