yangyang
2025-06-21 d2a110c9676950ff805fe8b8311240aaa1d551c1
Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

# Conflicts:
# zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
4个文件已修改
19 ■■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wms.apis.wcs.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
@@ -97,17 +98,14 @@
        if (Objects.isNull(request.get("eventCode"))){
            throw new CoolException("事件名称不能为空!!");
        }
        String tagCode = request.get("tagCode").toString();
        log.info("播种墙拍灯,请求参数:{}", JSONObject.toJSONString(request));
        // 根据站点编码查播种站点信息
        CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, tagCode));
        if (Objects.isNull(cacheSite)) {
            throw new CoolException("播种站点不存在!!");
        }
        CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getSiteNo, request.get("tagCode")));
        // 根据播种站点信息条码,查任务
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, cacheSite.getBarcode()));
        if (Objects.isNull(task)) {
            throw new CoolException("任务不存在!!");
        }
        request.clear();
        request.put("taskNo", task.getTaskNo());
        request.put("orderNo",cacheSite.getOrderNo());
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WcsApiServiceImpl.java
@@ -115,7 +115,7 @@
                    for (CacheSite cacheSite:cacheSites) {
                        // 获取任务明细数量
                        List<TaskDetl> taskDetlByTaskId = taskDetlService.getTaskDetlByTaskId(task.getId());
                        double sum = taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();
                        int sum = (int)taskDetlByTaskId.stream().mapToDouble(TaskDetl::getAnfme).sum();
                        SlapLightControlParam slapLightControlParam = new SlapLightControlParam();
                        slapLightControlParam
                                .setControllerCode(cacheSite.getMemo())
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/CacheSite.java
@@ -47,7 +47,7 @@
    private String siteNo;
    @ApiModelProperty("Tag编码")
    @TableField("index")
    @TableField("`index`")
    private String index;
    /**
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -58,7 +58,6 @@
                mt.task_type,
                mt.target_site,
                mtt.title,
                mt.target_site,
                mt.update_time,
                mtd.wave_no,
                SUM( mtd.anfme ) anfme,