#

luxiaotao1123

2021-03-25 af73582c1bd3c20e2e805d4df56c111073d3fd6f

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

@@ -112,23 +112,22 @@
            return;
        }
        Date now = new Date();

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

//            // 查看立库库存
            // 查看立库库存
            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()));
                    throw new CodeCoolException("20001-" + result.getData());
                }

            }
            if (result.getCode() == 200) {
                List<PakoutVo> res = (List<PakoutVo>) result.getData();
                for (PakoutVo vo : res) {
                for (PakoutVo vo : result.getData()) {
                    // 判断物料是否存在
                    Mat mat = matService.selectByMatnr(vo.getMatnr());
                    if (null == mat) {
@@ -142,7 +141,7 @@
                    pakout.setNodeId(-1L);
                    pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
                    VersionUtils.setPakout(pakout, mat);
//                    pakout.setDocId(custOrder.getBTypeId());
                    pakout.setDocId(getDocId(dto.getNumber())); // 单据类型
                    pakout.setDocNum(dto.getNumber());    // 单据编号
                    pakout.setCreateTime(now);
                    pakout.setUpdateTime(now);
@@ -154,8 +153,8 @@

            }
        }
//        // 检查库存是否足够
//        locDetlService.checkLocDetlCount(dto.getNumber());

        /******************************* 平仓拣货单 ********************************/
        for (CustOrder custOrder : dto.getCustOrders()) {
            // 判断物料是否存在
            Mat mat = matService.selectByMatnr(custOrder.getUserCode());
@@ -176,7 +175,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 +205,11 @@
        }
    }

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

}