skyouc
2025-07-08 61678d13d96ca99b4586f786ba5408aed378e750
no message
6个文件已修改
21 ■■■■■ 已修改文件
construction-data/src/components/datav/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
construction-data/src/components/datav/index.vue
@@ -406,7 +406,7 @@
    getTaskDetl (data) {
      let that = this
      // eslint-disable-next-line no-undef
      $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr }).then(response => {
      $ajax.post('wave/task/detl/qutify/', { taskNo: data.taskNo, matnr: data.matnr, waveNo: data.waveNo }).then(response => {
        if (response.code === 200) {
          that.taskDetls = []
          // this.show = false
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -70,9 +70,10 @@
            throw new CoolException("请求参数:任务编码不能为空!!");
        }
        String taskNoStr = (String) param.get("taskNo");
        String waveNo = param.get("waveNo").toString();
//        Long matnr = Long.valueOf(taskNo.get("matnr").toString());
        return waveManagentService.getTaskDetlQutify(taskNoStr);
        return waveManagentService.getTaskDetlQutify(taskNoStr, waveNo);
    }
    /**
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -21,7 +21,6 @@
import org.springframework.stereotype.Service;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;
@@ -94,12 +93,14 @@
    /**
     * 获取非汇总明细数据
     *
     * @param taskNo
     * @param waveNo
     * @return
     */
    @Override
    public R getTaskDetlQutify(String taskNo) {
        List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo);
    public R getTaskDetlQutify(String taskNo, String waveNo) {
        List<WaveTaskDetl> taskDetls = taskMapper.getTaskDetlQutify(taskNo, waveNo);
        return R.ok(taskDetls);
    }
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
@@ -17,7 +17,7 @@
    R getTaskDetl(String taskNo);
    R getTaskDetlQutify(String taskNo);
    R getTaskDetlQutify(String taskNo, String waveNo);
    R getAllOrders(String waveNo);
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java
@@ -20,7 +20,7 @@
    List<WaveTaskDetl> getTaskDetlByTaskNo(@Param("taskNo") String taskNo);
    List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo);
    List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo, @Param("waveNo") String waveNo);
    List<LargeScreenTaskDto> getTaskIntegrateByTaskNo(@Param(Constants.WRAPPER) LambdaQueryWrapper<Task> ew);
}
zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml
@@ -43,7 +43,10 @@
                <if test="taskNo != null and taskNo != ''">
                    AND mt.task_no = #{taskNo}
                </if>
            )
                )
                <if test="waveNo != null and waveNo != ''">
                    AND mws.wave_no = #{waveNo}
                </if>
            GROUP BY
                order_no, matnr
        ) t