#修复波种列表明细显示不正确问题

DESKTOP-LMJ82IJ\Eno

2025-01-01 e6a5ab7b69d0dfd6ffa4080fd5f40c77656528cf

#修复波种列表明细显示不正确问题

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

@@ -7,6 +7,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Map;

@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {
@@ -24,6 +26,25 @@
    }


    /**
     * 通过任务号拉取任务明细
     * @param taskNo
     * @return
     */
    @GetMapping("/sow/task/detl/{taskNo}")
    public R getTaskDetl(@PathVariable String taskNo) {
        return waveManagentService.getTaskDetl(taskNo);
    }

    @PostMapping("/task/detl/qutify")
    public R getTaskDetlQutify(@RequestBody Map<String, Object> param) {
        return waveManagentService.getTaskDetlQutify(param);
    }

    /***
     * 获取出库列表
     * @return
     */
    @GetMapping("/sow/tasks")
    public R getTasks() {
        return waveManagentService.getTask();

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/WaveTaskDetl.java

New file
@@ -0,0 +1,43 @@
package com.zy.asrs.wms.apis.wcs.entity.domain;

import lombok.Data;
import lombok.experimental.Accessors;

import java.io.Serializable;

@Data
@Accessors(chain = true)
public class WaveTaskDetl implements Serializable {
    private static final long serialVersionUID = 1L;

    /**
     * 任务单号
     */
    private String taskNo;
    /**
     * 物料编码
     */
    private String matnr;
    /**
     * 数量
     */
    private Integer anfme;
    /**
     * 波次号
     */
    private String waveNo;

    /**
     * 订单编码
     */
    private String orderNo;
    /**
     * 执行中数量
     */
    private Integer workQty;
    /**
     * 批号
     */
    private String batch;

}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/enums/EssTaskStatus.java

File was renamed from zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/domain/EssTaskStatus.java
@@ -1,4 +1,4 @@
package com.zy.asrs.wms.apis.wcs.entity.domain;
package com.zy.asrs.wms.apis.wcs.entity.enums;

public enum EssTaskStatus {


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

@@ -1,13 +1,12 @@
package com.zy.asrs.wms.apis.wcs.services.Impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;
import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.Task;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.asrs.service.TaskService;
import com.zy.asrs.wms.asrs.service.WaveSeedService;
@@ -15,6 +14,7 @@
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

@Service
public class WaveManagentServiceImpl implements WaveManagentService {
@@ -50,4 +50,21 @@
        List<Task> list = taskService.list(new LambdaQueryWrapper<Task>().ge(Task::getTaskType, 101));
        return R.ok(list);
    }

    @Override
    public R getTaskDetl(String taskNo) {
        List<WaveTaskDetl> taskDetls = taskService.getTaskDetlByTaskNo(taskNo);
        return R.ok(taskDetls);
    }

    /**
     * 获取非汇总明细数据
     * @param taskNo
     * @return
     */
    @Override
    public R getTaskDetlQutify(Map<String, Object> taskNo) {
        List<WaveTaskDetl> taskDetls = taskService.getTaskDetlQutify(taskNo);
        return R.ok(taskDetls);
    }
}

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

@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

import com.zy.asrs.framework.common.R;

import com.zy.asrs.framework.exception.CoolException;

import com.zy.asrs.wms.apis.wcs.entity.domain.EssTaskStatus;

import com.zy.asrs.wms.apis.wcs.entity.enums.EssTaskStatus;

import com.zy.asrs.wms.apis.wcs.entity.request.*;

import com.zy.asrs.wms.apis.wcs.services.WcsApiService;

import com.zy.asrs.wms.asrs.entity.Task;


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

@@ -1,10 +1,10 @@
package com.zy.asrs.wms.apis.wcs.services;


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;

import java.util.Map;

public interface WaveManagentService {
    R getSowSeeds();
@@ -14,4 +14,8 @@
    int removeSowSeed(Long id);

    R getTask();

    R getTaskDetl(String taskNo);

    R getTaskDetlQutify(Map<String, Object> taskNo);
}

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/TaskMapper.java

@@ -1,8 +1,10 @@
package com.zy.asrs.wms.asrs.mapper;



import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;

import com.zy.asrs.wms.asrs.entity.Task;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import org.apache.ibatis.annotations.Mapper;

import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Repository;



import java.util.List;

@@ -13,4 +15,7 @@


    List<Task> selectWaitWaveOut(List<Long> waveIds);//获取等待波次出库的任务List



    List<WaveTaskDetl> getTaskDetlByTaskNo(@Param("taskNo") String taskNo);



    List<WaveTaskDetl> getTaskDetlQutify(@Param("taskNo") String taskNo,@Param("matnr") Long matnr);

}


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/TaskService.java

@@ -1,9 +1,11 @@
package com.zy.asrs.wms.asrs.service;



import com.baomidou.mybatisplus.extension.service.IService;

import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;

import com.zy.asrs.wms.asrs.entity.Task;



import java.util.List;

import java.util.Map;



public interface TaskService extends IService<Task> {



@@ -11,4 +13,7 @@


    List<Task> selectWaitWaveOut(List<Long> waveIds);//获取等待波次出库的任务List



    List<WaveTaskDetl> getTaskDetlByTaskNo(String taskNo);



    List<WaveTaskDetl> getTaskDetlQutify(Map<String, Object> taskNo);

}


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

@@ -1,6 +1,7 @@
package com.zy.asrs.wms.asrs.service.impl;



import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

import com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl;

import com.zy.asrs.wms.asrs.mapper.TaskMapper;

import com.zy.asrs.wms.asrs.entity.Task;

import com.zy.asrs.wms.asrs.service.TaskDetlService;

@@ -10,8 +11,8 @@
import org.springframework.stereotype.Service;



import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Map;



@Service("taskService")

public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements TaskService {

@@ -33,4 +34,18 @@
    public List<Task> selectWaitWaveOut(List<Long> waveIds) {

        return this.baseMapper.selectWaitWaveOut(waveIds);

    }



    @Override

    public List<WaveTaskDetl> getTaskDetlByTaskNo(String taskNo) {

        return this.baseMapper.getTaskDetlByTaskNo(taskNo);

    }



    @Override

    public List<WaveTaskDetl> getTaskDetlQutify(Map<String, Object> taskNo) {

        String taskNoStr = (String) taskNo.get("taskNo");

        Long matnr = Long.valueOf(taskNo.get("matnr").toString());

        return this.baseMapper.getTaskDetlQutify(taskNoStr, matnr);

    }





}


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

@@ -8,9 +8,35 @@
        on mt.id = mtd.task_id

        where task_sts not in (199,200)

        and wave_id in

        <foreach item="item" collection="waveIds" index="index"  separator="," open="(" close=")">

        <foreach item="item" collection="waveIds" index="index" separator="," open="(" close=")">

            #{item}

        </foreach>

    </select>

    <select id="getTaskDetlByTaskNo" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">

        SELECT mt.task_no,mtd.matnr, mtd.anfme ,mtd.wave_no, mtd.stock, mtd.batch FROM man_task mt INNER JOIN

        man_task_detl mtd ON mt.id = mtd.task_id

        WHERE 1 = 1

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

            AND mt.task_no = #{taskNo}

        </if>

        GROUP BY mt.task_no, mtd.matnr

    </select>

    <select id="getTaskDetlQutify" resultType="com.zy.asrs.wms.apis.wcs.entity.domain.WaveTaskDetl">

        SELECT

        matnr,order_no, anfme ,wave_no, work_qty, batch

        FROM

        man_wave_seed

        WHERE

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

        WHERE 1 = 1

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

            AND mt.task_no = #{taskNo}

        </if>

        )

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

            AND matnr = #{matnr}

        </if>



    </select>



</mapper>