From 65a1c0814c475ff656c6a271a4df2cebd650a4c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Tue, 5 Aug 2025 13:49:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/pda/controller/PdaController.java | 6 +++++ .../com/ruoyi/pda/service/PdaService.java | 2 ++ .../com/ruoyi/pda/service/PdaServiceImp.java | 24 +++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index d39d2b0..34475cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -467,5 +467,11 @@ public class PdaController extends BaseController { List list = dictTypeService.selectDictDataByType(dictType); return list; } + + @RequestMapping("/movePoint") + @ResponseBody + public AjaxResult movePoint(String startPoint, String endPoint) { + return pdaService.movePoint(startPoint,endPoint); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java index 806b928..0f97954 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java @@ -44,4 +44,6 @@ public interface PdaService { AjaxResult bindContainer(TrayCodeMakeSure trayCodeMakeSure); AjaxResult bindShelf(TrayCodeMakeSure trayCodeMakeSure); + + AjaxResult movePoint(String startPoint, String endPoint); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index d98aa2a..7e44b7e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -793,4 +793,28 @@ public class PdaServiceImp implements PdaService { return AjaxResult.success(); } + + @Override + public AjaxResult movePoint(String startPoint, String endPoint) { + BasContainerDetails basContainerDetails = new BasContainerDetails(); + basContainerDetails.setContainerId(startPoint); + List basContainerDetails1 = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails); + if(basContainerDetails1.size()==0){ + return AjaxResult.error("此起点无料架，请检查"); + } + BasContainerDetails basContainer=basContainerDetails1.get(0); + + String result = HttpUtil.post("http://192.168.1.100:8080/agv/api/receiveAgvMoveJob", "startPoint=" + startPoint + "&endPoint=" + endPoint + "&containerCode=" + basContainer.getContainerId()); + //接口的返回结果为AjaxResult,从result中获取code + + //获取code + int code = JSONObject.parseObject(result).getIntValue("code"); + if(code==200){ + return AjaxResult.success(result); + }else{ + return AjaxResult.warn(JSONObject.parseObject(result).getString("msg")); + } + + + } }