no message

skyouc

2025-07-10 87d66c61fc5047fb5708d609f4a5f1f868cd646c

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

@@ -3,15 +3,27 @@
import com.mysql.cj.util.StringUtils;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.apis.wcs.entity.request.RfidSingalRequest;
import com.zy.asrs.wms.apis.wcs.entity.response.CommonReponse;
import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.system.controller.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;

import javax.servlet.http.HttpServletRequest;
import java.util.Map;
import java.util.Objects;

import static com.zy.asrs.wms.utils.HttpUtils.getClientIpAddress;

/**
 * 大屏操作基本功能
 */
@Slf4j
@RestController
@RequestMapping("/wave")
public class WaveManagentController extends BaseController {
@@ -45,6 +57,7 @@

    /**
     * 大屏获取任务明细
     * 获取当前播种中具体任务明细
     * @param param
     * @return
     */
@@ -57,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);
    }

    /**
@@ -68,20 +82,24 @@
     */
    @GetMapping("/seed/locs")
    public R getSeedLoc() {
        return waveManagentService.AllSeedLocs();
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        return waveManagentService.AllSeedLocs(request);
    }

    /***
     * 大屏获取出库列表
     * 获取当前播种中执行数据
     * @return
     */
    @GetMapping("/sow/tasks")
    public R getTasks() {
        return waveManagentService.getTask();
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        return waveManagentService.getTask(request);
    }

    /**
     * 审核播种状态任务
     * 波次播种
     * 播种明细数量修改
     * @param reviewParam
     * @return
     */
@@ -96,6 +114,10 @@
        if (Objects.isNull(reviewParam.getWaveSeedId())) {
            return R.error("播种明细标识不能为空！！");
        }
//        if (Objects.isNull(reviewParam.getSiteNo())) {
//            return R.error("播种站点不能为空！！");
//        }

        return waveManagentService.reviewSeeds(reviewParam);
    }

@@ -126,4 +148,7 @@
        return waveManagentService.getAllOrders(waveNo);
    }




}