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

更新

Browse Source
This commit is contained in:
gengby
2022-06-29 09:17:47 +08:00
parent f87ad5af97
commit b9c108ff21
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/utils/TwoAgvPhase.java
View File

@@ -1,5 +1,8 @@
package org.nl.acs.device_driver.basedriver.agv.utils; package org.nl.acs.device_driver.basedriver.agv.utils;
import org.springframework.stereotype.Service;
@Service
public class TwoAgvPhase implements IAgv { public class TwoAgvPhase implements IAgv {
@Override @Override
public String getPhaseName(Integer phase) { public String getPhaseName(Integer phase) {

12
wcs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
View File

@@ -71,6 +71,8 @@ import java.util.Map;
@Slf4j @Slf4j
public class StageActorServiceImpl implements StageActorService { public class StageActorServiceImpl implements StageActorService {
private final RedisUtils redisUtils; private final RedisUtils redisUtils;
private final StorageCellService storageCellService;
@Override @Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) { public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -497,12 +499,15 @@ public class StageActorServiceImpl implements StageActorService {
} else if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) { } else if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) {
agvNdcOneDeviceDriver = (AgvNdcOneDeviceDriver) device.getDeviceDriver(); agvNdcOneDeviceDriver = (AgvNdcOneDeviceDriver) device.getDeviceDriver();
StorageCellService storageCellService = SpringContextHolder.getBean("StorageCellService");
IAgv oneAgv = SpringContextHolder.getBean(OneAgvPhase.class); IAgv oneAgv = SpringContextHolder.getBean(OneAgvPhase.class);
obj.put("device_name", agvNdcOneDeviceDriver.getDevice().getDevice_name()); obj.put("device_name", agvNdcOneDeviceDriver.getDevice().getDevice_name());
int agvaddr_copy = agvNdcOneDeviceDriver.getAgvaddr_copy(); int agvaddr_copy = agvNdcOneDeviceDriver.getAgvaddr_copy();
StorageCellDto storageCellDto = storageCellService.findByAddress(agvaddr_copy + ""); StorageCellDto storageCellDto = storageCellService.findByAddress(agvaddr_copy + "");
if (ObjectUtil.isNotEmpty(storageCellDto)){
jo.put("address",storageCellDto.getAddress()); jo.put("address",storageCellDto.getAddress());
} else {
jo.put("address","");
}
int phase = agvNdcOneDeviceDriver.getPhase(); int phase = agvNdcOneDeviceDriver.getPhase();
String phaseName = oneAgv.getPhaseName(phase); String phaseName = oneAgv.getPhaseName(phase);
jo.put("phaseName",phaseName); jo.put("phaseName",phaseName);
@@ -511,9 +516,12 @@ public class StageActorServiceImpl implements StageActorService {
IAgv twoAgv = SpringContextHolder.getBean(TwoAgvPhase.class); IAgv twoAgv = SpringContextHolder.getBean(TwoAgvPhase.class);
obj.put("device_name", agvNdcTwoDeviceDriver.getDevice().getDevice_name()); obj.put("device_name", agvNdcTwoDeviceDriver.getDevice().getDevice_name());
int agvaddr_copy = agvNdcTwoDeviceDriver.getAgvaddr_copy(); int agvaddr_copy = agvNdcTwoDeviceDriver.getAgvaddr_copy();
StorageCellService storageCellService = SpringContextHolder.getBean("StorageCellService");
StorageCellDto storageCellDto = storageCellService.findByAddress(agvaddr_copy + ""); StorageCellDto storageCellDto = storageCellService.findByAddress(agvaddr_copy + "");
if (ObjectUtil.isNotEmpty(storageCellDto)){
jo.put("address",storageCellDto.getAddress()); jo.put("address",storageCellDto.getAddress());
} else {
jo.put("address","");
}
int phase = agvNdcTwoDeviceDriver.getPhase(); int phase = agvNdcTwoDeviceDriver.getPhase();
String phaseName = twoAgv.getPhaseName(phase); String phaseName = twoAgv.getPhaseName(phase);
jo.put("phaseName",phaseName); jo.put("phaseName",phaseName);