no message

skyouc

2025-07-10 25579b7079f5fab8fc660358644deb5aea633ed2

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java

@@ -84,7 +84,7 @@
        if (task == null) {

            return R.error("任务不存在！！");

        }

        log.info("容器到达接收，任务号：{}，当前状态：{}，上报状态：{}",task.getTaskNo(),task.getTaskSts$(),TaskStsType.WCS_CONTAINER_RECEIVE.desc);

        log.info("容器到达接收，任务号：{}，当前状态：{}，上报状态：{}, 接收参数：{}",task.getTaskNo(),task.getTaskSts$(),TaskStsType.WCS_CONTAINER_RECEIVE.desc, JSONObject.toJSONString(arrivedParam));



        taskType = task.getTaskType() > 100 ? "outStock":"inStock";



@@ -107,32 +107,36 @@
            if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id

            || task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id ) {

                // 到达拣选位，控制播种墙亮灯

                    List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getBarcode, task.getBarcode()));

                    if(cacheSites.size() == 0) {

                CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>()

                        .eq(CacheSite::getChannel, task.getTargetSite())

                        .isNull(CacheSite::getOrderId).orderByAsc(CacheSite::getId));

//                List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()

//                            .eq(CacheSite::getBarcode, task.getBarcode()));

                    if(Objects.isNull(cacheSite)) {

                        log.error("条码：{}，未找到播种墙亮灯",task.getBarcode());

                        throw new CoolException("未找到播种墙");

                    }

                    for (CacheSite cacheSite:cacheSites) {

                        // 获取任务明细数量

                        List<TaskDetl> taskDetlByTaskId = taskDetlService.getTaskDetlByTaskId(task.getId());

                        int sum = (int)taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();

                        SlapLightControlParam slapLightControlParam = new SlapLightControlParam();

                        slapLightControlParam

                                .setControllerCode(cacheSite.getMemo())

                                .setTagCode(cacheSite.getSiteNo())

                                .setColor("GREEN")

                                .setIndex(cacheSite.getIndex())

                                .setMode("LIGHT")

                                .setDisplay(sum + "");

                        // 发起亮灯请求

                        log.info("任务{}到达拣选位，播种墙亮灯下发",task.getTaskNo(), JSONObject.toJSONString(slapLightControlParam));

                        CommonReponse response = HttpEssUtils.post("到达拣选位，播种墙亮灯", HttpEssUtils.PLT_SEND_COMMAND, slapLightControlParam);

                        if (response.getCode().equals(0)) {

                            log.info("任务{}到达拣选位，播种墙{}亮灯成功",task.getTaskNo(),cacheSite.getSiteNo());

                        } else {

                            log.info("任务{}到达拣选位，播种墙{}亮灯失败",task.getTaskNo(),cacheSite.getSiteNo());

                        }

                    }



                // 获取任务明细数量

                List<TaskDetl> taskDetlByTaskId = taskDetlService.getTaskDetlByTaskId(task.getId());

                int sum = (int)taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();

                SlapLightControlParam slapLightControlParam = new SlapLightControlParam();

                slapLightControlParam

                        .setControllerCode(cacheSite.getMemo())

                        .setTagCode(cacheSite.getSiteNo())

                        .setColor("GREEN")

                        .setIndex(cacheSite.getIndex())

                        .setMode("LIGHT")

                        .setDisplay(sum + "");

                // 发起亮灯请求

                log.info("任务{}到达拣选位，播种墙亮灯下发",task.getTaskNo(), JSONObject.toJSONString(slapLightControlParam));

                CommonReponse response = HttpEssUtils.post("到达拣选位，播种墙亮灯", HttpEssUtils.PLT_SEND_COMMAND, slapLightControlParam);

                if (response.getCode().equals(0)) {

                    log.info("任务{}到达拣选位，播种墙{}亮灯成功",task.getTaskNo(),cacheSite.getSiteNo());

                } else {

                    log.info("任务{}到达拣选位，播种墙{}亮灯失败",task.getTaskNo(),cacheSite.getSiteNo());

                }



                boolean update = taskService.update(new LambdaUpdateWrapper<Task>()

                        .set(Task::getTaskSts, TaskStsType.WAVE_SEED.id)

                        .set(Task::getOriginSite, arrivedParam.getSlotCode())

@@ -140,7 +144,6 @@
                if (!update) {

                    throw new CoolException("容器到达任务更新失败！！");

                }



            } else if(task.getTaskSts().equals(TaskStsType.UPDATED_OUT.id)) {

                ConveyorStarParam conveyorStarParam = new ConveyorStarParam();

                conveyorStarParam.setSlotCode(task.getOriginSite())

@@ -345,9 +348,9 @@
    @Override

    @Transactional(rollbackFor = Exception.class)

    public R slapLightLogic(Map<String, Object> request) {

        String taskNo = request.get("taskNo").toString();

        List<String> taskNos = (List<String>)request.get("taskNo");

        String orderNo = request.get("orderNo").toString();



        String siteNo = Objects.isNull(request.get("siteNo")) ? null : request.get("siteNo").toString();

        List<CacheSite> performs = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));

        if (Objects.isNull(performs.stream().findFirst().get().getPlatformId())) {

            throw new CoolException("请打印明细，并绑定目标集货区");

@@ -356,29 +359,32 @@
        //* 1. 判断当前容器是否还有物料未拣，未拣完闪灯，拣完通知容器流动，并灭灯

        SlapLightControlParam slapParam = new SlapLightControlParam();

        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();

        //判断当前任务是否还有物料未拣

        if (!checked(orderNo, taskNo)) {

            log.info("未完成闪灯请求地址：{}，请求参数：{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));

            //调用三方接口,闪灯不做操作

            // 设置请求参数

            throw new CoolException("当前任务未完成，不能执行此操作！！");



        taskNos.forEach(taskNo -> {

            //判断当前任务是否还有物料未拣

            if (!checked(orderNo, taskNo)) {

                log.info("未完成闪灯请求地址：{}，请求参数：{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));

                //调用三方接口,闪灯不做操作

                // 设置请求参数

                throw new CoolException("当前任务未完成，不能执行此操作！！");

//            params.add("params", JSONObject.toJSONString(slapParam));

        } else {

            //调用三方接口,灭灯通知容器流动， 传灭灯参数

            //todo 判断当前订单是否完成，完成灭灯，未完成保持拣货状态亮灯

            Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo));

            if (Objects.isNull(one)) {

                throw new CoolException("当前订单明细不存在！！");

            }

            } else {

                //调用三方接口,灭灯通知容器流动， 传灭灯参数

                //todo 判断当前订单是否完成，完成灭灯，未完成保持拣货状态亮灯

                Order one = orderService.getOne(new LambdaQueryWrapper<Order>().eq(Order::getOrderNo, orderNo));

                if (Objects.isNull(one)) {

                    throw new CoolException("当前订单明细不存在！！");

                }

//            //获取播种已完成的订单明细

//            List<OrderDetl> detlList = orderDetls.stream().filter(detl -> {

//                return detl.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val;

//            }).collect(Collectors.toList());



            //判断数量是否与订单明细的需求量相同，相同则订单完成

            if (one.getPickStatus() == OrderPickStatus.ORDER_PICK_STATUS_DONE.val) {

                //判断数量是否与订单明细的需求量相同，相同则订单完成

                //播种完成，释放绑定站点

                List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, orderNo));

                List<CacheSite> cacheSites = cacheSiteService.list(new LambdaQueryWrapper<CacheSite>()

                        .eq(!Objects.isNull(siteNo), CacheSite::getSiteNo, siteNo)

                        .eq(CacheSite::getOrderNo, orderNo));

                for (CacheSite cacheSite : cacheSites) {

                    if (!cacheSite.getSiteStatus().equals(CacheSiteStatusType.O.id)) {

                        cacheSite.setSiteStatus(CacheSiteStatusType.O.id);

@@ -393,22 +399,21 @@
                        }

                    }

                }

                params.add("params", JSONObject.toJSONString(slapParam));

                log.info("完成灭灯请求地址：{}，请求参数：{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));

            }

            params.add("params", JSONObject.toJSONString(slapParam));

            log.info("完成灭灯请求地址：{}，请求参数：{}", SystemProperties.SLAP_LIGHT, JSONObject.toJSONString(slapParam));

        }



        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, request.get("taskNo")));

        if (Objects.isNull(task)) {

            throw new CoolException("任务不存在！！");

        }

        try {

            containerConveryor(task.getBarcode());

        } catch (Exception e) {

            log.error("执行异常:UNK",  e);

            throw new CoolException(e.getMessage());

        }



            Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getTaskNo, request.get("taskNo")));

            if (Objects.isNull(task)) {

                throw new CoolException("任务不存在！！");

            }

            try {

                containerConveryor(task.getBarcode());

            } catch (Exception e) {

                log.error("执行异常:UNK",  e);

                throw new CoolException(e.getMessage());

            }

        });

        return R.ok();

    }