From d98fe2a30cd2af735b7cf2be5cff87be95cb2080 Mon Sep 17 00:00:00 2001 From: "1009473166@qq.com" <草拟吗23> Date: Thu, 19 Mar 2026 18:44:54 +0800 Subject: [PATCH] =?UTF-8?q?2026.3.19=20=E6=99=9A=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=88=B0=E4=BD=8D=E8=87=AA=E5=8A=A8=E8=BF=87?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/api/service/IApiService.java | 2 ++ .../api/service/impl/ApiServiceImpl.java | 11 ++++++++++ .../main/java/com/ruoyi/common/Constant.java | 5 ++++- .../scheduleTask/srgv/BaseSRgvThread.java | 9 ++++---- .../schedule/scheduleTask/ssj/SsjThread.java | 22 +++++++++---------- 5 files changed, 32 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java index 08bce48..5daa7a6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java @@ -143,4 +143,6 @@ public interface IApiService DeviceSsj getDeviceMsg(String taskNo); DeviceSsj getDeviceMsgSsj(String entranceId); + + AjaxResult OutMakeSure(HashMap map); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index 8833d1f..74c67c5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -490,4 +490,15 @@ public class ApiServiceImpl implements IApiService { List deviceSsjs = deviceSsjService.selectDeviceSsjList(ssj); return deviceSsjs.get(0); } + + @Override + public AjaxResult OutMakeSure(HashMap param) { + RequestLog requestLog = requestLogService.getRequestLog(OUT_MAKE_SURE, "线边直出请求过账", JSONUtil.toJsonStr(param)); + if ("1".equals(requestLog.getIsSuccessful())) { + InterfaceReceive bean = JSONUtil.toBean(requestLog.getResponseBody(), InterfaceReceive.class); + return AjaxResult.success(bean.getData()); + } else { + return AjaxResult.error(); + } + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java index d71c5e4..4ee198b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java @@ -1,12 +1,14 @@ package com.ruoyi.common; +import org.springframework.security.access.method.P; + public class Constant { public static final String WMS_BASE_URL = "http://localhost:8080/api2wms/"; public static final String RCS_BASE_URL = "http://127.0.0.1:8081/rcms-dps/rest/"; public static final String AGV_BASE_URL = "http://127.0.0.1:9501/api/app/agvs-task"; - + public static final String WMS_BASE_PDA_URL = "http://localhost:8080/pda/"; public static final String JOB_FINISH_URL = WMS_BASE_URL+"jobFinish"; public static final String CONTINUE_TASK_URL = RCS_BASE_URL+"continueTask"; @@ -19,6 +21,7 @@ public class Constant { public static final String RE_MATERIAL_URL = WMS_BASE_URL+"reMaterial"; public static final String REQUEST_ENTER_URL = WMS_BASE_URL+"requestEnterByTrayCodeAndEntranceId"; public static final String CREATE_AGV_TASK_URL = AGV_BASE_URL+"agvs-task"; + public static final String OUT_MAKE_SURE=WMS_BASE_PDA_URL+"outMakeSure"; public static final String WAREHOUSE_01 = "01"; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java index c250243..5d7d969 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/srgv/BaseSRgvThread.java @@ -322,8 +322,6 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface { // 最终选中的小车赋值给deviceSrgv（保持原有变量名兼容） deviceSrgv = bestSrgv; - - if (deviceSrgv == null) { //如果未选择到小车，再找其他楼层的小车 for (DeviceSrgv deviceSrgv1 : deviceSrgvList) { @@ -1475,8 +1473,11 @@ public class BaseSRgvThread implements Runnable, SRgvThreadInterface { jobCallBack.setTaskNo(Convert.toLong(mydoJobOut.getTaskNo())); jobCallBack.setCreateTime(new Date()); jobCallBackService.insertJobCallBack(jobCallBack); - mydoJobService.insertHistory(mydoJobOut.getJobId()); - mydoJobService.deleteMydoJobByJobId(mydoJobOut.getJobId()); + // 不是线边整托线边直出的删除作业 + if (!mydoJobOut.getInOrOut().equals("22")) { + mydoJobService.insertHistory(mydoJobOut.getJobId()); + mydoJobService.deleteMydoJobByJobId(mydoJobOut.getJobId()); + } } case "7"://移库，变动库存 MydoJob mydoJobyk = mydoJobService.selectMydoJobByTaskNo(Long.valueOf(wcsSrgvQueue.getTaskNo())); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java index 91b0b69..81540f5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ssj/SsjThread.java @@ -106,19 +106,17 @@ public class SsjThread implements Runnable { void inDispatch(DeviceSsj deviceSsj) { //出库到位 if (deviceSsj.getDw() == 1 && deviceSsj.getTaskNo() > 0) { - MydoJob mydoJob = mydoJobService.selectMydoJobByTaskNo(Convert.toLong(deviceSsj.getTaskNo())); - if (mydoJob != null) { - log.info("设备：{} 位置：{} 任务号：{} 出库到位", "输送线", deviceSsj.getDeviceCode(), mydoJob.getTaskNo()); - mydoJobService.insertHistory(mydoJob.getJobId()); - mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId()); - JobCallBack jobCallBack = new JobCallBack(); - jobCallBack.setType("2"); - jobCallBack.setMydojobId(mydoJob.getJobId()); - jobCallBack.setStatus("0"); - jobCallBack.setTaskNo(Convert.toLong(mydoJob.getTaskNo())); - jobCallBack.setCreateTime(new Date()); - jobCallBackService.insertJobCallBack(jobCallBack); + if (mydoJob != null && mydoJob.getInOrOut().equals("22")) { + // 新增agv执行队列，以及调用wms后台任务过账 + HashMap map = new HashMap<>(); + map.put("trayCode", mydoJob.getTrayCode()); + //拉取 + AjaxResult ajaxResult = apiService.OutMakeSure(map); + if (ajaxResult.get("code").equals("200")) { + mydoJobService.insertHistory(mydoJob.getJobId()); + mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId()); + } } } }