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

rev:更新

Browse Source
This commit is contained in:
gengby
2024-02-18 11:09:46 +08:00
parent bbb76ddc84
commit 8e04672090
50 changed files with 2615 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
acs/nladmin-system/src/main/java/org/nl/acs/agv/server/AgvWaitUtil.java
View File

@@ -10,19 +10,21 @@ import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.modules.common.exception.BadRequestException;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* @author zhangjiangwei
*/
@Service
@Component
@RequiredArgsConstructor
@Slf4j
public class AgvWaitUtil {
private final DeviceAppService deviceAppService;
private final DeviceExecuteLogService deviceExecuteLogService;
@Autowired
private DeviceAppService deviceAppService;
@Autowired
private DeviceExecuteLogService deviceExecuteLogService;
//取货前等待
public JSONObject waitInGet(String deviceCode) {
@@ -107,7 +109,6 @@ public class AgvWaitUtil {
}
if (device.getDeviceDriver() instanceof PhotoelectricDetectionDeviceDriver) {
// 诺力4期对接位驱动
PhotoelectricDetectionDeviceDriver driver = (PhotoelectricDetectionDeviceDriver) device.getDeviceDriver();
if (driver.getMove() == 0) {
String message = "允许AGV放货。";

4
acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java
View File

@@ -10,8 +10,8 @@ import com.alibaba.fastjson.JSONObject;
*/
public enum DriverTypeEnum {
ORDINARY_SITE(1, "standard_ordinary_site", "普通站点", "station"),
PHOTOELECTRIC_DETECTION_DEVICE_DRIVER(2, "photoelectric_detection_station", "光电检测站点", "station");
STANDARD_STORAGE(2, "standard_storage", "标准版-货架", "storage"),
PHOTOELECTRIC_DETECTION_DEVICE_DRIVER(3, "photoelectric_detection_station", "光电检测站点", "station");
//驱动索引
private int index;
//驱动编码

4
acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -876,7 +876,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
celldto.setZ("0");
celldto.setAddress(0);
celldto.setCreate_by("init");
celldto.setCreate_time(SecurityUtils.getCurrentUsername());
celldto.setCreate_time(DateUtil.now());
wo.insert((JSONObject) JSONObject.toJSON(celldto));
}
}
@@ -892,7 +892,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
celldto.setZ("0");
celldto.setAddress(0);
celldto.setCreate_by("init");
celldto.setCreate_time(SecurityUtils.getCurrentUsername());
celldto.setCreate_time(DateUtil.now());
wo.insert((JSONObject) JSONObject.toJSON(celldto));
}
}