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

rev

master
汪菘 1 year ago
parent
ecbb66cbe8
commit
a26ee63253
8 changed files with 94 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      acs/nladmin-system/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
  2. 72
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
  3. 1
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/converor_barcode/ConveyorBarcodeDeviceDriver.java
  4. 34
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
  5. 3
      acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java
  6. 2
      acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java
  7. 21
      acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
  8. 29
      acs/nladmin-ui/src/views/system/monitor/device/index.vue

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

@ -870,7 +870,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
} else { } else {
//空盘堆叠驱动 需要按照数量生成 //空盘堆叠驱动 需要按照数量生成
WQLObject wo = WQLObject.getWQLObject("acs_storage_cell"); WQLObject wo = WQLObject.getWQLObject("acs_storage_cell");
if (StrUtil.equals(driver_code, "standard_emptypallet_site") && form.containsKey("max_emptypalletnum")) { if ((StrUtil.equals(driver_code, "standard_emptypallet_site") || StrUtil.equals(driver_code, "lnsh_fold_disc_site") ) && form.containsKey("max_emptypalletnum")) {
int num = form.getInteger("max_emptypalletnum"); int num = form.getInteger("max_emptypalletnum");
for (int i = 1; i < num + 1; i++) { for (int i = 1; i < num + 1; i++) {
JSONObject json = wo.query("storage_code ='" + device_code + "." + i + "'").uniqueResult(0); JSONObject json = wo.query("storage_code ='" + device_code + "." + i + "'").uniqueResult(0);
@ -882,7 +882,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
celldto.setX("0"); celldto.setX("0");
celldto.setY("0"); celldto.setY("0");
celldto.setZ("0"); celldto.setZ("0");
celldto.setAddress(Integer.parseInt(CodeUtil.getNewCode("NDCADDRESS_NO"))); celldto.setAddress(0);
celldto.setCreate_by("init"); celldto.setCreate_by("init");
celldto.setCreate_time(SecurityUtils.getCurrentUsername()); celldto.setCreate_time(SecurityUtils.getCurrentUsername());
wo.insert((JSONObject) JSONObject.toJSON(celldto)); wo.insert((JSONObject) JSONObject.toJSON(celldto));
@ -898,7 +898,7 @@ public class DeviceServiceImpl implements DeviceService, ApplicationAutoInitial
celldto.setX("0"); celldto.setX("0");
celldto.setY("0"); celldto.setY("0");
celldto.setZ("0"); celldto.setZ("0");
celldto.setAddress(Integer.parseInt(CodeUtil.getNewCode("NDCADDRESS_NO"))); celldto.setAddress(0);
celldto.setCreate_by("init"); celldto.setCreate_by("init");
celldto.setCreate_time(SecurityUtils.getCurrentUsername()); celldto.setCreate_time(SecurityUtils.getCurrentUsername());
wo.insert((JSONObject) JSONObject.toJSON(celldto)); wo.insert((JSONObject) JSONObject.toJSON(celldto));

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

@ -86,6 +86,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
int last_error = 0; int last_error = 0;
String error_message = ""; String error_message = "";
boolean flag = false; boolean flag = false;
String agv_message ="";
private synchronized void setErrorInfo(int error, String error_code, String error_message) { private synchronized void setErrorInfo(int error, String error_code, String error_message) {
this.error = error; this.error = error;
this.error_code = error_code; this.error_code = error_code;
@ -208,6 +210,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
//校验agv上报站点编号与指令起始点相同 //校验agv上报站点编号与指令起始点相同
if (ObjectUtil.isEmpty(inst)) { if (ObjectUtil.isEmpty(inst)) {
log.info("未找到编号{}对应的指令", ikey); log.info("未找到编号{}对应的指令", ikey);
agv_message = "未找到编号"+ikey +"对应的指令";
logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey); logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
return; return;
} }
@ -241,6 +244,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货。"; message += "不允许AGV取货。";
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -274,6 +278,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货。"; message += "不允许AGV取货。";
lnshStationDeviceDriver.setMessage(message); lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -305,6 +310,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货。"; message += "不允许AGV取货。";
conveyorPressStationDeviceDriver.setMessage(message); conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -332,8 +338,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
conveyorBarcodeDeviceDriver.writing(3); conveyorBarcodeDeviceDriver.writing(3);
if (conveyorBarcodeDeviceDriver.getMode() != 0 if (conveyorBarcodeDeviceDriver.getMode() != 0
&& conveyorBarcodeDeviceDriver.getMove() != 0 && conveyorBarcodeDeviceDriver.getMove() != 0
&& (conveyorBarcodeDeviceDriver.getIo_action() == 3 || conveyorBarcodeDeviceDriver.getIo_action() == 1) ) {
&& (conveyorBarcodeDeviceDriver.getAction() == 3 || conveyorBarcodeDeviceDriver.getAction() == 1)) {
inst.setExecute_status("1"); inst.setExecute_status("1");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
@ -347,15 +352,10 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (conveyorBarcodeDeviceDriver.getMove() == 0) { if (conveyorBarcodeDeviceDriver.getMove() == 0) {
message += "站点无货,"; message += "站点无货,";
} }
if (conveyorBarcodeDeviceDriver.getIo_action() != 3 && conveyorBarcodeDeviceDriver.getIo_action() != 1) {
message += "站点不允许进入,";
}
if (conveyorBarcodeDeviceDriver.getAction() != 3 && conveyorBarcodeDeviceDriver.getAction() != 1) {
message += "站点不允许取货,";
}
} }
message += "不允许AGV取货。"; message += "不允许AGV取货。";
conveyorBarcodeDeviceDriver.setMessage(message); conveyorBarcodeDeviceDriver.setMessage(message);
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -388,6 +388,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
// } // }
} }
message += "不允许AGV取货。"; message += "不允许AGV取货。";
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
lnshFoldDiscSiteDeviceDriver.setMessage(message); lnshFoldDiscSiteDeviceDriver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
@ -476,6 +477,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货后离开。"; message += "不允许AGV取货后离开。";
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -506,6 +508,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货后离开。"; message += "不允许AGV取货后离开。";
lnshStationDeviceDriver.setMessage(message); lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -536,6 +539,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货后离开。"; message += "不允许AGV取货后离开。";
conveyorPressStationDeviceDriver.setMessage(message); conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -559,10 +563,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){ if(device.getDeviceDriver() instanceof ConveyorBarcodeDeviceDriver){
conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver(); conveyorBarcodeDeviceDriver = (ConveyorBarcodeDeviceDriver) device.getDeviceDriver();
conveyorBarcodeDeviceDriver.writing(5); conveyorBarcodeDeviceDriver.writing(5);
if (conveyorBarcodeDeviceDriver.getMode() != 0 if (conveyorBarcodeDeviceDriver.getMode() != 0) {
&& conveyorBarcodeDeviceDriver.getMove() != 0
&& (conveyorBarcodeDeviceDriver.getIo_action() == 3 || conveyorBarcodeDeviceDriver.getIo_action() == 2)
) {
inst.setExecute_status("5"); inst.setExecute_status("5");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
@ -582,6 +583,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货后离开。"; message += "不允许AGV取货后离开。";
conveyorBarcodeDeviceDriver.setMessage(message); conveyorBarcodeDeviceDriver.setMessage(message);
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -612,6 +614,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV取货后离开。"; message += "不允许AGV取货后离开。";
lnshFoldDiscSiteDeviceDriver.setMessage(message); lnshFoldDiscSiteDeviceDriver.setMessage(message);
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -633,22 +636,22 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (ObjectUtil.isNotEmpty(data)) { if (ObjectUtil.isNotEmpty(data)) {
logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈:" + Bytes2HexString(data)); logServer.deviceExecuteLog(this.device_code, "", "", "agvphase：" + phase + "反馈:" + Bytes2HexString(data));
} }
if (flag) { // if (flag) {
String hasWms = acsConfigService.findByCode(AcsConfig.HASWMS).getValue(); // String hasWms = acsConfigService.findByCode(AcsConfig.HASWMS).getValue();
if (!StrUtil.startWith(inst.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) { // if (!StrUtil.startWith(inst.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
try { // try {
JSONArray ar = new JSONArray(); // JSONArray ar = new JSONArray();
JSONObject param = new JSONObject(); // JSONObject param = new JSONObject();
param.put("task_code", inst.getTask_code()); // param.put("task_code", inst.getTask_code());
param.put("task_status", "4"); // param.put("task_status", "4");
ar.add(param); // ar.add(param);
acsToWmsService.feedbackTaskStatusToWms(ar); // acsToWmsService.feedbackTaskStatusToWms(ar);
} catch (Exception e) { // } catch (Exception e) {
logServer.deviceExecuteLog(device_code, "", "", "AGV取货完成离开后，反馈上位系统失败！"); // logServer.deviceExecuteLog(device_code, "", "", "AGV取货完成离开后，反馈上位系统失败！");
e.printStackTrace(); // e.printStackTrace();
} // }
} // }
} // }
if (flag) { if (flag) {
log.info("================允许AGV取货后离开================="); log.info("================允许AGV取货后离开=================");
logServer.deviceExecuteLog(device_code, "", "", "允许AGV取货后离开。"); logServer.deviceExecuteLog(device_code, "", "", "允许AGV取货后离开。");
@ -721,6 +724,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
} }
message += "不允许AGV放货。"; message += "不允许AGV放货。";
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
@ -755,6 +759,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货。"; message += "不允许AGV放货。";
lnshStationDeviceDriver.setMessage(message); lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -788,6 +793,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货。"; message += "不允许AGV放货。";
conveyorPressStationDeviceDriver.setMessage(message); conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -829,6 +835,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货。"; message += "不允许AGV放货。";
conveyorBarcodeDeviceDriver.setMessage(message); conveyorBarcodeDeviceDriver.setMessage(message);
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -863,6 +870,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货。"; message += "不允许AGV放货。";
lnshFoldDiscSiteDeviceDriver.setMessage(message); lnshFoldDiscSiteDeviceDriver.setMessage(message);
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -950,6 +958,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货后离开。"; message += "不允许AGV放货后离开。";
lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message); lnshPalletizingManipulatorSiteDeviceDriver.setMessage(message);
agv_message = lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -979,6 +988,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货后离开。"; message += "不允许AGV放货后离开。";
lnshStationDeviceDriver.setMessage(message); lnshStationDeviceDriver.setMessage(message);
agv_message = lnshStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -1023,6 +1033,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货后离开。"; message += "不允许AGV放货后离开。";
conveyorPressStationDeviceDriver.setMessage(message); conveyorPressStationDeviceDriver.setMessage(message);
agv_message = conveyorPressStationDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }
@ -1064,11 +1075,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (conveyorBarcodeDeviceDriver.getMove() == 0) { if (conveyorBarcodeDeviceDriver.getMove() == 0) {
message += "站点无货，"; message += "站点无货，";
} }
if (conveyorBarcodeDeviceDriver.getIo_action() != 2 && conveyorBarcodeDeviceDriver.getIo_action() != 3) {
message += "站点不允许离开，";
}
} }
message += "不允许AGV放货后离开。"; message += "不允许AGV放货后离开。";
agv_message = conveyorBarcodeDeviceDriver.getDevice_code() + message;
conveyorBarcodeDeviceDriver.setMessage(message); conveyorBarcodeDeviceDriver.setMessage(message);
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
@ -1100,6 +1109,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
} }
message += "不允许AGV放货后离开。"; message += "不允许AGV放货后离开。";
lnshFoldDiscSiteDeviceDriver.setMessage(message); lnshFoldDiscSiteDeviceDriver.setMessage(message);
agv_message = lnshFoldDiscSiteDeviceDriver.getDevice_code() + message;
logServer.deviceExecuteLog(device_code, "", "", message); logServer.deviceExecuteLog(device_code, "", "", message);
} }
} }

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

@ -759,6 +759,7 @@ public class ConveyorBarcodeDeviceDriver extends AbstractOpcDeviceDriver impleme
if (resp.getCode() == 200) { if (resp.getCode() == 200) {
this.writing(200); this.writing(200);
this.writing("to_barcode",String.valueOf(resp.getWeight()));
this.setRequireSucess(true); this.setRequireSucess(true);
} else { } else {
this.writing(400); this.writing(400);

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

@ -836,7 +836,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
List<ApplyDeviceDto> listDto = new ArrayList<>(); List<ApplyDeviceDto> listDto = new ArrayList<>();
// if(ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))){ if(ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))){
// Device device = deviceAppService.findDeviceByCode(this.getDevice().getExtraValue().get("link_device_code").toString()); // Device device = deviceAppService.findDeviceByCode(this.getDevice().getExtraValue().get("link_device_code").toString());
// if(ObjectUtil.isNotEmpty(device)){ // if(ObjectUtil.isNotEmpty(device)){
// //混碾满料请求给lms碾次 // //混碾满料请求给lms碾次
@ -847,22 +847,22 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
// } // }
// } // }
// //
// //包装下料位木托盘满托请求 //包装下料位木托盘满托请求
// List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_device_code"); List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_device_code");
// LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
// for (int i = 0; i < getDeviceCodeList.size(); i++) { for (int i = 0; i < getDeviceCodeList.size(); i++) {
// ApplyDeviceDto applyDeviceDto=new ApplyDeviceDto(); ApplyDeviceDto applyDeviceDto=new ApplyDeviceDto();
// Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(i).toString()); Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(i).toString());
// if(getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){ if(getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver){
// lnshPalletizingManipulatorSiteDeviceDriver=(LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver=(LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver();
// applyDeviceDto.setQty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); applyDeviceDto.setQty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
// applyDeviceDto.setDevice_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code())); applyDeviceDto.setDevice_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getDevice_code()));
// applyDeviceDto.setVehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); applyDeviceDto.setVehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
// } }
// listDto.add(applyDeviceDto); listDto.add(applyDeviceDto);
// request.setList(listDto); request.setList(listDto);
// } }
// } }
ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class);

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

@ -145,6 +145,9 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
barcode = this.itemProtocol.getBarcode(); barcode = this.itemProtocol.getBarcode();
if (mode != last_mode) { if (mode != last_mode) {
if(mode==2){
this.writing(0);
}
this.setRequireSucess(false); this.setRequireSucess(false);
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode)); logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + " -> " + mode); logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + " -> " + mode);

2
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java
View File

@ -21,5 +21,5 @@ public class ApplyTaskResponse extends BaseResponse {
*/ */
private String mix_num; private String mix_num;
private String weight;
} }

21
acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@ -573,18 +573,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
finishAndCreateNextInst(entity); finishAndCreateNextInst(entity);
} }
} }
LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
//变更三色灯状态
if (!ObjectUtils.isEmpty(device.getExtraValue().get("link_three_lamp"))) {
String lamd_device = device.getExtraValue().get("link_three_lamp").toString();
Device lamddevice = appService.findDeviceByCode(lamd_device);
if (lamddevice.getDeviceDriver() instanceof LampThreecolorDeviceDriver) {
lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) lamddevice.getDeviceDriver();
lampThreecolorDeviceDriver.writing(0);
}
}
removeByCodeFromCache(entity.getInstruction_code()); removeByCodeFromCache(entity.getInstruction_code());
} }
@ -807,15 +795,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
return; return;
} }
LampThreecolorDeviceDriver lampThreecolorDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
//变更三色灯状态
if (!ObjectUtils.isEmpty(device.getExtraValue().get("link_three_lamp"))) {
String lamd_device = device.getExtraValue().get("link_three_lamp").toString();
Device lamddevice = appService.findDeviceByCode(lamd_device);
if (lamddevice.getDeviceDriver() instanceof LampThreecolorDeviceDriver) {
lampThreecolorDeviceDriver = (LampThreecolorDeviceDriver) lamddevice.getDeviceDriver();
lampThreecolorDeviceDriver.writing(0);
}
}
removeByCodeFromCache(entity.getInstruction_code()); removeByCodeFromCache(entity.getInstruction_code());
} }

29
acs/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@ -183,7 +183,7 @@ export default {
size: 5 size: 5
}, },
background: { background: {
backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")', backgroundImage: 'url("data:image/svg+xml;base64,PH`N2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
backgroundRepeat: 'repeat' backgroundRepeat: 'repeat'
}, },
isSilentMode: true, isSilentMode: true,
@ -508,6 +508,33 @@ export default {
} else if (val === 'qty') { } else if (val === 'qty') {
const obj = { name: '数量', value: data[val] } const obj = { name: '数量', value: data[val] }
this.arr.push(obj) this.arr.push(obj)
} else if (val === 'phase') {
const obj = { name: 'AGV交互', value: data[val] }
this.arr.push(obj)
} else if (val === 'x') {
const obj = { name: 'X坐标', value: data[val] }
this.arr.push(obj)
} else if (val === 'y') {
const obj = { name: 'Y坐标', value: data[val] }
this.arr.push(obj)
} else if (val === 'angle') {
const obj = { name: '角度', value: data[val] }
this.arr.push(obj)
} else if (val === 'phase_name') {
const obj = { name: 'AGV交互名称', value: data[val] }
this.arr.push(obj)
} else if (val === 'status_name') {
const obj = { name: '状态', value: data[val] }
this.arr.push(obj)
} else if (val === 'electricity') {
const obj = { name: '电量', value: data[val] }
this.arr.push(obj)
} else if (val === 'fault') {
const obj = { name: '异常', value: data[val] }
this.arr.push(obj)
} else if (val === 'task_code') {
const obj = { name: '当前执行任务号', value: data[val] }
this.arr.push(obj)
} }
} }
} }

Write Preview
Loading…
Cancel
Save