diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index 41ac4f4..0cfb07a 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -409,7 +409,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { public GetCarStatusResponse getCarStatus() { GetCarStatusResponse response = new GetCarStatusResponse(); List agvDevices = deviceAppService.findAllDevice().stream().filter(a -> "agv_ndc_two".equals(a.getDevice_type())).collect(Collectors.toList()); - List instructions = instructionService.queryAll(new HashMap()).stream().filter(a -> InstructionStatusEnum.BUSY.getIndex().equals(a.getInstruction_status())).collect(Collectors.toList()); + List instructions = instructionService.findByStatus(InstructionStatusEnum.BUSY.getIndex()); List jsonObjectList = new ArrayList<>(); for (Device device : agvDevices) { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java index b78aaa0..cbd3bde 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java @@ -168,6 +168,14 @@ public interface InstructionService extends CommonService { */ Instruction findByTaskcodeAndStatus(String code); + /** + * 根据任务status查询 + * + * @param code code + * @return Instruction + */ + List findByStatus(String status); + /** * 根据任务id查询 * @@ -498,6 +506,7 @@ public interface InstructionService extends CommonService { List findByCodeAndExcute(String nextDeviceCode); + List findByNextCode(String nextDeviceCode); List findReadyIns(); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 0dd5611..b329f35 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -362,6 +362,14 @@ public class InstructionServiceImpl extends CommonServiceImpl findByStatus(String status) { + List ins = new LambdaQueryChainWrapper<>(instructionMapper) + .eq(InstructionMybatis::getInstruction_status, status) + .list(); + return ConvertUtil.convertList(ins, Instruction.class); + } + @Override public Instruction findByTaskid(String id, String wherecaluse) {