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

skyouc

2025-06-26 714d8ba0d3a83fa802b30deac7cc594813d06d0e

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

 license.lic

Binary files differ

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/schedule/ScheduleJobs.java

@@ -76,7 +76,8 @@
    @Transactional(rollbackFor = Exception.class)

    public void conveyorStart() {

        List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()

                .eq(Task::getTaskSts, TaskStsType.WCS_CONTAINER_RECEIVE.id).eq(Task::getStatus, 1));

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

                .eq(Task::getStatus, 1));

        tasks.forEach(task -> {

            try {

                ConveyorStarParam conveyorStarParam = new ConveyorStarParam();


 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";




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

@@ -200,6 +200,8 @@
        }

        if (str.startsWith("PK")) {

            ordersParam.setInType(OrderType.PK_IN_ORDER.id);

        } else {

            ordersParam.setInType(OrderType.UTC_OUT_ORDER.id);

        }

       boolean result = mobileService.batchMergeOrders(ordersParam);

        if (result) {


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

@@ -106,7 +106,9 @@
                    .setMatnr(orderdetl.getMatnr())

                    .setDetlId(orderdetl.getDetlId())

                    .setIoStatus(0)

                    .setOrderNo(orderdetl.getOrderNo()).setOrderId(orderdetl.getOrderId()).setStatus(1);

                    .setOrderNo(orderdetl.getOrderNo())

                    .setOrderId(orderdetl.getOrderId())

                    .setStatus(1);

            waitPakins.add(waitPakin);

        });



@@ -203,6 +205,7 @@
            WaitPakinLog pakinLog = new WaitPakinLog();

            BeanUtils.copyProperties(waitPakin, pakinLog);

            pakinLog.setIoStatus(1);

            pakinLog.setId(null);

            if (!waitPakinLogService.saveOrUpdate(pakinLog)) {

                throw new CoolException("组拖历史档更新失败");

            }

@@ -223,6 +226,7 @@
            order.setOrderSettle(OrderSettleType.COMPLETE.val());

            OrderLog orderLog = new OrderLog();

            BeanUtils.copyProperties(order, orderLog);

            orderLog.setId(null);

            if (!orderLogService.save(orderLog)) {

                throw new CoolException("历史单据更新失败！！");

            }

@@ -240,6 +244,7 @@
            BeanUtils.copyProperties(delt, detlLog);

            detlLog.setQty(delt.getWorkQty());

            detlLog.setWorkQty(0.0);

            detlLog.setId(null);

            detlLogs.add(detlLog);

        });




 zy-asrs-wms/src/main/resources/license.lic

Binary files differ