#

luxiaotao1123

2021-04-09 b388f4e1deb6f4a4680bb74b8a0f074f80df61f8

 src/main/java/zy/cloud/wms/common/service/MainService.java

@@ -15,10 +15,7 @@
import zy.cloud.wms.manager.service.MatService;
import zy.cloud.wms.manager.service.PakoutService;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.*;

/**
 * Created by vincent on 2021/3/1
@@ -38,56 +35,15 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

//    @Transactional
//    public List<StoPreVo> stockOutPreview0(OrderStoDto dto) {
//        if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
//            throw new CoolException("数据异常，请联系管理员");
//        }
//        // 检查库存是否足够
//        locDetlService.checkLocDetlCount(dto.getNumber());
//        List<StoPreVo> result = new ArrayList<>();
//        for (CustOrder custOrder : dto.getCustOrders()) {
//            // 判断物料是否存在
//            Mat mat = matService.selectByMatnr(custOrder.getUserCode());
//            if (null == mat) {
//                throw new CoolException(custOrder.getUserCode() + "物料尚未更新。" + custOrder.getNumber() +"单据因此中断！");
//            }
//            // 查询存有当前物料的货位
//            List<LocDetl> locDetls = locDetlService.findOfSort(mat.getMatnr());
//            double issued = Optional.ofNullable(custOrder.getQty()).orElse(0.0D) ;
//            // 视图对象
//            StoPreVo vo = new StoPreVo();
//            vo.setMatnr(mat.getMatnr());
//            vo.setMaktx(mat.getMaktx());
//            vo.setAnfme(issued);
//            List<StoPreVo.StoPreLoc> locVos = new ArrayList<>();
//            vo.setLocs(locVos);
//            for (LocDetl locDetl : locDetls) {
//                if (issued > 0) {
//                    StoPreVo.StoPreLoc locVo = new StoPreVo.StoPreLoc();
//                    locVo.setLocNo(locDetl.getLocNo());
//                    locVo.setNodeId(locDetl.getNodeId());
//                    locVo.setTotal(locDetl.getAnfme());
//                    locVo.setReduce(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
//                    locVo.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
//                    locVos.add(locVo);
//                    // 剩余待出数量递减
//                    issued = issued - locDetl.getAnfme();
//                }
//            }
//            result.add(vo);
//        }
//        return result;
//    }

    @Transactional
    public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
        if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
            throw new CoolException("数据异常，请联系管理员");
        }
        List<StoPreTab> res = new ArrayList<>();
        // 检查库存是否足够
        locDetlService.checkLocDetlCount(dto.getNumber());
        List<StoPreTab> result = new ArrayList<>();

        for (CustOrder custOrder : dto.getCustOrders()) {
            // 判断物料是否存在
            Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -114,14 +70,22 @@
                    tab.setRemQty(tab.getTotal() - tab.getReduce());
                    tab.setPrior(locDetlService.isPrior(locDetl.getNodeId(), mat.getMatnr()));
                    tab.setPrior$(tab.getPrior()?"✔":"×");
                    result.add(tab);
                    tab.setType(1);
                    res.add(tab);
                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();
                }
            }

        }
        return result;
        res.sort(new Comparator<StoPreTab>() {
            @Override
            public int compare(StoPreTab o1, StoPreTab o2) {
//                return o1.getMatnr().length() - o2.getMatnr().length();
                return (int) (o1.getAnfme() - o2.getAnfme());
            }
        });
        return res;
    }

    @Transactional
@@ -129,9 +93,13 @@
        if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
            return;
        }
        Date now = new Date();

        /******************************* 立库拣货单 ********************************/
        // 检查库存是否足够
        locDetlService.checkLocDetlCount(dto.getNumber());
        Date now = new Date();

        /******************************* 平仓拣货单 ********************************/
        for (CustOrder custOrder : dto.getCustOrders()) {
            // 判断物料是否存在
            Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -152,7 +120,7 @@
                    pakout.setNodeId(locDetl.getNodeId());
                    pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
                    VersionUtils.setPakout(pakout, mat);
//                    pakout.setDocId(custOrder.getBTypeId());
                    pakout.setDocId(getDocId(dto.getNumber())); // 单据类型
                    pakout.setDocNum(custOrder.getNumber());    // 单据编号
                    pakout.setCreateTime(now);
                    pakout.setUpdateTime(now);
@@ -161,15 +129,15 @@
                        throw new CoolException("保存出库通知单失败");
                    }
                    if (issued>=locDetl.getAnfme()) {
                        // 删除库存明细
                        if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
                            throw new CoolException("删除库存明细失败");
                        }
//                        // 删除库存明细
//                        if (!locDetlService.removeStock(locDetl.getNodeId(), mat.getMatnr())) {
//                            throw new CoolException("删除库存明细失败");
//                        }
                    } else {
                        // 修改库存明细数量
                        if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
                            throw new CoolException("修改库存明细数量失败");
                        }
//                        // 修改库存明细数量
//                        if (!locDetlService.reduceStock(locDetl.getNodeId(), mat.getMatnr(), issued)) {
//                            throw new CoolException("修改库存明细数量失败");
//                        }
                    }
                    // 剩余待出数量递减
                    issued = issued - locDetl.getAnfme();
@@ -182,5 +150,11 @@
        }
    }

    private Long getDocId(String number) {
        if (number.startsWith("PR")) {
            return 6L;
        }
        return 11L;
    }

}