#

lsh

2024-01-21 113342593a17ecb75cd2f7f5af271a2528fd4a10

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

@@ -154,7 +154,7 @@
        LocTypeDto locTypeDto = new LocTypeDto();
        locTypeDto.setLocType1((short)1);

        StartupDto dto = commonService.getLocNo(1, 1, 145, matnr,null,null, locTypeDto);
        StartupDto dto = commonService.getLocNo(1, 1, param.getSouSta(), matnr,null,null, locTypeDto);

        int workNo = dto.getWorkNo();
        // 生成工作档
@@ -226,8 +226,8 @@
        }

        Order order = orderService.selectByNo(param.getOrderNo());
        if (Cools.isEmpty(order)){
            throw new CoolException("未查询到此订单，单号："+param.getOrderNo());
        if (Cools.isEmpty(order) || order.getSettle() > 2) {
            throw new CoolException("单据编号已过期，单号："+param.getOrderNo());
        }
        DocType docType = docTypeService.selectById(order.getDocType());
        if (Cools.isEmpty(docType) || !docType.getDocName().equals("退货入库单")){
@@ -252,6 +252,9 @@
            if (!orderBoxNoList.contains(matList.getBatch())){
                throw new CoolException("单号："+param.getOrderNo()+" 箱号："+matList.getBatch()+"不属于此订单或者已经入库");
            }else {
//                if (matList.getAnfme() > orderDetls.get(0).getAnfme()) {
//                    throw new CoolException("箱号："+orderDetls.get(0).getBatch() + "入库数量不合法");
//                }
                matListBoxNoList.add(matList.getBoxNo());
            }
        }
@@ -273,6 +276,7 @@
            matnr = mat.getMatnr();
            WaitPakin waitPakin = new WaitPakin();
            waitPakin.sync(mat);
            waitPakin.setOrderNo(order.getOrderNo());   // 单据编号
            waitPakin.setModel(orderDetl.getModel());     //批次
            waitPakin.setSpecs(orderDetl.getSpecs());     //规格
            waitPakin.setBatch(orderDetl.getBatch());       //木箱编码
@@ -328,6 +332,7 @@
        waitPakins.forEach(waitPakin -> {
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.sync(waitPakin);
            wrkDetl.setOrderNo(order.getOrderNo());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
@@ -348,6 +353,11 @@
        } else {
            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
        }
        // 修改订单作业数量
        if (!orderDetlService.increaseWorkQty(order.getId(), orderDetls.get(0).getMatnr(), orderDetls.get(0).getBatch(), orderDetls.get(0).getAnfme())) {
            throw new CoolException("修改单据作业数量失败");
        }
        orderService.updateSettle(order.getId(), 2L, userId);
    }
    @Override
    @Transactional