修改bug

liujie

2 天以前 59099ec96f7a2da11df4b0b1593092b0aff38e90

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

@@ -167,6 +167,29 @@
        return R.ok();
    }

    @ApiOperation(value = "删除采购")
    @DeleteMapping(value = "/delProcurement/{id}")
    public R<String> delProcurement(@PathVariable String id) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        String clinicSupplierId=null;
        if(roleType == 5){
            // 诊所
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            clinicSupplierId = crmClinic.getId();
        }
        TErpProcurement tErpProcurement = erpProcurementService.getById(id);
        if(tErpProcurement.getClinicId().equals(clinicSupplierId)){
            erpProcurementService.removeById( id);
            return R.ok();
        }else {
            return R.fail("无权限");
        }
    }





@@ -311,7 +334,7 @@
        tErpClinicWarehousing.setWarehousingType(1);
        tErpClinicWarehousing.setType(1);

        TErpClinicWarehousing last = erpClinicWarehousingService.getOne(new LambdaQueryWrapper<TErpClinicWarehousing>().orderByDesc(BaseModel::getCreateTime).last("LIMIT 1"));
        TErpClinicWarehousing last = erpClinicWarehousingService.getOne(new LambdaQueryWrapper<TErpClinicWarehousing>().orderByDesc(BaseModel::getCreateTime).orderByDesc(TErpClinicWarehousing::getWarehouseNo).last("LIMIT 1"));
        if(last==null){
            tErpClinicWarehousing.setWarehouseNo("G"+ DateUtils.dateTimeNow()+"00001");
        }else {