From d98af68f2ea108254ec362ac2497fd619e6dd3eb Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 13 一月 2026 18:13:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java | 558 +++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 491 insertions(+), 67 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
index 5c1c855..c0d9b5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -5,22 +5,28 @@
import cn.afterturn.easypoi.excel.ExcelImportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.crypto.SecureUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.BaseModel;
+import com.ruoyi.common.core.domain.BasePage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.dto.TErpGoodsAddDto;
-import com.ruoyi.system.dto.TErpGoodsInfoSaveDto;
-import com.ruoyi.system.dto.TErpGoodsUpdateStatusDto;
+import com.ruoyi.system.dto.*;
import com.ruoyi.system.importExcel.TErpGoodsExcel;
import com.ruoyi.system.model.*;
+import com.ruoyi.system.query.PageAddListQuery;
+import com.ruoyi.system.query.TErpGoodsAdminQuery;
import com.ruoyi.system.query.TErpGoodsQuery;
import com.ruoyi.system.service.*;
import com.ruoyi.system.vo.TErpGoodsVO;
@@ -42,9 +48,7 @@
import java.math.RoundingMode;
import java.net.URLEncoder;
import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -71,11 +75,12 @@
private final TErpMaintenanceReminderService erpMaintenanceReminderService;
private final TCrmClinicService crmClinicService;
private final TCrmSupplierService crmSupplierService;
+ private final ISysUserService sysUserService;
@Autowired
public TErpGoodsController(TErpGoodsService erpGoodsService, TokenService tokenService, TErpGoodsTypeService erpGoodsTypeService, TErpGoodsUnitService erpGoodsUnitService,
TErpSupplierWarehousingBatchService erpSupplierWarehousingBatchService, TErpSupplierWarehousingService erpSupplierWarehousingService,
- TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService) {
+ TErpSupplierOutboundGoodsService erpSupplierOutboundGoodsService, TErpMaintenanceReminderService erpMaintenanceReminderService, TCrmClinicService crmClinicService, TCrmSupplierService crmSupplierService, ISysUserService sysUserService) {
this.erpGoodsService = erpGoodsService;
this.tokenService = tokenService;
this.erpGoodsTypeService = erpGoodsTypeService;
@@ -86,59 +91,208 @@
this.erpMaintenanceReminderService = erpMaintenanceReminderService;
this.crmClinicService = crmClinicService;
this.crmSupplierService = crmSupplierService;
+ this.sysUserService = sysUserService;
}
-
/**
* 获取erp问题上报管理列表
*/
- @ApiOperation(value = "供应商获取商品分页列表")
+ @ApiOperation(value = "供应商 诊所 获取商品分页列表")
@PostMapping(value = "/pageList")
public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) {
SysUser user = tokenService.getLoginUser().getUser();
Integer roleType = user.getRoleType();
- if(roleType == 4){
+ if (roleType == 4) {
// 供应商
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ***
+ if (Objects.isNull(crmSupplier)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
+
query.setSupplierClinicId(crmSupplier.getId());
}
- if(roleType == 5){
+ if (roleType == 5) {
// 诊所
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
query.setSupplierClinicId(crmClinic.getId());
}
- return R.ok(erpGoodsService.pageList(query,user));
+
+ return R.ok(erpGoodsService.pageList(query, user));
}
+ /**
+ * 获取erp问题上报管理列表
+ */
+ @ApiOperation(value = "平台获取商品分页列表")
+ @PostMapping(value = "/pageAdminList")
+ public R<PageInfo<TErpGoodsVO>> pageAdminList(@RequestBody TErpGoodsAdminQuery query) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+ if (roleType == 1) {
+ // 平台
+ return R.ok(erpGoodsService.pageAdminList(query));
+ }
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "平台审核商品内容")
+ @PostMapping(value = "/adminAudit")
+ @Log(title = "商品管理-平台审核商品内容", businessType = BusinessType.UPDATE)
+ public R<?> adminAudit(@RequestBody AdminAuditDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+ List<TErpGoods> tErpGoods = erpGoodsService.listByIds(dto.getIds());
+ if (roleType == 1) {
+ tErpGoods.stream().forEach(e -> {
+ e.setContentState(dto.getContentState());
+ e.setContentRemark(dto.getContentRemark());
+ }
+ );
+ erpGoodsService.updateBatchById(tErpGoods);
+ // 平台
+ return R.ok();
+ }
+ return R.ok();
+ }
+
+
+ @ApiOperation(value = "供应商提交商品内容")
+ @PostMapping(value = "/supplierSubmitContent")
+ @Log(title = "商品管理-供应商提交商品内容", businessType = BusinessType.UPDATE)
+ public R<?> adminAudit(@RequestBody SupplierSubmitContentDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+ TErpGoods erpGoods = erpGoodsService.getById(dto.getId());
+ if (roleType == 4) {
+ erpGoods.setContent(dto.getContent());
+ erpGoods.setContentState(0);
+ erpGoodsService.updateById(erpGoods);
+ return R.ok();
+ }
+ return R.ok();
+ }
+
+
+ /**
+ * 获取erp问题上报管理列表
+ */
+ @ApiOperation(value = "诊所 一键获取商品分页列表")
+ @PostMapping(value = "/pageAddList")
+ public R<Page<TErpGoods>> pageAddList(@RequestBody PageAddListQuery query) {
+ 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"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ clinicSupplierId = crmClinic.getId();
+ }
+ Page<TErpGoods> tErpGoodsPage = new Page<>(query.getPageNum(), query.getPageSize());
+
+ List<TErpGoods> page = erpGoodsService.pageAddList(tErpGoodsPage, clinicSupplierId, query);
+ tErpGoodsPage.setRecords(page);
+ return R.ok(tErpGoodsPage);
+ }
+
+ /**
+ * 获取erp问题上报管理列表
+ */
+ @ApiOperation(value = "诊所 一键获取商品 获取全部")
+ @PostMapping(value = "/getAllGoodsList")
+ @Log(title = "商品管理-诊所 一键获取商品", businessType = BusinessType.INSERT)
+ public R<?> getAllGoodsList() {
+ 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"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ clinicSupplierId = crmClinic.getId();
+ }
+
+ List<TErpGoods> list = erpGoodsService.list(new LambdaQueryWrapper<TErpGoods>().eq(TErpGoods::getGoodsSource, 1).eq(TErpGoods::getState, 1).eq(BaseModel::getDisabled, 0).isNotNull(TErpGoods::getPlatformCommissionPrice).last("and (NOT FIND_IN_SET(" + clinicSupplierId + ",clinic_ids) or clinic_ids is null)"));
+ for (TErpGoods goods : list) {
+ String clinicIds = goods.getClinicIds();
+ if (clinicIds == null || clinicIds.isEmpty()) {
+ goods.setClinicIds(clinicSupplierId);
+ } else {
+ String[] split = clinicIds.split(",");
+ ArrayList<String> split1 = new ArrayList<>();
+ for (String s : split) {
+ split1.add(s);
+ }
+ if (!split1.contains(clinicSupplierId)) {
+ split1.add(clinicSupplierId);
+ goods.setClinicIds(String.join(",", split1));
+ }
+ }
+
+ }
+ erpGoodsService.updateBatchById(list);
+ return R.ok();
+ }
@ApiOperation(value = "供应商添加商品")
@PostMapping(value = "/add")
+ @Log(title = "商品管理-供应商添加", businessType = BusinessType.INSERT)
public R<Boolean> add(@Validated @RequestBody TErpGoodsAddDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
- if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber())) {
+ if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber(), null)) {
return R.fail("erp商品已存在");
}
Integer roleType = user.getRoleType();
TErpGoods goods = new TErpGoods();
- if(roleType == 4){
+ if (roleType == 4) {
// 供应商
TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
.eq(TCrmSupplier::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ***
+ if (Objects.isNull(crmSupplier)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
goods.setSupplierClinicId(crmSupplier.getId());
goods.setGoodsSource(1);
}
- if(roleType == 5){
+ if (roleType == 5) {
// 诊所
TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
.eq(TCrmClinic::getUserId, user.getUserId())
.last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
goods.setSupplierClinicId(crmClinic.getId());
goods.setGoodsSource(2);
}
@@ -149,13 +303,162 @@
goods.setFormulationSpec(dto.getFormulationSpec());
goods.setPackingSpec(dto.getPackingSpec());
goods.setGoodsName(dto.getGoodsName());
+ goods.setIsPrescriptionDrug(null);
+ goods.setGoodsSpec(dto.getFormulationSpec() + "*" + dto.getPackingSpec());
return R.ok(erpGoodsService.save(goods));
}
- @ApiOperation(value = "供应商删除商品")
+ @ApiOperation(value = "诊所添加商品")
+ @PostMapping(value = "/clinicAdd")
+ @Log(title = "商品管理-诊所添加", businessType = BusinessType.INSERT)
+ 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商品已存在，商品条码重复");
+ }
+ 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)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ goods.setSupplierClinicId(crmClinic.getId());
+ goods.setGoodsSource(2);
+ }
+ goods.setCreateId(user.getUserId().toString());
+ goods.setGoodsIdCode(dto.getGoodsIdCode());
+ goods.setGoodsSpec(dto.getFormulationSpec() + "*" + dto.getPackingSpec());
+// goods.setClinicPurchasePrice(dto.getSalesAmount());
+ if (goods.getIsPrescriptionDrug() != null && goods.getIsPrescriptionDrug() == 3) {
+ goods.setIsPrescriptionDrug(null);
+ }
+ return R.ok(erpGoodsService.save(goods));
+ }
+
+ @ApiOperation(value = "诊所编辑商品")
+ @PostMapping(value = "/clinicUpdate")
+ @Log(title = "商品管理-诊所编辑", businessType = BusinessType.UPDATE)
+ public R<Boolean> clinicUpdate(@Validated @RequestBody TErpClinicGoodsUpdateDto dto) {
+ SysUser user = tokenService.getLoginUser().getUser();
+ if (erpGoodsService.isExit(dto.getGoodsIdCode(), dto.getQuasiNumber(), dto.getId())) {
+ return R.fail("erp商品已存在");
+ }
+ Integer roleType = user.getRoleType();
+ TErpGoods goods = new TErpGoods();
+ BeanUtils.copyProperties(dto, goods);
+ if (roleType == 5) {
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ goods.setSupplierClinicId(crmClinic.getId());
+ goods.setGoodsSource(2);
+ }
+ goods.setCreateId(user.getUserId().toString());
+ goods.setGoodsIdCode(dto.getGoodsIdCode());
+ goods.setId(dto.getId());
+ goods.setGoodsSpec(dto.getFormulationSpec() + "*" + dto.getPackingSpec());
+ if (goods.getIsPrescriptionDrug() != null && goods.getIsPrescriptionDrug() == 3) {
+ goods.setIsPrescriptionDrug(null);
+ }
+ return R.ok(erpGoodsService.updateById(goods));
+ }
+
+ @ApiOperation(value = "供应商/诊所 删除商品")
@DeleteMapping(value = "/delete/{id}")
+ @Log(title = "商品管理-删除", businessType = BusinessType.DELETE)
public R<Boolean> delete(@PathVariable String id) {
- return R.ok(erpGoodsService.removeById(id));
+ TErpGoods goods = erpGoodsService.getById(id);
+ SysUser user = tokenService.getLoginUser().getUser();
+ String cid = null;
+
+ if (user.getRoleType() == 5) {
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ cid = crmClinic.getId();
+ if (goods.getGoodsSource() == 1) {
+ String clinicIds = goods.getClinicIds();
+ String[] split = clinicIds.split(",");
+ // clinicIds 移除cid
+ ArrayList<String> strings = new ArrayList<>();
+ for (String s : split) {
+ if (!s.equals(cid)) {
+ strings.add(s);
+ }
+ }
+ goods.setClinicIds(String.join(",", strings));
+ erpGoodsService.updateById(goods);
+ } else {
+ erpGoodsService.removeById(id);
+ }
+ return R.ok();
+ }
+ erpGoodsService.removeById(id);
+ return R.ok();
+ }
+
+ @ApiOperation(value = "诊所 一键添加商品")
+ @PostMapping(value = "/addSupplierGoods")
+ @Log(title = "商品管理-诊所一键添加商品", businessType = BusinessType.INSERT)
+ public R<Boolean> addSupplierGoods(@RequestBody AddSupplierGoodsDto dto) {
+// List<String> split = Arrays.asList(goodsIds.split(","));
+ List<TErpGoods> list = erpGoodsService.list(new LambdaQueryWrapper<TErpGoods>().in(TErpGoods::getId, dto.getGoodsIds()));
+ SysUser user = tokenService.getLoginUser().getUser();
+ String cid = null;
+
+ if (user.getRoleType() == 5) {
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ cid = crmClinic.getId();
+ for (TErpGoods goods : list) {
+ String clinicIds = goods.getClinicIds();
+ if (clinicIds == null || clinicIds.isEmpty()) {
+ goods.setClinicIds(cid);
+ } else {
+ String[] split = clinicIds.split(",");
+ List<String> split1 = new ArrayList<>();
+ for (String s : split) {
+ split1.add(s);
+ }
+ if (!split1.contains(cid)) {
+ split1.add(cid);
+ goods.setClinicIds(String.join(",", split1));
+ }
+ }
+
+ }
+ erpGoodsService.updateBatchById(list);
+ }
+ return R.ok();
}
@@ -164,38 +467,87 @@
*/
@ApiOperation(value = "供应商启用 停用商品")
@PostMapping(value = "/updateStatus")
+ @Log(title = "商品管理-启用/停用商品", businessType = BusinessType.UPDATE)
public R<Boolean> updateStatus(@RequestBody TErpGoodsUpdateStatusDto dto) {
+
+ SysUser user = tokenService.getLoginUser().getUser();
TErpGoods goods = erpGoodsService.getById(dto.getId());
- if(dto.getState()==1 && goods.getTypeId()==null){
+ if (goods.getState() == 2 && dto.getState() == 2) {
+ return R.fail("操作失败，该商品已是禁用状态");
+ }
+ if (dto.getState() == 1 && goods.getTypeId() == null) {
return R.fail("操作失败，请先完善商品信息");
}
- if(dto.getState()==1 && goods.getClinicPurchasePrice()==null){
+ if (dto.getState() == 1 && goods.getClinicPurchasePrice() == null) {
return R.fail("操作失败，请设置供应商分佣比例后再启用");
}
+ if (dto.getState() == 1 && goods.getStateUser() == 1 && user.getRoleType() == 4) {
+ return R.fail("操作失败，平台禁用商品不可启用");
+ }
+ if (user.getRoleType() == 1) {
+ goods.setStateUser(1);
+ } else if (user.getRoleType() == 5) {
+ goods.setStateUser(2);
+ }
+ goods.setStateRemark(dto.getStateRemark());
goods.setState(dto.getState());
boolean b = erpGoodsService.updateById(goods);
return R.ok(b);
}
+
+ public static void main(String[] args) {
+ String s = SecureUtil.md5("cca19Broker@.!142536cca");
+ System.out.println(s);
+ }
+
@ApiOperation(value = "供应商完善商品")
@PostMapping(value = "/saveDataInfo")
+ @Log(title = "商品管理-供应商完善商品", businessType = BusinessType.UPDATE)
public R<Boolean> saveDataInfo(@RequestBody @Valid TErpGoodsInfoSaveDto dto) {
SysUser user = tokenService.getLoginUser().getUser();
+ Integer roleType = user.getRoleType();
+ String clinicSupplierId = null;
+ if (roleType == 4) {
+ // 供应商
+ TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ***
+ if (Objects.isNull(crmSupplier)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
+ clinicSupplierId = crmSupplier.getId();
+ }
+ if (roleType == 5) {
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ clinicSupplierId = crmClinic.getId();
+ }
+
TErpGoods goods = erpGoodsService.getById(dto.getId());
- BeanUtils.copyProperties(dto,goods);
- if(goods.getMaintenanceInterval()!=null){
+ BeanUtils.copyProperties(dto, goods);
+ if (goods.getMaintenanceInterval() != null) {
List<TErpSupplierWarehousing> list = erpSupplierWarehousingService.list(new LambdaQueryWrapper<TErpSupplierWarehousing>().eq(TErpSupplierWarehousing::getGoodsId, dto.getId()));
- if(!list.isEmpty()){
+ if (!list.isEmpty()) {
List<TErpSupplierWarehousingBatch> tErpSupplierWarehousingBatches = erpSupplierWarehousingBatchService.list(new LambdaQueryWrapper<TErpSupplierWarehousingBatch>().in(TErpSupplierWarehousingBatch::getWarehousingId, list.stream().map(TErpSupplierWarehousing::getId).collect(Collectors.toList())));
for (TErpSupplierWarehousingBatch tErpSupplierWarehousingBatch : tErpSupplierWarehousingBatches) {
List<TErpSupplierOutboundGoods> list1 = erpSupplierOutboundGoodsService.list(new LambdaQueryWrapper<TErpSupplierOutboundGoods>().eq(TErpSupplierOutboundGoods::getWarehousingBatchId, tErpSupplierWarehousingBatch.getId()));
- if(!list1.isEmpty()){
+ if (!list1.isEmpty()) {
int sum = list1.stream().mapToInt(TErpSupplierOutboundGoods::getOutboundCount).sum();
- if (tErpSupplierWarehousingBatch.getWarehousingNumber()-sum>0) {
+ if (tErpSupplierWarehousingBatch.getWarehousingNumber() - sum > 0) {
// 生成保养单
TErpMaintenanceReminder tErpMaintenanceReminder = new TErpMaintenanceReminder();
- tErpMaintenanceReminder.setClinicSupplierId(user.getUserId().toString());
+ tErpMaintenanceReminder.setClinicSupplierId(clinicSupplierId);
tErpMaintenanceReminder.setMaintenanceType(1);
tErpMaintenanceReminder.setWarehousingBatchId(tErpSupplierWarehousingBatch.getId());
Integer day = Integer.valueOf(goods.getMaintenanceInterval());
@@ -211,24 +563,53 @@
}
}
-
+ if (goods.getIsPrescriptionDrug() != null && goods.getIsPrescriptionDrug() == 3) {
+ goods.setIsPrescriptionDrug(null);
+ }
return R.ok(erpGoodsService.updateById(goods));
}
- @ApiOperation(value = "供应商商品详情")
+ @ApiOperation(value = "商品详情")
@GetMapping(value = "/detail/{id}")
- public R<TErpGoods> detail( @PathVariable String id) {
+ public R<TErpGoods> detail(@PathVariable String id) {
TErpGoods goods = erpGoodsService.getById(id);
return R.ok(goods);
}
@ApiOperation(value = "商品管理信息导出--导出")
@PostMapping("/export")
- public void listExport(@RequestBody TErpGoodsQuery query)
- {
+ @Log(title = "商品管理-导出", businessType = BusinessType.EXPORT)
+ public void listExport(@RequestBody TErpGoodsQuery query) {
SysUser user = tokenService.getLoginUser().getUser();
- List<TErpGoodsVO> pageList = erpGoodsService.listExport(query,user);
+
+ Integer roleType = user.getRoleType();
+ if (roleType == 4) {
+ // 供应商
+ TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ***
+ if (Objects.isNull(crmSupplier)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
+ query.setSupplierClinicId(crmSupplier.getId());
+ }
+ if (roleType == 5) {
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ query.setSupplierClinicId(crmClinic.getId());
+ }
+
+ List<TErpGoodsVO> pageList = erpGoodsService.listExport(query, user);
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), TErpGoodsVO.class, pageList);
HttpServletResponse response = WebUtils.response();
assert response != null;
@@ -257,7 +638,8 @@
@ApiOperation(value = "商品管理信息导入")
@PostMapping("/importFile")
- public AjaxResult importFile(@RequestParam(value = "file") MultipartFile file ) {
+ @Log(title = "商品管理-导入", businessType = BusinessType.IMPORT)
+ public AjaxResult importFile(@RequestParam(value = "file") MultipartFile file) {
SysUser user = tokenService.getLoginUser().getUser();
JSONObject jsonObject = new JSONObject();
@@ -272,35 +654,61 @@
List<TErpGoodsExcel> carAnnuallyImportExcels = ExcelImportUtil.importExcel(inputStream, TErpGoodsExcel.class, params);
Set<String> collect = carAnnuallyImportExcels.stream().map(TErpGoodsExcel::getGoodsIdCode).collect(Collectors.toSet());
if (collect.size() != carAnnuallyImportExcels.size()) {
- return AjaxResult.error("导入数据中商品标识码重复");
+ return AjaxResult.error("导入数据中商品条码重复");
}
+ Integer roleType = user.getRoleType();
for (TErpGoodsExcel erpGoodsExcel : carAnnuallyImportExcels) {
TErpGoods goods = new TErpGoods();
- goods.setSupplierClinicId(user.getUserId().toString());
- goods.setGoodsSource(1);
+
+ if (roleType == 4) {
+ // 供应商
+ TCrmSupplier crmSupplier = crmSupplierService.getOne(Wrappers.lambdaQuery(TCrmSupplier.class)
+ .eq(TCrmSupplier::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ***
+ if (Objects.isNull(crmSupplier)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmSupplier = crmSupplierService.getById(sysUser.getObjectId());
+ }
+ goods.setSupplierClinicId(crmSupplier.getId());
+ goods.setGoodsSource(1);
+ }
+ if (roleType == 5) {
+ // 诊所
+ TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
+ .eq(TCrmClinic::getUserId, user.getUserId())
+ .last("LIMIT 1"));
+ // ---
+ if (Objects.isNull(crmClinic)) {
+ SysUser sysUser = sysUserService.selectUserById(user.getUserId());
+ crmClinic = crmClinicService.getById(sysUser.getObjectId());
+ }
+ goods.setSupplierClinicId(crmClinic.getId());
+ goods.setGoodsSource(2);
+ }
// 判空
- if(erpGoodsExcel.getGoodsName()==null || erpGoodsExcel.getGoodsName().isEmpty()){
+ if (erpGoodsExcel.getGoodsName() == null || erpGoodsExcel.getGoodsName().isEmpty()) {
names.add("商品名称不能为空");
continue;
}
- if(erpGoodsExcel.getGoodsIdCode()==null || erpGoodsExcel.getGoodsIdCode().isEmpty()
- || erpGoodsExcel.getQuasiNumber() ==null || erpGoodsExcel.getQuasiNumber().isEmpty()
- || erpGoodsExcel.getManufacturer()==null || erpGoodsExcel.getManufacturer().isEmpty()
- || erpGoodsExcel.getFormulationSpec()==null || erpGoodsExcel.getFormulationSpec().isEmpty()
- || erpGoodsExcel.getPackingSpec()==null || erpGoodsExcel.getPackingSpec().isEmpty()
- || erpGoodsExcel.getClinicPurchasePrice()==null|| erpGoodsExcel.getClinicPurchasePrice().isEmpty()
- || erpGoodsExcel.getWarningInventory()==null|| erpGoodsExcel.getWarningInventory().isEmpty()
- || erpGoodsExcel.getTypeName()==null|| erpGoodsExcel.getTypeName().isEmpty()){
- names.add(erpGoodsExcel.getGoodsName()+" :信息有误，请检查后重新提交。");
+ if (erpGoodsExcel.getGoodsIdCode() == null || erpGoodsExcel.getGoodsIdCode().isEmpty()
+ || erpGoodsExcel.getQuasiNumber() == null || erpGoodsExcel.getQuasiNumber().isEmpty()
+ || erpGoodsExcel.getManufacturer() == null || erpGoodsExcel.getManufacturer().isEmpty()
+ || erpGoodsExcel.getFormulationSpec() == null || erpGoodsExcel.getFormulationSpec().isEmpty()
+ || erpGoodsExcel.getPackingSpec() == null || erpGoodsExcel.getPackingSpec().isEmpty()
+ || erpGoodsExcel.getClinicPurchasePrice() == null || erpGoodsExcel.getClinicPurchasePrice().isEmpty()
+ || erpGoodsExcel.getWarningInventory() == null || erpGoodsExcel.getWarningInventory().isEmpty()
+ || erpGoodsExcel.getTypeName() == null || erpGoodsExcel.getTypeName().isEmpty()) {
+ names.add(erpGoodsExcel.getGoodsName() + " :信息有误，请检查后重新提交。");
continue;
}
goods.setGoodsName(erpGoodsExcel.getGoodsName());
// 判断数据是否正确
- // 判断标识码是否重复
+ // 判断条码是否重复
long count = erpGoodsService.count(new QueryWrapper<TErpGoods>().eq("goods_id_code", erpGoodsExcel.getGoodsIdCode()));
- if(count>0){
- names.add(erpGoodsExcel.getGoodsName() + " :标识码重复");
+ if (count > 0) {
+ names.add(erpGoodsExcel.getGoodsName() + " :条码重复");
continue;
}
goods.setGoodsIdCode(erpGoodsExcel.getGoodsIdCode());
@@ -311,7 +719,7 @@
// 商品类型
TErpGoodsType one = erpGoodsTypeService.getOne(new LambdaQueryWrapper<TErpGoodsType>().eq(TErpGoodsType::getTypeName, erpGoodsExcel.getTypeName()));
- if(one==null){
+ if (one == null) {
names.add(erpGoodsExcel.getGoodsName() + " :商品类型不存在");
continue;
}
@@ -320,38 +728,38 @@
// 采购价
try {
goods.setClinicPurchasePrice(new BigDecimal(erpGoodsExcel.getClinicPurchasePrice()).setScale(2, RoundingMode.HALF_UP));
- }catch (Exception e){
+ } catch (Exception e) {
names.add(erpGoodsExcel.getGoodsName() + " :采购价有误");
continue;
}
// 预警库存
try {
goods.setWarningInventory(Integer.valueOf(erpGoodsExcel.getWarningInventory()));
- }catch (Exception e){
+ } catch (Exception e) {
names.add(erpGoodsExcel.getGoodsName() + " :预警库存有误");
continue;
}
goods.setGoodsYards(erpGoodsExcel.getGoodsYards());
try {
- if(erpGoodsExcel.getMaintenanceInterval()!=null && !erpGoodsExcel.getMaintenanceInterval().isEmpty()){
+ if (erpGoodsExcel.getMaintenanceInterval() != null && !erpGoodsExcel.getMaintenanceInterval().isEmpty()) {
Integer i = Integer.valueOf(erpGoodsExcel.getMaintenanceInterval());
}
- }catch (Exception e){
+ } catch (Exception e) {
names.add(erpGoodsExcel.getGoodsName() + " :保养周期有误");
continue;
}
goods.setMaintenanceInterval(erpGoodsExcel.getMaintenanceInterval());
try {
- if(erpGoodsExcel.getLowPurchaseQuantity()!=null && !erpGoodsExcel.getLowPurchaseQuantity().isEmpty()){
+ if (erpGoodsExcel.getLowPurchaseQuantity() != null && !erpGoodsExcel.getLowPurchaseQuantity().isEmpty()) {
goods.setLowPurchaseQuantity(Integer.valueOf(erpGoodsExcel.getLowPurchaseQuantity()));
}
- }catch (Exception e){
+ } catch (Exception e) {
names.add(erpGoodsExcel.getGoodsName() + " :最低采购数量有误");
continue;
}
- if(erpGoodsExcel.getLowUnitName()!=null && !erpGoodsExcel.getLowUnitName().isEmpty()){
+ if (erpGoodsExcel.getLowUnitName() != null && !erpGoodsExcel.getLowUnitName().isEmpty()) {
TErpGoodsUnit one1 = erpGoodsUnitService.getOne(new LambdaQueryWrapper<TErpGoodsUnit>().eq(TErpGoodsUnit::getUnitName, erpGoodsExcel.getLowUnitName()));
if (one1 == null) {
names.add(erpGoodsExcel.getGoodsName() + " :最低采购单位有误");
@@ -361,22 +769,22 @@
}
- if(erpGoodsExcel.getIsPrescriptionDrug() !=null && !erpGoodsExcel.getIsPrescriptionDrug().isEmpty()){
- if(erpGoodsExcel.getIsPrescriptionDrug().equals("是")){
+ if (erpGoodsExcel.getIsPrescriptionDrug() != null && !erpGoodsExcel.getIsPrescriptionDrug().isEmpty()) {
+ if (erpGoodsExcel.getIsPrescriptionDrug().equals("是")) {
goods.setIsPrescriptionDrug(1);
- }else if (erpGoodsExcel.getIsPrescriptionDrug().equals("否")){
+ } else if (erpGoodsExcel.getIsPrescriptionDrug().equals("否")) {
goods.setIsPrescriptionDrug(2);
- }else {
+ } else {
names.add(erpGoodsExcel.getGoodsName() + " :是否为处方药有误");
continue;
}
}
- if(erpGoodsExcel.getPackingUnitName() !=null && !erpGoodsExcel.getPackingUnitName().isEmpty()){
+ if (erpGoodsExcel.getPackingUnitName() != null && !erpGoodsExcel.getPackingUnitName().isEmpty()) {
TErpGoodsUnit unit = erpGoodsUnitService.getOne(new LambdaQueryWrapper<TErpGoodsUnit>().eq(TErpGoodsUnit::getUnitName, erpGoodsExcel.getPackingUnitName()));
- if(unit != null){
+ if (unit != null) {
goods.setPackingUnitId(unit.getId());
- }else {
+ } else {
names.add(erpGoodsExcel.getGoodsName() + " :包装单位有误");
continue;
}
@@ -396,20 +804,20 @@
goods.setPrecautions(erpGoodsExcel.getPrecautions());
goods.setInteraction(erpGoodsExcel.getInteraction());
goods.setStorage(erpGoodsExcel.getStorage());
- tErpGoods.add( goods);
+ tErpGoods.add(goods);
}
} catch (Exception e) {
e.printStackTrace();
return AjaxResult.error("记录导入失败!");
- }finally {
+ } finally {
try {
inputStream.close();
} catch (IOException e) {
throw new ServiceException(e.getMessage());
}
}
- if(names.size()>0){
- return AjaxResult.error("导入失败记录如下：",names);
+ if (names.size() > 0) {
+ return AjaxResult.error("导入失败记录如下：", names);
}
erpGoodsService.saveBatch(tErpGoods);
return AjaxResult.success();
@@ -417,5 +825,21 @@
}
+ @ApiOperation(value = "平台设置分佣")
+ @PostMapping(value = "/setCommission")
+ @Log(title = "商品管理-平台设置分佣", businessType = BusinessType.UPDATE)
+ public R<Boolean> setCommission(@RequestBody @Valid TErpGoodsSetCommissionDto dto) {
+
+ SysUser user = tokenService.getLoginUser().getUser();
+ if (user.getRoleType() == 1) {
+ TErpGoods goods = erpGoodsService.getById(dto.getId());
+ goods.setClinicPurchasePrice(BigDecimal.valueOf(dto.getClinicPurchasePrice()).setScale(2, RoundingMode.HALF_UP));
+ goods.setPlatformCommissionPrice(BigDecimal.valueOf(dto.getPlatformCommissionPrice()).setScale(2, RoundingMode.HALF_UP));
+ goods.setRetailPrice(dto.getRetailPrice());
+ goods.setSalesAmount(dto.getRetailPrice());
+ erpGoodsService.updateById(goods);
+ }
+ return R.ok();
+ }
}
--
Gitblit v1.7.1