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

skyouc

1 天以前 32a41ca494eed0cc37fcb3aff1e9f83e1a3792fc

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

@@ -21,7 +21,6 @@
import com.vincent.rsf.server.manager.service.impl.MatnrServiceImpl;
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;
@@ -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("调整库存明细保存失败！！");
                }
@@ -654,7 +686,8 @@
            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()));
            List<CheckDiffItem> items = checkDiffItemService.list(new LambdaQueryWrapper<CheckDiffItem>()
                    .eq(CheckDiffItem::getCheckId, check.getId()));
            checkDto.setItems(items)
                    .setCheckDiff(checkDiff);
            dtos.add(checkDto);