库存调整功能接口功能优化 库存调整功能优化

skyouc

1 天以前 32a41ca494eed0cc37fcb3aff1e9f83e1a3792fc

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/ReceiveMsgServiceImpl.java

@@ -9,20 +9,18 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.api.controller.erp.params.*;
import com.vincent.rsf.server.api.controller.erp.params.dto.CheckDiffDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.TransferInfoDto;
import com.vincent.rsf.server.api.controller.erp.params.dto.WkOrderDto;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.dto.LocStockDto;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.enums.OrderSourceType;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
import com.vincent.rsf.server.manager.service.impl.TransferItemServiceImpl;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.entity.Fields;
import com.vincent.rsf.server.system.service.FieldsItemService;
import com.vincent.rsf.server.system.service.FieldsService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import com.vincent.rsf.server.api.service.ReceiveMsgService;
@@ -53,8 +51,6 @@
    @Autowired
    private FieldsService fieldsService;
    @Autowired
    private FieldsItemService fieldsItemService;
    @Autowired
    private MatnrGroupService matnrGroupService;
    @Autowired
    private MatnrServiceImpl matnrService;
@@ -68,8 +64,6 @@
    private DeliveryItemService deliveryItemService;
    @Autowired
    private LocService locService;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private WarehouseAreasService warehouseAreasService;
    @Autowired
@@ -86,6 +80,10 @@
    private ReviseLogService reviseLogService;
    @Autowired
    private ReviseLogItemService reviseLogItemService;
    @Autowired
    private CheckDiffService checkDiffService;
    @Autowired
    private CheckDiffItemService checkDiffItemService;


    /**
@@ -95,7 +93,7 @@
     * @version 1.0
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public boolean syncPurchasee(List<OrderParams> orders) {
        if (orders.isEmpty()) {
            throw new CoolException("单据内容不能为空！！");
@@ -177,6 +175,7 @@
     * @param matnrs
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public void syncMatnrs(List<BaseMatParms> matnrs) {
        List<Matnr> syncMatnrs = new ArrayList<>();
        if (!matnrs.isEmpty()) {
@@ -432,17 +431,17 @@
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncTransfer(SyncTransferParams transferParams) {
    public R syncTransfer(SyncTransferParams transferParams, Long loginUserId) {
        Transfer transfer = new Transfer();
        WarehouseAreas warehouseAreas = warehouseAreasService
                .getOne(new LambdaQueryWrapper<WarehouseAreas>()
                        .eq(WarehouseAreas::getName, transfer.getOrgAreaName()));
                        .eq(WarehouseAreas::getName, transferParams.getOrgAreaName()));
        if (Objects.isNull(warehouseAreas)) {
            throw new CoolException("原库区不存在！！");
        }

        WarehouseAreas warehouseAreas1 = warehouseAreasService.getOne(new LambdaQueryWrapper<WarehouseAreas>()
                .eq(WarehouseAreas::getName, transfer.getTarAreaName()));
                .eq(WarehouseAreas::getName, transferParams.getTarAreaName()));
        if (Objects.isNull(warehouseAreas1)) {
            throw new CoolException("目标库区不存在！！");
        }
@@ -456,6 +455,11 @@
                .setTarAreaId(warehouseAreas1.getId())
                .setTarWareName(warehouseAreas1.getWarehouseId$())
                .setTarWareId(warehouseAreas1.getWarehouseId())
                .setCreateBy(loginUserId)
                .setCreateTime(new Date())
                .setUpdateTime(new Date())
                .setUpdateBy(loginUserId)
                .setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, null))
                .setSource(OrderSourceType.ORDER_SOURCE_TYPE_ERP.val);

        if (!transferService.save(transfer)) {
@@ -471,6 +475,10 @@
            }
            transferItem.setMatnrId(matnr.getId())
                    .setTransferId(transfer.getId())
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setCreateTime(new Date())
                    .setUpdateTime(new Date())
                    .setTransferCode(transfer.getCode());

            if (!transferItemService.save(transferItem)) {
@@ -489,7 +497,7 @@
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncLocRevise(SyncLocReviseParams reviseParams) {
    public R syncLocRevise(SyncLocReviseParams reviseParams, Long loginUserId) {
        LocRevise locRevise = new LocRevise();
        if (Objects.isNull(reviseParams.getAreaName())) {
            throw new CoolException("库区不能为空！！");
@@ -500,7 +508,13 @@
        if (Objects.isNull(warehouseAreas)) {
            throw new CoolException("库区不存在！！");
        }
        locRevise.setAreaName(locRevise.getAreaName())

        locRevise.setAreaName(warehouseAreas.getName())
                .setType(LocReviseType.getLocRevise(reviseParams.getType()))
                .setCreateBy(loginUserId)
                .setUpdateBy(loginUserId)
                .setCreateTime(new Date())
                .setUpdateTime(new Date())
                .setAreaId(warehouseAreas.getId());
        locRevise.setCode(SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_LOC_REVISE_CODE, null));

@@ -508,22 +522,40 @@
            throw new CoolException("库存调整单保存失败！！");
        }

        reviseParams.getItems().forEach(revise -> {
        reviseParams.getReviseItems().forEach(revise -> {
            Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, revise.getLocCode()));
            ReviseLog reviseLog = new ReviseLog();
            BeanUtils.copyProperties(loc, reviseLog);
            reviseLog.setReviseId(locRevise.getId()).setReviseCode(locRevise.getCode());
            reviseLog.setReviseId(locRevise.getId())
                    .setLocCode(loc.getCode())
                    .setType(Integer.parseInt(loc.getType()))
                    .setCreateBy(loginUserId)
                    .setUpdateBy(loginUserId)
                    .setCreateTime(new Date())
                    .setUpdateTime(new Date())
                    .setReviseCode(locRevise.getCode());
            if (!reviseLogService.save(reviseLog)) {
                throw new CoolException("库存调整单不能为空！！");
            }
            revise.getItems().forEach(reviseItem -> {
                ReviseLogItem logItem = new ReviseLogItem();
                BeanUtils.copyProperties(reviseItem, logItem);
                Matnr matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>().eq(Matnr::getCode, reviseItem.getMatnrCode()));
                if (Objects.isNull(matnr)) {
                    throw new CoolException("物料不存在！！");
                }
                logItem.setLocId(loc.getId())
                        .setLocCode(loc.getCode())
                        .setId(null)
                        .setMaktx(matnr.getName())
                        .setMatnrCode(matnr.getCode())
                        .setMatnrId(matnr.getId())
                        .setReviseLogId(reviseLog.getId())
                        .setCreateBy(loginUserId)
                        .setUpdateBy(loginUserId)
                        .setCreateTime(new Date())
                        .setUpdateTime(new Date())
                        .setReviseQty(reviseItem.getAnfme());

                if (!reviseLogItemService.save(logItem)) {
                    throw new CoolException("调整库存明细保存失败！！");
                }
@@ -546,6 +578,7 @@
        if (orders.getType().equals(OrderType.ORDER_IN.type)) {
            orders.getItems().forEach(orderItem -> {
                WkOrder order = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(WkOrder::getType, OrderType.ORDER_IN.type)
                        .eq(WkOrder::getCode, orderItem.getOrderCode()));
                if (Objects.isNull(order)) {
                    throw new CoolException("单据不存在！！");
@@ -571,7 +604,6 @@
                if (!asnOrderService.updateById(order)) {
                    throw new CoolException("单据修改失败！！");
                }
                //TODO 添加操作日志
            });
        } else {

@@ -579,4 +611,88 @@
        return null;
    }

    /**
     * @author Ryan
     * @date 2025/8/21
     * @description: 删除单据
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncOrderDelete(List<SyncOrderParams> orders) {
        orders.forEach(order -> {
            order.getItems().forEach(orderItem -> {
                WkOrder wkOrder = asnOrderService.getOne(new LambdaQueryWrapper<WkOrder>()
                        .eq(WkOrder::getType, order.getType())
                        .in(WkOrder::getExceStatus, Arrays.asList(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val))
                        .eq(WkOrder::getId, orderItem.getOrderId()));
                if (Objects.isNull(wkOrder)) {
                    throw new CoolException("订单：" + orderItem.getOrderCode() + "，当前状态，不可执行删除操作！！");
                }
                if (!asnOrderItemService.remove(new LambdaQueryWrapper<WkOrderItem>()
                        .eq(WkOrderItem::getMatnrId, orderItem.getMatnrId())
                        .eq(WkOrderItem::getSplrBatch, orderItem.getBatch())
                        .eq(WkOrderItem::getOrderCode, orderItem.getOrderCode()))) {
                    throw new CoolException("单据明细删除失败！！");
                }
                List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, orderItem.getOrderId()));
                if (orderItems.isEmpty()) {
                    if (!asnOrderService.removeById(orderItem.getOrderId())) {
                        throw new CoolException("单据删除失败！！");
                    }
                }
            });
        });
        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/8/21
     * @description: 调拔单明细查询
     * @version 1.0
     */
    @Override
    public R queryTransfer(QueryOrderParam queryParams) {
        Transfer transfer = transferService.getOne(new LambdaQueryWrapper<Transfer>()
                .in(Transfer::getCode, queryParams.getOrderNo()));
        if (Objects.isNull(transfer)) {
            throw new CoolException("单据不存在！！");
        }
        List<TransferItem> orderItems = transferItemService.list(new LambdaQueryWrapper<TransferItem>()
                .eq(TransferItem::getTransferId, transfer.getId()));
        TransferInfoDto wkorderDto = new TransferInfoDto();
        wkorderDto.setTransfer(transfer).setItems(orderItems);
        return R.ok().add(wkorderDto);
    }

    /**
     * @author Ryan
     * @date 2025/8/22
     * @description: 盘点差异单同步
     * @version 1.0
     */
    @Override
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public R syncCheckDiffs(SyncCheckDiffParams syncParams) {
        List<CheckDiff> diffs = checkDiffService.list(new LambdaQueryWrapper<CheckDiff>()
                .eq(CheckDiff::getExceStatus, CheckDiffExceStatus.CHECK_DIFF_EXCE_STATUS_END.val)
                .in(CheckDiff::getOrderCode, syncParams.getDiffCode()));
        if (diffs.isEmpty()) {
            return R.ok();
        }
        List<CheckDiffDto> dtos = new ArrayList<>();
        diffs.forEach(check -> {
            CheckDiffDto checkDto = new CheckDiffDto();
            CheckDiff checkDiff = new CheckDiff();
            BeanUtils.copyProperties(check, checkDiff);
            List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
                    .eq(CheckDiffItem::getCheckId, check.getId()));
            checkDto.setItems(items)
                    .setCheckDiff(checkDiff);
            dtos.add(checkDto);
        });

        return R.ok().add(dtos);
    }
}