|
|
|
@ -2,42 +2,76 @@ package cn.iocoder.yudao.module.erp.service.stock;
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
|
|
|
|
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
|
|
|
|
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.framework.common.util.number.NumberUtils;
|
|
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.product.vo.product.ErpProductRespVO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckAuditReqVO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckGenerateByLocationReqVO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckGenerateByProductReqVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckPageReqVO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckRespVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSaveReqVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSaveReqVO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.check.ErpStockCheckSubmitReqVO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckApproveRecordDO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckDO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockCheckItemDO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockDO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpWarehouseDO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockCheckApproveRecordMapper;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockCheckItemMapper;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockCheckItemMapper;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockCheckMapper;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockCheckMapper;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMapper;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
|
|
|
|
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
|
|
|
|
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.enums.stock.ErpStockCheckApproveActionEnum;
|
|
|
|
import cn.iocoder.yudao.module.erp.enums.stock.ErpStockRecordBizTypeEnum;
|
|
|
|
import cn.iocoder.yudao.module.erp.enums.stock.ErpStockRecordBizTypeEnum;
|
|
|
|
import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
|
|
|
|
import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
|
|
|
|
import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
|
|
|
|
import cn.iocoder.yudao.module.erp.service.stock.bo.ErpStockRecordCreateReqBO;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.erp.service.warehousearea.WarehouseAreaService;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.system.api.permission.PermissionApi;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
|
|
|
|
|
|
|
import cn.iocoder.yudao.module.system.enums.permission.RoleCodeEnum;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import javax.annotation.Resource;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Collection;
|
|
|
|
import java.util.Collection;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
|
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
|
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.diffList;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_APPROVE_FAIL;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_AUDIT_FAIL_RESULT;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_AUDIT_FAIL_STATUS;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_AUDIT_FAIL_USER;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_DELETE_FAIL_APPROVE;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_DELETE_FAIL_PROCESS;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_NOT_EXISTS;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_NO_EXISTS;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_PROCESS_FAIL;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_SUBMIT_FAIL_AUDIT_USER_EMPTY;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_SUBMIT_FAIL_STATUS;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_SUBMIT_FAIL_USER;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_UPDATE_FAIL_APPROVE;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.STOCK_CHECK_UPDATE_FAIL_PROCESS;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_AREA_NOT_EXISTS;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.WAREHOUSE_LOCATION_WAREHOUSE_AREA_NOT_MATCH;
|
|
|
|
|
|
|
|
|
|
|
|
// TODO 芋艿:记录操作日志
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* ERP 库存盘点单 Service 实现类
|
|
|
|
|
|
|
|
*
|
|
|
|
|
|
|
|
* @author 芋道源码
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
@Service
|
|
|
|
@Service
|
|
|
|
@Validated
|
|
|
|
@Validated
|
|
|
|
public class ErpStockCheckServiceImpl implements ErpStockCheckService {
|
|
|
|
public class ErpStockCheckServiceImpl implements ErpStockCheckService {
|
|
|
|
@ -46,36 +80,41 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService {
|
|
|
|
private ErpStockCheckMapper stockCheckMapper;
|
|
|
|
private ErpStockCheckMapper stockCheckMapper;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ErpStockCheckItemMapper stockCheckItemMapper;
|
|
|
|
private ErpStockCheckItemMapper stockCheckItemMapper;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private ErpStockCheckApproveRecordMapper stockCheckApproveRecordMapper;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private ErpStockMapper stockMapper;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ErpNoRedisDAO noRedisDAO;
|
|
|
|
private ErpNoRedisDAO noRedisDAO;
|
|
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ErpProductService productService;
|
|
|
|
private ErpProductService productService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
private ErpWarehouseService warehouseService;
|
|
|
|
private ErpWarehouseService warehouseService;
|
|
|
|
@Resource
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private WarehouseAreaService warehouseAreaService;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
private ErpStockRecordService stockRecordService;
|
|
|
|
private ErpStockRecordService stockRecordService;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private AdminUserApi adminUserApi;
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
|
|
|
private PermissionApi permissionApi;
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public Long createStockCheck(ErpStockCheckSaveReqVO createReqVO) {
|
|
|
|
public Long createStockCheck(ErpStockCheckSaveReqVO createReqVO) {
|
|
|
|
// 1.1 校验盘点项的有效性
|
|
|
|
|
|
|
|
List<ErpStockCheckItemDO> stockCheckItems = validateStockCheckItems(createReqVO.getItems());
|
|
|
|
List<ErpStockCheckItemDO> stockCheckItems = validateStockCheckItems(createReqVO.getItems());
|
|
|
|
// 1.2 生成盘点单号,并校验唯一性
|
|
|
|
|
|
|
|
String no = noRedisDAO.generate(ErpNoRedisDAO.STOCK_CHECK_NO_PREFIX);
|
|
|
|
String no = noRedisDAO.generate(ErpNoRedisDAO.STOCK_CHECK_NO_PREFIX);
|
|
|
|
if (stockCheckMapper.selectByNo(no) != null) {
|
|
|
|
if (stockCheckMapper.selectByNo(no) != null) {
|
|
|
|
throw exception(STOCK_CHECK_NO_EXISTS);
|
|
|
|
throw exception(STOCK_CHECK_NO_EXISTS);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 2.1 插入盘点单
|
|
|
|
|
|
|
|
ErpStockCheckDO stockCheck = BeanUtils.toBean(createReqVO, ErpStockCheckDO.class, in -> in
|
|
|
|
ErpStockCheckDO stockCheck = BeanUtils.toBean(createReqVO, ErpStockCheckDO.class, in -> in
|
|
|
|
.setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
|
|
|
|
.setNo(no)
|
|
|
|
.setTotalCount(getSumValue(stockCheckItems, ErpStockCheckItemDO::getCount, BigDecimal::add))
|
|
|
|
.setStatus(ErpAuditStatus.DRAFT.getStatus())
|
|
|
|
|
|
|
|
.setTotalCount(getSumValue(stockCheckItems, ErpStockCheckItemDO::getCount, BigDecimal::add, BigDecimal.ZERO))
|
|
|
|
.setTotalPrice(getSumValue(stockCheckItems, ErpStockCheckItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO)));
|
|
|
|
.setTotalPrice(getSumValue(stockCheckItems, ErpStockCheckItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO)));
|
|
|
|
stockCheckMapper.insert(stockCheck);
|
|
|
|
stockCheckMapper.insert(stockCheck);
|
|
|
|
// 2.2 插入盘点单项
|
|
|
|
stockCheckItems.forEach(item -> item.setCheckId(stockCheck.getId()));
|
|
|
|
stockCheckItems.forEach(o -> o.setCheckId(stockCheck.getId()));
|
|
|
|
|
|
|
|
stockCheckItemMapper.insertBatch(stockCheckItems);
|
|
|
|
stockCheckItemMapper.insertBatch(stockCheckItems);
|
|
|
|
return stockCheck.getId();
|
|
|
|
return stockCheck.getId();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -83,101 +122,119 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void updateStockCheck(ErpStockCheckSaveReqVO updateReqVO) {
|
|
|
|
public void updateStockCheck(ErpStockCheckSaveReqVO updateReqVO) {
|
|
|
|
// 1.1 校验存在
|
|
|
|
|
|
|
|
ErpStockCheckDO stockCheck = validateStockCheckExists(updateReqVO.getId());
|
|
|
|
ErpStockCheckDO stockCheck = validateStockCheckExists(updateReqVO.getId());
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
throw exception(STOCK_CHECK_UPDATE_FAIL_APPROVE, stockCheck.getNo());
|
|
|
|
throw exception(STOCK_CHECK_UPDATE_FAIL_APPROVE, stockCheck.getNo());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 1.2 校验盘点项的有效性
|
|
|
|
if (ErpAuditStatus.PROCESS.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
List<ErpStockCheckItemDO> stockCheckItems = validateStockCheckItems(updateReqVO.getItems());
|
|
|
|
throw exception(STOCK_CHECK_UPDATE_FAIL_PROCESS, stockCheck.getNo());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 2.1 更新盘点单
|
|
|
|
List<ErpStockCheckItemDO> stockCheckItems = validateStockCheckItems(updateReqVO.getItems());
|
|
|
|
ErpStockCheckDO updateObj = BeanUtils.toBean(updateReqVO, ErpStockCheckDO.class, in -> in
|
|
|
|
ErpStockCheckDO updateObj = BeanUtils.toBean(updateReqVO, ErpStockCheckDO.class, in -> in
|
|
|
|
.setTotalCount(getSumValue(stockCheckItems, ErpStockCheckItemDO::getCount, BigDecimal::add))
|
|
|
|
.setTotalCount(getSumValue(stockCheckItems, ErpStockCheckItemDO::getCount, BigDecimal::add, BigDecimal.ZERO))
|
|
|
|
.setTotalPrice(getSumValue(stockCheckItems, ErpStockCheckItemDO::getTotalPrice, BigDecimal::add)));
|
|
|
|
.setTotalPrice(getSumValue(stockCheckItems, ErpStockCheckItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO)));
|
|
|
|
stockCheckMapper.updateById(updateObj);
|
|
|
|
stockCheckMapper.updateById(updateObj);
|
|
|
|
// 2.2 更新盘点单项
|
|
|
|
|
|
|
|
updateStockCheckItemList(updateReqVO.getId(), stockCheckItems);
|
|
|
|
updateStockCheckItemList(updateReqVO.getId(), stockCheckItems);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void updateStockCheckStatus(Long id, Integer status) {
|
|
|
|
public void updateStockCheckStatus(Long id, Integer status) {
|
|
|
|
boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
|
|
|
|
|
|
|
|
// 1.1 校验存在
|
|
|
|
|
|
|
|
ErpStockCheckDO stockCheck = validateStockCheckExists(id);
|
|
|
|
ErpStockCheckDO stockCheck = validateStockCheckExists(id);
|
|
|
|
// 1.2 校验状态
|
|
|
|
boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
|
|
|
|
if (stockCheck.getStatus().equals(status)) {
|
|
|
|
if (approve) {
|
|
|
|
throw exception(approve ? STOCK_CHECK_APPROVE_FAIL : STOCK_CHECK_PROCESS_FAIL);
|
|
|
|
if (!ErpAuditStatus.PROCESS.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_APPROVE_FAIL);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
if (!ErpAuditStatus.APPROVE.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_PROCESS_FAIL);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 2. 更新状态
|
|
|
|
int updateCount = stockCheckMapper.updateByIdAndStatus(id, stockCheck.getStatus(), new ErpStockCheckDO().setStatus(status));
|
|
|
|
int updateCount = stockCheckMapper.updateByIdAndStatus(id, stockCheck.getStatus(),
|
|
|
|
|
|
|
|
new ErpStockCheckDO().setStatus(status));
|
|
|
|
|
|
|
|
if (updateCount == 0) {
|
|
|
|
if (updateCount == 0) {
|
|
|
|
throw exception(approve ? STOCK_CHECK_APPROVE_FAIL : STOCK_CHECK_PROCESS_FAIL);
|
|
|
|
throw exception(approve ? STOCK_CHECK_APPROVE_FAIL : STOCK_CHECK_PROCESS_FAIL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 3. 变更库存
|
|
|
|
|
|
|
|
List<ErpStockCheckItemDO> stockCheckItems = stockCheckItemMapper.selectListByCheckId(id);
|
|
|
|
List<ErpStockCheckItemDO> stockCheckItems = stockCheckItemMapper.selectListByCheckId(id);
|
|
|
|
stockCheckItems.forEach(stockCheckItem -> {
|
|
|
|
if (approve) {
|
|
|
|
// 没有盈亏,不用出入库
|
|
|
|
applyStockCheckEffect(stockCheck, stockCheckItems);
|
|
|
|
if (stockCheckItem.getCount().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
cancelStockCheckEffect(stockCheck, stockCheckItems);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 10;12;-2()
|
|
|
|
|
|
|
|
BigDecimal count = approve ? stockCheckItem.getCount(): stockCheckItem.getCount().negate();
|
|
|
|
|
|
|
|
Integer bizType;
|
|
|
|
|
|
|
|
if (approve) {
|
|
|
|
|
|
|
|
bizType = count.compareTo(BigDecimal.ZERO) > 0 ? ErpStockRecordBizTypeEnum.CHECK_MORE_IN.getType()
|
|
|
|
|
|
|
|
: ErpStockRecordBizTypeEnum.CHECK_LESS_OUT.getType();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
bizType = count.compareTo(BigDecimal.ZERO) > 0 ? ErpStockRecordBizTypeEnum.CHECK_MORE_IN_CANCEL.getType()
|
|
|
|
|
|
|
|
: ErpStockRecordBizTypeEnum.CHECK_LESS_OUT_CANCEL.getType();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
ErpProductDO productDO = productService.getProduct(stockCheckItem.getProductId());
|
|
|
|
|
|
|
|
stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
|
|
|
|
|
|
|
|
stockCheckItem.getProductId(),productDO.getCategoryId(), stockCheckItem.getWarehouseId(), count,
|
|
|
|
|
|
|
|
bizType, stockCheckItem.getCheckId(), stockCheckItem.getId(), stockCheck.getNo(),stockCheck.getCheckTime()));
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private List<ErpStockCheckItemDO> validateStockCheckItems(List<ErpStockCheckSaveReqVO.Item> list) {
|
|
|
|
@Override
|
|
|
|
// 1.1 校验产品存在
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
List<ErpProductDO> productList = productService.validProductList(
|
|
|
|
public void submitStockCheckAudit(ErpStockCheckSubmitReqVO submitReqVO) {
|
|
|
|
convertSet(list, ErpStockCheckSaveReqVO.Item::getProductId));
|
|
|
|
ErpStockCheckDO stockCheck = validateStockCheckExists(submitReqVO.getId());
|
|
|
|
Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
|
|
|
|
Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
|
|
|
|
// 1.2 校验仓库存在
|
|
|
|
if (!Objects.equals(NumberUtils.parseLong(stockCheck.getCreator()), loginUserId)) {
|
|
|
|
warehouseService.validWarehouseList(convertSet(list, ErpStockCheckSaveReqVO.Item::getWarehouseId));
|
|
|
|
throw exception(STOCK_CHECK_SUBMIT_FAIL_USER);
|
|
|
|
// 2. 转化为 ErpStockCheckItemDO 列表
|
|
|
|
}
|
|
|
|
return convertList(list, o -> BeanUtils.toBean(o, ErpStockCheckItemDO.class, item -> item
|
|
|
|
if (!ErpAuditStatus.DRAFT.getStatus().equals(stockCheck.getStatus())
|
|
|
|
.setProductUnitId(productMap.get(item.getProductId()).getUnitId())
|
|
|
|
&& !ErpAuditStatus.UN_APPROVE.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()))));
|
|
|
|
throw exception(STOCK_CHECK_SUBMIT_FAIL_STATUS);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Long auditUserId = submitReqVO.getAuditUserId() != null ? submitReqVO.getAuditUserId() : stockCheck.getAuditUserId();
|
|
|
|
|
|
|
|
if (auditUserId == null) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_SUBMIT_FAIL_AUDIT_USER_EMPTY);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
adminUserApi.validateUser(auditUserId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Integer fromStatus = stockCheck.getStatus();
|
|
|
|
|
|
|
|
int updateCount = stockCheckMapper.updateByIdAndStatus(stockCheck.getId(), fromStatus,
|
|
|
|
|
|
|
|
new ErpStockCheckDO().setAuditUserId(auditUserId).setStatus(ErpAuditStatus.PROCESS.getStatus()));
|
|
|
|
|
|
|
|
if (updateCount == 0) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_SUBMIT_FAIL_STATUS);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
createApproveRecord(stockCheck.getId(), ErpStockCheckApproveActionEnum.SUBMIT,
|
|
|
|
|
|
|
|
fromStatus, ErpAuditStatus.PROCESS.getStatus(), auditUserId, submitReqVO.getRemark());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void updateStockCheckItemList(Long id, List<ErpStockCheckItemDO> newList) {
|
|
|
|
@Override
|
|
|
|
// 第一步,对比新老数据,获得添加、修改、删除的列表
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
List<ErpStockCheckItemDO> oldList = stockCheckItemMapper.selectListByCheckId(id);
|
|
|
|
public void auditStockCheck(ErpStockCheckAuditReqVO auditReqVO) {
|
|
|
|
List<List<ErpStockCheckItemDO>> diffList = diffList(oldList, newList, // id 不同,就认为是不同的记录
|
|
|
|
ErpStockCheckDO stockCheck = validateStockCheckExists(auditReqVO.getId());
|
|
|
|
(oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
|
|
|
|
if (!ErpAuditStatus.PROCESS.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_AUDIT_FAIL_STATUS);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 第二步,批量添加、修改、删除
|
|
|
|
Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
|
|
|
|
if (CollUtil.isNotEmpty(diffList.get(0))) {
|
|
|
|
boolean adminCanAudit = permissionApi.hasAnyRoles(loginUserId, RoleCodeEnum.SUPER_ADMIN.getCode());
|
|
|
|
diffList.get(0).forEach(o -> o.setCheckId(id));
|
|
|
|
if (!Objects.equals(stockCheck.getAuditUserId(), loginUserId) && !adminCanAudit) {
|
|
|
|
stockCheckItemMapper.insertBatch(diffList.get(0));
|
|
|
|
throw exception(STOCK_CHECK_AUDIT_FAIL_USER);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (CollUtil.isNotEmpty(diffList.get(1))) {
|
|
|
|
if (!ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())
|
|
|
|
stockCheckItemMapper.updateBatch(diffList.get(1));
|
|
|
|
&& !ErpAuditStatus.UN_APPROVE.getStatus().equals(auditReqVO.getStatus())) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_AUDIT_FAIL_RESULT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (CollUtil.isNotEmpty(diffList.get(2))) {
|
|
|
|
|
|
|
|
stockCheckItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockCheckItemDO::getId));
|
|
|
|
Integer fromStatus = stockCheck.getStatus();
|
|
|
|
|
|
|
|
int updateCount = stockCheckMapper.updateByIdAndStatus(stockCheck.getId(), fromStatus,
|
|
|
|
|
|
|
|
new ErpStockCheckDO().setStatus(auditReqVO.getStatus()));
|
|
|
|
|
|
|
|
if (updateCount == 0) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_AUDIT_FAIL_STATUS);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<ErpStockCheckItemDO> stockCheckItems = stockCheckItemMapper.selectListByCheckId(stockCheck.getId());
|
|
|
|
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())) {
|
|
|
|
|
|
|
|
applyStockCheckEffect(stockCheck, stockCheckItems);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Long targetUserId = NumberUtils.parseLong(stockCheck.getCreator());
|
|
|
|
|
|
|
|
createApproveRecord(stockCheck.getId(), ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())
|
|
|
|
|
|
|
|
? ErpStockCheckApproveActionEnum.APPROVE : ErpStockCheckApproveActionEnum.REJECT,
|
|
|
|
|
|
|
|
fromStatus, auditReqVO.getStatus(), targetUserId, auditReqVO.getRemark());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
public void deleteStockCheck(List<Long> ids) {
|
|
|
|
public void deleteStockCheck(List<Long> ids) {
|
|
|
|
// 1. 校验不处于已审批
|
|
|
|
|
|
|
|
List<ErpStockCheckDO> stockChecks = stockCheckMapper.selectBatchIds(ids);
|
|
|
|
List<ErpStockCheckDO> stockChecks = stockCheckMapper.selectBatchIds(ids);
|
|
|
|
if (CollUtil.isEmpty(stockChecks)) {
|
|
|
|
if (CollUtil.isEmpty(stockChecks)) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
@ -186,25 +243,18 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService {
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
throw exception(STOCK_CHECK_DELETE_FAIL_APPROVE, stockCheck.getNo());
|
|
|
|
throw exception(STOCK_CHECK_DELETE_FAIL_APPROVE, stockCheck.getNo());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ErpAuditStatus.PROCESS.getStatus().equals(stockCheck.getStatus())) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_DELETE_FAIL_PROCESS, stockCheck.getNo());
|
|
|
|
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// 2. 遍历删除,并记录操作日志
|
|
|
|
|
|
|
|
stockChecks.forEach(stockCheck -> {
|
|
|
|
stockChecks.forEach(stockCheck -> {
|
|
|
|
// 2.1 删除盘点单
|
|
|
|
|
|
|
|
stockCheckMapper.deleteById(stockCheck.getId());
|
|
|
|
stockCheckMapper.deleteById(stockCheck.getId());
|
|
|
|
// 2.2 删除盘点单项
|
|
|
|
|
|
|
|
stockCheckItemMapper.deleteByCheckId(stockCheck.getId());
|
|
|
|
stockCheckItemMapper.deleteByCheckId(stockCheck.getId());
|
|
|
|
|
|
|
|
stockCheckApproveRecordMapper.deleteByStockCheckId(stockCheck.getId());
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private ErpStockCheckDO validateStockCheckExists(Long id) {
|
|
|
|
|
|
|
|
ErpStockCheckDO stockCheck = stockCheckMapper.selectById(id);
|
|
|
|
|
|
|
|
if (stockCheck == null) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_NOT_EXISTS);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return stockCheck;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public ErpStockCheckDO getStockCheck(Long id) {
|
|
|
|
public ErpStockCheckDO getStockCheck(Long id) {
|
|
|
|
return stockCheckMapper.selectById(id);
|
|
|
|
return stockCheckMapper.selectById(id);
|
|
|
|
@ -215,8 +265,6 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService {
|
|
|
|
return stockCheckMapper.selectPage(pageReqVO);
|
|
|
|
return stockCheckMapper.selectPage(pageReqVO);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// ==================== 盘点项 ====================
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public List<ErpStockCheckItemDO> getStockCheckItemListByCheckId(Long checkId) {
|
|
|
|
public List<ErpStockCheckItemDO> getStockCheckItemListByCheckId(Long checkId) {
|
|
|
|
return stockCheckItemMapper.selectListByCheckId(checkId);
|
|
|
|
return stockCheckItemMapper.selectListByCheckId(checkId);
|
|
|
|
@ -230,4 +278,210 @@ public class ErpStockCheckServiceImpl implements ErpStockCheckService {
|
|
|
|
return stockCheckItemMapper.selectListByCheckIds(checkIds);
|
|
|
|
return stockCheckItemMapper.selectListByCheckIds(checkIds);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public List<ErpStockCheckApproveRecordDO> getStockCheckApproveRecordList(Long stockCheckId) {
|
|
|
|
|
|
|
|
return stockCheckApproveRecordMapper.selectListByStockCheckId(stockCheckId);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public List<ErpStockCheckRespVO.Item> generateStockCheckItemsByLocation(ErpStockCheckGenerateByLocationReqVO reqVO) {
|
|
|
|
|
|
|
|
if (reqVO == null || !reqVO.validSelection()) {
|
|
|
|
|
|
|
|
return Collections.emptyList();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
List<ErpStockDO> stockList = stockMapper.selectListByWarehouseIdsAndAreaIds(reqVO.getWarehouseIds(), reqVO.getAreaIds());
|
|
|
|
|
|
|
|
if (!Boolean.TRUE.equals(reqVO.getAllowEmpty())) {
|
|
|
|
|
|
|
|
stockList = filterNonZeroStocks(stockList);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return buildPreviewItems(stockList);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public List<ErpStockCheckRespVO.Item> generateStockCheckItemsByProduct(ErpStockCheckGenerateByProductReqVO reqVO) {
|
|
|
|
|
|
|
|
if (reqVO == null || CollUtil.isEmpty(reqVO.getProductIds())) {
|
|
|
|
|
|
|
|
return Collections.emptyList();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return buildPreviewItems(filterNonZeroStocks(stockMapper.selectListByProductIds(reqVO.getProductIds())));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<ErpStockDO> filterNonZeroStocks(List<ErpStockDO> stockList) {
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(stockList)) {
|
|
|
|
|
|
|
|
return Collections.emptyList();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
List<ErpStockDO> result = new ArrayList<>();
|
|
|
|
|
|
|
|
for (ErpStockDO stock : stockList) {
|
|
|
|
|
|
|
|
if (stock != null && stock.getCount() != null && stock.getCount().compareTo(BigDecimal.ZERO) != 0) {
|
|
|
|
|
|
|
|
result.add(stock);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<ErpStockCheckRespVO.Item> buildPreviewItems(List<ErpStockDO> stockList) {
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(stockList)) {
|
|
|
|
|
|
|
|
return Collections.emptyList();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
Map<Long, ErpProductDO> productMap = productService.getProductMap(convertSet(stockList, ErpStockDO::getProductId));
|
|
|
|
|
|
|
|
Map<Long, ErpWarehouseDO> warehouseMap = warehouseService.getWarehouseMap(convertSet(stockList, ErpStockDO::getWarehouseId));
|
|
|
|
|
|
|
|
Map<Long, WarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(convertSet(stockList, ErpStockDO::getAreaId));
|
|
|
|
|
|
|
|
List<ErpStockCheckRespVO.Item> result = new ArrayList<>();
|
|
|
|
|
|
|
|
for (ErpStockDO stock : stockList) {
|
|
|
|
|
|
|
|
ErpStockCheckRespVO.Item item = new ErpStockCheckRespVO.Item();
|
|
|
|
|
|
|
|
item.setWarehouseId(stock.getWarehouseId());
|
|
|
|
|
|
|
|
item.setAreaId(stock.getAreaId());
|
|
|
|
|
|
|
|
item.setAreaName(stock.getAreaName());
|
|
|
|
|
|
|
|
item.setProductId(stock.getProductId());
|
|
|
|
|
|
|
|
item.setStockCount(stock.getCount() != null ? stock.getCount() : BigDecimal.ZERO);
|
|
|
|
|
|
|
|
item.setActualCount(stock.getCount() != null ? stock.getCount() : BigDecimal.ZERO);
|
|
|
|
|
|
|
|
item.setCount(BigDecimal.ZERO);
|
|
|
|
|
|
|
|
MapUtils.findAndThen(warehouseMap, stock.getWarehouseId(), warehouse -> item.setWarehouseName(warehouse.getName()));
|
|
|
|
|
|
|
|
if (item.getAreaName() == null) {
|
|
|
|
|
|
|
|
MapUtils.findAndThen(areaMap, stock.getAreaId(), area -> item.setAreaName(area.getAreaName()));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
ErpProductDO productDO = productMap.get(stock.getProductId());
|
|
|
|
|
|
|
|
item.setProductPrice(resolveProductPrice(productDO));
|
|
|
|
|
|
|
|
if (productDO != null) {
|
|
|
|
|
|
|
|
item.setProductName(productDO.getName());
|
|
|
|
|
|
|
|
item.setProductBarCode(productDO.getBarCode());
|
|
|
|
|
|
|
|
ErpProductRespVO productVO = productService.getProduct(productDO.getId());
|
|
|
|
|
|
|
|
if (productVO != null) {
|
|
|
|
|
|
|
|
item.setProductUnitName(productVO.getUnitName());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
result.add(item);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private BigDecimal resolveProductPrice(ErpProductDO productDO) {
|
|
|
|
|
|
|
|
if (productDO == null) {
|
|
|
|
|
|
|
|
return BigDecimal.ZERO;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (productDO.getPurchasePrice() != null) {
|
|
|
|
|
|
|
|
return productDO.getPurchasePrice();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (productDO.getSalePrice() != null) {
|
|
|
|
|
|
|
|
return productDO.getSalePrice();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return BigDecimal.ZERO;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void applyStockCheckEffect(ErpStockCheckDO stockCheck, List<ErpStockCheckItemDO> stockCheckItems) {
|
|
|
|
|
|
|
|
operateStockCheckEffect(stockCheck, stockCheckItems, true);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void cancelStockCheckEffect(ErpStockCheckDO stockCheck, List<ErpStockCheckItemDO> stockCheckItems) {
|
|
|
|
|
|
|
|
operateStockCheckEffect(stockCheck, stockCheckItems, false);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void operateStockCheckEffect(ErpStockCheckDO stockCheck, List<ErpStockCheckItemDO> stockCheckItems, boolean approve) {
|
|
|
|
|
|
|
|
stockCheckItems.forEach(stockCheckItem -> {
|
|
|
|
|
|
|
|
if (stockCheckItem.getCount() == null || stockCheckItem.getCount().compareTo(BigDecimal.ZERO) == 0) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
BigDecimal count = approve ? stockCheckItem.getCount() : stockCheckItem.getCount().negate();
|
|
|
|
|
|
|
|
Integer bizType;
|
|
|
|
|
|
|
|
if (approve) {
|
|
|
|
|
|
|
|
bizType = stockCheckItem.getCount().compareTo(BigDecimal.ZERO) > 0
|
|
|
|
|
|
|
|
? ErpStockRecordBizTypeEnum.CHECK_MORE_IN.getType()
|
|
|
|
|
|
|
|
: ErpStockRecordBizTypeEnum.CHECK_LESS_OUT.getType();
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
bizType = stockCheckItem.getCount().compareTo(BigDecimal.ZERO) > 0
|
|
|
|
|
|
|
|
? ErpStockRecordBizTypeEnum.CHECK_MORE_IN_CANCEL.getType()
|
|
|
|
|
|
|
|
: ErpStockRecordBizTypeEnum.CHECK_LESS_OUT_CANCEL.getType();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
ErpProductDO productDO = productService.validProductList(Collections.singleton(stockCheckItem.getProductId()))
|
|
|
|
|
|
|
|
.stream().findFirst().orElse(null);
|
|
|
|
|
|
|
|
if (productDO == null) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
|
|
|
|
|
|
|
|
stockCheckItem.getProductId(), productDO.getCategoryId(), null,
|
|
|
|
|
|
|
|
stockCheckItem.getWarehouseId(), stockCheckItem.getAreaId(), stockCheckItem.getAreaName(),
|
|
|
|
|
|
|
|
count, bizType, stockCheckItem.getCheckId(), stockCheckItem.getId(), stockCheck.getNo(), stockCheck.getCheckTime()));
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private List<ErpStockCheckItemDO> validateStockCheckItems(List<ErpStockCheckSaveReqVO.Item> list) {
|
|
|
|
|
|
|
|
List<ErpProductDO> productList = productService.validProductList(convertSet(list, ErpStockCheckSaveReqVO.Item::getProductId));
|
|
|
|
|
|
|
|
Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
|
|
|
|
|
|
|
|
Map<Long, ErpWarehouseDO> warehouseMap = convertMap(
|
|
|
|
|
|
|
|
warehouseService.validWarehouseList(convertSet(list, ErpStockCheckSaveReqVO.Item::getWarehouseId)),
|
|
|
|
|
|
|
|
ErpWarehouseDO::getId);
|
|
|
|
|
|
|
|
Map<Long, WarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(convertSet(list, ErpStockCheckSaveReqVO.Item::getAreaId));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
list.forEach(item -> {
|
|
|
|
|
|
|
|
if (item.getAreaId() == null) {
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
WarehouseAreaDO area = areaMap.get(item.getAreaId());
|
|
|
|
|
|
|
|
if (area == null) {
|
|
|
|
|
|
|
|
throw exception(WAREHOUSE_AREA_NOT_EXISTS);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!warehouseMap.containsKey(item.getWarehouseId()) || !Objects.equals(item.getWarehouseId(), area.getWarehouseId())) {
|
|
|
|
|
|
|
|
throw exception(WAREHOUSE_LOCATION_WAREHOUSE_AREA_NOT_MATCH);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return convertList(list, item -> {
|
|
|
|
|
|
|
|
ErpProductDO productDO = productMap.get(item.getProductId());
|
|
|
|
|
|
|
|
WarehouseAreaDO area = item.getAreaId() != null ? areaMap.get(item.getAreaId()) : null;
|
|
|
|
|
|
|
|
BigDecimal stockCount = item.getStockCount() != null ? item.getStockCount() : BigDecimal.ZERO;
|
|
|
|
|
|
|
|
BigDecimal actualCount = item.getActualCount() != null ? item.getActualCount() : BigDecimal.ZERO;
|
|
|
|
|
|
|
|
BigDecimal count = actualCount.subtract(stockCount);
|
|
|
|
|
|
|
|
BigDecimal productPrice = item.getProductPrice() != null ? item.getProductPrice() : resolveProductPrice(productDO);
|
|
|
|
|
|
|
|
return ErpStockCheckItemDO.builder()
|
|
|
|
|
|
|
|
.id(item.getId())
|
|
|
|
|
|
|
|
.warehouseId(item.getWarehouseId())
|
|
|
|
|
|
|
|
.areaId(item.getAreaId())
|
|
|
|
|
|
|
|
.areaName(area != null ? area.getAreaName() : null)
|
|
|
|
|
|
|
|
.productId(item.getProductId())
|
|
|
|
|
|
|
|
.productUnitId(productDO != null ? productDO.getUnitId() : null)
|
|
|
|
|
|
|
|
.productPrice(productPrice)
|
|
|
|
|
|
|
|
.stockCount(stockCount)
|
|
|
|
|
|
|
|
.actualCount(actualCount)
|
|
|
|
|
|
|
|
.count(count)
|
|
|
|
|
|
|
|
.totalPrice(MoneyUtils.priceMultiply(productPrice, count))
|
|
|
|
|
|
|
|
.remark(item.getRemark())
|
|
|
|
|
|
|
|
.build();
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void updateStockCheckItemList(Long id, List<ErpStockCheckItemDO> newList) {
|
|
|
|
|
|
|
|
List<ErpStockCheckItemDO> oldList = stockCheckItemMapper.selectListByCheckId(id);
|
|
|
|
|
|
|
|
List<List<ErpStockCheckItemDO>> diffList = diffList(oldList, newList,
|
|
|
|
|
|
|
|
(oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(diffList.get(0))) {
|
|
|
|
|
|
|
|
diffList.get(0).forEach(item -> item.setCheckId(id));
|
|
|
|
|
|
|
|
stockCheckItemMapper.insertBatch(diffList.get(0));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(diffList.get(1))) {
|
|
|
|
|
|
|
|
diffList.get(1).forEach(item -> item.setCheckId(id));
|
|
|
|
|
|
|
|
stockCheckItemMapper.updateBatch(diffList.get(1));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(diffList.get(2))) {
|
|
|
|
|
|
|
|
stockCheckItemMapper.deleteBatchIds(convertList(diffList.get(2), ErpStockCheckItemDO::getId));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void createApproveRecord(Long stockCheckId, ErpStockCheckApproveActionEnum action, Integer fromStatus,
|
|
|
|
|
|
|
|
Integer toStatus, Long targetUserId, String remark) {
|
|
|
|
|
|
|
|
stockCheckApproveRecordMapper.insert(ErpStockCheckApproveRecordDO.builder()
|
|
|
|
|
|
|
|
.stockCheckId(stockCheckId)
|
|
|
|
|
|
|
|
.actionType(action.getActionType())
|
|
|
|
|
|
|
|
.fromStatus(fromStatus)
|
|
|
|
|
|
|
|
.toStatus(toStatus)
|
|
|
|
|
|
|
|
.targetUserId(targetUserId)
|
|
|
|
|
|
|
|
.remark(remark)
|
|
|
|
|
|
|
|
.build());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private ErpStockCheckDO validateStockCheckExists(Long id) {
|
|
|
|
|
|
|
|
ErpStockCheckDO stockCheck = stockCheckMapper.selectById(id);
|
|
|
|
|
|
|
|
if (stockCheck == null) {
|
|
|
|
|
|
|
|
throw exception(STOCK_CHECK_NOT_EXISTS);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return stockCheck;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|