#3.5

zhou zhou

昨天 cfe049492f81d2c650a2b17348593edbc5054498

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/ReviseLogItemServiceImpl.java

@@ -2,10 +2,10 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.manager.controller.params.ReviseLogItemParams;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.CommonExceStatus;
import com.vincent.rsf.server.manager.mapper.ReviseLogMapper;
import com.vincent.rsf.server.manager.mapper.ReviseLogItemMapper;
import com.vincent.rsf.server.manager.service.*;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -22,13 +22,11 @@
public class ReviseLogItemServiceImpl extends ServiceImpl<ReviseLogItemMapper, ReviseLogItem> implements ReviseLogItemService {

    @Autowired
    private ReviseLogService reviseLogService;
    private ReviseLogMapper reviseLogMapper;
    @Autowired
    private LocItemService locItemService;
    @Autowired
    private LocService locService;
    @Autowired
    private ReviseLogItemService reviseLogItemService;
    @Autowired
    private LocReviseService locReviseService;

@@ -40,9 +38,9 @@
     * @return
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    @Transactional(timeout = 60, rollbackFor = Exception.class)
    public List<ReviseLogItem> itemSave(ReviseLogItemParams reviseLogItem, Long userId) {
        ReviseLog reviseLog = reviseLogService.getById(reviseLogItem.getReviseLogId());
        ReviseLog reviseLog = reviseLogMapper.selectById(reviseLogItem.getReviseLogId());
        if (Objects.isNull(reviseLog)) {
            throw new RuntimeException("库存历史单据不存在！！");
        }
@@ -71,37 +69,37 @@
                throw new RuntimeException("库存明细调整失败");
            }

            LocItem one = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
                    .eq(LocItem::getMatnrId, logItem.getMatnrId())
                    .eq(StringUtils.isNotBlank(logItem.getBatch()), LocItem::getBatch, logItem.getBatch())
                    .eq(StringUtils.isNotBlank(logItem.getFieldsIndex()), LocItem::getFieldsIndex, logItem.getFieldsIndex())
                    .eq(LocItem::getLocCode, logItem.getLocCode()));
            if (Objects.isNull(one)) {
                LocItem locDetl = new LocItem();
                BeanUtils.copyProperties(logItem, locDetl);
                locDetl.setLocId(loc.getId())
                        .setLocCode(loc.getCode())
                        .setAnfme(logItem.getReviseQty())
                        .setUpdateBy(userId)
                        .setId(null)
                        .setCreateBy(userId);
                if (!locItemService.save(locDetl)) {
                    throw new CoolException("库存明细保存失败！！");
                }
            } else {
                one.setAnfme(logItem.getReviseQty());
                if (!locItemService.updateById(one)) {
                    throw new RuntimeException("库存明细修改失败！！");
                }
            }
//            LocItem one = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
//                    .eq(LocItem::getMatnrId, logItem.getMatnrId())
//                    .eq(StringUtils.isNotBlank(logItem.getBatch()), LocItem::getBatch, logItem.getBatch())
//                    .eq(StringUtils.isNotBlank(logItem.getFieldsIndex()), LocItem::getFieldsIndex, logItem.getFieldsIndex())
//                    .eq(LocItem::getLocCode, logItem.getLocCode()));
//            if (Objects.isNull(one)) {
//                LocItem locDetl = new LocItem();
//                BeanUtils.copyProperties(logItem, locDetl);
//                locDetl.setLocId(loc.getId())
//                        .setLocCode(loc.getCode())
//                        .setAnfme(logItem.getReviseQty())
//                        .setUpdateBy(userId)
//                        .setId(null)
//                        .setCreateBy(userId);
//                if (!locItemService.save(locDetl)) {
//                    throw new CoolException("库存明细保存失败！！");
//                }
//            } else {
//                one.setAnfme(logItem.getReviseQty());
//                if (!locItemService.updateById(one)) {
//                    throw new RuntimeException("库存明细修改失败！！");
//                }
//            }
        });

        List<ReviseLog> list = reviseLogService.list(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, reviseLog.getReviseId()));
        List<ReviseLog> list = reviseLogMapper.selectList(new LambdaQueryWrapper<ReviseLog>().eq(ReviseLog::getReviseId, reviseLog.getReviseId()));
        if (Objects.isNull(list)) {
            throw new RuntimeException("数据错误：库存调整单不存在！！");
        }
        List<Long> reviseIds = list.stream().map(ReviseLog::getId).collect(Collectors.toList());
        List<ReviseLogItem> logItems = reviseLogItemService.list(new LambdaQueryWrapper<ReviseLogItem>()
        List<ReviseLogItem> logItems = this.list(new LambdaQueryWrapper<ReviseLogItem>()
                .in(ReviseLogItem::getReviseLogId, reviseIds));

        Double anfems = logItems.stream().mapToDouble(ReviseLogItem::getAnfme).sum();
@@ -110,6 +108,7 @@
        if (!locReviseService.update(new LambdaUpdateWrapper<LocRevise>()
                .eq(LocRevise::getId, reviseLog.getReviseId())
                        .set(LocRevise::getAnfme, anfems)
                        .set(LocRevise::getExceStatus, CommonExceStatus.COMMON_EXCE_STATUS_EXCE_ING.val)
                        .set(LocRevise::getReviseQty, reviseQty))) {
            throw new RuntimeException("库存调整单修改失败！！");
        }