rev:修改

This commit is contained in:
2026-02-26 09:14:56 +08:00
parent 5dce1929e5
commit 6ab50ecd2f
3 changed files with 55 additions and 0 deletions

View File

@@ -112,4 +112,12 @@ public class WmsToAcsController {
return new ResponseEntity<>(wmstoacsService.getWeigh(param), HttpStatus.OK);
}
@PostMapping("/getEmpReady")
@Log("wms获取栈板机信号")
/** wms获取栈板机信号 */
@SaIgnore
public ResponseEntity<Object> getEmpReady(@RequestBody JSONObject param) {
return new ResponseEntity<>(wmstoacsService.getEmpReady(param), HttpStatus.OK);
}
}

View File

@@ -116,4 +116,18 @@ public interface WmsToAcsService {
* }
*/
CreateTaskResponse getWeigh(JSONObject param);
/**
* wms获取栈板机信号
* @param param
* {
* device_code 设备编码
* }
* @return {
* data: {
* is_ready: 是否就绪
* }
* }
*/
CreateTaskResponse getEmpReady(JSONObject param);
}

View File

@@ -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<String, String> 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);
}
}
}