#

luxiaotao1123

2021-03-25 af73582c1bd3c20e2e805d4df56c111073d3fd6f

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -9,6 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.service.asrs.AsrsService;
@@ -21,6 +22,7 @@

import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;

/**
@@ -49,6 +51,8 @@
    private AsrsService asrsService;
    @Autowired
    private ErpService erpService;
    @Autowired
    private CheckService checkService;

    @Override
    @Transactional
@@ -63,6 +67,16 @@
        }
        Date now = new Date();
        String docNum = String.valueOf(snowflakeIdWorker.nextId());
        switch (param.getDocType()) {
            case 34:    // 采购单
                docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                break;
            case 45:    // 销售退货单
                docNum = "SR-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                break;
            default:
                break;
        }
        for (Comb comb : combs) {
            // 改变组托档状态
            comb.setIoStatus(4);
@@ -102,7 +116,14 @@
        }

        // 上报给erp
        if (!erpService.uploadBill(combs, param.getDocType(), docNum)) {
        List<BillDto> dtos = new ArrayList<>();
        for (Comb comb : combs) {
            BillDto billDto = new BillDto();
            billDto.setMatnr(comb.getMatnr());
            billDto.setQty(comb.getAnfme());
            dtos.add(billDto);
        }
        if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) {
            throw new CoolException("无法上报至erp");
        }

@@ -187,6 +208,24 @@
        if (!custOrderService.updateStatus(param.getNumber(), 4)) {
            throw new CoolException("修改单据状态失败");
        }
        // 采购退货单
//        if (param.getNumber().startsWith("PR-")) {
            // erp单据上传
            Long docId = pakouts.get(0).getDocId();
            if (null != docId) {
                List<BillDto> dtos = new ArrayList<>();
                for (Pakout pakout : pakouts) {
                    BillDto billDto = new BillDto();
                    billDto.setMatnr(pakout.getMatnr());
                    billDto.setQty(pakout.getAnfme());
                    dtos.add(billDto);
                }
                if (!erpService.uploadBill(dtos, docId.intValue() , pakouts.get(0).getDocNum())) {
                    throw new CoolException("无法上报至erp");
                }
            }

//        }
        return R.ok();
    }

@@ -379,4 +418,210 @@
        return R.error("暂不缺货，不需要立库调拨");
    }

    @Override
    public R stockCheck(StoCheckParam param, Long userId) {
        if (Cools.isEmpty(param.getLocNo())) {
            return R.error("请选择货位");
        }
        Node node = nodeService.selectByUuid(param.getLocNo());
        if (Cools.isEmpty(node)) {
            return R.error("货位异常,请联系管理员");
        }
        // 准备数据
        Date now = new Date();
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("node_id", node.getId()));
        List<String> locDetlMatnrs = new ArrayList<>();
        locDetls.forEach(locDetl -> locDetlMatnrs.add(locDetl.getMatnr()));
        Iterator<LocDetl> detlIterator = locDetls.iterator();
        List<PakinMatDto> dtos = param.getDtos();

        // 1.盈亏 修改数量
        while (detlIterator.hasNext()){
            LocDetl locDetl = detlIterator.next();
            for (PakinMatDto dto : dtos) {
                if (locDetl.getMatnr().equals(dto.getMatnr())) {
                    if (!locDetl.getAnfme().equals(dto.getCount())) {
                        Check check = new Check(
                                String.valueOf(snowflakeIdWorker.nextId()),    // 盘点编号
                                node.getId(),    // 盘点货位
                                node.getUuid(),    // 货位编号
                                node.getName(),    // 货位名称
                                locDetl.getMatnr(),    // 商品编号
                                locDetl.getMaktx(),    // 商品名称
                                locDetl.getUnit(),    // 单位
                                null,    // 单据类型
                                null,    // 单据编号
                                locDetl.getAnfme(),    // 账面数量
                                dto.getCount(),    // 实盘数量
                                dto.getCount() - locDetl.getAnfme(), // 差值
                                locDetl.getAnfme() < dto.getCount() ? 1 : 2,    // 盈亏
                                1,    // 状态
                                userId,    // 添加人员
                                now,    // 添加时间
                                userId,    // 修改人员
                                now,    // 修改时间
                                null    // 备注
                        );
                        if (!checkService.insert(check)) {
                            throw new CoolException("保存盘点记录失败");
                        }
                    }
                    detlIterator.remove();
                    break;
                }
            }
        }

        // 2.盘亏 删除库存
        for (LocDetl locDetl : locDetls) {
            Check check = new Check(
                    String.valueOf(snowflakeIdWorker.nextId()),    // 盘点编号
                    node.getId(),    // 盘点货位
                    node.getUuid(),    // 货位编号
                    node.getName(),    // 货位名称
                    locDetl.getMatnr(),    // 商品编号
                    locDetl.getMaktx(),    // 商品名称
                    locDetl.getUnit(),    // 单位
                    null,    // 单据类型
                    null,    // 单据编号
                    locDetl.getAnfme(),    // 账面数量
                    0D,    // 实盘数量
                    0D - locDetl.getAnfme(), // 差值
                    2,    // 盈亏
                    1,    // 状态
                    userId,    // 添加人员
                    now,    // 添加时间
                    userId,    // 修改人员
                    now,    // 修改时间
                    null    // 备注
            );
            if (!checkService.insert(check)) {
                throw new CoolException("保存盘点记录失败");
            }

        }

        // 3.盘盈 新增库存
        for (PakinMatDto dto : dtos) {
            if (!locDetlMatnrs.contains(dto.getMatnr())) {
                Mat mat = matService.selectByMatnr(dto.getMatnr());
                Check check = new Check(
                        String.valueOf(snowflakeIdWorker.nextId()),    // 盘点编号
                        node.getId(),    // 盘点货位
                        node.getUuid(),    // 货位编号
                        node.getName(),    // 货位名称
                        mat.getMatnr(),    // 商品编号
                        mat.getMaktx(),    // 商品名称
                        mat.getUnit(),    // 单位
                        null,    // 单据类型
                        null,    // 单据编号
                        0D,    // 账面数量
                        dto.getCount(),    // 实盘数量
                        dto.getCount() - 0D, // 差值
                        1,    // 盈亏
                        1,    // 状态
                        userId,    // 添加人员
                        now,    // 添加时间
                        userId,    // 修改人员
                        now,    // 修改时间
                        null    // 备注
                );
                if (!checkService.insert(check)) {
                    throw new CoolException("保存盘点记录失败");
                }

            }
        }
        return R.ok();
    }

    @Override
    @Transactional
    public R stockCheckAuditing(Long checkId, Long userId) {
        Check check = checkService.selectById(checkId);
        if (null == check) {
            return R.error("盘点记录已失效");
        }
        Date now = new Date();
        // 1.修改库存数量
        if (check.getOriQty() != 0 && check.getCekQty() != 0) {
            // 更新库存明细
            if (check.getSettle() == 1) {
                if (!locDetlService.incrementStock(check.getNodeId(), check.getMatnr(), Math.abs(check.getDiffQty()))) {
                    throw new CoolException("修改库存明细数量失败");
                }
            } else if (check.getSettle() == 2) {
                if (!locDetlService.reduceStock(check.getNodeId(), check.getMatnr(), Math.abs(check.getDiffQty()))) {
                    throw new CoolException("修改库存明细数量失败");
                }
            }
        }

        // 2.删除库存
        if (check.getOriQty() != 0 && check.getCekQty() == 0) {
            if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("node_id", check.getNodeId()).eq("matnr", check.getMatnr()))) {
                throw new CoolException("删除库存明细数量失败");
            }
        }

        // 3.新增库存
        if (check.getOriQty() == 0 && check.getCekQty() != 0) {
            Mat mat = matService.selectByMatnr(check.getMatnr());
            if (mat == null) {
                throw new CoolException("商品数据异常，请联系管理员");
            }
            // 更新货位库存明细
            LocDetl locDetl = new LocDetl();
            locDetl.setLocNo(check.getLocNo());
            locDetl.setNodeId(check.getNodeId());
//            locDetl.setZpallet(param.getZpallet());
            locDetl.setAnfme(check.getCekQty());
            VersionUtils.setLocDetl(locDetl, mat);
            locDetl.setStatus(1);
            locDetl.setCreateBy(userId);
            locDetl.setCreateTime(now);
            locDetl.setUpdateBy(userId);
            locDetl.setUpdateTime(now);
            if (!locDetlService.insert(locDetl)) {
                throw new CoolException("新增库存明细失败");
            }
        }

        // 修改盘点记录
        String docNum = null;
        Long docId = null;
        switch (check.getSettle()) {
            case 1:    // 盘盈
                docNum = "CS-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                docId = 14L; // 报溢单
                break;
            case 2:    // 盘亏
                docNum = "CD-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                docId = 9L;  // 报损单
                break;
            default:
                throw new CoolException("盘点记录盈亏情况异常");
        }
        check.setStatus(2);
        check.setDocId(docId);
        check.setDocNum(docNum);
        check.setUpdateBy(userId);
        check.setUpdateTime(now);
        if (!checkService.updateById(check)) {
            throw new CoolException("修改盘点记录状态失败");
        }

        // 上报给erp
        List<BillDto> dtos = new ArrayList<>();
        BillDto billDto = new BillDto();
        billDto.setMatnr(check.getMatnr());
        billDto.setQty(Math.abs(check.getDiffQty()));
        dtos.add(billDto);
        if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) {
            throw new CoolException("无法上报至erp");
        }

        return R.ok();
    }

}