Merge remote-tracking branch 'origin/ghtzwcsOld' into ghtzwcsOld

LSH

2023-12-02 e4d5a0e37babc1ae214c34162e58f5084927d301

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

@@ -8,6 +8,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.TaskOverParam;
import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.entity.param.taskCreateParam;
import com.zy.asrs.service.*;
@@ -50,6 +51,24 @@
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};
    //agv任务完成
    @PostMapping("/toAgvTaskOver")
    public R getAgvTaskOver(@RequestHeader String appkey,
                           @RequestBody TaskOverParam param,
                           HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getWharfCode())){
            return R.error("码头[wharfCode]不能为空");
        }
        if (Cools.isEmpty(param.getStatus())){
            return R.error("完成标记[status]不能为空");
        }
        openService.getAgvTaskOver(param);
        return R.ok();
    }

    //创建任务
    @PostMapping("/taskCreate")
@@ -117,6 +136,8 @@
    public R targetWharfApply(@RequestHeader String appkey,
                              @RequestBody WMSAndAGVInterfaceParam param,
                              HttpServletRequest request) throws IOException {
        auth(appkey,param,request);

        if (Cools.isEmpty(param)){
            return R.error("参数为空！");
        } else if (Cools.isEmpty(param.getTaskNo())){
@@ -128,35 +149,8 @@
        } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
            return R.error("空闲的入库码头（AGV）为空！");
        }
        ToWmsDTO toWmsDTO = new ToWmsDTO();
        Map<String, Object> map = new HashMap<>();
        map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
        List<Integer> list = new ArrayList<>();
        list.add(1);
        list.add(4);
        //TaskWrk taskWrk = taskWrkService.selectByTaskNo(param.getTaskNo());
        toWmsDTO.setWarehouseId("1688469798893297665");
        toWmsDTO.setContainerCode(param.getContainerCode());
        toWmsDTO.setApplyType("TUNNEL");
        toWmsDTO.setCanInboundTunnels(list);
        String response = new HttpHandler.Builder()
                .setHeaders(map)
                .setUri(wmsUrl)
                .setPath("wcsManager/wcsInterface/inboundTaskApply")
                .setJson(JSON.toJSONString(toWmsDTO))
                .build()
                .doPost();

        JSONObject jsonObject = JSON.parseObject(response);
        if (jsonObject.getInteger("code").equals(200)) {
            //解析
            return R.ok(jsonObject.get("data"));
        }else {
            return R.error((String) jsonObject.get("msg"));
        }



        R r = openService.AgvToWCSToWms(param);
        return r;
    }

    //AGV请求动作接口
@@ -173,12 +167,20 @@
            return R.error("码头编号为空！");
        }

        Map<String,Integer> map = new HashMap<>();
        map.put("J-1101",102);map.put("J-1102",101);
        map.put("J-1103",106);map.put("J-1104",105);
        map.put("J-1105",110);map.put("J-1106",109);
        map.put("J-1107",114);map.put("J-1108",113);
        map.put("J-1109",118);map.put("J-1110",117);
        map.put("J-1111",122);map.put("J-1112",121);

        try{
            BasDevp basDevp = basDevpService.selectById(param.getWharfCode());
            BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
            if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N")){
                return R.ok();
            }else {
                return R.error();
                return R.error("站点状态不可入");
            }
        }catch (Exception e){
            log.error("AGV请求动作接口报错:"+e);