#

luxiaotao1123

2021-04-10 b2623f99d7aa231eff76ef52665813df3ee6939b

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

@@ -7,15 +7,9 @@
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.OrderStoDto;
import zy.cloud.wms.common.service.asrs.AsrsService;
import zy.cloud.wms.common.service.asrs.entity.Result;
import zy.cloud.wms.common.service.asrs.entity.Result1;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.StockTransferParam;
import zy.cloud.wms.manager.entity.result.PakoutVo;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;
@@ -40,8 +34,6 @@
    private CustOrderService custOrderService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private AsrsService asrsService;

    @Transactional
    public List<StoPreTab> stockOutPreview(OrderStoDto dto) {
@@ -50,17 +42,7 @@
        }
        List<StoPreTab> res = new ArrayList<>();
        // 检查库存是否足够
        List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
        if (!Cools.isEmpty(transferParams)) {
            // 查看立库库存
            Result result = asrsService.stockTransferPrew(transferParams);
            if (result.getCode() == 500) {
                throw new CodeCoolException("20001-" + String.valueOf(result.getData()));
            }
            if (result.getCode() == 200) {
                res = (List<StoPreTab>) result.getData();
            }
        }
        locDetlService.checkLocDetlCount(dto.getNumber());

        for (CustOrder custOrder : dto.getCustOrders()) {
            // 判断物料是否存在
@@ -112,50 +94,12 @@
            return;
        }
        Date now = new Date();

        /******************************* 立库拣货单 ********************************/
        // 检查库存是否足够
        List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
        if (!Cools.isEmpty(transferParams)) {
        locDetlService.checkLocDetlCount(dto.getNumber());

//            // 查看立库库存
            Result1 result = asrsService.stockTransfer(transferParams);
            if (result.getCode() == 500) {
                if (Cools.isEmpty(result.getData())) {
                    throw new CodeCoolException(result.getMsg());
                } else {
                    throw new CodeCoolException("20001-" + String.valueOf(result.getData()));
                }

            }
            if (result.getCode() == 200) {
                List<PakoutVo> res = (List<PakoutVo>) result.getData();
                for (PakoutVo vo : res) {
                    // 判断物料是否存在
                    Mat mat = matService.selectByMatnr(vo.getMatnr());
                    if (null == mat) {
                        throw new CoolException(vo.getMatnr() + "物料尚未更新。" + dto.getNumber() +"单据因此中断！");
                    }
                    Pakout pakout = new Pakout();
                    pakout.setWrkSts(1L);
                    pakout.setAnfme(vo.getAnfme());
                    pakout.setZpallet(vo.getZpallet());
                    pakout.setLocNo(vo.getLocNo());
                    pakout.setNodeId(-1L);
                    pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
                    VersionUtils.setPakout(pakout, mat);
//                    pakout.setDocId(custOrder.getBTypeId());
                    pakout.setDocNum(dto.getNumber());    // 单据编号
                    pakout.setCreateTime(now);
                    pakout.setUpdateTime(now);
                    pakout.setStatus(1);
                    if (!pakoutService.insert(pakout)) {
                        throw new CoolException("保存出库通知单失败");
                    }
                }

            }
        }
//        // 检查库存是否足够
//        locDetlService.checkLocDetlCount(dto.getNumber());
        /******************************* 平仓拣货单 ********************************/
        for (CustOrder custOrder : dto.getCustOrders()) {
            // 判断物料是否存在
            Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -176,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);
@@ -206,5 +150,11 @@
        }
    }

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

}