Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master int...

skyouc

2025-06-22 ebe2da6e4eefd59b366ebab3a651b32763b580ed

Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

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

@@ -86,6 +86,7 @@
    }

    /**
     * ESS 播种墙拍灯回调
     * 播种墙拍灯，ESS调用
     */
    @PostMapping("/light/off")

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

@@ -137,7 +137,8 @@
            }



            if (!taskIds.isEmpty()) {

                List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds).notIn(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id, TaskStsType.UPDATED_OUT.id));

                List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, taskIds)

                        .notIn(Task::getTaskSts, TaskStsType.COMPLETE_OUT.id, TaskStsType.UPDATED_OUT.id));

                if (!tasks.isEmpty()) {

                    throw new CoolException("存在未完成任务");

                }


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

@@ -105,9 +105,13 @@


        int update;

        if (detlList.isEmpty()) {

             update = orderMapper.update(new LambdaUpdateWrapper<Order>().eq(Order::getOrderNo, orderDetl.getOrderNo()).set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_DONE.val));

             update = orderMapper.update(new LambdaUpdateWrapper<Order>()

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

                     .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_DONE.val));

        } else {

            update = orderMapper.update(new LambdaUpdateWrapper<Order>().eq(Order::getOrderNo, orderDetl.getOrderNo()).set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_SECTION.val));

            update = orderMapper.update(new LambdaUpdateWrapper<Order>()

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

                    .set(Order::getPickStatus, OrderPickStatus.ORDER_PICK_STATUS_SECTION.val));

        }



        if (update < 1) {


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskLogTimer.java

@@ -185,16 +185,7 @@
                return;

            }



//            Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>().eq(Dict::getFlag, "taskLogDiffDays").eq(Dict::getStatus, 1));

//            if (dict == null) {

//                return;

//            }

            for (Task task : list) {

//                int diff = DateUtils.diff(task.getCreateTime(), new Date());

//                int taskLogDiffDays = Integer.parseInt(dict.getValue());

//                if (diff < taskLogDiffDays) {

//                    continue;

//                }

                Long hostId = task.getHostId();

                //保存任务明细历史档

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


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java

@@ -387,6 +387,11 @@
        }

    }





    /**

     * 更新任务明细，更新库存明细

     * @param task

     */

    //出库

    private void executeTask101(Task task) {

        Long hostId = task.getHostId();


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java

@@ -59,7 +59,7 @@
    /**

     * @author Ryan

     * @date 2025/6/20

     * @description: 波次加入历史档

     * @description: 更新波次明细，加入历史档

     * @version 1.0

     */

    @Scheduled(cron = "0/30 * * * * ? ")


 zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml

@@ -34,11 +34,10 @@
                mws.wave_no,

                SUM( mws.work_qty ) work_qty,

                mws.batch,

                mws.task_detl_id

--                 ,mcs.site_no

                mws.task_detl_id,

                mcs.site_no

            FROM

                man_wave_seed mws

--                 man_wave_seed mws LEFT JOIN man_cache_site mcs ON mws.order_id = mcs.order_id

                man_wave_seed mws LEFT JOIN man_cache_site mcs ON mws.order_id = mcs.order_id

            WHERE

                task_detl_id IN ( SELECT mtd.id FROM man_task mt INNER JOIN man_task_detl mtd ON mt.id = mtd.task_id

                <if test="taskNo != null and taskNo != ''">