实现多订单组托，并且在pda上区分配盘和来料入库单

zyh

13 小时以前 9e2eb64f6f9cf3f0921818e773f52e8e41b1ad88

实现多订单组托，并且在pda上区分配盘和来料入库单

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -648,8 +648,16 @@
    }

    @RequestMapping("/orderIn")
    public synchronized R AGVOrderInReturn() {
        List<OrderPakin> settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
    public synchronized R AGVOrderInReturn(@RequestBody JSONObject param) {
        List<OrderPakin> settle;
        if(param.getString("type").equals("1")){
            settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",1));
        }else if(param.getString("type").equals("2")){
            settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2).eq("doc_type",2));
        }
        else {
            settle = orderPakinService.selectList(new EntityWrapper<OrderPakin>().in("settle", 1, 2));
        }
        List<String> list = new ArrayList<>();
        for (OrderPakin orderPakin : settle) {
            if (orderPakin.getSettle()==2){

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -13,6 +13,9 @@
    // 单据编号
    private String orderNo;

    // 单据编号
    private List<String> orderNos;

    // 托盘条码
    private String barcode;


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

@@ -596,7 +596,7 @@

        Date now = new Date();
        // 无单组托
        if (Cools.isEmpty(param.getOrderNo())) {
        if (Cools.isEmpty(param.getOrderNos())) {
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
@@ -645,117 +645,99 @@
            }
            // 关联组托
        } else {
//            Order order = orderService.selectByNo(param.getOrderNo());
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, elem.getOrderNo());
            // 1. 先按订单分组
            Map<String, List<CombParam.CombMat>> orderGoodsMap = new HashMap<>();
            for (CombParam.CombMat elem : param.getCombMats()) {
                String orderNo = elem.getOrderNo();
                orderGoodsMap.computeIfAbsent(orderNo, k -> new ArrayList<>()).add(elem);
            }

            // 2. 验证所有订单
            for (String orderNo : param.getOrderNos()) {
                Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
                if (Cools.isEmpty(order) || order.getSettle() > 2) {
                    throw new CoolException("订单号不存在或者已执行完成");
                }
                // 订单明细数量校验
//                OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
//                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3());
                OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
                        .eq("order_id", order.getId())
                        .eq("matnr", elem.getMatnr()));

                if (Objects.isNull(detls)) {
                    throw new CoolException("数据错误：单据明细不存在！！");
                }

                if (elem.getAnfme() > detls.getEnableQty()) {
                    throw new CoolException(detls.getMatnr() + "入库数量不合法");
                }
                OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
                        elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(), elem.getAnfme());
                detlDto.setOrderId(order.getId());
                detlDto.setOrderNo(order.getOrderNo());
                if (DetlDto.has(detlDtos, detlDto)) {
                    DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                    assert one != null;
                    one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                } else {
                    detlDtos.add(detlDto);
                }
            });

//            BasContainer container = basContainerService.selectOne(new EntityWrapper<BasContainer>().eq("barcode", param.getBarcode()));
//            if (Objects.isNull(container)) {
//                throw new CoolException("数据错误：容器码不存在！！");
//            }
//            if (container.getMixMax() < detlDtos.size()) {
//                throw new CoolException("超出容器最大混装数量，当前容器最大数量为：" + container.getMixMax() + "!!");
//            }
//            Set<String> matnrs = detlDtos.stream().map(DetlDto::getMatnr).collect(Collectors.toSet());
//            List<Mat> mats = matService.selectList(new EntityWrapper<Mat>().in("matnr", matnrs));
//            Set<Long> tagIds = mats.stream().map(Mat::getTagId).collect(Collectors.toSet());
//            if (tagIds.size() > 1) {
//                throw new CoolException("组托物料类型不一致，只有相同的物料分类才可以组托！！");
//            }
            //还可以放入多少种物料
//            Integer suplus = container.getMixMax();
            for (DetlDto detlDto : detlDtos) {
                Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                if (Cools.isEmpty(mat)) {
                    throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                }
                //最多可放数量
//                Double singleMax = mat.getUpQty() * suplus;
//                if (singleMax.compareTo(detlDto.getAnfme()) < 0) {
//                    throw new CoolException("物料：" + detlDto.getMatnr() + "单次组托上限为：" + mat.getUpQty() + ",当前总量超出托盘装载上限!!");
//                }
//                BigDecimal decimal = new BigDecimal(detlDto.getAnfme() / mat.getUpQty());
//                //当前物料需要占用料箱格数
//                Integer curr = decimal.setScale(0, RoundingMode.CEILING).intValue();
//                suplus = suplus - curr;
//                if (suplus < 0) {
//                    throw new CoolException("物料：" + detlDto.getMatnr() + ", 超出当前托盘装载上限！！");
//                }
                OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
                        .eq("order_no", param.getOrderNo())
                        .eq("matnr", detlDto.getMatnr()));

                WaitPakin waitPakin = new WaitPakin();
                BeanUtils.copyProperties(mat, waitPakin);
//                waitPakin.sync(mat);
                waitPakin.setOrderNo(detlDto.getOrderNo());   // 单据编号
                waitPakin.setOrderId(detlDto.getOrderId());
                waitPakin.setBatch(detlDto.getBatch());     // 序列码
                waitPakin.setZpallet(param.getBarcode());   // 托盘码
                waitPakin.setIoStatus("N");     // 入出状态
                waitPakin.setAnfme(detlDto.getAnfme());  // 数量
                waitPakin.setStatus("Y");    // 状态
                waitPakin.setAppeUser(userId);
                waitPakin.setAppeTime(now);
                waitPakin.setModiUser(userId);
                waitPakin.setModiTime(now);
                if (!detlDto.getStandby1().isEmpty() && detlDto.getStandby1() != null && !detlDto.getStandby1().equals("")){
                    waitPakin.setStandby1(detls.getStandby1());//配盘号
                }

                if (!waitPakinService.insert(waitPakin)) {
                    throw new CoolException("保存入库通知档失败");
                    throw new CoolException("订单号不存在或者已执行完成：" + orderNo);
                }
            }

//            Date date1 = now;
//            CanFin canFin = new CanFin();
//            canFin.setApplyTime(date1);
//            canFin.setAgvType("agv-in");
//            canFinMapper.insert(canFin);
            // 3. 按订单分别处理商品
            for (Map.Entry<String, List<CombParam.CombMat>> entry : orderGoodsMap.entrySet()) {
                String orderNo = entry.getKey();
                List<CombParam.CombMat> goodsList = entry.getValue();

            Set<String> stringSet = param.getCombMats().stream().map(CombParam.CombMat::getOrderNo).collect(Collectors.toSet());
            stringSet.forEach(orderNo -> {
                Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);

                // 生成入库通知档
                List<DetlDto> detlDtos = new ArrayList<>();
                for (CombParam.CombMat elem : goodsList) {
                    OrderDetlPakin detls = orderDetlPakinService.selectOne(new EntityWrapper<OrderDetlPakin>()
                            .eq("order_id", order.getId())
                            .eq("matnr", elem.getMatnr()));

                    if (Objects.isNull(detls)) {
                        throw new CoolException("数据错误：单据明细不存在！！");
                    }

                    if (elem.getAnfme() > detls.getEnableQty()) {
                        throw new CoolException(detls.getMatnr() + "入库数量不合法");
                    }

                    OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE, order.getId(),
                            elem.getMatnr(), elem.getBatch(), elem.getBrand(),
                            elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
                            elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(),
                            elem.getAnfme());

                    DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),
                            elem.getBrand(), elem.getStandby1(), elem.getStandby2(), elem.getStandby3(),
                            elem.getBoxType1(), elem.getBoxType2(), elem.getBoxType3(),
                            elem.getAnfme());
                    detlDto.setOrderId(order.getId());
                    detlDto.setOrderNo(order.getOrderNo());

                    if (DetlDto.has(detlDtos, detlDto)) {
                        DetlDto one = DetlDto.findDto(detlDtos, detlDto);
                        assert one != null;
                        one.setAnfme(one.getAnfme() + detlDto.getAnfme());
                    } else {
                        detlDtos.add(detlDto);
                    }
                }

                // 保存入库通知档
                for (DetlDto detlDto : detlDtos) {
                    Mat mat = matService.selectByMatnr(detlDto.getMatnr());
                    if (Cools.isEmpty(mat)) {
                        throw new CoolException(detlDto.getMatnr() + "商品档案不存在");
                    }

                    WaitPakin waitPakin = new WaitPakin();
                    BeanUtils.copyProperties(mat, waitPakin);
                    waitPakin.setOrderNo(detlDto.getOrderNo());
                    waitPakin.setOrderId(detlDto.getOrderId());
                    waitPakin.setBatch(detlDto.getBatch());
                    waitPakin.setZpallet(param.getBarcode());
                    waitPakin.setIoStatus("N");
                    waitPakin.setAnfme(detlDto.getAnfme());
                    waitPakin.setStatus("Y");
                    waitPakin.setAppeUser(userId);
                    waitPakin.setAppeTime(now);
                    waitPakin.setModiUser(userId);
                    waitPakin.setModiTime(now);

                    if (!waitPakinService.insert(waitPakin)) {
                        throw new CoolException("保存入库通知档失败");
                    }
                }
            }

            // 4. 更新所有订单状态
            for (String orderNo : param.getOrderNos()) {
                Order order = OrderInAndOutUtil.selectByNo(Boolean.TRUE, orderNo);
                OrderInAndOutUtil.updateOrder(Boolean.TRUE, order.getId(), 2L, userId);
            });
            }

            if(!Cools.isEmpty(param.getRsta()) && param.getRsta().contains("-")){
                //生成AGV搬运任务
                //生成AGV搬运出库任务
                // 保存工作档
                Task task = new Task();
                Date date = new Date();
                String s = "";
@@ -791,6 +773,8 @@
                }
            }



        }
    }