#平库入库完成+库存明细+库存统计

zjj

2025-01-06 f56e004dac74ebcf6638e0b8dc162062f19dbe34

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

@@ -144,8 +144,7 @@
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getInteger("code").equals(0)) {
                success = true;
                // 没有出库任务，更改为入库模式
                basDevp.setDevMk("1");
                // 入库暂存+1
                basDevp.setInQty(basDevp.getInQty() + 1);
                basDevpMapper.updateById(basDevp);
            } else {
@@ -418,6 +417,10 @@
                waitPakin.setTemp2(detlDto.getTemp2());
                waitPakin.setTemp3(detlDto.getTemp3());
                waitPakin.setTemp4(detlDto.getTemp4());
                int countWrk2 = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
                if (countWrk2 > 0) {
                    throw new CoolException("工作档条码数据已存在===>>" + param.getBarcode());
                }
                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                }
@@ -489,6 +492,11 @@
            wrkDetl.setModiTime(now);
            wrkDetl.setModiUser(userId);
            wrkDetl.setManu(orderDetl.getManu());
            wrkDetl.setSupp(orderDetl.getSupp());
            wrkDetl.setTemp1(orderDetl.getTemp1());
            wrkDetl.setTemp2(orderDetl.getTemp2());
            wrkDetl.setTemp3(orderDetl.getTemp3());
            wrkDetl.setTemp4(orderDetl.getTemp4());
            wrkDetlService.insert(wrkDetl);
        }

@@ -996,6 +1004,109 @@

    }

    @Override
    @Transactional
    public void pingKuShelves(CombParam combParam,Long userId) {
        Node node = nodeService.selectOne(new EntityWrapper<Node>().eq("name", combParam.getLocno()).eq("type", 3));
        if (Cools.isEmpty(node)){
            throw new CoolException("未找到库位信息");
        }

        Order order = orderService.selectByNo(combParam.getOrderNo());
        if (Cools.isEmpty(order) || order.getSettle() > 2) {
            throw new CoolException("单据编号已过期");
        }
        // 生成入库通知档
        List<DetlDto> detlDtos = new ArrayList<>();

        for (CombParam.CombMat elem : combParam.getCombMats()) {


//            param.getCombMats().forEach(elem -> {

            // 订单明细数量校验
            OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
            if (Cools.isEmpty(orderDetl)) {
                throw new CoolException("该单据中未找到对应物料明细");
            }
            if (elem.getAnfme() > orderDetl.getEnableQty()) {
                throw new CoolException(orderDetl.getMatnr() + "入库数量不合法");
            }
            // 修改订单作业数量
            if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
                throw new CoolException("修改单据作业数量失败");
            }

//                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getManu());
            DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),orderDetl.getSuppCode()
                    , orderDetl.getManu(),orderDetl.getSku(),orderDetl.getSupp(),orderDetl.getTemp1(),orderDetl.getTemp2(),orderDetl.getTemp3(),orderDetl.getTemp4());
            if (DetlDto.has(detlDtos, detlDto)) {
                DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
                assert one != null;
                one.setAnfme(one.getAnfme() + detlDto.getAnfme());
            } else {
                detlDtos.add(detlDto);
            }
//            });
        }
        int workNo = commonService.getWorkNo(4);
        Date now = new Date();
        // 生成工作档
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(new Date());
        wrkMast.setWrkSts(4L); // 工作状态：生成入库ID
        wrkMast.setIoType(300); // 入出库状态：1.入库
        wrkMast.setIoPri(12D); // 优先级
        wrkMast.setLocNo(node.getName());
        wrkMast.setBarcode(""); // 托盘码
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料
        wrkMast.setExitMk("N"); // 退出
        wrkMast.setEmptyMk("N"); // 空板
        wrkMast.setLinkMis("Y");
        wrkMast.setSheetNo(order.getOrderNo());
        // 操作人员数据
        wrkMast.setAppeTime(now);
        wrkMast.setModiTime(now);
        boolean res = wrkMastService.insert(wrkMast);
        if (!res) {
            throw new CoolException("保存工作档失败");
        }
        for (DetlDto detlDto : detlDtos) {
            Mat mat = matService.selectByMatnr(detlDto.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
            }
            WrkDetl wrkDetl = new WrkDetl();

            wrkDetl.sync(detlDto);
            wrkDetl.sync(mat);

            wrkDetl.setOrderNo(order.getOrderNo());
            wrkDetl.setWrkNo(wrkMast.getWrkNo());
            wrkDetl.setIoTime(wrkMast.getIoTime());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiTime(now);
            wrkDetl.setManu(detlDto.getMark()); //标记
            wrkDetl.setOrigin(order.getItemName());//仓库
            wrkDetl.setSupp(detlDto.getSuppName()); //供应商
            wrkDetl.setSku(detlDto.getCustomer()); //客户名称
            wrkDetl.setThreeCode(detlDto.getOrderNo()); //u8发过来的订单号
            wrkDetl.setSuppCode(detlDto.getFromOrderNo()); //来源单号
            wrkDetl.setTemp1(detlDto.getTemp1());
            wrkDetl.setTemp2(detlDto.getTemp2());
            wrkDetl.setTemp3(detlDto.getTemp3());
            wrkDetl.setTemp4(detlDto.getTemp4());
            if (!wrkDetlService.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }
        }
        orderService.updateSettle(order.getId(), 2L, userId);


    }

    public void uploadErp(InventoryErpParam param){
        String response = "";
        boolean success = false;