#

luxiaotao1123

2021-04-09 eb13b96cc3b01a3d44fbce6a730004e158418ab5

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

@@ -1,17 +1,18 @@
package zy.cloud.wms.manager.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.*;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import zy.cloud.wms.common.config.CodeCoolException;
import zy.cloud.wms.common.model.BillDto;
import zy.cloud.wms.common.model.MatnrDto;
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.MainService;
import zy.cloud.wms.common.service.asrs.AsrsService;
import zy.cloud.wms.common.service.asrs.entity.Result1;
import zy.cloud.wms.common.service.erp.ErpService;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
@@ -19,10 +20,7 @@
import zy.cloud.wms.manager.entity.result.StoPrintVo;
import zy.cloud.wms.manager.service.*;

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

/**
 * Created by vincent on 2021/2/25
@@ -47,11 +45,81 @@
    @Autowired
    private MatService matService;
    @Autowired
    private AsrsService asrsService;
    @Autowired
    private ErpService erpService;
    @Autowired
    private CheckService checkService;

    @Override
    @Transactional
    public R stockPakin(PakinParam param, Long userId) {
        Node node = nodeService.selectByUuid(param.getNodeId());
        if (node == null) {
            node = nodeService.selectById(param.getNodeId());
        }
        if (node == null) {
            return R.error("货位不存在");
        }
        if (Cools.isEmpty(param.getMats())) {
            return R.error("入库物料不能为空");
        }
        Date now = new Date();
        for (MatnrDto dto : param.getMats()) {
            Mat mat = matService.selectByMatnr(dto.getMatnr());
            if (mat == null) {
                throw new CoolException("物料数据错误，请联系管理员");
            }
            LocDetl locDetl = locDetlService.getLocDetl(node.getId(), dto.getMatnr());
            if (locDetl == null) {
                // 更新货位库存明细
                locDetl = new LocDetl();
                locDetl.setLocNo(node.getName());
                locDetl.setNodeId(node.getId());
                locDetl.setZpallet("");
                locDetl.setAnfme(dto.getCount());
                VersionUtils.setLocDetl(locDetl, mat);
//                locDetl.setDocId(param.getDocType().longValue());
//                locDetl.setDocNum(docNum);
                locDetl.setStatus(1);
                locDetl.setCreateBy(userId);
                locDetl.setCreateTime(now);
                locDetl.setUpdateBy(userId);
                locDetl.setUpdateTime(now);
                boolean insert = locDetlService.insert(locDetl);
                if (!insert) {
                    throw new CoolException("新增库存明细档失败");
                }
            } else {
                if (!locDetlService.incrementStock(node.getId(), dto.getMatnr(), dto.getCount())) {
                    throw new CoolException("新增库存明细档失败");
                }
            }
        }

        // 上报给erp
        List<BillDto> dtos = new ArrayList<>();
        for (MatnrDto dto : param.getMats()) {
            BillDto billDto = new BillDto();
            billDto.setMatnr(dto.getMatnr());
            billDto.setQty(dto.getCount());
            dtos.add(billDto);
        }
        Integer docId = Optional.ofNullable(param.getDocType()).orElse(34);
        String docNum = String.valueOf(snowflakeIdWorker.nextId());
        switch (docId) {
            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;
        }
        if (!erpService.uploadBill(dtos, docId, docNum)) {
            throw new CoolException("无法上报至erp");
        }
        return R.ok("入库成功");
    }

    @Override
    @Transactional
@@ -184,9 +252,59 @@
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
                .eq("doc_num", param.getNumber())
                .in("wrk_sts", 1, 2));
        // 修改库存数量
        for (Pakout pakout : pakouts) {
            LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
            // 缺货 or 立库
            if (locDetl == null) {
                // 缺货
                if (pakout.getLocNo().equals("缺货")) {
                    Double count = Optional.ofNullable(locDetlService.selectCountByMatnr(pakout.getMatnr())).orElse(0.0D);
                    if (count < pakout.getAnfme()) {
                        throw new CoolException(pakout.getMaktx()+"缺货");
                    }
                    Date now = new Date();
                    // 查找推荐货位是否库存足够
                    List<LocDetl> locDetls = locDetlService.findOfSort(pakout.getMatnr());
                    double issued = Optional.ofNullable(pakout.getAnfme()).orElse(0.0D) ;
                    for (LocDetl locDetl1 : locDetls) {
                        if (issued > 0) {
                            // 保存出库通知单
                            Pakout newPakout = new Pakout();
                            newPakout.setWrkSts(3L);
                            newPakout.setAnfme(issued>=locDetl1.getAnfme()?locDetl1.getAnfme():issued);
                            newPakout.setZpallet(locDetl1.getZpallet());
                            newPakout.setLocNo(locDetl1.getLocNo());
                            newPakout.setNodeId(locDetl1.getNodeId());
                            newPakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
                            VersionUtils.setPakout(newPakout, locDetl1);
                            newPakout.setDocId(pakout.getDocId()); // 单据类型
                            newPakout.setDocNum(pakout.getDocNum());    // 单据编号
                            newPakout.setCreateTime(now);
                            newPakout.setUpdateTime(now);
                            newPakout.setStatus(1);
                            if (!pakoutService.insert(newPakout)) {
                                throw new CoolException("保存出库通知单失败");
                            }
                            if (issued>=locDetl1.getAnfme()) {
                                // 删除库存明细
                                if (!locDetlService.removeStock(locDetl1.getNodeId(), newPakout.getMatnr())) {
                                    throw new CoolException("删除库存明细失败");
                                }
                            } else {
                                // 修改库存明细数量
                                if (!locDetlService.reduceStock(locDetl1.getNodeId(), newPakout.getMatnr(), issued)) {
                                    throw new CoolException("修改库存明细数量失败");
                                }
                            }
                            // 剩余待出数量递减
                            issued = issued - locDetl1.getAnfme();
                        }
                    }

                }
                continue;
            }
            // 修改库存数量
            if (pakout.getAnfme()>=locDetl.getAnfme()) {
                // 删除库存明细
                if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
@@ -199,6 +317,7 @@
                }
            }
        }

        // 修改出库单状态
        if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
            return R.error("保存数据失败");
@@ -209,20 +328,20 @@
        }
        // 采购退货单
//        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");
                }
            }
            // erp单据上传 todo
//            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();
@@ -365,10 +484,12 @@
                    DateUtils.convert(now),    // 单据日期[非空]
                    param.getCustomerTypeId(),    // 客户编号
                    null,    // 经手人编号[空]
                    null,
                    dto.getMatnr(),    // 商品编号
                    dto.getCount(),    // 商品数量
                    dto.getCount(),    // 总数量
                    Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()),    // 商品单价
                    null,       // 商品明细行号
                    null,    // 商品备注[空]
                    1,    // 状态
                    now,    // 添加时间
@@ -380,63 +501,6 @@
            }
        }
        return R.ok("生成销售订单" + param.getNumber() + "成功");
    }

    @Override
    @Transactional
    public R stockTransfer(String number, Long userId) {
        List<CustOrder> custOrders = custOrderService.selectList(new EntityWrapper<CustOrder>().eq("number", number).eq("status", 1));
        boolean asrs = false;
        List<StockTransferParam> params = new ArrayList<>();
        for (CustOrder custOrder : custOrders) {
            Double count = locDetlService.selectCountByMatnr(custOrder.getUserCode());
            if (count == null) {
                count = 0.0D;
            }
            if (count < custOrder.getQty()) {
                if (!asrs) { asrs = true; }
                StockTransferParam param = new StockTransferParam();
                param.setMatnr(custOrder.getUserCode());
                param.setAnfme(custOrder.getQty() - count);
                params.add(param);
            }
        }
        if (asrs) {
//            if (asrsService.stockTransfer(params)) {
//                for (StockTransferParam param : params) {
//                    // 修改销售订单待出数量
//                    if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
//                        throw new CoolException("修改销售订单待出数量失败");
//                    }
//                }
//                return R.ok("库存调拨成功");
//            } else {
//                return R.error("立库调拨失败，请联系管理员");
//            }
        }
        return R.error("暂不缺货，不需要立库调拨");
    }

    @Override
    public R asrsStockTransfer(AsrsTransferParam param, Long userId) {
        if (Cools.isEmpty(param.getNode_id(), param.getMatnr(), param.getSafe_qua(), param.getAmount())) {
            return R.error("数量错误");
        }
        List<StockTransferParam> params = new ArrayList<>();
        StockTransferParam transferParam = new StockTransferParam();
        transferParam.setMatnr(param.getMatnr());
        transferParam.setAnfme(Arith.subtract(2, param.getSafe_qua(), param.getAmount()));
        transferParam.setAllotNo(param.getNode_id()+ "_" +param.getMatnr());
        params.add(transferParam);
        Result1 result = asrsService.stockTransfer(params);
        if (result.getCode() == 500) {
            if (Cools.isEmpty(result.getData())) {
                throw new CoolException(result.getMsg());
            } else {
                throw new CodeCoolException("20001-" + result.getData());
            }
        }
        return R.ok("补仓成功，等待立库调拨");
    }

    @Override