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
2023-02-13 14:23:37 +08:00
parent 2d2c4116ff
commit ccc01ad78a
9 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,8 +302,11 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
LnshPackagePalletManipulatorDeviceDriver lnshPackagePalletManipulatorDeviceDriver;
//码垛机械手
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
//英莱码垛机械手
LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver;
//分拣拆码垛机械手
RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver;
if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
if (lnshPalletizingManipulatorSiteDeviceDriver.getIserror()
@@ -324,6 +327,24 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
lnshPalletizingManipulatorSiteDeviceDriver.writing(3);
is_flag = true;
}
if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver();
if (lnshPalletizingManipulatorDeviceDriver.getIserror()
&& !device_code.equals("MDJXS601")) {
throw new BadRequestException("设备状态异常，下发失败！");
}
if (StrUtil.isEmpty(qty)) {
throw new WDKException("数量不能为空");
}
if (StrUtil.isEmpty(material_code)) {
throw new WDKException("物料编号不能为空！");
}
lnshPalletizingManipulatorDeviceDriver.writing("to_order_No", producetask_code);
lnshPalletizingManipulatorDeviceDriver.writing("to_order_qty", qty);
lnshPalletizingManipulatorDeviceDriver.writing("to_material_code", material_code);
lnshPalletizingManipulatorDeviceDriver.writing(3);
is_flag = true;
}
if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) {
lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver();
if (lnshSplitManipulatorDeviceDriver.getIserror()) {

7
acs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java
View File

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import org.nl.acs.config.AcsConfig;
import org.nl.acs.config.server.AcsConfigService;
import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator.LnshPalletizingManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_palletizing_manipulator_site.LnshPalletizingManipulatorSiteDeviceDriver;
import org.nl.acs.device_driver.lnsh.lnsh_split_manipulator.LnshSplitManipulatorDeviceDriver;
import org.nl.acs.device_driver.lnsh.rljn_package_palletSplit_manipulator.RljnPackagePalletSplitManipulatorDeviceDriver;
@@ -31,7 +32,6 @@ import cn.hutool.core.util.IdUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.nl.utils.SecurityUtils;
import org.nl.wql.core.bean.ResultBean;
import org.nl.wql.core.bean.WQLObject;
import org.nl.wql.util.WqlUtil;
import org.nl.utils.FileUtil;
@@ -180,6 +180,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
Device device = deviceAppService.findDeviceByCode(dto.getDevice_code());
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
LnshPalletizingManipulatorDeviceDriver lnshPalletizingManipulatorDeviceDriver;
LnshSplitManipulatorDeviceDriver lnshSplitManipulatorDeviceDriver;
RljnPackagePalletSplitManipulatorDeviceDriver rljnPackagePalletSplitManipulatorDeviceDriver;
@@ -187,6 +188,10 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
lnshPalletizingManipulatorSiteDeviceDriver.writing(9);
}
if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorDeviceDriver) {
lnshPalletizingManipulatorDeviceDriver = (LnshPalletizingManipulatorDeviceDriver) device.getDeviceDriver();
lnshPalletizingManipulatorDeviceDriver.writing(9);
}
if (device.getDeviceDriver() instanceof LnshSplitManipulatorDeviceDriver) {
lnshSplitManipulatorDeviceDriver = (LnshSplitManipulatorDeviceDriver) device.getDeviceDriver();
lnshSplitManipulatorDeviceDriver.writing(9);

8
acs/hd/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java
View File

@@ -200,7 +200,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break;
}
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) {
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
@@ -300,7 +300,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break;
}
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) {
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
@@ -422,7 +422,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break;
}
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) {
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}
@@ -503,7 +503,7 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
logServer.deviceExecuteLog("ndc", "","","未找到指令号对应的指令：" + ikey);
break;
}
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS301") || device_code.equals("MDJXS601")) {
if (device_code.equals("MDJXS201") || device_code.equals("MDJXS601")) {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
}