root
/
acs_jinbao
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

add lucene日志

master
周俊杰 1 year ago
parent
ffa481ae7a
commit
1a5e9dcfdf
18 changed files with 315 additions and 142 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 145
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
  2. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDeviceDriver.java
  3. 4
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java
  4. 12
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
  5. 2
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
  6. 1
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDeviceDriver.java
  7. 7
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java
  8. 1
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java
  9. 1
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java
  10. 1
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java
  11. 13
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
  12. 6
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
  13. 17
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
  14. 15
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
  15. 1
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java
  16. 40
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
  17. 7
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java
  18. 180
      acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue

145
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@ -2,6 +2,7 @@ package org.nl.acs.device_driver.basedriver.agv.ndcone;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.Data;
@ -39,7 +40,9 @@ import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.task.service.TaskService;
import org.nl.acs.task.service.dto.TaskDto;
import org.nl.acs.task.service.impl.TaskServiceImpl;
import org.nl.modules.lucene.service.LuceneExecuteLogService;
import org.nl.modules.lucene.service.dto.LuceneLogDto;
import org.nl.modules.system.service.ParamService;
import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.modules.wql.util.SpringContextHolder;
@ -64,14 +67,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
TaskService taskService=SpringContextHolder.getBean(TaskServiceImpl.class);
AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class);
DeviceExecuteLogService lucene = SpringContextHolder.getBean(DeviceExecuteLogService.class);
DeviceExecuteLogService logService = SpringContextHolder.getBean(DeviceExecuteLogService.class);
DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class);
DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class);
NDCAgvService AgvService = SpringContextHolder.getBean(NDCAgvService.class);
OneAgvPhase oneAgvPhase = new OneAgvPhase();
ParamService acsConfigService = SpringContextHolder.getBean(ParamServiceImpl.class);
WmsToAcsService wmsToAcsService=SpringContextHolder.getBean(WmsToAcsService.class);
LuceneExecuteLogService lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
int agvaddr = 0;
int agvaddr_copy = 0;
@ -87,6 +90,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
int status = 0; //三色灯状态
int error = 0;
int last_error = 0;
String error_message = "";
boolean flag = false;
@ -114,7 +118,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
agvaddr = arr[18] * 256 + arr[19];
//车号
int carno = arr[20];
lucene.deviceExecuteLog(this.device_code, "", "", "接收agv上报信息：" + "phase--" + phase + " index--" + index + " 指令号--" + ikey + " 站点号--" + agvaddr + " 车号--" + carno);
logService.deviceExecuteLog(this.device_code, "", "", "接收agv上报信息：" + "phase--" + phase + " index--" + index + " 指令号--" + ikey + " 站点号--" + agvaddr + " 车号--" + carno);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "接收agv上报信息：" + "phase--" + phase + " index--" + index + " 指令号--" + ikey + " 站点号--" + agvaddr + " 车号--" + carno));
Instruction link_inst = null;
List<Instruction> insts = null;
Instruction inst = null;
@ -170,8 +175,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (phase == 0x02) {
inst.setCarno(String.valueOf(carno));
instructionService.update(inst);
lucene.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈车号:" + carno + "，指令号:" + ikey);
logService.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈车号:" + carno + "，指令号:" + ikey);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agvphase：" + phase + "反馈车号:" + carno + "，指令号:" + ikey));
//到达取货点
//(需要WCS反馈)
} else if (phase == 0x03) {
@ -179,14 +184,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (ObjectUtil.isEmpty(inst)) {
log.info("未找到指令：" + ikey);
lucene.deviceExecuteLog(device_code, "", "", "未找到指令 [" + ikey + "]");
logService.deviceExecuteLog(device_code, "", "", "未找到指令 [" + ikey + "]");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "未找到指令 [" + ikey + "]"));
return;
}
if (agvaddr == 0) {
agvaddr = agvaddr_copy;
}
if (agvaddr < 1) {
lucene.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
logService.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agv地址参数有误,phase:" + phase));
return;
}
device_code = deviceService.queryDeviceCodeByAddress(agvaddr);
@ -207,14 +214,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
device = deviceAppService.findDeviceByCode(device_code);
if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!");
lucene.deviceExecuteLog(this.device_code, "", "", agvaddr + "对应设备号为空");
logService.deviceExecuteLog(this.device_code, "", "", agvaddr + "对应设备号为空");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, agvaddr + "对应设备号为空"));
return;
}
//校验agv上报站点编号与指令起始点相同
if (ObjectUtil.isEmpty(inst)) {
log.info("未找到编号{}对应的指令", ikey);
agv_message = "未找到编号"+ikey +"对应的指令";
lucene.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
logService.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "未找到关联编号对应的指令" + ikey));
return;
}
//标准版-机械手对接位
@ -248,7 +257,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货。";
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-工位(交互模板)
@ -282,7 +292,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货。";
lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-压制对接位
@ -294,6 +305,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
&& (conveyorPressStationDeviceDriver.getIo_action() == 3 || conveyorPressStationDeviceDriver.getIo_action() == 1)
&& (conveyorPressStationDeviceDriver.getAction() == 3 || conveyorPressStationDeviceDriver.getAction() == 1)) {
data = AgvService.sendAgvOneModeInst(phase, index, 0);
conveyorPressStationDeviceDriver.writing(2);
conveyorPressStationDeviceDriver.setMessage("");
flag = true;
} else {
@ -314,7 +326,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货。";
conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//普通站点
@ -331,7 +344,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
data = AgvService.sendAgvOneModeInst(phase, index, 0);
flag = true;
} else {
lucene.deviceExecuteLog(device_code, "", "", "AGV请求取货设备{}无货,无法反馈");
logService.deviceExecuteLog(device_code, "", "", "AGV请求取货设备{}无货,无法反馈");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "AGV请求取货设备{}无货,无法反馈"));
}
}
}
@ -346,6 +360,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
conveyorBarcodeDeviceDriver.setMessage("");
conveyorBarcodeDeviceDriver.writing(2);
flag = true;
} else {
String message = "";
@ -359,7 +374,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货。";
conveyorBarcodeDeviceDriver.setMessage(message);
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-叠盘机 LnshFoldDiscSiteDeviceDriverl
@ -372,6 +388,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
// && (lnshFoldDiscSiteDeviceDriver.getAction() == 3 || lnshFoldDiscSiteDeviceDriver.getAction() == 1)
inst.setExecute_status("1");
instructionService.update(inst);
lnshFoldDiscSiteDeviceDriver.writing(2);
data = AgvService.sendAgvOneModeInst(phase, index, 0);
lnshFoldDiscSiteDeviceDriver.setMessage("");
flag = true;
@ -393,7 +410,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货。";
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
lnshFoldDiscSiteDeviceDriver.setMessage(message);
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
@ -409,7 +427,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (flag) {
log.info("==================允许AGV取货==================");
lucene.deviceExecuteLog(device_code, "", "", "允许AGV取货。");
logService.deviceExecuteLog(device_code, "", "", "允许AGV取货。");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "允许AGV取货。"));
}
//取货完毕
//(需要WCS反馈)
@ -417,14 +436,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("================AGV取货完成请求离开================");
if (ObjectUtil.isEmpty(inst)) {
log.info("未找到指令：" + ikey);
lucene.deviceExecuteLog(device_code, "", "", "未找到指令 [" + ikey + "]");
logService.deviceExecuteLog(device_code, "", "", "未找到指令 [" + ikey + "]");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "未找到指令 [" + ikey + "]"));
return;
}
if (agvaddr == 0) {
agvaddr = agvaddr_copy;
}
if (agvaddr < 1) {
lucene.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
logService.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agv地址参数有误,phase:" + phase));
return;
}
if (agvaddr != 0) {
@ -444,13 +465,15 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (ObjectUtil.isEmpty(device_code)) {
log.info(agvaddr + "对应设备号为空!");
lucene.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code);
logService.deviceExecuteLog(this.device_code, "", "", "对应设备号为空" + device_code);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "对应设备号为空" + device_code));
return;
}
//校验agv上报站点编号与指令起始点相同
if (ObjectUtil.isEmpty(inst)) {
log.info("未找到关联编号{}对应的指令", ikey);
lucene.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
logService.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "未找到关联编号对应的指令" + ikey));
return;
}
//标准版-机械手对接位
@ -481,13 +504,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货后离开。";
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-工位(交互模板) LnshStationDeviceDriver
if(device.getDeviceDriver() instanceof LnshStationDeviceDriver){
lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver();
lnshStationDeviceDriver.writing(5);
lnshStationDeviceDriver.writing(3);
if (lnshStationDeviceDriver.getMode() != 0
&& lnshStationDeviceDriver.getMove() == 0
&& (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2)
@ -512,13 +536,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货后离开。";
lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-压制对接位
if(device.getDeviceDriver() instanceof ConveyorPressStationDeviceDriver){
conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver();
conveyorPressStationDeviceDriver.writing(2);
conveyorPressStationDeviceDriver.writing(3);
if (conveyorPressStationDeviceDriver.getMode() != 0
&& conveyorPressStationDeviceDriver.getMove() == 0
&& (conveyorPressStationDeviceDriver.getIo_action() == 3 || conveyorPressStationDeviceDriver.getIo_action() == 2)
@ -543,7 +568,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货后离开。";
conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//普通站点
@ -565,7 +591,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
//标准版-下发条码输送线
if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
conveyorBarcodeDeviceDriver.writing(5);
conveyorBarcodeDeviceDriver.writing(3);
if (conveyorBarcodeDeviceDriver.getMode() != 0) {
inst.setExecute_status("5");
instructionService.update(inst);
@ -587,13 +613,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货后离开。";
conveyorBarcodeDeviceDriver.setMessage(message);
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-叠盘机
if(device.getDeviceDriver() instanceof LnshFoldDiscSiteDeviceDriver){
lnshFoldDiscSiteDeviceDriver = (LnshFoldDiscSiteDeviceDriver) device.getDeviceDriver();
lnshFoldDiscSiteDeviceDriver.writing(5);
lnshFoldDiscSiteDeviceDriver.writing(3);
if (lnshFoldDiscSiteDeviceDriver.getMode() != 0
// && lnshFoldDiscSiteDeviceDriver.getContainer_qty() == 0
// && (lnshFoldDiscSiteDeviceDriver.getIo_action() == 3 || lnshFoldDiscSiteDeviceDriver.getIo_action() == 2)
@ -618,7 +645,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV取货后离开。";
lnshFoldDiscSiteDeviceDriver.setMessage(message);
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
if (StrUtil.equals(inst.getStart_device_code(), device_code)) {
@ -637,7 +665,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (ObjectUtil.isNotEmpty(data)) {
lucene.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈:" + Bytes2HexString(data));
logService.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈:" + Bytes2HexString(data));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agvphase：" + phase + "反馈:" + Bytes2HexString(data)));
}
// if (flag) {
// String hasWms = acsConfigService.findByCode(AcsConfig.HASWMS).getValue();
@ -650,14 +679,15 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
// ar.add(param);
// acsToWmsService.feedbackTaskStatusToWms(ar);
// } catch (Exception e) {
// lucene.deviceExecuteLog(device_code, "", "", "AGV取货完成离开后，反馈上位系统失败！");
// logService.deviceExecuteLog(device_code, "", "", "AGV取货完成离开后，反馈上位系统失败！");
// e.printStackTrace();
// }
// }
// }
if (flag) {
log.info("================允许AGV取货后离开=================");
lucene.deviceExecuteLog(device_code, "", "", "允许AGV取货后离开。");
logService.deviceExecuteLog(device_code, "", "", "允许AGV取货后离开。");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "允许AGV取货后离开。"));
}
//到达放货点
//(需要WCS反馈)
@ -665,14 +695,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("==================AGV请求放货==================");
if (ObjectUtil.isEmpty(inst)) {
log.info("未找到指令：" + ikey);
lucene.deviceExecuteLog(device_code, "", "", "未找到指令 [" + ikey + "]");
logService.deviceExecuteLog(device_code, "", "", "未找到指令 [" + ikey + "]");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "未找到指令 [" + ikey + "]"));
return;
}
if (agvaddr == 0) {
agvaddr = agvaddr_copy;
}
if (agvaddr < 1) {
lucene.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
logService.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agv地址参数有误,phase:" + phase));
return;
}
if (agvaddr != 0) {
@ -729,7 +761,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货。";
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-工位(交互模板)
@ -763,7 +796,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货。";
lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-压制对接位
@ -797,7 +831,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货。";
conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//普通站点
@ -839,7 +874,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货。";
conveyorBarcodeDeviceDriver.setMessage(message);
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-叠盘机
@ -874,7 +910,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货。";
lnshFoldDiscSiteDeviceDriver.setMessage(message);
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
if (StrUtil.equals(inst.getNext_device_code(), device_code)) {
@ -892,7 +929,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (flag) {
log.info("==================允许AGV放货==================");
lucene.deviceExecuteLog(device_code, "", "", "允许AGV放货。");
logService.deviceExecuteLog(device_code, "", "", "允许AGV放货。");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "允许AGV放货。"));
}
//放货完毕
@ -901,14 +939,16 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
log.info("================AGV放货完成请求离开================");
if (ObjectUtil.isEmpty(inst)) {
log.info("未找到指令：" + ikey);
lucene.deviceExecuteLog("未找到指令号对应的指令：", "", "", String.valueOf(ikey));
logService.deviceExecuteLog("未找到指令号对应的指令：", "", "", String.valueOf(ikey));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, String.valueOf(ikey)));
return;
}
if (agvaddr == 0) {
agvaddr = agvaddr_copy;
}
if (agvaddr < 1) {
lucene.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
logService.deviceExecuteLog(this.device_code, "", "", "agv地址参数有误,phase:" + phase);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agv地址参数有误,phase:" + phase));
return;
}
if (agvaddr != 0) {
@ -962,7 +1002,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货后离开。";
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-工位(交互模板)
@ -992,7 +1033,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货后离开。";
lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-压制对接位(需要给电气目标站)
@ -1037,7 +1079,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货后离开。";
conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//普通站点
@ -1082,7 +1125,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货后离开。";
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
conveyorBarcodeDeviceDriver.setMessage(message);
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
//标准版-叠盘机
@ -1113,12 +1157,14 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
message += "不允许AGV放货后离开。";
lnshFoldDiscSiteDeviceDriver.setMessage(message);
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
lucene.deviceExecuteLog(device_code, "", "", message);
logService.deviceExecuteLog(device_code, "", "", message);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
}
if (flag) {
log.info("================允许AGV放货后离开=================");
lucene.deviceExecuteLog(device_code, "", "", "允许AGV放货后离开。");
logService.deviceExecuteLog(device_code, "", "", "允许AGV放货后离开。");
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "允许AGV放货后离开。"));
}
}
//到达位置点
@ -1162,7 +1208,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
}
if (!ObjectUtil.isEmpty(data)) {
phase = 0;
lucene.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + Bytes2HexString(data));
logService.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + Bytes2HexString(data));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agvphase:" + phase + "反馈:" + Bytes2HexString(data)));
NDCSocketConnectionAutoRun.write(data);
}

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/empty_vehicle_stacking_position/EmptyVehicleStackingPositionDeviceDriver.java
View File

@ -1,5 +1,6 @@
package org.nl.acs.device_driver.basedriver.empty_vehicle_stacking_position;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.Getter;
import lombok.Setter;
@ -22,6 +23,7 @@ import org.nl.acs.opc.Device;
import org.nl.acs.opc.DeviceAppService;
import org.nl.acs.route.service.RouteLineService;
import org.nl.acs.task.service.TaskService;
import org.nl.modules.lucene.service.dto.LuceneLogDto;
import org.nl.modules.system.service.ParamService;
import org.nl.modules.wql.util.SpringContextHolder;
import org.openscada.opc.lib.da.Server;
@ -187,6 +189,7 @@ public class EmptyVehicleStackingPositionDeviceDriver extends AbstractOpcDeviceD
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
public void writing(String key, String value) {
@ -199,6 +202,7 @@ public class EmptyVehicleStackingPositionDeviceDriver extends AbstractOpcDeviceD
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", key + " 写入 " + value);
}
@Override

4
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java
View File

@ -356,6 +356,7 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
public synchronized void OpenOrClose(String type) {
@ -530,11 +531,12 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求成功" + resp.getMessage();
} else {
this.writing(400);
message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();;
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(request)));
return true;
} else {
message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 设备有货未请求LMS...";

12
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/conveyor_press_station/ConveyorPressStationDeviceDriver.java
View File

@ -336,6 +336,7 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
public synchronized void OpenOrClose(String type) {
@ -577,9 +578,12 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
} else {
@ -711,12 +715,16 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
if(StrUtil.equals(resp.getIs_standing_finish(),"1")){
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}else {
this.writing(400);
message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + "没有静置完成";
}
} else {
this.writing(400);
message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
} else {

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java
View File

@ -156,7 +156,6 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
ApplySignalStatusResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), ApplySignalStatusResponse.class);
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "请求参数:" + JSON.toJSONString(request)));
if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求成功" + resp.getMessage();;
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(request)));
@ -279,6 +278,7 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
public void writing(String param, String value) {

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_crusher/LnshCrusherDeviceDriver.java
View File

@ -256,6 +256,7 @@ public class LnshCrusherDeviceDriver extends AbstractOpcDeviceDriver implements
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
}
}

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/LnshFoldDiscSiteDeviceDriver.java
View File

@ -263,12 +263,16 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem
message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("apply_take_empty_vehicle") + "apply_take_empty_vehicle 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
}
@ -308,6 +312,7 @@ public class LnshFoldDiscSiteDeviceDriver extends AbstractOpcDeviceDriver implem
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
/**

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_mixing_mill/LnshMixingMillDeviceDriver.java
View File

@ -230,6 +230,7 @@ public class LnshMixingMillDeviceDriver extends AbstractOpcDeviceDriver implemen
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
public void writing(int type, int command) {

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_out_kiln_truss/LnshOutKilnTrussDeviceDriver.java
View File

@ -277,6 +277,7 @@ public class LnshOutKilnTrussDeviceDriver extends AbstractOpcDeviceDriver implem
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
public void writing(String param, String value) {

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_line/LnshPackageLineDeviceDriver.java
View File

@ -291,6 +291,7 @@ public class LnshPackageLineDeviceDriver extends AbstractOpcDeviceDriver impleme
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
}
/**

13
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java
View File

@ -431,9 +431,13 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
if (resp.getCode() == 200) {
this.writing(101);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
@ -454,9 +458,12 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
if (resp.getCode() == 200) {
this.writing(102);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}
@ -508,6 +515,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_feedback 写入 " + feedback);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_feedback 写入 " + feedback));
}
public void writing(String param, String value) {
@ -522,6 +530,7 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, param + " 写入 " + value));
}
@Override

6
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java
View File

@ -399,9 +399,12 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_one_grab") + "apply_one_grab 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("apply_one_grab") + "apply_one_grab 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("apply_one_grab") + "apply_one_grab 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
return true;
@ -603,6 +606,7 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
@Override

17
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
View File

@ -775,14 +775,16 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class);
message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
this.setIserror(true);
message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
} else {
@ -881,10 +883,13 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
this.setIserror(true);
message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
} else {
@ -914,10 +919,13 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
this.setIserror(true);
message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("apply_force_take_full_vehicle") + "apply_force_take_full_vehicle 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
} else {
@ -1173,6 +1181,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
public synchronized void OpenOrClose(String type) {

15
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_press/LnshPressDeviceDriver.java
View File

@ -304,9 +304,12 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
if (resp.getCode() == 200) {
this.writing(101);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("order_verify") + "order_verify 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message));
}else{
@ -330,9 +333,12 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
if (resp.getCode() == 200) {
this.writing(102);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("order_finish") + "order_finish 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
@ -356,9 +362,12 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("pressRequestMaterial") + "pressRequestMaterial 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("pressRequestMaterial") + "pressRequestMaterial 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
@ -382,9 +391,12 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_feedback_weight") + "apply_feedback_weight 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("apply_feedback_weight") + "apply_feedback_weight 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
return true;
@ -443,6 +455,7 @@ public class LnshPressDeviceDriver extends AbstractOpcDeviceDriver implements De
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_command 写入 " + command));
}
public static Boolean isExistFieldName(String fieldName, Object obj) throws NoSuchFieldException {

1
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java
View File

@ -1361,6 +1361,7 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_feedback 写入 " + feedback);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "to_feedback 写入 " + feedback));
}
public void writing(int type, int command) {

40
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
View File

@ -151,10 +151,14 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
this.setRequireSucess(false);
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + " -> " + mode);
lucene.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号mode:" + last_mode + " -> " + mode));
}
if (move != last_move) {
logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + " -> " + move);
lucene.deviceItemValue(this.device_code, "move", String.valueOf(move));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号mode:" + last_move + " -> " + move));
if ("true".equals(this.device.getExtraValue().get("sendDeviceStatus"))) {
ApplySignalStatusRequest request = new ApplySignalStatusRequest();
request.setDevice_code(this.getDevice_code());
@ -164,25 +168,32 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
ApplySignalStatusResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), ApplySignalStatusResponse.class);
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求成功" + resp.getMessage();;
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(request)));
} else {
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求失败" + resp.getMessage();;
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(request)));
}
}
}
if (error != last_error) {
logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + " -> " + error);
lucene.deviceItemValue(this.device_code, "error", String.valueOf(error));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号error：" + last_error + " -> " + error));
}
if (task != last_task) {
logServer.deviceItemValue(this.device_code, "task", String.valueOf(task));
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + " -> " + task);
lucene.deviceItemValue(this.device_code, "task", String.valueOf(task));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号task：" + last_task + " -> " + task));
}
if (action != last_action) {
logServer.deviceItemValue(this.device_code, "action", String.valueOf(action));
logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + " -> " + action);
lucene.deviceItemValue(this.device_code, "action", String.valueOf(action));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号action：" + last_action + " -> " + action));
if ("true".equals(this.device.getExtraValue().get("sendDeviceStatus"))) {
ApplySignalStatusRequest request = new ApplySignalStatusRequest();
request.setDevice_code(this.getDevice_code());
@ -195,26 +206,36 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求成功" + resp.getMessage();;
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(request)));
} else {
message = RequestMethodEnum.getName("real_time_set_point") + "real_time_set_point 接口请求失败" + resp.getMessage();;
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(request)));
}
}
}
if (io_action != last_ioaction) {
logServer.deviceItemValue(this.device_code, "io_action", String.valueOf(io_action));
logServer.deviceExecuteLog(this.device_code, "", "", "信号io_action: " + last_ioaction + " -> " + io_action);
lucene.deviceItemValue(this.device_code, "io_action", String.valueOf(io_action));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号action：" + last_action + " -> " + action));
}
if (weight != last_weight) {
logServer.deviceItemValue(this.device_code, "weight", String.valueOf(weight));
logServer.deviceExecuteLog(this.device_code, "", "", "信号weight: " + last_weight + " -> " + weight);
lucene.deviceItemValue(this.device_code, "weight", String.valueOf(weight));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号weight: " + last_weight + " -> " + weight));
}
if (!StrUtil.equals(material, last_material)) {
logServer.deviceItemValue(this.device_code, "material", material);
logServer.deviceExecuteLog(this.device_code, "", "", "信号material：" + last_material + " -> " + material);
lucene.deviceItemValue(this.device_code, "material", String.valueOf(material));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号material：" + last_material + " -> " + material));
}
if (barcode != last_barcode) {
logServer.deviceItemValue(this.device_code, "barcode", String.valueOf(barcode));
logServer.deviceExecuteLog(this.device_code, "", "", "信号barcode：" + last_barcode + " -> " + barcode);
lucene.deviceItemValue(this.device_code, "barcode", String.valueOf(barcode));
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "信号barcode：" + last_barcode + " -> " + barcode));
}
} catch (Exception var17) {
@ -332,12 +353,15 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
if (type == 1) {
itemMap.put(to_command, command);
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "to_command 写入 " + command));
} else if (type == 2) {
itemMap.put(to_target, command);
logServer.deviceExecuteLog(this.device_code, "", "", "to_target 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "to_target 写入 " + command));
} else if (type == 3) {
itemMap.put(to_task, command);
logServer.deviceExecuteLog(this.device_code, "", "", "to_task 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "to_task 写入 " + command));
}
ReadUtil.write(itemMap, server);
server.disconnect();
@ -359,6 +383,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", param + " 写入 " + value);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + param + " 写入 " + value));
}
public void writing(int command) {
@ -372,6 +397,7 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "to_command 写入 " + command));
}
public synchronized void OpenOrClose(String type) {
@ -655,9 +681,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("apply_take_full_vehicle") + "apply_take_full_vehicle 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
} else {
@ -751,9 +780,12 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
if (resp.getCode() == 200) {
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();;
message = RequestMethodEnum.getName("barcode_success_apply") + "barcode_success_apply 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
return true;
} else {

7
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/package_site/PackageSiteDeviceDriver.java
View File

@ -268,13 +268,13 @@ public class PackageSiteDeviceDriver extends AbstractOpcDeviceDriver implements
this.writing("to_message",resp.getLabel_message());
this.writing(200);
this.setRequireSucess(true);
message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else {
this.writing(400);
message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 接口请求失败" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
}
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
return true;
} else {
message = RequestMethodEnum.getName("apply_labelling") + "apply_labelling 设备无货未请求LMS...";
@ -294,6 +294,7 @@ public class PackageSiteDeviceDriver extends AbstractOpcDeviceDriver implements
ReadUtil.write(itemMap, server);
server.disconnect();
logServer.deviceExecuteLog(this.device_code, "", "", "to_command 写入 " + command);
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "to_command 写入 " + command));
}
public void writing(String param, String value) {

180
acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue
View File

@ -1,6 +1,7 @@
<template>
<!--晟华叠盘工位-->
<!--晟华-碟盘机-->
<div>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">设备协议：</span>
@ -66,12 +67,22 @@
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="最大数量">
<el-input v-model="form.max_emptypalletnum" />
<el-form-item label="关联设备" prop="device_code">
<el-select
v-model="form.link_device_code"
clearable
filterable
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="检验有货">
<el-switch v-model="form.inspect_in_stocck" />
@ -87,26 +98,30 @@
<el-switch v-model="form.ignore_release_check" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="反馈设备状态" label-width="150px">
<el-switch v-model="form.sendDeviceStatus" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="呼叫">
<el-form-item label="申请任务">
<el-switch v-model="form.apply_task" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="响应" label-width="150px">
<el-form-item label="手动生成任务" label-width="150px">
<el-switch v-model="form.manual_create_task" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="关联设备" prop="device_code">
<el-form-item label="申请空盘" prop="device_code">
<el-select
v-model="form.link_device_code"
v-model="form.apply_empty"
filterable
multiple
placeholder="请选择"
@ -120,28 +135,6 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联三色灯" prop="device_code" label-width="100px">
<el-select
v-model="form.link_three_lamp"
filterable
clearable
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否输入物料" label-width="150px">
<el-switch v-model="form.input_material" />
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
@ -154,7 +147,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="取货">
<el-switch v-model="form.is_pickup" />
<el-switch v-model="form.pickup" />
</el-form-item>
</el-col>
<el-col :span="8">
@ -171,27 +164,27 @@
<span class="role-span">交互相关：</span>
</div>
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertdtl()"
>
新增一行
</el-button>
</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertdtl()"
>
新增一行
</el-button>
</span>
</div>
<div class="app-container">
<el-table :data="modeform.tableData" border fit highlight-current-row style="width: 100%;" class="tb-edit">
<el-table-column label="mode" prop="模式" width="180">
<template scope="scope">
<el-input-number value="3" :min="3" v-model="scope.row.mode" size="mini" />
<el-input-number v-model="scope.row.mode" value="3" :min="3" size="mini" />
<span v-show="scope.row.edit">{{ scope.row.mode }}</span>
</template>
</el-table-column>
@ -213,7 +206,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="170" >
<el-table-column align="center" label="操作" width="170">
<template scope="scope">
<el-button
type="danger"
@ -245,12 +238,7 @@
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data1[scope.$index].db"
size="mini"
class="edit-input"
@input="finishReadEdit(data1[scope.$index])"
/>
<el-input v-model="data1[scope.$index].db" size="mini" class="edit-input" @input="finishReadEdit(data1[scope.$index])" />
</template>
</el-table-column>
<el-table-column prop="dbr_value">
@ -282,12 +270,7 @@
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
v-model="data2[scope.$index].db"
size="mini"
class="edit-input"
@input="finishWriteEdit(data2[scope.$index])"
/>
<el-input v-model="data2[scope.$index].db" size="mini" class="edit-input" @input="finishWriteEdit(data2[scope.$index])" />
</template>
</el-table-column>
<el-table-column prop="dbr_value2">
@ -343,7 +326,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'LnshFoldDisc',
name: 'LnshStation',
mixins: [crud],
props: {
parentForm: {
@ -363,17 +346,60 @@ export default {
opc_id: '',
opc_code: '',
configLoading: false,
requestMethodList: [],
dataOpcservers: [],
dataOpcPlcs: [],
deviceList: [],
requestMethodList: [],
data1: [],
data2: [],
modeform: {
tableData: [
// {
// mode: '3',
// request: 'order_verify'
// },
// {
// mode: '4',
// request: 'order_finish'
// },
{
mode: '5',
request: 'apply_put_full_vehicle'
},
{
mode: '6',
request: 'apply_put_empty_vehicle'
},
{
mode: '7',
request: 'apply_take_empty_vehicle'
},
{
mode: '8',
request: 'apply_take_full_vehicle'
},
{
mode: '9',
request: 'apply_force_take_full_vehicle'
},
{
mode: '10',
request: 'apply_force_take_full_vehicle_in_storage'
},
{
mode: '11',
request: 'barcode_success_apply'
},
{
mode: '12',
request: 'get_vehicle_info'
},
{
mode: '13',
request: 'force_no_package'
},
{
mode: '14',
request: 'apply_labelling'
}
]
},
@ -382,14 +408,13 @@ export default {
ignore_pickup_check: true,
ignore_release_check: true,
apply_task: true,
link_three_lamp: '',
apply_empty: [],
manual_create_task: true,
is_pickup: true,
is_release: true,
link_device_code: [],
max_emptypalletnum: 0
is_release: true
},
rules: {}
rules: {},
deviceList: {}
}
},
created() {
@ -418,6 +443,13 @@ export default {
}
this.data1 = data.rs
this.data2 = data.ws
if (data.modeform) {
const arr = Object.keys(data.modeform)
// 不为空
if (arr.length > 0) {
this.modeform.tableData = data.modeform
}
}
this.sliceItem()
})
selectPlcList().then(data => {
@ -437,6 +469,9 @@ export default {
})
},
methods: {
insertdtl() {
this.modeform.tableData.push({mode: '', request: '' })
},
deleteRow(index, rows) {
debugger
rows.splice(index, 1)
@ -444,10 +479,9 @@ export default {
finishReadEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('mode') !== -1) {
debugger
const dbValue = data.db
// .之前的字符串
// const beforeStr = dbValue.match(/(\S*)\./)[1]
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
@ -492,7 +526,7 @@ export default {
if (data.code.indexOf('to_command') !== -1) {
const dbValue = data.db
// .之前的字符串
// const beforeStr = dbValue.match(/(\S*)\./)[1]
const beforeStr = dbValue.match(/(\S*)\./)[1]
// .之后的字符串
const afterStr = dbValue.match(/\.(\S*)/)[1]
// 取最后数字
@ -506,7 +540,7 @@ export default {
this.data2[val].db = beforeStr + '.' + afterStr.substring(0, 1) + (parseInt(endNumber) + 2)
}
if (this.data2[val].code.indexOf('to_task') !== -1) {
this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 6)
this.data2[val].db = beforeStr + '.' + 'D' + (parseInt(endNumber) + 4)
}
}
}

Write Preview
Loading…
Cancel
Save