#

zjj

2024-11-06 7c011f84de74287c75610cce7add18e73db252fd

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

@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -26,7 +25,6 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.List;

/**
 * 移动端接口控制器
@@ -67,17 +65,27 @@
    @PostMapping("/agv/start")
    @ManagerAuth
    public R pdaAgvStart(@RequestBody Map<String,Object> map){
        HashMap<String, String> map1 = new HashMap<>();
        map1.put("agv0001","sta0001");
        String sta = map.get("sta").toString();

        ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
        getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
        String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
        if ("SUCCESS".equals(request)) {
            return R.ok();
        if (Cools.isEmpty(map.get("sta"))) {
            return R.parse("暂存位不能为空");
        } else if (Cools.isEmpty(map.get("inSta"))) {
            return R.parse("入库站点不能为空");
        }
        return R.error();
//        HashMap<String, String> map1 = new HashMap<>();
//        map1.put("agv0001","sta0001");
//        String sta = map.get("sta").toString();
//
//        ForwardAGVTaskParam forwardAGVTaskParam = new ForwardAGVTaskParam();
//        getAgvTaskParam(forwardAGVTaskParam,sta,map1.get(sta));
//        String request = forwardAGVHttpRequest(forwardAGVTaskParam, "10.0.100.110:8182", "/rcms/services/rest/hikRpcService/genAgvSchedulingTask");
//        if ("SUCCESS".equals(request)) {
//            return R.ok();
//        }
        String sta = (String) map.get("sta"); // 暂存位
        String inSta = String.valueOf(map.get("inSta")); // 入库站点

        return mobileService.inLocCallAgv(sta, inSta);

    }

    private void getAgvTaskParam(ForwardAGVTaskParam agvTaskCreateParam,String agv,String sta){