From 6ab50ecd2fea6d285572ff0342edd34c07ac9bcf Mon Sep 17 00:00:00 2001 From: liuxy Date: Thu, 26 Feb 2026 09:14:56 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/ext/wms/rest/WmsToAcsController.java | 8 +++++ .../acs/ext/wms/service/WmsToAcsService.java | 14 ++++++++ .../wms/service/impl/WmsToAcsServiceImpl.java | 33 +++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java index 45cb27d..f708b5b 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/rest/WmsToAcsController.java @@ -112,4 +112,12 @@ public class WmsToAcsController { return new ResponseEntity<>(wmstoacsService.getWeigh(param), HttpStatus.OK); } + @PostMapping("/getEmpReady") + @Log("wms获取栈板机信号") + /** wms获取栈板机信号 */ + @SaIgnore + public ResponseEntity getEmpReady(@RequestBody JSONObject param) { + return new ResponseEntity<>(wmstoacsService.getEmpReady(param), HttpStatus.OK); + } + } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java index 9bfccf5..a320c89 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/WmsToAcsService.java @@ -116,4 +116,18 @@ public interface WmsToAcsService { * } */ CreateTaskResponse getWeigh(JSONObject param); + + /** + * wms获取栈板机信号 + * @param param + * { + * device_code: 设备编码 + * } + * @return { + * data: { + * is_ready: 是否就绪 + * } + * } + */ + CreateTaskResponse getEmpReady(JSONObject param); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index d7fae07..710fd21 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapp import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.device.domain.Device; +import org.nl.acs.device_driver.basedriver.pallet_dispenser.PalletDispenseDeviceDriver; import org.nl.acs.device_driver.basedriver.weight_platform.WeightPlatformDeviceDriver; import org.nl.acs.device_driver.conveyor.primary_device.PrimaryDeviceConveyorDeviceDriver; import org.nl.acs.ext.wms.data.JsonUtl; @@ -479,4 +480,36 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } } + @Override + public CreateTaskResponse getEmpReady(JSONObject param) { + MDC.put(log_file_type, log_type); + log.info("ACS接收WMS获取栈板机信号-----输入参数{}", param); + CreateTaskResponse response = new CreateTaskResponse(); + try { + String device_code = param.getString("device_code"); + if (ObjectUtil.isEmpty(device_code)) { + response.setStatus(400); + response.setMessage("设备不能为空"); + } + // 根据设备编码 + DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); + Device device = deviceAppService.findDeviceByCode(device_code); + if (ObjectUtil.isEmpty(device)) { + response.setStatus(400); + response.setMessage("设备【" + device_code + "】不存在"); + } + + PalletDispenseDeviceDriver driver = (PalletDispenseDeviceDriver) device.getDeviceDriver(); + // 返回是否就绪 + HashMap data = new HashMap<>(); + data.put("is_ready", String.valueOf(driver.getEmp_ready())); + response.setStatus(200); + response.setParameters(data); + log.info("ACS接收WMS获取栈板机信号--------------:输出参数:" + JSON.toJSONString(response)); + return response; + } finally { + MDC.remove(log_file_type); + } + } + }