1

ZY

2024-10-29 52f2306fe8e8f0760b32f33371adf4037e031bcf

1

 src/main/java/com/zy/asrs/service/OrderService.java

@@ -17,7 +17,7 @@
    boolean updateSettle2(Long orderId, Long settle, Integer pltType);


    void checkComplete(String orderNo, String locNo);
    void checkComplete(String orderNo, Integer pltType);

    boolean saveHandlerOrder(Boolean pakin, WrkMast wrkMast, List<WrkDetl> wrkDetls);


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

@@ -98,7 +98,7 @@
            //检索库位，选择合适的库位
            AgvLocMast agvLocMast = agvCommonService.getLocNo(agvBasDevp.getLocType1(),agvBasDevp.getFloor(),false,false);
            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2());
            AgvWrkMast wrkMast = createWrkMast(1,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),agvBasDevp.getBarcode(),now,userId, agvBasDevp.getLocType2(),agvLocMast.getPltType());
            //标记是否为输送线入库
            wrkMast.setMk(isConveyor ? "Y" : "N");
            //生成工作档明细
@@ -141,7 +141,7 @@
            //判断是否全板出库
            int ioType = isPakOut(sourceLocNo,taskDto) ?  101 : 103;
            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),null);
            //生成工作档明细
            taskDto.getLocDtos().forEach(locDto -> {
                if (!BaseController.isJSON(locDto.getOrderNo())) {
@@ -215,7 +215,7 @@
            //判断是否全板出库
            int ioType = 107;
            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)));
            AgvWrkMast wrkMast = createWrkMast(ioType,wrkSts,sourceLocNo,targetLocNo,containerCode,now,userId,Short.valueOf(containerCode.substring(0,2)),null);
            //生成工作档明细
            taskDto.getLocDtos().forEach(locDto -> {
                if (!BaseController.isJSON(locDto.getOrderNo())) {
@@ -346,7 +346,7 @@
            int containerType = getContainerTypeByloc(taskDto.getLocNo());

            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType);
            AgvWrkMast wrkMast = createWrkMast(107, 21L,taskDto.getLocNo(),taskDto.getAgvStaNo(),taskDto.getLocDtos().get(0).getContainerCode(),now,userId,containerType,null);
            //生成工作档明细
            taskDto.getLocDtos().forEach(locDto -> {
                //明细档所需参数
@@ -389,7 +389,7 @@
        Date now = new Date();

        //生成移库工作档
        AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo));
        AgvWrkMast wrkMast = createWrkMast(11, 21L, sourceLocNo, targetLocNo, sourceLocDetl.getSuppCode(), now, userId,getContainerTypeByloc(sourceLocNo),targetLocMast.getPltType());
        //生成工作党明细
        createWrkDetlReWrite(
                sourceLocDetl.getMatnr(),
@@ -520,7 +520,7 @@
            String locNo = agvLocMast.getLocNo();

            //生成工作档
            AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType);
            AgvWrkMast wrkMast = createWrkMast(1,201L,devNo,locNo,containerCode,now,userId, containerType,agvLocMast.getPltType());
            //生成工作档明细
            agvWaitPakinList.forEach(wp -> {
                createWrkDetlReWrite(wp.getMatnr(),wrkMast.getWrkNo(),wp.getOrderNo(),wp.getBatch(),wp.getAnfme(),wp.getSuppCode(),now,userId,wp.getThreeCode(),wp.getDeadTime(),wp.getProcessSts());
@@ -537,7 +537,7 @@
            }
            agvLocMast = agvCommonService.getLocNo(locType,agvBasDevp.getFloor(),true,true);
            // 生成工作档 10.空板入库
            createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType);
            createWrkMast(10,201L,agvBasDevp.getDevNo(),agvLocMast.getLocNo(),containerCode,now,userId,containerType,agvLocMast.getPltType());
            //更新源站点状态
            updateAgvBasDevp(agvBasDevp,"R",containerType,containerCode);
        }
@@ -572,7 +572,7 @@
            throw new CoolException("暂无当前出库站点类型的空货架！");
        }
        //生成工作档
        createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType);
        createWrkMast(110,21L,agvLocMast.getLocNo(),agvBasDevp.getDevNo(),agvLocMast.getBarcode(),now,userId,containerType,agvLocMast.getPltType());

        //修改源库位状态
        updateAgvLocMast(agvLocMast,"R");
@@ -1109,7 +1109,7 @@
    /*
    生成工作档
     */
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType){
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode,  Date now, Long userId, int containerType,Integer pltType){
        AgvWrkMast wrkMast = new AgvWrkMast();
        //工作状态
        wrkMast.setWrkSts(wrkSts);
@@ -1131,6 +1131,7 @@
        wrkMast.setAppeTime(now);
        wrkMast.setModiUser(userId);
        wrkMast.setModiTime(now);
        wrkMast.setPltType(pltType);
        wrkMast.setLogErrMemo("createWaitPainWrkMastStart");
        if (!agvWrkMastService.insertByIncrease(wrkMast)) {
            throw new CoolException("保存工作档失败");

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

@@ -526,7 +526,7 @@
        //删除入库通知档
        waitPakinService.delete(new EntityWrapper<WaitPakin>().eq("zpallet", zpallet));

        orderService.checkComplete(waitPakinList.get(0).getOrderNo(),locNo);
        orderService.checkComplete(waitPakinList.get(0).getOrderNo(),null);


    }
@@ -596,7 +596,7 @@
        manLocDetlService.update(manLocDetl,manLocDetlWrapper);

        //检测订单是否完成
        orderService.checkComplete(param.getOrderNo(),param.getLocNo());
        orderService.checkComplete(param.getOrderNo(),null);

    }


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

@@ -98,7 +98,7 @@
    }

    @Override
    public void checkComplete(String orderNo, String locNo) {
    public void checkComplete(String orderNo, Integer pltType) {
        Order order = this.selectByNo(orderNo);
        if (Cools.isEmpty(order)) {
            return;
@@ -115,12 +115,7 @@
                break;
            }
        }
        Integer pltType = null;
        //仓库编码
        if (Cools.isEmpty(order.getPltType()) && !Cools.isEmpty(locNo)) {
            AgvLocMast locNo1 = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", locNo));
            pltType = locNo1.getPltType();
        }

        // 如果 作业数量等于单据总数量 && 工作明细档中无该单据的数据 && AGV工作明细档中无该单据的数据
        int count = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", orderNo));
        boolean wrkDeltExist = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().like("order_no", orderNo)) < 1;

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -80,7 +80,8 @@
        }
    }

    @Scheduled(cron = "* 0/5 * * * ? ")
    //@Scheduled(cron = "* 0/5 * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void reportOrder() {
        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));

 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java

@@ -297,12 +297,12 @@

            if (!isJSON(orderNo)) {
                //检查订单是否已完成
                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
            } else {
                List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                maps.forEach(map -> {
                    String o = map.get("orderNo").toString();
                    orderService.checkComplete(o, agvWrkMast.getLocNo());
                    orderService.checkComplete(o, agvWrkMast.getPltType());
                });
            }

@@ -404,12 +404,12 @@
            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
            if (!isJSON(orderNo)) {
                //检查订单是否已完成
                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
            } else {
                List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                maps.forEach(map -> {
                    String o = map.get("orderNo").toString();
                    orderService.checkComplete(o, agvWrkMast.getLocNo());
                    orderService.checkComplete(o, agvWrkMast.getPltType());
                });
            }

@@ -461,12 +461,12 @@
            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
            if (!isJSON(orderNo)) {
                //检查订单是否已完成
                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
            } else {
                List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                maps.forEach(map -> {
                    String o = map.get("orderNo").toString();
                    orderService.checkComplete(o, agvWrkMast.getLocNo());
                    orderService.checkComplete(o, agvWrkMast.getPltType());
                });
            }
            //上报mes

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -103,19 +103,19 @@
                    report.add(orderDetl);
                }
            }
            if (Cools.isEmpty(order.getPltType())) {
                return;
            }
            if (!Cools.isEmpty(report)) {
                ReportErpParam param = new ReportErpParam();
                mappingParam(order, param);
                mappingParamChildren(report, param);
                if (Cools.isEmpty(order.getPltType())) {
                    return;
                }

                int code = doHttpRequest(param, "单据审核", url, orderReportPath, null, "127.0.0.1");
                if (code == 0) {
                    for (OrderDetl orderDetl : orderDetlList) {
                        orderDetl.setReportQty(orderDetl.getQty());
                    for (OrderDetl orderDetl : report) {
                        log.info("{}单据审核上报了：{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
                        orderDetl.setReportQty(orderDetl.getQty());
                        orderDetlService.updateById(orderDetl);
                    }
                }

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -120,12 +120,12 @@
            // 修改订单状态 作业中 ===>> 已完成
            for (WrkDetl wrkDetl : wrkDetlsKeyOrder) {
                if (!BaseController.isJSON(wrkDetl.getOrderNo())) {
                    orderService.checkComplete(wrkDetl.getOrderNo(),wrkMast.getLocNo());
                    orderService.checkComplete(wrkDetl.getOrderNo(),wrkMast.getPltType());
                } else {
                    // 订单合并出库
                    List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
                    for (OrderDto one : orderDtoList) {
                        orderService.checkComplete(one.getOrderNo(),wrkMast.getLocNo());
                        orderService.checkComplete(one.getOrderNo(),wrkMast.getPltType());
                    }
                }
            }