From f4f163eb45c1b98f3a3641c5cee5b29e1573094b Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Wed, 10 Sep 2025 17:45:45 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=8F=8D=E9=A6=88mes=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndcone/AgvNdcOneDeviceDriver.java | 6 +++ .../acs/ext/wms/service/AcsToWmsService.java | 7 ++++ .../wms/service/impl/AcsToWmsServiceImpl.java | 40 +++++++++++++++++++ .../controller/AcsToWmsController.java | 9 +++++ .../ext_manage/service/AcsToWmsService.java | 2 + .../service/impl/AcsToWmsServiceImpl.java | 23 +++++++++++ 6 files changed, 87 insertions(+) diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java index 8d617ec..a9c7be4 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -728,6 +728,12 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic .build(); logDto.setLog_level(4); luceneExecuteLogService.deviceExecuteLog(logDto); + + //回传MES放货完毕 逻辑：acs-> lms -> mes + String task_code = inst.getTask_code(); + JSONObject jsonObject = new JSONObject(); + jsonObject.put("task_code", task_code); + acsToWmsService.uploadMes(jsonObject); } catch (Exception e) { e.printStackTrace(); } diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java index cc2188a..7c09f23 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/AcsToWmsService.java @@ -224,6 +224,13 @@ public interface AcsToWmsService { */ ApplyPlugPullSitResponse actionCheckMaterialBucket(JSONObject jsonObject); + /** + * 回传MES + * @param jsonObject + * @return + */ + ApplyPlugPullSitResponse uploadMes(JSONObject jsonObject); + /** * 横移请求 * @param jsonObject diff --git a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java index be6ed91..095b46e 100644 --- a/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java +++ b/acs/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java @@ -897,6 +897,46 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } } + @Override + public ApplyPlugPullSitResponse uploadMes(JSONObject param) { + log.info("向lms请求 ，lms向MES请求放料完成,请求参数{}", param); + String result = ""; + try { + MDC.put(log_file_type, log_type); + ApplyPlugPullSitResponse applyPlugPullSitResponse = new ApplyPlugPullSitResponse(); + if (StrUtil.equals(paramService.findByCode(AcsConfig.HASWMS).getValue(), "1")) { + String wmsUrl = paramService.findByCode(AcsConfig.WMSURL).getValue(); + AddressDto addressDto = addressService.findByCode("uploadMes"); + String methods_url = addressDto.getMethods_url(); + String url = wmsUrl + methods_url; + log.info("向lms请求 ，lms向MES请求放料完成----请求参数:{}", JSONObject.toJSONString(param)); + try { + result = HttpRequest.post(url) + .addInterceptor(tLogHutoolhttpInterceptor) + .header(Header.USER_AGENT, "Hutool http") + .body(JSON.toJSONString(param)) + .execute().body(); + JSONObject jsonObject = JSONObject.parseObject(result); + applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class); + LuceneLogDto luceneLogDto = new LuceneLogDto(4, "uploadMes", String.valueOf(applyPlugPullSitResponse.getstatus()), + JSON.toJSONString(param), String.valueOf(result), "ACS向LMS发送物料已经放好"); + luceneLogService.interfaceExecuteLog(luceneLogDto); + } catch (Exception e) { + JSONObject jsonObject = JSONObject.parseObject(result); + log.info("向lms请求 ，lms向MES请求放料完成----返回参数{}", e.getMessage()); + applyPlugPullSitResponse = JSONObject.toJavaObject(jsonObject, ApplyPlugPullSitResponse.class); + LuceneLogDto luceneLogDto = new LuceneLogDto(4, "向lms请求 ，lms向MES请求放料完成", String.valueOf(applyPlugPullSitResponse.getstatus()), + JSON.toJSONString(param), + String.valueOf(result), "ACS向LMS发送物料已经放好"); + luceneLogService.interfaceExecuteLog(luceneLogDto); + } + } + return applyPlugPullSitResponse; + } finally { + MDC.remove(log_file_type); + } + } + @Override public ApplyPlugPullSitResponse actionMove(JSONObject param) { log.info("向lms请求横移,请求参数{}", param); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java index 4bbd927..8e7374e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/controller/AcsToWmsController.java @@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.ext_manage.service.AcsToWmsService; +import org.redisson.executor.TasksService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -42,4 +43,12 @@ public class AcsToWmsController { return new ResponseEntity<>(acsToWmsService.emptyMove(param), HttpStatus.OK); } + @PostMapping("/upload-mes") + @Log(value = "ACS给WMS反馈物料已经放好，WMS反馈给MES") + @SaIgnore + public ResponseEntity uploadMes(@RequestBody JSONObject param) { + return new ResponseEntity<>(acsToWmsService.uploadMes(param), HttpStatus.OK); + } + + } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java index 4e1989d..f70e802 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/AcsToWmsService.java @@ -25,4 +25,6 @@ public interface AcsToWmsService { Map receiveTaskStatusAcs(String string); AcsResponse emptyMove(JSONObject param); + + AcsResponse uploadMes(JSONObject param); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java index 857761e..e3090b3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/AcsToWmsServiceImpl.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.wms.ext_manage.enums.ResultAcsStatus; import org.nl.wms.ext_manage.service.AcsToWmsService; +import org.nl.wms.ext_manage.service.WmsToMesService; import org.nl.wms.ext_manage.service.util.AcsResponse; import org.nl.wms.sch_manage.enums.TaskStatus; import org.nl.wms.sch_manage.service.ISchBasePointService; @@ -20,6 +21,7 @@ import org.nl.wms.sch_manage.service.util.AbstractTask; import org.nl.wms.sch_manage.service.util.TaskFactory; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; +import org.redisson.executor.TasksService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @@ -55,6 +57,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { @Autowired private ISchBasePointService pointService; + /** + * WMS回传MES + */ + @Autowired + private WmsToMesService wmsToMesService; + + /** * 任务工厂服务 */ @@ -133,4 +142,18 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { pointService.updateBatchById(Arrays.asList(inPoint, outPoint)); return AcsResponse.requestOk(); } + + @Override + public AcsResponse uploadMes(JSONObject param) { + SchBaseTask schBaseTask = iSchBaseTaskService.getByCode(param.getString("task_code")); + if (schBaseTask == null) { + return AcsResponse.requestOk(); + } + JSONObject jsonObject = new JSONObject(); + jsonObject.put("status", 200); + jsonObject.put("message", "成功"); + jsonObject.put("task_code", schBaseTask.getExt_task_code()); + wmsToMesService.uploadMes(jsonObject); + return AcsResponse.requestOk(); + } }