root/ynfj_acs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt:越南富佳优化

Browse Source
This commit is contained in:
郑旭明\73939
2025-12-24 17:41:05 +08:00
parent 32b11ad087
commit 552d48b758
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -409,7 +409,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
public GetCarStatusResponse getCarStatus() { public GetCarStatusResponse getCarStatus() {
GetCarStatusResponse response = new GetCarStatusResponse(); GetCarStatusResponse response = new GetCarStatusResponse();
List<Device> agvDevices = deviceAppService.findAllDevice().stream().filter(a -> "agv_ndc_two".equals(a.getDevice_type())).collect(Collectors.toList()); List<Device> agvDevices = deviceAppService.findAllDevice().stream().filter(a -> "agv_ndc_two".equals(a.getDevice_type())).collect(Collectors.toList());
List<Instruction> instructions = instructionService.queryAll(new HashMap()).stream().filter(a -> InstructionStatusEnum.BUSY.getIndex().equals(a.getInstruction_status())).collect(Collectors.toList()); List<Instruction> instructions = instructionService.findByStatus(InstructionStatusEnum.BUSY.getIndex());
List<JSONObject> jsonObjectList = new ArrayList<>(); List<JSONObject> jsonObjectList = new ArrayList<>();
for (Device device : agvDevices) { for (Device device : agvDevices) {

9
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/InstructionService.java
View File

@@ -168,6 +168,14 @@ public interface InstructionService extends CommonService<InstructionMybatis> {
*/ */
Instruction findByTaskcodeAndStatus(String code); Instruction findByTaskcodeAndStatus(String code);
/**
* 根据任务status查询
*
* @param code code
* @return Instruction
*/
List<Instruction> findByStatus(String status);
/** /**
* 根据任务id查询 * 根据任务id查询
* *
@@ -498,6 +506,7 @@ public interface InstructionService extends CommonService<InstructionMybatis> {
List<Instruction> findByCodeAndExcute(String nextDeviceCode); List<Instruction> findByCodeAndExcute(String nextDeviceCode);
List<Instruction> findByNextCode(String nextDeviceCode); List<Instruction> findByNextCode(String nextDeviceCode);
List<Instruction> findReadyIns(); List<Instruction> findReadyIns();

8
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -362,6 +362,14 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
return null; return null;
} }
@Override
public List<Instruction> findByStatus(String status) {
List<InstructionMybatis> ins = new LambdaQueryChainWrapper<>(instructionMapper)
.eq(InstructionMybatis::getInstruction_status, status)
.list();
return ConvertUtil.convertList(ins, Instruction.class);
}
@Override @Override
public Instruction findByTaskid(String id, String wherecaluse) { public Instruction findByTaskid(String id, String wherecaluse) {