#

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;
    }

}

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

@@ -209,20 +209,23 @@
            throw new CoolException("修改单据状态失败");
        }
        // 采购退货单
        if (param.getNumber().startsWith("PR-")) {
            List<BillDto> dtos = new ArrayList<>();
            for (Pakout pakout : pakouts) {
                BillDto billDto = new BillDto();
                billDto.setMatnr(pakout.getMatnr());
                billDto.setQty(pakout.getAnfme());
                dtos.add(billDto);
            }
            // erp单据上传 -- 采购退货单
            if (!erpService.uploadBill(dtos, 6, pakouts.get(0).getDocNum())) {
                throw new CoolException("无法上报至erp");
//        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();
    }

@@ -585,12 +588,39 @@
        }

        // 修改盘点记录
        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();
    }


 src/main/webapp/static/js/ioWorks/stockOut.js

@@ -45,11 +45,6 @@
                if (data.length === 0){
                    layer.msg('请先添加库位物料');
                } else {
                    // var staNo = $("#staNoSelect").val();
                    // if (staNo === "" || staNo === null){
                    //     layer.msg("请选择出库口");
                    //     return;
                    // }
                    var locDetls = [];
                    data.forEach(function(elem) {
                        locDetls.push({nodeId: elem.nodeId, matnr: elem.matnr, count: elem.count});