diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java index dbea2ab..87ed4d4 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java @@ -46,8 +46,9 @@ public enum RequestMethodEnum { apply_get_put_station(18, "apply_get_put_station", "反馈当前抓取放置位","0"), - press_request_material(19, "pressRequestMaterial", "压机叫料","0"); + press_request_material(19, "pressRequestMaterial", "压机叫料","0"), + wooden_pallet_binding(20,"wooden_pallet_binding","木托盘绑定","0"); //驱动索引 diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java index ea194e2..ad72de2 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java @@ -73,6 +73,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic WmsToAcsService wmsToAcsService=SpringContextHolder.getBean(WmsToAcsService.class); LuceneExecuteLogService lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); + int agvaddr = 0; int agvaddr_copy = 0; int weight = 0; @@ -196,7 +197,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agv地址参数有误,phase:" + phase)); return; } - device_code = deviceService.queryDeviceCodeByAddress(agvaddr); + device_code= deviceService.queryDeviceCodeByAddress(agvaddr); if (agvaddr != 0) { old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); if (StrUtil.contains(old_device_code, "-")) { @@ -232,7 +233,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() != 0 - && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1) +// && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1) && (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 1)) { Map map = new LinkedHashMap<>(); map.put("to_command",2); @@ -270,7 +271,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshStationDeviceDriver=(LnshStationDeviceDriver) device.getDeviceDriver(); if(lnshStationDeviceDriver.getMode()!=0 &&lnshStationDeviceDriver.getMove() != 0 - && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 1) +// && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 1) && (lnshStationDeviceDriver.getAction() == 3 || lnshStationDeviceDriver.getAction() == 1)){ inst.setExecute_status("1"); instructionService.update(inst); @@ -503,7 +504,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0 - && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2) +// && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2) ) { Map map = new LinkedHashMap<>(); map.put("to_command",3); @@ -538,7 +539,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() == 0 - && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2) +// && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2 + ) { inst.setExecute_status("5"); instructionService.update(inst); @@ -774,7 +776,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0 - && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3) +// && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 1 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3) && (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 3)) { Map map = new LinkedHashMap<>(); map.put("to_command",4); @@ -812,7 +814,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() == 0 - && (lnshStationDeviceDriver.getIo_action() == 1 || lnshStationDeviceDriver.getIo_action() == 3) +// && (lnshStationDeviceDriver.getIo_action() == 1 || lnshStationDeviceDriver.getIo_action() == 3) && (lnshStationDeviceDriver.getAction() == 2 || lnshStationDeviceDriver.getAction() == 3)) { inst.setExecute_status("3"); instructionService.update(inst); @@ -1035,12 +1037,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic //标准版-机械手对接位 if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); - Map map = new LinkedHashMap<>(); - map.put("to_command",5); - lnshPalletizingManipulatorSiteDeviceDriver.writing(map); if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() != 0 - && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3)) { +// && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3) + ) { + Map map = new LinkedHashMap<>(); + map.put("to_command",5); + lnshPalletizingManipulatorSiteDeviceDriver.writing(map); inst.setExecute_status("6"); instructionService.update(inst); data = AgvService.sendAgvOneModeInst(phase, index, 0); @@ -1071,7 +1074,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); if (lnshStationDeviceDriver.getMode() != 0 && lnshStationDeviceDriver.getMove() != 0 - && (lnshStationDeviceDriver.getIo_action() == 2 || lnshStationDeviceDriver.getIo_action() == 3)) { +// && (lnshStationDeviceDriver.getIo_action() == 2 || lnshStationDeviceDriver.getIo_action() == 3) + ) { inst.setExecute_status("6"); instructionService.update(inst); Map map = new LinkedHashMap<>(); @@ -1106,7 +1110,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver(); if (conveyorPressStationDeviceDriver.getMode() != 0 && conveyorPressStationDeviceDriver.getMove() != 0 - && (conveyorPressStationDeviceDriver.getIo_action() == 2 || conveyorPressStationDeviceDriver.getIo_action() == 3)) { +// && (conveyorPressStationDeviceDriver.getIo_action() == 2 || conveyorPressStationDeviceDriver.getIo_action() == 3) + ) { inst.setExecute_status("6"); instructionService.update(inst); TaskDto task=taskService.findByCode(inst.getTask_code()); @@ -1171,9 +1176,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic if (conveyorBarcodeDeviceDriver.getMode() == 2){ inst.setExecute_status("6"); instructionService.update(inst); - if(ObjectUtil.isNotEmpty(inst.getVehicle_code())){ - conveyorBarcodeDeviceDriver.writing("to_barcode",inst.getVehicle_code()); - } +// if(ObjectUtil.isNotEmpty(inst.getVehicle_code())){ +// conveyorBarcodeDeviceDriver.writing("to_barcode",inst.getVehicle_code()); +// } Map map = new LinkedHashMap<>(); map.put("to_command",5); conveyorBarcodeDeviceDriver.writing(map); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDeviceDriver.java index 4efafa2..5fe4ee9 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDeviceDriver.java @@ -57,7 +57,7 @@ public class CargoLiftConveyorDeviceDriver extends AbstractOpcDeviceDriver imple RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); + AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); ParamService paramService = SpringContextHolder.getBean(ParamService.class); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index e535553..2978627 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -185,153 +185,153 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + " -> " + error); } - if (put_station != last_put_station) { - logServer.deviceItemValue(this.device_code,"put_station" ,String.valueOf(put_station)); - logServer.deviceExecuteLog(this.device_code,"","","信号put_station：" + last_put_station + " -> " + put_station); - } - if (!StrUtil.equals(material,last_material)) { - logServer.deviceItemValue(this.device_code,"material", material); - logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + " -> " + material); - } - if (qty != last_qty) { - logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); - logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + " -> " + qty); - } - if (order_qty != last_order_qty) { - logServer.deviceItemValue(this.device_code,"order_qty" ,String.valueOf(order_qty)); - logServer.deviceExecuteLog(this.device_code,"","","order_qty：" + last_order_qty + " -> " + order_qty); - } - if (!open_time.equals(last_open_time)) { - logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + " -> " + open_time); - } - if (standby_time != last_standby_time) { - logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + " -> " + standby_time); - } - if (production_time != last_production_time) { - logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + " -> " + production_time); - } - if (error_time != last_error_time) { - logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); - logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + " -> " + error_time); - } - if (!StrUtil.equals(order_No,last_order_No)) { - logServer.deviceItemValue(this.device_code,"order_No" ,order_No); - logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + " -> " + order_No); - } - if (product_code != last_product_code) { - logServer.deviceItemValue(this.device_code,"product_code" ,String.valueOf(product_code)); - logServer.deviceExecuteLog(this.device_code,"","","信号product_code：" + last_product_code + " -> " + product_code); - } - if (AlongSide != last_AlongSide) { - logServer.deviceItemValue(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); - logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide：" + last_AlongSide + " -> " + AlongSide); - } - if (BshortSide != last_BshortSide) { - logServer.deviceItemValue(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); - logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide：" + last_BshortSide + " -> " + BshortSide); - } - if (Htrapezoidal != last_Htrapezoidal) { - logServer.deviceItemValue(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); - logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + " -> " + Htrapezoidal); - } - if (Wthickness != last_Wthickness) { - logServer.deviceItemValue(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); - logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + " -> " + Wthickness); - } - if(grab_station != last_grab_station){ - if(grab_station>0) { - GrabPlaceStationRequest request = new GrabPlaceStationRequest(); - request.setDevice_code(this.getDevice_code()); - request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode()); - request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName()); - List getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); - List putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); - request.setGet_station(getDeviceCodeList.get((grab_station)-1)); - request.setPut_station(putDeviceCodeList.get((place_station)-1)); - Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); - Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); - - if (ObjectUtil.isEmpty(getDevice)) { - throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); - } - if (ObjectUtil.isEmpty(putDevice)) { - throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); - } - - LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; - if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); - request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); - request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); - } - if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver(); - request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); - request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); - } - - GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class); - message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS..."; - lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); - - if (resp.getCode() == 200) { - message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage(); - ; - } else { - message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage(); - ; - } - } - - } - if(place_station != last_place_station){ - if(place_station>0) { - GrabPlaceStationRequest request = new GrabPlaceStationRequest(); - request.setDevice_code(this.getDevice_code()); - request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode()); - request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName()); - List getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); - List putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); - request.setGet_station(getDeviceCodeList.get((grab_station)-1)); - request.setPut_station(putDeviceCodeList.get((place_station)-1)); - Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); - Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); - - if (ObjectUtil.isEmpty(getDevice)) { - throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); - } - if (ObjectUtil.isEmpty(putDevice)) { - throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); - } - - LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; - if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); - request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); - request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); - } - if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { - lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver(); - request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); - request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); - } - - GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class); - message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS..."; - lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); - - if (resp.getCode() == 200) { - message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage(); - ; - } else { - message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage(); - ; - } - } - } +// if (put_station != last_put_station) { +// logServer.deviceItemValue(this.device_code,"put_station" ,String.valueOf(put_station)); +// logServer.deviceExecuteLog(this.device_code,"","","信号put_station：" + last_put_station + " -> " + put_station); +// } +// if (!StrUtil.equals(material,last_material)) { +// logServer.deviceItemValue(this.device_code,"material", material); +// logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + " -> " + material); +// } +// if (qty != last_qty) { +// logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); +// logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + " -> " + qty); +// } +// if (order_qty != last_order_qty) { +// logServer.deviceItemValue(this.device_code,"order_qty" ,String.valueOf(order_qty)); +// logServer.deviceExecuteLog(this.device_code,"","","order_qty：" + last_order_qty + " -> " + order_qty); +// } +// if (!open_time.equals(last_open_time)) { +// logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(open_time)); +// logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + " -> " + open_time); +// } +// if (standby_time != last_standby_time) { +// logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(standby_time)); +// logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + " -> " + standby_time); +// } +// if (production_time != last_production_time) { +// logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(production_time)); +// logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + " -> " + production_time); +// } +// if (error_time != last_error_time) { +// logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(error_time)); +// logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + " -> " + error_time); +// } +// if (!StrUtil.equals(order_No,last_order_No)) { +// logServer.deviceItemValue(this.device_code,"order_No" ,order_No); +// logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + " -> " + order_No); +// } +// if (product_code != last_product_code) { +// logServer.deviceItemValue(this.device_code,"product_code" ,String.valueOf(product_code)); +// logServer.deviceExecuteLog(this.device_code,"","","信号product_code：" + last_product_code + " -> " + product_code); +// } +// if (AlongSide != last_AlongSide) { +// logServer.deviceItemValue(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); +// logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide：" + last_AlongSide + " -> " + AlongSide); +// } +// if (BshortSide != last_BshortSide) { +// logServer.deviceItemValue(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); +// logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide：" + last_BshortSide + " -> " + BshortSide); +// } +// if (Htrapezoidal != last_Htrapezoidal) { +// logServer.deviceItemValue(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); +// logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + " -> " + Htrapezoidal); +// } +// if (Wthickness != last_Wthickness) { +// logServer.deviceItemValue(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); +// logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + " -> " + Wthickness); +// } +// if(grab_station != last_grab_station){ +// if(grab_station>0) { +// GrabPlaceStationRequest request = new GrabPlaceStationRequest(); +// request.setDevice_code(this.getDevice_code()); +// request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode()); +// request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName()); +// List getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); +// List putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); +// request.setGet_station(getDeviceCodeList.get((grab_station)-1)); +// request.setPut_station(putDeviceCodeList.get((place_station)-1)); +// Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); +// Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); +// +// if (ObjectUtil.isEmpty(getDevice)) { +// throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); +// } +// if (ObjectUtil.isEmpty(putDevice)) { +// throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); +// } +// +// LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; +// if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { +// lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); +// request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); +// request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); +// } +// if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { +// lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver(); +// request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); +// request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); +// } +// +// GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class); +// message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS..."; +// lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); +// +// if (resp.getCode() == 200) { +// message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage(); +// ; +// } else { +// message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage(); +// ; +// } +// } +// +// } +// if(place_station != last_place_station){ +// if(place_station>0) { +// GrabPlaceStationRequest request = new GrabPlaceStationRequest(); +// request.setDevice_code(this.getDevice_code()); +// request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode()); +// request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName()); +// List getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); +// List putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); +// request.setGet_station(getDeviceCodeList.get((grab_station)-1)); +// request.setPut_station(putDeviceCodeList.get((place_station)-1)); +// Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); +// Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); +// +// if (ObjectUtil.isEmpty(getDevice)) { +// throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); +// } +// if (ObjectUtil.isEmpty(putDevice)) { +// throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); +// } +// +// LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; +// if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { +// lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); +// request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); +// request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); +// } +// if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { +// lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver(); +// request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); +// request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); +// } +// +// GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class); +// message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS..."; +// lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); +// +// if (resp.getCode() == 200) { +// message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage(); +// ; +// } else { +// message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage(); +// ; +// } +// } +// } } catch (Exception var17) { return; diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java index 1ee8e5f..46ab929 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java @@ -746,7 +746,11 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic this.setRequireSucess(true); } else { Map map = new LinkedHashMap<>(); - map.put("to_command",400); + if(StrUtil.equals(resp.getIs_needmaterial(),"0")){ + map.put("to_command",210); + }else { + map.put("to_command", 400); + } this.writing(map); this.setIserror(true); message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();; @@ -803,11 +807,6 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic if (resp.getCode() == 200) { this.writing(200); this.setRequireSucess(true); - if(resp.getIs_satisfy()==1){ - this.writing(20); - this.writing(20); - log.info("下发20,库存不足"); - } 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 { @@ -1064,6 +1063,44 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic } } + /** + * 木托盘绑定 + * + * @param + */ + public synchronized boolean wooden_pallet_binding() { + if(move > 0) { + ApplyTaskRequest request = new ApplyTaskRequest(); + request.setDevice_code(this.getDevice_code()); + request.setRequest_method_code(Thread.currentThread().getStackTrace()[1].getMethodName()); + request.setRequest_method_name(RequestMethodEnum.getName(Thread.currentThread().getStackTrace()[1].getMethodName())); + request.setVehicle_code(String.valueOf(barcode)); + ApplyTaskResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)),ApplyTaskResponse.class); + + message = RequestMethodEnum.getName("wooden_pallet_binding") + "wooden_pallet_binding 接口请求LMS..."; + lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); + + if (resp.getCode() == 200) { + Map map = new LinkedHashMap<>(); + map.put("to_command",200); + this.writing(map); + this.setRequireSucess(true); + } else { + Map map = new LinkedHashMap<>(); + map.put("to_command",400); + this.writing(map); + this.setIserror(true); + message = RequestMethodEnum.getName("wooden_pallet_binding") + "wooden_pallet_binding 接口请求失败" + resp.getMessage();; + } + return true; + } else { + message = RequestMethodEnum.getName("wooden_pallet_binding") + "wooden_pallet_binding 设备无货未请求LMS..."; + lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message)); + return false; + } + + } + /** * 获取组盘信息 * diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java index a2e196a..fe429c1 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java @@ -527,7 +527,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi return; } - log.info("当前RGV的模式为{}",mode); if (mode == 0) { this.setIsonline(false); this.setIserror(true); @@ -700,6 +699,12 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi } } } else { + if(ObjectUtil.isNotEmpty(start_device_code)){ + if (addressdevice.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) { + lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) addressdevice.getDeviceDriver(); + lnshLaminatingMachineDeviceDriver.writing("to_command", "1"); + } + } sendHeadSignalType(instdto); requireSucess1 = true; log.info("申请前工位任务成功,{}",requireSucess1); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java index b8645c3..e33f8aa 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/AcsToWmsData/applyTask/ApplyTaskResponse.java @@ -32,5 +32,8 @@ public class ApplyTaskResponse extends BaseResponse { * 是否码满规定托盘数 */ private int is_satisfy; - + /** + * 是否还有所需物料 + */ + private String is_needmaterial; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createOrder/OrderDto.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createOrder/OrderDto.java index 144c1c4..6bd9af7 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createOrder/OrderDto.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createOrder/OrderDto.java @@ -25,7 +25,7 @@ public class OrderDto { private String standard_size_height4; // 标准尺寸4 private String standard_weight; // 标准重量 private String detection_error; // 检测误差值 - - + private String order_number; //订单编号 + private String material_model; } diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index f67d4dd..80d447f 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -356,6 +356,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String order_code = orderDto.getWorkorder_code(); String device_code = orderDto.getDevice_code(); String material_code = orderDto.getMaterial_code(); + String order_number=orderDto.getOrder_number(); String qty = orderDto.getPlan_qty(); String product_code = orderDto.getBrick_code(); String AlongSide = orderDto.getA(); @@ -375,6 +376,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String detection_error = orderDto.getDetection_error(); + if (StrUtil.isEmpty(order_code)) { JSONObject json = new JSONObject(); json.put("order_code", order_code); @@ -506,8 +508,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { map.put("to_BshortSide", BshortSide); map.put("to_Htrapezoidal", Htrapezoidal); map.put("to_Wthickness", Wthickness); - map.put("to_brick_code", brick_code); - map.put("to_formula", formula); + map.put("to_brick_code", product_code+formula); + map.put("to_formula", order_number); // map.put("to_size_error", size_error); // map.put("to_single_weight", single_weight); // map.put("to_drawing_address", drawing_address); @@ -592,14 +594,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } Map map = new LinkedHashMap<>(); map.put("to_order_No", order_code); - map.put("to_material_qty", qty); + map.put("to_qty", qty); map.put("to_material_code", material_code); map.put("to_product_code", product_code); map.put("to_AlongSide", AlongSide); map.put("to_BshortSide", BshortSide); map.put("to_Htrapezoidal", Htrapezoidal); map.put("to_Wthickness", Wthickness); - map.put("to_formula",formula); + map.put("to_brick_code", product_code+formula); + map.put("to_formula", order_number); map.put("to_feedback",100); lnshSplitManipulatorDeviceDriver.writing(map); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java index f582d80..5cc3cd3 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java @@ -83,8 +83,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { private DeviceAppService deviceAppService; @Autowired private RouteLineService routelineserver; + + @Lazy @Autowired private AcsToWmsService acstowmsService; + @Autowired @Lazy private TaskFeedbackService taskFeedbackService; @@ -155,7 +158,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial { @Override public Map queryAllByCache(Map whereJson, Pageable page) { - this.reload(); +// this.reload(); String task_code = (String) whereJson.get("task_code"); String vehicle_code = (String) whereJson.get("vehicle_code"); String material_type = (String) whereJson.get("material_type"); diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LogMessageConstant.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LogMessageConstant.java index ca7f941..838b64e 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LogMessageConstant.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LogMessageConstant.java @@ -40,5 +40,5 @@ public class LogMessageConstant { public final static String BACKGROUND_YELLOW = "\u001B[43m"; /** 索引路径 */ - public final static String INDEX_DIR = "D:\\lucene\\index"; + public final static String INDEX_DIR = "D:\\acshh\\lucene\\index"; } diff --git a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java index 3357671..04fb633 100644 --- a/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java @@ -43,12 +43,12 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { @Override public void interfaceExecuteLog(LuceneLogDto luceneLogDto) { - luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); -// addIndex(luceneLogDto); - log.info("{}", JSON.toJSONString(luceneLogDto)); - } - - private void addIndex(LuceneLogDto luceneLogDto) { +// luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); +//// addIndex(luceneLogDto); +// log.info("{}", JSON.toJSONString(luceneLogDto)); +// } +// +// private void addIndex(LuceneLogDto luceneLogDto) { // IndexWriter indexWriter = LuceneIndexWriter.getIndexWriter(); // //创建一个Document对象 // Document document = new Document(); diff --git a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java index 6ce0bda..36e047a 100644 --- a/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/start/auto/run/NDCSocketConnectionAutoRun.java @@ -68,7 +68,8 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { ParamService paramService; @Autowired AutoRunService autoRunService; - + @Autowired + AcsToWmsService acsToWmsService; public NDCSocketConnectionAutoRun() { this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut); @@ -86,10 +87,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable { System.out.println("1楼NDCAgv链接开始"); ParamService ParamService = SpringContextHolder.getBean(ParamServiceImpl.class); InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); +// AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class); NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class); DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); - DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); +// DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class); ip = paramService.findByCode(org.nl.acs.AcsConfig.AGVURL).getValue(); port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue()); diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml index ee5f412..5719a8e 100644 --- a/acs/nladmin-system/src/main/resources/logback-spring.xml +++ b/acs/nladmin-system/src/main/resources/logback-spring.xml @@ -73,8 +73,35 @@ https://juejin.cn/post/6844903775631572999 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -117,5 +144,8 @@ https://juejin.cn/post/6844903775631572999 + + + diff --git a/acs/nladmin-ui/package.json b/acs/nladmin-ui/package.json index 81ea67b..c69f10a 100644 --- a/acs/nladmin-ui/package.json +++ b/acs/nladmin-ui/package.json @@ -1,132 +1,132 @@ { - "name": "eladmin-web", - "version": "2.6.0", - "description": "EL-ADMIN 前端源码", - "author": "Zheng Jie", - "license": "Apache-2.0", - "scripts": { - "dev": "vue-cli-service serve", - "build:prod": "vue-cli-service build", - "build:stage": "vue-cli-service build --mode staging", - "preview": "node build/index.js --preview", - "lint": "eslint --ext .js,.vue src", - "test:unit": "jest --clearCache && vue-cli-service test:unit", - "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", - "new": "plop" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, - "lint-staged": { - "src/**/*.{js,vue}": [ - "eslint --fix", - "git add" + "name": "eladmin-web", + "version": "2.6.0", + "description": "EL-ADMIN 前端源码", + "author": "Zheng Jie", + "license": "Apache-2.0", + "scripts": { + "dev": "vue-cli-service serve", + "build:prod": "vue-cli-service build", + "build:stage": "vue-cli-service build --mode staging", + "preview": "node build/index.js --preview", + "lint": "eslint --ext .js,.vue src", + "test:unit": "jest --clearCache && vue-cli-service test:unit", + "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", + "new": "plop" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "lint-staged": { + "src/**/*.{js,vue}": [ + "eslint --fix", + "git add" + ] + }, + "repository": { + "type": "git", + "url": "https://github.com/elunez/eladmin-web.git" + }, + "bugs": { + "url": "https://github.com/elunez/eladmin/issues" + }, + "dependencies": { + "@logicflow/core": "1.2.1", + "@logicflow/extension": "1.2.1", + "@riophae/vue-treeselect": "0.4.0", + "af-table-column": "^1.0.3", + "ansi_up": "^5.1.0", + "axios": "0.18.1", + "clipboard": "^2.0.4", + "codemirror": "^5.49.2", + "connect": "3.6.6", + "echarts": "^4.2.1", + "echarts-gl": "^1.1.1", + "echarts-wordcloud": "^1.1.3", + "element-ui": "^2.15.8", + "file-saver": "1.3.8", + "font-awesome": "^4.7.0", + "fuse.js": "3.4.4", + "jquery": "^3.6.0", + "js-beautify": "^1.10.2", + "js-cookie": "2.2.0", + "jsbarcode": "^3.11.5", + "jsencrypt": "^3.0.0-rc.1", + "jszip": "3.1.5", + "mavon-editor": "^2.9.0", + "normalize.css": "7.0.0", + "nprogress": "0.2.0", + "path-to-regexp": "2.4.0", + "qrcodejs2": "0.0.2", + "qs": "^6.9.1", + "screenfull": "4.2.0", + "sortablejs": "1.8.4", + "throttle-debounce": "^5.0.0", + "vue": "2.6.10", + "vue-color": "^2.8.1", + "vue-count-to": "1.0.13", + "vue-cropper": "0.4.9", + "vue-easy-print": "0.0.8", + "vue-echarts": "^5.0.0-beta.0", + "vue-highlightjs": "^1.3.3", + "vue-image-crop-upload": "^2.5.0", + "vue-print-nb": "^1.7.5", + "vue-router": "3.0.2", + "vue-seamless-scroll": "^1.1.23", + "vue-splitpane": "1.0.4", + "vuedraggable": "^2.24.3", + "vuex": "3.1.0", + "vxe-table": "^3.3.10", + "wangeditor": "^3.1.1", + "xe-ajax": "^4.0.5", + "xe-utils": "^3.3.1", + "xlsx": "^0.14.1" + }, + "devDependencies": { + "@babel/core": "7.0.0", + "@babel/parser": "^7.7.4", + "@babel/register": "7.0.0", + "@vue/babel-plugin-transform-vue-jsx": "^1.2.1", + "@vue/cli-plugin-babel": "3.5.3", + "@vue/cli-plugin-eslint": "^3.9.1", + "@vue/cli-plugin-unit-jest": "3.5.3", + "@vue/cli-service": "3.5.3", + "@vue/test-utils": "1.0.0-beta.29", + "autoprefixer": "^9.5.1", + "babel-core": "7.0.0-bridge.0", + "babel-eslint": "10.0.1", + "babel-jest": "23.6.0", + "babel-plugin-dynamic-import-node": "2.3.0", + "babel-plugin-transform-remove-console": "^6.9.4", + "chalk": "2.4.2", + "chokidar": "2.1.5", + "connect": "3.6.6", + "eslint": "5.15.3", + "eslint-plugin-vue": "5.2.2", + "html-webpack-plugin": "3.2.0", + "http-proxy-middleware": "^0.19.1", + "husky": "1.3.1", + "lint-staged": "8.1.5", + "plop": "2.3.0", + "print-template": "^1.2.5", + "runjs": "^4.3.2", + "sass": "~1.26.5", + "sass-loader": "^7.1.0", + "script-ext-html-webpack-plugin": "2.1.3", + "script-loader": "0.7.2", + "serve-static": "^1.13.2", + "svg-sprite-loader": "4.1.3", + "svgo": "1.2.0", + "vue-template-compiler": "2.6.10" + }, + "engines": { + "node": ">=8.9", + "npm": ">= 3.0.0" + }, + "browserslist": [ + "> 1%", + "last 2 versions" ] - }, - "repository": { - "type": "git", - "url": "https://github.com/elunez/eladmin-web.git" - }, - "bugs": { - "url": "https://github.com/elunez/eladmin/issues" - }, - "dependencies": { - "@logicflow/core": "^1.1.22", - "@logicflow/extension": "^1.1.22", - "@riophae/vue-treeselect": "0.4.0", - "af-table-column": "^1.0.3", - "ansi_up": "^5.1.0", - "axios": "0.18.1", - "clipboard": "^2.0.4", - "codemirror": "^5.49.2", - "connect": "3.6.6", - "echarts": "^4.2.1", - "echarts-gl": "^1.1.1", - "echarts-wordcloud": "^1.1.3", - "element-ui": "^2.15.8", - "file-saver": "1.3.8", - "font-awesome": "^4.7.0", - "fuse.js": "3.4.4", - "jquery": "^3.6.0", - "js-beautify": "^1.10.2", - "js-cookie": "2.2.0", - "jsbarcode": "^3.11.5", - "jsencrypt": "^3.0.0-rc.1", - "jszip": "3.1.5", - "mavon-editor": "^2.9.0", - "normalize.css": "7.0.0", - "nprogress": "0.2.0", - "path-to-regexp": "2.4.0", - "qrcodejs2": "0.0.2", - "qs": "^6.9.1", - "screenfull": "4.2.0", - "sortablejs": "1.8.4", - "throttle-debounce": "^5.0.0", - "vue": "2.6.10", - "vue-color": "^2.8.1", - "vue-count-to": "1.0.13", - "vue-cropper": "0.4.9", - "vue-easy-print": "0.0.8", - "vue-echarts": "^5.0.0-beta.0", - "vue-highlightjs": "^1.3.3", - "vue-image-crop-upload": "^2.5.0", - "vue-print-nb": "^1.7.5", - "vue-router": "3.0.2", - "vue-seamless-scroll": "^1.1.23", - "vue-splitpane": "1.0.4", - "vuedraggable": "^2.24.3", - "vuex": "3.1.0", - "vxe-table": "^3.3.10", - "wangeditor": "^3.1.1", - "xe-ajax": "^4.0.5", - "xe-utils": "^3.3.1", - "xlsx": "^0.14.1" - }, - "devDependencies": { - "@babel/core": "7.0.0", - "@babel/parser": "^7.7.4", - "@babel/register": "7.0.0", - "@vue/babel-plugin-transform-vue-jsx": "^1.2.1", - "@vue/cli-plugin-babel": "3.5.3", - "@vue/cli-plugin-eslint": "^3.9.1", - "@vue/cli-plugin-unit-jest": "3.5.3", - "@vue/cli-service": "3.5.3", - "@vue/test-utils": "1.0.0-beta.29", - "autoprefixer": "^9.5.1", - "babel-core": "7.0.0-bridge.0", - "babel-eslint": "10.0.1", - "babel-jest": "23.6.0", - "babel-plugin-dynamic-import-node": "2.3.0", - "babel-plugin-transform-remove-console": "^6.9.4", - "chalk": "2.4.2", - "chokidar": "2.1.5", - "connect": "3.6.6", - "eslint": "5.15.3", - "eslint-plugin-vue": "5.2.2", - "html-webpack-plugin": "3.2.0", - "http-proxy-middleware": "^0.19.1", - "husky": "1.3.1", - "lint-staged": "8.1.5", - "plop": "2.3.0", - "print-template": "^1.2.5", - "runjs": "^4.3.2", - "sass": "~1.26.5", - "sass-loader": "^7.1.0", - "script-ext-html-webpack-plugin": "2.1.3", - "script-loader": "0.7.2", - "serve-static": "^1.13.2", - "svg-sprite-loader": "4.1.3", - "svgo": "1.2.0", - "vue-template-compiler": "2.6.10" - }, - "engines": { - "node": ">=8.9", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] -} +} \ No newline at end of file diff --git a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue index 1ba3751..9836cb7 100644 --- a/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue +++ b/acs/nladmin-ui/src/views/acs/device/driver/lnsh/lnsh_fold_disc_site.vue @@ -66,6 +66,11 @@ + + + + + - 同步 - + --> -
- -
+
+ + + + + + - - - - - - - + + + +
+ +
+ + + + + + + +
+ + +
+
+ 设备信息 +
+ + + + +
+ + +
+ + + + + +
+
+ + + + + @@ -36,26 +135,6 @@ - - - 禁止进出 - 允许进入 - 允许离开 - - - -
- 取 消 - 确 定 -
- - - - - - - - 无货 @@ -63,79 +142,9 @@ 有托盘有货 - - -
- 取 消 - 确 定 -
- - - - - - - - - - - 正常 - 禁用 - - - - - 否 - 是 - - - -
- 取 消 - 确 定 -
- - - - - - - - - - 否 - 是 - - - -
- 取 消 - 确 定 -
- - - - - - - - - - 否 - 是 - - - - - 否 - 是 - - - -
- 取 消 + 取 消 确 定
@@ -156,216 +165,99 @@ 确 定
+
- - + diff --git a/acs/nladmin-ui/src/views/acs/task/index.vue b/acs/nladmin-ui/src/views/acs/task/index.vue index ca62d15..fae4a91 100644 --- a/acs/nladmin-ui/src/views/acs/task/index.vue +++ b/acs/nladmin-ui/src/views/acs/task/index.vue @@ -68,7 +68,7 @@ > 新增 - 同步 - + --> diff --git a/acs/nladmin-ui/src/views/monitor/lucene/index.vue b/acs/nladmin-ui/src/views/monitor/lucene/index.vue index 83386ea..aba8b87 100644 --- a/acs/nladmin-ui/src/views/monitor/lucene/index.vue +++ b/acs/nladmin-ui/src/views/monitor/lucene/index.vue @@ -16,7 +16,7 @@ - + diff --git a/acs/nladmin-ui/src/views/system/monitor/device/index.vue b/acs/nladmin-ui/src/views/system/monitor/device/index.vue index bf9b27b..ee3b077 100644 --- a/acs/nladmin-ui/src/views/system/monitor/device/index.vue +++ b/acs/nladmin-ui/src/views/system/monitor/device/index.vue @@ -14,14 +14,11 @@ :show-close="false" :modal="false" > - - - - - - +