|
|
|
|
@ -3,19 +3,33 @@ package cn.iocoder.yudao.module.erp.service.stock;
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
|
|
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.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.move.ErpStockMoveAuditReqVO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move.ErpStockMovePageReqVO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move.ErpStockMoveSaveReqVO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.controller.admin.stock.vo.move.ErpStockMoveSubmitReqVO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveApproveRecordDO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveDO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.stock.ErpStockMoveItemDO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.dataobject.warehousearea.WarehouseAreaDO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMoveApproveRecordMapper;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMoveItemMapper;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.dal.mysql.stock.ErpStockMoveMapper;
|
|
|
|
|
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.stock.ErpStockMoveApproveActionEnum;
|
|
|
|
|
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.stock.bo.ErpStockRecordCreateReqBO;
|
|
|
|
|
import cn.iocoder.yudao.module.erp.service.warehousearea.WarehouseAreaService;
|
|
|
|
|
import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
|
|
|
|
|
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.transaction.annotation.Transactional;
|
|
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
|
|
@ -26,13 +40,14 @@ import java.util.Collection;
|
|
|
|
|
import java.util.Collections;
|
|
|
|
|
import java.util.List;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.Objects;
|
|
|
|
|
import java.util.stream.Stream;
|
|
|
|
|
|
|
|
|
|
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.module.erp.enums.ErrorCodeConstants.*;
|
|
|
|
|
|
|
|
|
|
// TODO 芋艿：记录操作日志
|
|
|
|
|
// TODO 记录操作日志
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* ERP 库存调拨单 Service 实现类
|
|
|
|
|
@ -43,10 +58,16 @@ import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
|
|
|
|
|
@Validated
|
|
|
|
|
public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
|
|
|
|
|
private static final String AUDIT_CONFIG_CATEGORY = "biz";
|
|
|
|
|
private static final String AUDIT_CONFIG_KEY = "transferAduit";
|
|
|
|
|
private static final String AUDIT_CONFIG_DISABLE_VALUE = "0";
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private ErpStockMoveMapper stockMoveMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
private ErpStockMoveItemMapper stockMoveItemMapper;
|
|
|
|
|
@Resource
|
|
|
|
|
private ErpStockMoveApproveRecordMapper stockMoveApproveRecordMapper;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private ErpNoRedisDAO noRedisDAO;
|
|
|
|
|
@ -57,11 +78,19 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
private ErpWarehouseService warehouseService;
|
|
|
|
|
@Resource
|
|
|
|
|
private ErpStockRecordService stockRecordService;
|
|
|
|
|
@Resource
|
|
|
|
|
private WarehouseAreaService warehouseAreaService;
|
|
|
|
|
@Resource
|
|
|
|
|
private AdminUserApi adminUserApi;
|
|
|
|
|
@Resource
|
|
|
|
|
private ConfigApi configApi;
|
|
|
|
|
@Resource
|
|
|
|
|
private PermissionApi permissionApi;
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public Long createStockMove(ErpStockMoveSaveReqVO createReqVO) {
|
|
|
|
|
// 1.1 校验出库项的有效性
|
|
|
|
|
// 1.1 校验调拨项的有效性
|
|
|
|
|
List<ErpStockMoveItemDO> stockMoveItems = validateStockMoveItems(createReqVO.getItems());
|
|
|
|
|
// 1.2 生成调拨单号，并校验唯一性
|
|
|
|
|
String no = noRedisDAO.generate(ErpNoRedisDAO.STOCK_MOVE_NO_PREFIX);
|
|
|
|
|
@ -69,13 +98,18 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
throw exception(STOCK_MOVE_NO_EXISTS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 2.1 插入出库单
|
|
|
|
|
if (createReqVO.getAuditUserId() != null) {
|
|
|
|
|
adminUserApi.validateUser(createReqVO.getAuditUserId());
|
|
|
|
|
}
|
|
|
|
|
boolean needAudit = needAudit();
|
|
|
|
|
ErpStockMoveDO stockMove = BeanUtils.toBean(createReqVO, ErpStockMoveDO.class, in -> in
|
|
|
|
|
.setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
|
|
|
|
|
.setNo(no)
|
|
|
|
|
.setNeedAudit(needAudit)
|
|
|
|
|
.setStatus(ErpAuditStatus.PROCESS.getStatus())
|
|
|
|
|
.setTotalCount(getSumValue(stockMoveItems, ErpStockMoveItemDO::getCount, BigDecimal::add))
|
|
|
|
|
.setTotalPrice(getSumValue(stockMoveItems, ErpStockMoveItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO)));
|
|
|
|
|
stockMoveMapper.insert(stockMove);
|
|
|
|
|
// 2.2 插入出库单项
|
|
|
|
|
// 2.2 插入调拨单项
|
|
|
|
|
stockMoveItems.forEach(o -> o.setMoveId(stockMove.getId()));
|
|
|
|
|
stockMoveItemMapper.insertBatch(stockMoveItems);
|
|
|
|
|
return stockMove.getId();
|
|
|
|
|
@ -89,38 +123,119 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(stockMove.getStatus())) {
|
|
|
|
|
throw exception(STOCK_MOVE_UPDATE_FAIL_APPROVE, stockMove.getNo());
|
|
|
|
|
}
|
|
|
|
|
// 1.2 校验出库项的有效性
|
|
|
|
|
// if (ErpAuditStatus.PROCESS.getStatus().equals(stockMove.getStatus())) {
|
|
|
|
|
// throw exception(STOCK_MOVE_UPDATE_FAIL_PROCESS, stockMove.getNo());
|
|
|
|
|
// }
|
|
|
|
|
List<ErpStockMoveItemDO> stockMoveItems = validateStockMoveItems(updateReqVO.getItems());
|
|
|
|
|
if (updateReqVO.getAuditUserId() != null) {
|
|
|
|
|
adminUserApi.validateUser(updateReqVO.getAuditUserId());
|
|
|
|
|
}
|
|
|
|
|
boolean needAudit = needAudit();
|
|
|
|
|
|
|
|
|
|
// 2.1 更新出库单
|
|
|
|
|
ErpStockMoveDO updateObj = BeanUtils.toBean(updateReqVO, ErpStockMoveDO.class, in -> in
|
|
|
|
|
.setNeedAudit(needAudit)
|
|
|
|
|
.setTotalCount(getSumValue(stockMoveItems, ErpStockMoveItemDO::getCount, BigDecimal::add))
|
|
|
|
|
.setTotalPrice(getSumValue(stockMoveItems, ErpStockMoveItemDO::getTotalPrice, BigDecimal::add)));
|
|
|
|
|
stockMoveMapper.updateById(updateObj);
|
|
|
|
|
// 2.2 更新出库单项
|
|
|
|
|
// 2.2 更新调拨单项
|
|
|
|
|
updateStockMoveItemList(updateReqVO.getId(), stockMoveItems);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void updateStockMoveStatus(Long id, Integer status) {
|
|
|
|
|
boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
|
|
|
|
|
// 1.1 校验存在
|
|
|
|
|
ErpStockMoveDO stockMove = validateStockMoveExists(id);
|
|
|
|
|
// 1.2 校验状态
|
|
|
|
|
if (stockMove.getStatus().equals(status)) {
|
|
|
|
|
throw exception(approve ? STOCK_MOVE_APPROVE_FAIL : STOCK_MOVE_PROCESS_FAIL);
|
|
|
|
|
boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
|
|
|
|
|
if (approve) {
|
|
|
|
|
if (!ErpAuditStatus.PROCESS.getStatus().equals(stockMove.getStatus())) {
|
|
|
|
|
throw exception(STOCK_MOVE_APPROVE_FAIL);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (!ErpAuditStatus.APPROVE.getStatus().equals(stockMove.getStatus())) {
|
|
|
|
|
throw exception(STOCK_MOVE_PROCESS_FAIL);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 2. 更新状态
|
|
|
|
|
int updateCount = stockMoveMapper.updateByIdAndStatus(id, stockMove.getStatus(),
|
|
|
|
|
new ErpStockMoveDO().setStatus(status));
|
|
|
|
|
if (updateCount == 0) {
|
|
|
|
|
throw exception(approve ? STOCK_MOVE_APPROVE_FAIL : STOCK_MOVE_PROCESS_FAIL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 3. 变更库存
|
|
|
|
|
List<ErpStockMoveItemDO> stockMoveItems = stockMoveItemMapper.selectListByMoveId(id);
|
|
|
|
|
operateStockMoveEffect(stockMove, stockMoveItems, approve);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void submitStockMoveAudit(ErpStockMoveSubmitReqVO submitReqVO) {
|
|
|
|
|
ErpStockMoveDO stockMove = validateStockMoveExists(submitReqVO.getId());
|
|
|
|
|
Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
|
|
|
|
|
// if (!Objects.equals(NumberUtils.parseLong(stockMove.getCreator()), loginUserId)) {
|
|
|
|
|
// throw exception(STOCK_MOVE_SUBMIT_FAIL_USER);
|
|
|
|
|
// }
|
|
|
|
|
if (!ErpAuditStatus.DRAFT.getStatus().equals(stockMove.getStatus())
|
|
|
|
|
&& !ErpAuditStatus.UN_APPROVE.getStatus().equals(stockMove.getStatus())) {
|
|
|
|
|
throw exception(STOCK_MOVE_SUBMIT_FAIL_STATUS);
|
|
|
|
|
}
|
|
|
|
|
Integer fromStatus = stockMove.getStatus();
|
|
|
|
|
Long auditUserId = submitReqVO.getAuditUserId() != null ? submitReqVO.getAuditUserId() : stockMove.getAuditUserId();
|
|
|
|
|
if (auditUserId != null) {
|
|
|
|
|
adminUserApi.validateUser(auditUserId);
|
|
|
|
|
}
|
|
|
|
|
int updateCount = stockMoveMapper.updateByIdAndStatus(stockMove.getId(), fromStatus,
|
|
|
|
|
new ErpStockMoveDO().setAuditUserId(auditUserId).setStatus(ErpAuditStatus.PROCESS.getStatus()));
|
|
|
|
|
if (updateCount == 0) {
|
|
|
|
|
throw exception(STOCK_MOVE_SUBMIT_FAIL_STATUS);
|
|
|
|
|
}
|
|
|
|
|
createApproveRecord(stockMove.getId(), ErpStockMoveApproveActionEnum.SUBMIT, fromStatus,
|
|
|
|
|
ErpAuditStatus.PROCESS.getStatus(), auditUserId, submitReqVO.getRemark());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
|
|
public void auditStockMove(ErpStockMoveAuditReqVO auditReqVO) {
|
|
|
|
|
ErpStockMoveDO stockMove = validateStockMoveExists(auditReqVO.getId());
|
|
|
|
|
Integer fromStatus = stockMove.getStatus();
|
|
|
|
|
Long loginUserId = SecurityFrameworkUtils.getLoginUserId();
|
|
|
|
|
if (!ErpAuditStatus.PROCESS.getStatus().equals(fromStatus) && needAudit()) {
|
|
|
|
|
throw exception(STOCK_MOVE_AUDIT_FAIL_STATUS);
|
|
|
|
|
}
|
|
|
|
|
if (!needAudit()) {
|
|
|
|
|
int updateCount = stockMoveMapper.updateByIdAndStatus(stockMove.getId(), fromStatus,
|
|
|
|
|
new ErpStockMoveDO().setNeedAudit(false).setStatus(ErpAuditStatus.APPROVE.getStatus()).setAuditUserId(loginUserId));
|
|
|
|
|
if (updateCount == 0) {
|
|
|
|
|
throw exception(STOCK_MOVE_AUDIT_FAIL_STATUS);
|
|
|
|
|
}
|
|
|
|
|
List<ErpStockMoveItemDO> stockMoveItems = stockMoveItemMapper.selectListByMoveId(stockMove.getId());
|
|
|
|
|
operateStockMoveEffect(stockMove, stockMoveItems, true);
|
|
|
|
|
createApproveRecord(stockMove.getId(), ErpStockMoveApproveActionEnum.AUTO_APPROVE, fromStatus,
|
|
|
|
|
ErpAuditStatus.APPROVE.getStatus(), NumberUtils.parseLong(stockMove.getCreator()),
|
|
|
|
|
auditReqVO.getRemark() != null ? auditReqVO.getRemark() : "无需审核，审核时自动调拨");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
boolean adminCanAudit = permissionApi.hasAnyRoles(loginUserId, RoleCodeEnum.SUPER_ADMIN.getCode());
|
|
|
|
|
// if (!Objects.equals(stockMove.getAuditUserId(), loginUserId) && !adminCanAudit) {
|
|
|
|
|
// throw exception(STOCK_MOVE_AUDIT_FAIL_USER);
|
|
|
|
|
// }
|
|
|
|
|
if (!ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())
|
|
|
|
|
&& !ErpAuditStatus.UN_APPROVE.getStatus().equals(auditReqVO.getStatus())) {
|
|
|
|
|
throw exception(STOCK_MOVE_AUDIT_FAIL_RESULT);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int updateCount = stockMoveMapper.updateByIdAndStatus(stockMove.getId(), fromStatus,
|
|
|
|
|
new ErpStockMoveDO().setNeedAudit(true).setStatus(auditReqVO.getStatus()).setAuditUserId(loginUserId));
|
|
|
|
|
if (updateCount == 0) {
|
|
|
|
|
throw exception(STOCK_MOVE_AUDIT_FAIL_STATUS);
|
|
|
|
|
}
|
|
|
|
|
List<ErpStockMoveItemDO> stockMoveItems = stockMoveItemMapper.selectListByMoveId(stockMove.getId());
|
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())) {
|
|
|
|
|
operateStockMoveEffect(stockMove, stockMoveItems, true);
|
|
|
|
|
}
|
|
|
|
|
createApproveRecord(stockMove.getId(), ErpAuditStatus.APPROVE.getStatus().equals(auditReqVO.getStatus())
|
|
|
|
|
? ErpStockMoveApproveActionEnum.APPROVE : ErpStockMoveApproveActionEnum.REJECT,
|
|
|
|
|
fromStatus, auditReqVO.getStatus(), NumberUtils.parseLong(stockMove.getCreator()), auditReqVO.getRemark());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void operateStockMoveEffect(ErpStockMoveDO stockMove, List<ErpStockMoveItemDO> stockMoveItems, boolean approve) {
|
|
|
|
|
Integer fromBizType = approve ? ErpStockRecordBizTypeEnum.MOVE_OUT.getType()
|
|
|
|
|
: ErpStockRecordBizTypeEnum.MOVE_OUT_CANCEL.getType();
|
|
|
|
|
Integer toBizType = approve ? ErpStockRecordBizTypeEnum.MOVE_IN.getType()
|
|
|
|
|
@ -128,13 +243,15 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
stockMoveItems.forEach(stockMoveItem -> {
|
|
|
|
|
BigDecimal fromCount = approve ? stockMoveItem.getCount().negate() : stockMoveItem.getCount();
|
|
|
|
|
BigDecimal toCount = approve ? stockMoveItem.getCount() : stockMoveItem.getCount().negate();
|
|
|
|
|
ErpProductDO productDO = productService.getProduct(stockMoveItem.getProductId());
|
|
|
|
|
ErpProductRespVO productDO = productService.getProduct(stockMoveItem.getProductId());
|
|
|
|
|
|
|
|
|
|
stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
|
|
|
|
|
stockMoveItem.getProductId(),productDO.getCategoryId(), stockMoveItem.getFromWarehouseId(), fromCount,
|
|
|
|
|
stockMoveItem.getProductId(), productDO.getCategoryId(), productDO.getCategoryType(),
|
|
|
|
|
stockMoveItem.getFromWarehouseId(), stockMoveItem.getFromAreaId(), stockMoveItem.getFromAreaName(), fromCount,
|
|
|
|
|
fromBizType, stockMoveItem.getMoveId(), stockMoveItem.getId(), stockMove.getNo(),stockMove.getMoveTime()));
|
|
|
|
|
stockRecordService.createStockRecord(new ErpStockRecordCreateReqBO(
|
|
|
|
|
stockMoveItem.getProductId(),productDO.getCategoryId(), stockMoveItem.getToWarehouseId(), toCount,
|
|
|
|
|
stockMoveItem.getProductId(), productDO.getCategoryId(), productDO.getCategoryType(),
|
|
|
|
|
stockMoveItem.getToWarehouseId(), stockMoveItem.getToAreaId(), stockMoveItem.getToAreaName(), toCount,
|
|
|
|
|
toBizType, stockMoveItem.getMoveId(), stockMoveItem.getId(), stockMove.getNo(),stockMove.getMoveTime()));
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
@ -147,12 +264,24 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
// 1.2 校验仓库存在
|
|
|
|
|
warehouseService.validWarehouseList(convertSetByFlatMap(list,
|
|
|
|
|
item -> Stream.of(item.getFromWarehouseId(), item.getToWarehouseId())));
|
|
|
|
|
Map<Long, WarehouseAreaDO> areaMap = warehouseAreaService.getWarehouseAreaMap(convertSetByFlatMap(list,
|
|
|
|
|
item -> Stream.of(item.getFromAreaId(), item.getToAreaId())));
|
|
|
|
|
// 2. 转化为 ErpStockMoveItemDO 列表
|
|
|
|
|
return convertList(list, o -> BeanUtils.toBean(o, ErpStockMoveItemDO.class, item -> item
|
|
|
|
|
.setProductUnitId(productMap.get(item.getProductId()).getUnitId())
|
|
|
|
|
.setFromAreaName(validateMoveArea(item.getFromWarehouseId(), item.getFromAreaId(), areaMap).getAreaName())
|
|
|
|
|
.setToAreaName(validateMoveArea(item.getToWarehouseId(), item.getToAreaId(), areaMap).getAreaName())
|
|
|
|
|
.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()))));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private WarehouseAreaDO validateMoveArea(Long warehouseId, Long areaId, Map<Long, WarehouseAreaDO> areaMap) {
|
|
|
|
|
WarehouseAreaDO area = areaMap.get(areaId);
|
|
|
|
|
if (area == null || !Objects.equals(area.getWarehouseId(), warehouseId)) {
|
|
|
|
|
throw exception(WAREHOUSE_AREA_NOT_EXISTS);
|
|
|
|
|
}
|
|
|
|
|
return area;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void updateStockMoveItemList(Long id, List<ErpStockMoveItemDO> newList) {
|
|
|
|
|
// 第一步，对比新老数据，获得添加、修改、删除的列表
|
|
|
|
|
List<ErpStockMoveItemDO> oldList = stockMoveItemMapper.selectListByMoveId(id);
|
|
|
|
|
@ -184,17 +313,37 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
if (ErpAuditStatus.APPROVE.getStatus().equals(stockMove.getStatus())) {
|
|
|
|
|
throw exception(STOCK_MOVE_DELETE_FAIL_APPROVE, stockMove.getNo());
|
|
|
|
|
}
|
|
|
|
|
// if (ErpAuditStatus.PROCESS.getStatus().equals(stockMove.getStatus())) {
|
|
|
|
|
// throw exception(STOCK_MOVE_DELETE_FAIL_PROCESS, stockMove.getNo());
|
|
|
|
|
// }
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// 2. 遍历删除，并记录操作日志
|
|
|
|
|
stockMoves.forEach(stockMove -> {
|
|
|
|
|
// 2.1 删除出库单
|
|
|
|
|
// 2.1 删除调拨单
|
|
|
|
|
stockMoveMapper.deleteById(stockMove.getId());
|
|
|
|
|
// 2.2 删除出库单项
|
|
|
|
|
// 2.2 删除调拨单项
|
|
|
|
|
stockMoveItemMapper.deleteByMoveId(stockMove.getId());
|
|
|
|
|
stockMoveApproveRecordMapper.deleteByStockMoveId(stockMove.getId());
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private boolean needAudit() {
|
|
|
|
|
return !AUDIT_CONFIG_DISABLE_VALUE.equals(configApi.getConfigValueByCategoryAndKey(AUDIT_CONFIG_CATEGORY, AUDIT_CONFIG_KEY));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private void createApproveRecord(Long stockMoveId, ErpStockMoveApproveActionEnum action, Integer fromStatus,
|
|
|
|
|
Integer toStatus, Long targetUserId, String remark) {
|
|
|
|
|
stockMoveApproveRecordMapper.insert(ErpStockMoveApproveRecordDO.builder()
|
|
|
|
|
.stockMoveId(stockMoveId)
|
|
|
|
|
.actionType(action.getActionType())
|
|
|
|
|
.fromStatus(fromStatus)
|
|
|
|
|
.toStatus(toStatus)
|
|
|
|
|
.targetUserId(targetUserId)
|
|
|
|
|
.remark(remark)
|
|
|
|
|
.build());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private ErpStockMoveDO validateStockMoveExists(Long id) {
|
|
|
|
|
ErpStockMoveDO stockMove = stockMoveMapper.selectById(id);
|
|
|
|
|
if (stockMove == null) {
|
|
|
|
|
@ -213,7 +362,12 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
return stockMoveMapper.selectPage(pageReqVO);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ==================== 出库项 ====================
|
|
|
|
|
@Override
|
|
|
|
|
public List<ErpStockMoveApproveRecordDO> getStockMoveApproveRecordList(Long id) {
|
|
|
|
|
return stockMoveApproveRecordMapper.selectListByStockMoveId(id);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// ==================== 调拨项 ====================
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public List<ErpStockMoveItemDO> getStockMoveItemListByMoveId(Long moveId) {
|
|
|
|
|
@ -228,4 +382,4 @@ public class ErpStockMoveServiceImpl implements ErpStockMoveService {
|
|
|
|
|
return stockMoveItemMapper.selectListByMoveIds(moveIds);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
HuangHuiKang
2 weeks ago