no message

skyouc

2025-07-10 87d66c61fc5047fb5708d609f4a5f1f868cd646c

no message

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java

@@ -117,26 +117,30 @@
            throw new CoolException("当前站点不存在！！");
        }

        List<WaveSeed> waveSeed = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
        WaveSeed waveSeed = waveSeedService.getOne(new LambdaQueryWrapper<WaveSeed>()
                        .eq(WaveSeed::getExceStatus, 1)
                .eq(WaveSeed::getSiteNo, request.get("tagCode").toString()));
        if (Objects.isNull(waveSeed)) {
            throw new CoolException("播种墙地标未绑定！！");
        }

        List<Long> taskIds = waveSeed.stream().map(WaveSeed::getTaskId).collect(Collectors.toList());

        // 根据播种站点信息条码，查任务
        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds));
        if (tasks.isEmpty()) {
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));
        if (Objects.isNull(task)) {
            throw new CoolException("当前站点任务不存在！！");
        }

        List<String> taskNos = tasks.stream().map(Task::getTaskNo).collect(Collectors.toList());

        Map<String, Object> param = new HashMap<>();
        param.put("taskNo", taskNos);
        param.put("taskNo", task.getTaskNo());
        param.put("siteNo", cacheSite.getSiteNo());
        param.put("weedId", waveSeed.getId());
        param.put("orderNo",cacheSite.getOrderNo());

        waveSeed.setExceStatus(0);
        if (!waveSeedService.updateById(waveSeed)) {
            throw new CoolException("播种状态修改失败！！");
        }

       return wcsApiService.slapLightLogic(param);
    }


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java

@@ -114,6 +114,10 @@
        if (Objects.isNull(reviewParam.getWaveSeedId())) {
            return R.error("播种明细标识不能为空！！");
        }
//        if (Objects.isNull(reviewParam.getSiteNo())) {
//            return R.error("播种站点不能为空！！");
//        }

        return waveManagentService.reviewSeeds(reviewParam);
    }


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

@@ -33,6 +33,7 @@
import javax.annotation.Resource;

import java.util.*;

import java.util.stream.Collectors;

import java.util.stream.DoubleStream;



@Slf4j

@Service

@@ -79,20 +80,20 @@
     */

    @Override

    @Transactional(rollbackFor = Exception.class)

    public R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType, Long hostId){

    public R containerArrivedNotify(ContainerArrivedParam arrivedParam, String taskType, Long hostId) {

        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, arrivedParam.getContainerCode()));

        if (task == null) {

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

        }

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

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



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

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



        if (taskType.equals("inStock")) {

            if (task.getTaskSts() == 198) {

                return R.error("播种中！！");

            }

            if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_IN.id ) {

            if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_IN.id) {

                //DONE 根据ESS返回的容器编码修改任务档中的输送线起始位置节点，及任务档容器到达状态

                taskService.update(new LambdaUpdateWrapper<Task>()

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

@@ -100,26 +101,26 @@
                        .set(Task::getOriginSite, arrivedParam.getSlotCode())

                        .eq(Task::getBarcode, arrivedParam.getContainerCode()));

            } else {

                  log.warn("{}没有下发任务",task.getTaskNo());

                  R.error(task.getTaskNo()+"没有下发任务");

                log.warn("{}没有下发任务", task.getTaskNo());

                R.error(task.getTaskNo() + "没有下发任务");

            }

        } else {

            if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_ARRIVED.id

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

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

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

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

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

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

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

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

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

                    if(Objects.isNull(cacheSite)) {

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

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

                    }

                if (Objects.isNull(cacheSite)) {

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

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

                }



                // 获取任务明细数量

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

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

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

                SlapLightControlParam slapLightControlParam = new SlapLightControlParam();

                slapLightControlParam

                        .setControllerCode(cacheSite.getMemo())

@@ -129,12 +130,12 @@
                        .setMode("LIGHT")

                        .setDisplay(sum + "");

                // 发起亮灯请求

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

                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());

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

                } else {

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

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

                }



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

@@ -144,16 +145,16 @@
                if (!update) {

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

                }

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

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

                ConveyorStarParam conveyorStarParam = new ConveyorStarParam();

                conveyorStarParam.setSlotCode(task.getOriginSite())

                        .setContainerCode(task.getBarcode())

                        .setDirection("200");

                // 出库完成，清除输送线条码，取下箱子

                    CommonReponse response = HttpEssUtils.post("清除输送线条码", HttpEssUtils.CONVEYOR_START, conveyorStarParam);

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

                        log.info("{}出库完成，清除{}输送线条码{}成功",task.getTaskNo(),task.getOriginSite(),task.getBarcode());

                    }

                CommonReponse response = HttpEssUtils.post("清除输送线条码", HttpEssUtils.CONVEYOR_START, conveyorStarParam);

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

                    log.info("{}出库完成，清除{}输送线条码{}成功", task.getTaskNo(), task.getOriginSite(), task.getBarcode());

                }

            }

        }



@@ -175,17 +176,17 @@
                .eq(Task::getTaskNo, callbackParam.getTaskCode()));

        if (!Collections.isEmpty(list)) {

            list.forEach(task -> {

                log.info("容器执行状态上报，任务号：{}，当前状态：{}，上报状态：{}",task.getTaskNo(),task.getTaskSts$(),callbackParam.getEventType());

                log.info("容器执行状态上报，任务号：{}，当前状态：{}，上报状态：{}", task.getTaskNo(), task.getTaskSts$(), callbackParam.getEventType());

                if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_ALLOCATED.event)) {

                    return;

                }

                // ESS只能配置一个状态上报接口，根据任务号判断是入库任务或出库任务

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

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

                TaskStsType taskStsType = null;

                if (taskType.equals("inStock")) { //入库任务

                    if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //上报取箱状态

//                        if (task.getTaskSts() == TaskStsType.WCS_CONVEYOR_START.id) {

                            taskStsType = TaskStsType.WCS_TOTE_LOAD;

                        taskStsType = TaskStsType.WCS_TOTE_LOAD;

//                        } else {

//                            String errMsg = "任务编号：" + task.getTaskNo() + "状态为不匹配，" + "不能执行：" + TaskStsType.WCS_TOTE_LOAD.desc + "任务";

//                            log.error(errMsg);

@@ -193,7 +194,7 @@
//                        }

                    } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //上报放箱状态

//                        if (task.getTaskSts() == TaskStsType.WCS_TOTE_LOAD.id) {

                            taskStsType = TaskStsType.WCS_TOTE_UNLOAD;

                        taskStsType = TaskStsType.WCS_TOTE_UNLOAD;

//                        } else {

//                            String errMsg = "任务编号：" + task.getTaskNo() + "状态为不匹配，" + "不能执行：" + TaskStsType.WCS_TOTE_UNLOAD.desc + "任务";

//                            log.error(errMsg);

@@ -201,7 +202,7 @@
//                        }

                    } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //TODO 需确认上报任务中，任务完成是哪个事件，目前暂定task事件

//                        if (task.getTaskSts() == TaskStsType.WCS_TOTE_UNLOAD.id) {

                            taskStsType = TaskStsType.WCS_PUTAWAY_SUCESS;

                        taskStsType = TaskStsType.WCS_PUTAWAY_SUCESS;

//                        } else {

//                            String errMsg = "任务编号：" + task.getTaskNo() + "状态为不匹配，" + "不能执行：" + TaskStsType.WCS_PUTAWAY_SUCESS.desc + "任务";

//                            log.error(errMsg);

@@ -225,7 +226,7 @@
                } else { //出库任务

                    if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_LOAD.event)) { //上报取箱状态

//                        if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT.id ) {

                            taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD;

                        taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD;

//                        } else {

//                            String errMsg = "任务编号：" + task.getTaskNo() + "状态为不匹配，" + "不能执行：" + TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.desc + "任务";

//                            log.error(errMsg);

@@ -233,7 +234,7 @@
//                        }

                    } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_TOTE_UNLOAD.event)) { //上报放箱状态

//                        if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_LOAD.id) {

                            taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD;

                        taskStsType = TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD;

//                        } else {

//                            String errMsg = "任务编号：" + task.getTaskNo() + "状态为不匹配，" + "不能执行：" + TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.desc + "任务";

//                            log.error(errMsg);

@@ -241,8 +242,8 @@
//                        }

                    } else if (callbackParam.getEventType().equals(EssTaskStatus.TASK_EVENT_STATUS.event)) { //上报完成状态

//                        if (task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TOTE_UNLOAD.id || task.getTaskSts() == TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.id) {

                            //出库任务完成，修改状态为容器到达，定时任务生成播种波次

                            taskStsType = TaskStsType.WCS_EXECUTE_OUT_TASK_DONE;

                        //出库任务完成，修改状态为容器到达，定时任务生成播种波次

                        taskStsType = TaskStsType.WCS_EXECUTE_OUT_TASK_DONE;

//                        } else {

//                            String errMsg = "任务编号：" + task.getTaskNo() + "状态为不匹配，" + "不能执行：" + TaskStsType.WCS_EXECUTE_OUT_TASK_DONE.desc + "任务";

//                            log.error(errMsg);

@@ -279,11 +280,11 @@
     */

    @Override

    @Transactional(rollbackFor = Exception.class)

    public synchronized R containerConveryor(String code) throws Exception{

    public synchronized R containerConveryor(String code) throws Exception {

        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, code));

        if (Objects.isNull(task)) {

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

        } 
        }

        try {

            ConveyorStarParam conveyorStarParam = new ConveyorStarParam();

            conveyorStarParam.setSlotCode(task.getOriginSite())

@@ -323,7 +324,7 @@
                }

            }

        } catch (Exception ex) {

            log.error("UNK",  ex);

            log.error("UNK", ex);

        }

        return R.ok();

    }

@@ -348,39 +349,46 @@
    @Override

    @Transactional(rollbackFor = Exception.class)

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

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

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

        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("请打印明细，并绑定目标集货区");

        }



        //* 1. 判断当前容器是否还有物料未拣，未拣完闪灯，拣完通知容器流动，并灭灯

        SlapLightControlParam slapParam = new SlapLightControlParam();

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



        taskNos.forEach(taskNo -> {

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

            if (!checked(orderNo, taskNo)) {

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

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

                // 设置请求参数

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

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

        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());



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

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



            List<WaveSeed> seeds = waveSeedService.list(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getOrderNo, orderNo));

            if (Objects.isNull(seeds)) {

                throw new CoolException("数据错误：播种数据不存在！！");

            }



            Double tolAnfme = seeds.stream().mapToDouble(WaveSeed::getAnfme).sum();

            Double toDouble = seeds.stream().mapToDouble(WaveSeed::getWorkQty).sum();

            if (toDouble.compareTo(tolAnfme) >= 0) {

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

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

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

@@ -399,21 +407,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();

    }



@@ -449,7 +457,7 @@
        //判断任务需求总量是否等播种总数量

        if (taskNum == seedNum) {

            return true;

        } else  {

        } else {

            return false;

        }

    }


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/WaveSeed.java

@@ -110,6 +110,9 @@
    @ApiModelProperty(value= "工作数量")

    private Double workQty;



    @ApiModelProperty("执行状态")

    private Integer exceStatus;



    /**

     * 商品编号

     */


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/WaveSeedReviewParam.java

@@ -9,4 +9,6 @@


    private Double reviewNum;



    private String siteNo;



}


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java

@@ -60,7 +60,8 @@
            throw new CoolException("播种数据不存在");

        }



        List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderNo, waveSeed.getOrderNo()));

        List<CacheSite> sites = cacheSiteMapper.selectList(new LambdaQueryWrapper<CacheSite>()

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

        if (sites.isEmpty()) {

            throw new CoolException("当前订单未绑定播种库位，请使用PDA->地标绑定,功能绑定后再操作！！");

        }

@@ -69,7 +70,9 @@
        if (stock - param.getReviewNum() < 0) {

            throw new CoolException("播种数量已满");

        }

        waveSeed.setWorkQty(waveSeed.getWorkQty() + param.getReviewNum());

        //设置状态为执行中

        waveSeed.setWorkQty(waveSeed.getWorkQty() + param.getReviewNum())

                .setExceStatus(1);



        TaskDetl taskDetl = taskDetlMapper.getOne(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getId, waveSeed.getTaskDetlId()));

        if (Objects.isNull(taskDetl)) {

@@ -110,17 +113,6 @@
                     .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_DONE.val))) {

                 throw new CoolException("原始订单主单拣货状态更新失败！！");

             }

            try {

                Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, waveSeed.getTaskId()));

                if (Objects.isNull(task)) {

                    throw new CoolException("数据错误： 任务单据不存在！！");

                }

                wcsApiService.containerConveryor(task.getBarcode());

            } catch (Exception e) {

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

                throw new CoolException(e.getMessage());

            }



        } else {

            if (!orderMapper.update(new LambdaUpdateWrapper<Order>()

                    .eq(Order::getOrderNo, orderDetl.getOrderNo())