mes对接单据相关

pang.jiabao

2024-08-27 2d0226ea3dd2116cfcc9ec307f17edf191458aad

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -1345,7 +1345,7 @@

    @Override
    @Transactional
    public String zwmsOutLocWork(ZwmsOutLocWorkDto param) {
    public R zwmsOutLocWork(ZwmsOutLocWorkDto param) {

        Order order = orderService.selectByNo(param.getOrderNo());
        if (!Cools.isEmpty(order)) {
@@ -1354,6 +1354,7 @@

        DocType docType = docTypeService.selectOrAdd(param.getOrderType(), Boolean.FALSE);
        Date now = new Date();

        // 单据主档
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
@@ -1391,38 +1392,16 @@
                now,    // 修改时间
                null    // 备注
        );

        if (!orderService.insert(order)) {
            throw new CoolException("生成单据主档失败，请联系管理员");
        }

        // 单据明细档
        List<DetlDto> list = new ArrayList<>();
        List<ZwmsOutLocWorkDto.Rolls> orderDetails = param.getMatDetails();
        for (ZwmsOutLocWorkDto.Rolls detail : orderDetails) {
            DetlDto dto = new DetlDto(detail.getRollNo(), detail.getBoxNo(), 1.0);
            dto.setOrderNo(detail.getSpecs());
            dto.setSplices(detail.getSplices());
            if (DetlDto.has(list, dto)) {
                DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
                assert detlDto != null;
                detlDto.setAnfme(detlDto.getAnfme() + 1);
            } else {
                list.add(dto);
            }
        }
        for (DetlDto detlDto : list) {
//            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
        for (String groupNo : param.getGroups()) {
            OrderDetl orderDetl = new OrderDetl();
//            if (Cools.isEmpty(mat)) {
//                throw new CoolException(detlDto.getMatnr() + "编号商品检索失败，请先添加商品");
//            } else {
//                orderDetl.sync(mat);
//            }
            orderDetl.setSpecs(String.valueOf(detlDto.getSplices()));
            orderDetl.setBatch(detlDto.getBatch() == null ? "" : detlDto.getBatch());
            orderDetl.setModel(detlDto.getMatnr());
            orderDetl.setMatnr(detlDto.getOrderNo());
            orderDetl.setMaktx(detlDto.getOrderNo());
            orderDetl.setAnfme(detlDto.getAnfme());
            orderDetl.setBrand(groupNo);
            orderDetl.setBatch("");
            orderDetl.setOrderId(order.getId());
            orderDetl.setOrderNo(order.getOrderNo());
            orderDetl.setCreateBy(9527L);
@@ -1431,12 +1410,14 @@
            orderDetl.setUpdateTime(now);
            orderDetl.setStatus(1);
            orderDetl.setQty(0.0D);
            orderDetl.setAnfme(1.0);
            if (!orderDetlService.insert(orderDetl)) {
                throw new CoolException("生成单据明细失败，请联系管理员");
            }
        }

        return null;
        return R.ok("单据生成成功");

    }

    @Override
@@ -1464,11 +1445,11 @@

        // 到达出库口确认为1，更新工作档状态为57.出库完成
        if (param.getOutLocResult() == 1) {
            wrkMast.setWrkSts(20L);
            // 空托盘到位直接更新工作档状态为14.已出库未确认，空托无需复核确认
            if (!flag || wrkMast.getIoType() == 110) {
//            wrkMast.setWrkSts(20L);
//            // 空托盘到位直接更新工作档状态为14.已出库未确认，空托无需复核确认
//            if (!flag || wrkMast.getIoType() == 110) {
                wrkMast.setWrkSts(14L);
            }
//            }
            wrkMastService.updateById(wrkMast);
        }