修改bug

liujie

2 天以前 6664ba895c7b2b5837f53cea44692610848ff60c

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

@@ -239,11 +239,15 @@
    public R<Boolean> clinicAdd(@Validated @RequestBody TErpClinicGoodsAddDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber(),null)) {
            return R.fail("erp商品已存在");
            return R.fail("erp商品已存在，商品条码重复");
        }
        if (erpGoodsService.isExitOne(dto.getGoodsIdCode(), dto.getQuasiNumber(),null)) {
            return R.fail("erp商品已存在，国药准字号重复");
        }
        Integer roleType = user.getRoleType();
        TErpGoods goods = new TErpGoods();
        BeanUtils.copyProperties(dto,goods);
        goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec());
        if(roleType == 5){
            // 诊所
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
@@ -254,7 +258,7 @@
        }
        goods.setCreateId(user.getUserId().toString());
        goods.setGoodsIdCode(dto.getGoodsIdCode());
        goods.setClinicPurchasePrice(dto.getSalesAmount());
//        goods.setClinicPurchasePrice(dto.getSalesAmount());
        return R.ok(erpGoodsService.save(goods));
    }

@@ -279,6 +283,7 @@
        goods.setCreateId(user.getUserId().toString());
        goods.setGoodsIdCode(dto.getGoodsIdCode());
        goods.setId(dto.getId());
        goods.setGoodsSpec(dto.getFormulationSpec()+"*"+dto.getPackingSpec());
        return R.ok(erpGoodsService.updateById(goods));
    }