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

mes接口更新

Browse Source
This commit is contained in:
loujf
2022-12-01 16:38:40 +08:00
parent b8bcdd7dce
commit 629c7bca1b
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java
View File

@@ -175,15 +175,13 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
if (move_1 == 0) {
this.setRequireSucess1(false);
}
logServer.deviceItemValue(this.device_code, "move_1", String.valueOf(move_1));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move_1：" + last_move_1 + "->" + move_1);
}
if (move_2 != last_move_2) {
if (move_2 == 0) {
this.setRequireSucess2(false);
}
logServer.deviceItemValue(this.device_code, "move_1", String.valueOf(move_1));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move_1：" + last_move_1 + "->" + move_1);
}
if (move_2 != last_move_2) {
logServer.deviceItemValue(this.device_code, "move_2", String.valueOf(move_2));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move_2：" + last_move_2 + "->" + move_2);
}

13
acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
View File

@@ -35,6 +35,7 @@ import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.route.service.dto.RouteLineDto;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.exception.BadRequestException;
import org.nl.exception.WDKException;
import org.nl.utils.SpringContextHolder;
import org.nl.wql.core.bean.WQLObject;
@@ -305,6 +306,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver;
if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
if (lnshPalletizingManipulatorSiteDeviceDriver.getIserror()) {
throw new BadRequestException("设备状态异常，下发失败！");
}
if (StrUtil.isEmpty(qty)) {
throw new WDKException("数量不能为空");
}
@@ -319,6 +323,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
}
if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) {
lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver();
if (lnshSplitManipulatorDeviceDriver.getIserror()) {
throw new BadRequestException("设备状态异常，下发失败！");
}
if (StrUtil.isEmpty(qty)) {
throw new WDKException("数量不能为空");
}
@@ -347,6 +354,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
}
if (device.getDeviceDriver() instanceof LnshPackagePalletManipulatorDeviceDriver) {
lnshPackagePalletManipulatorDeviceDriver = (LnshPackagePalletManipulatorDeviceDriver) device.getDeviceDriver();
if (lnshPackagePalletManipulatorDeviceDriver.getIserror()) {
throw new BadRequestException("设备状态异常，下发失败！");
}
if (StrUtil.isEmpty(qty)) {
throw new WDKException("数量不能为空");
}
@@ -363,6 +373,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
if (device.getDeviceDriver() instanceof RljnPackagePalletSplitManipulatorDeviceDriver) {
rljnPackagePalletSplitManipulatorDeviceDriver = (RljnPackagePalletSplitManipulatorDeviceDriver) device.getDeviceDriver();
if (rljnPackagePalletSplitManipulatorDeviceDriver.getIserror()) {
throw new BadRequestException("设备状态异常，下发失败！");
}
if (StrUtil.isEmpty(qty)) {
throw new WDKException("数量不能为空");
}