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

rev acs更新

Browse Source
This commit is contained in:
周俊杰
2024-01-18 14:17:09 +08:00
parent 4ec19ad5f4
commit 3add95ac30
21 changed files with 851 additions and 1126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/RequestMethodEnum.java
View File

@@ -46,8 +46,9 @@ public enum RequestMethodEnum {
apply_get_put_station(18, "apply_get_put_station", "反馈当前抓取放置位","0"), 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");
//驱动索引 //驱动索引

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

@@ -73,6 +73,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
WmsToAcsService wmsToAcsService=SpringContextHolder.getBean(WmsToAcsService.class); WmsToAcsService wmsToAcsService=SpringContextHolder.getBean(WmsToAcsService.class);
LuceneExecuteLogService lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl"); LuceneExecuteLogService lucene = SpringContextHolder.getBean("luceneExecuteLogServiceImpl");
int agvaddr = 0; int agvaddr = 0;
int agvaddr_copy = 0; int agvaddr_copy = 0;
int weight = 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)); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, "agv地址参数有误,phase:" + phase));
return; return;
} }
device_code = deviceService.queryDeviceCodeByAddress(agvaddr); device_code= deviceService.queryDeviceCodeByAddress(agvaddr);
if (agvaddr != 0) { if (agvaddr != 0) {
old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr);
if (StrUtil.contains(old_device_code, "-")) { if (StrUtil.contains(old_device_code, "-")) {
@@ -232,7 +233,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0
&& lnshPalletizingManipulatorSiteDeviceDriver.getMove() != 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)) { && (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 1)) {
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command",2); map.put("to_command",2);
@@ -270,7 +271,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
lnshStationDeviceDriver=(LnshStationDeviceDriver) device.getDeviceDriver(); lnshStationDeviceDriver=(LnshStationDeviceDriver) device.getDeviceDriver();
if(lnshStationDeviceDriver.getMode()!=0 if(lnshStationDeviceDriver.getMode()!=0
&&lnshStationDeviceDriver.getMove() != 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)){ && (lnshStationDeviceDriver.getAction() == 3 || lnshStationDeviceDriver.getAction() == 1)){
inst.setExecute_status("1"); inst.setExecute_status("1");
instructionService.update(inst); instructionService.update(inst);
@@ -503,7 +504,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0
&& lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 0
&& (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2) // && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2)
) { ) {
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command",3); map.put("to_command",3);
@@ -538,7 +539,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver();
if (lnshStationDeviceDriver.getMode() != 0 if (lnshStationDeviceDriver.getMode() != 0
&& lnshStationDeviceDriver.getMove() == 0 && lnshStationDeviceDriver.getMove() == 0
&& (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2) // && (lnshStationDeviceDriver.getIo_action() == 3 || lnshStationDeviceDriver.getIo_action() == 2
) { ) {
inst.setExecute_status("5"); inst.setExecute_status("5");
instructionService.update(inst); instructionService.update(inst);
@@ -774,7 +776,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0
&& lnshPalletizingManipulatorSiteDeviceDriver.getMove() == 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)) { && (lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getAction() == 3)) {
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command",4); map.put("to_command",4);
@@ -812,7 +814,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver();
if (lnshStationDeviceDriver.getMode() != 0 if (lnshStationDeviceDriver.getMode() != 0
&& lnshStationDeviceDriver.getMove() == 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)) { && (lnshStationDeviceDriver.getAction() == 2 || lnshStationDeviceDriver.getAction() == 3)) {
inst.setExecute_status("3"); inst.setExecute_status("3");
instructionService.update(inst); instructionService.update(inst);
@@ -1035,12 +1037,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
//标准版-机械手对接位 //标准版-机械手对接位
if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { if (device.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver(); lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) device.getDeviceDriver();
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command",5);
lnshPalletizingManipulatorSiteDeviceDriver.writing(map);
if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0 if (lnshPalletizingManipulatorSiteDeviceDriver.getMode() != 0
&& lnshPalletizingManipulatorSiteDeviceDriver.getMove() != 0 && lnshPalletizingManipulatorSiteDeviceDriver.getMove() != 0
&& (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3)) { // && (lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 2 || lnshPalletizingManipulatorSiteDeviceDriver.getIo_action() == 3)
) {
Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command",5);
lnshPalletizingManipulatorSiteDeviceDriver.writing(map);
inst.setExecute_status("6"); inst.setExecute_status("6");
instructionService.update(inst); instructionService.update(inst);
data = AgvService.sendAgvOneModeInst(phase, index, 0); data = AgvService.sendAgvOneModeInst(phase, index, 0);
@@ -1071,7 +1074,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver(); lnshStationDeviceDriver = (LnshStationDeviceDriver) device.getDeviceDriver();
if (lnshStationDeviceDriver.getMode() != 0 if (lnshStationDeviceDriver.getMode() != 0
&& lnshStationDeviceDriver.getMove() != 0 && lnshStationDeviceDriver.getMove() != 0
&& (lnshStationDeviceDriver.getIo_action() == 2 || lnshStationDeviceDriver.getIo_action() == 3)) { // && (lnshStationDeviceDriver.getIo_action() == 2 || lnshStationDeviceDriver.getIo_action() == 3)
) {
inst.setExecute_status("6"); inst.setExecute_status("6");
instructionService.update(inst); instructionService.update(inst);
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
@@ -1106,7 +1110,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver(); conveyorPressStationDeviceDriver = (ConveyorPressStationDeviceDriver) device.getDeviceDriver();
if (conveyorPressStationDeviceDriver.getMode() != 0 if (conveyorPressStationDeviceDriver.getMode() != 0
&& conveyorPressStationDeviceDriver.getMove() != 0 && conveyorPressStationDeviceDriver.getMove() != 0
&& (conveyorPressStationDeviceDriver.getIo_action() == 2 || conveyorPressStationDeviceDriver.getIo_action() == 3)) { // && (conveyorPressStationDeviceDriver.getIo_action() == 2 || conveyorPressStationDeviceDriver.getIo_action() == 3)
) {
inst.setExecute_status("6"); inst.setExecute_status("6");
instructionService.update(inst); instructionService.update(inst);
TaskDto task=taskService.findByCode(inst.getTask_code()); TaskDto task=taskService.findByCode(inst.getTask_code());
@@ -1171,9 +1176,9 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if (conveyorBarcodeDeviceDriver.getMode() == 2){ if (conveyorBarcodeDeviceDriver.getMode() == 2){
inst.setExecute_status("6"); inst.setExecute_status("6");
instructionService.update(inst); instructionService.update(inst);
if(ObjectUtil.isNotEmpty(inst.getVehicle_code())){ // if(ObjectUtil.isNotEmpty(inst.getVehicle_code())){
conveyorBarcodeDeviceDriver.writing("to_barcode",inst.getVehicle_code()); // conveyorBarcodeDeviceDriver.writing("to_barcode",inst.getVehicle_code());
} // }
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_command",5); map.put("to_command",5);
conveyorBarcodeDeviceDriver.writing(map); conveyorBarcodeDeviceDriver.writing(map);

2
acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/cargo_lift_conveyor/CargoLiftConveyorDeviceDriver.java
View File

@@ -57,7 +57,7 @@ public class CargoLiftConveyorDeviceDriver extends AbstractOpcDeviceDriver imple
RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class);
AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsService.class);
ParamService paramService = SpringContextHolder.getBean(ParamService.class); ParamService paramService = SpringContextHolder.getBean(ParamService.class);

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

@@ -185,153 +185,153 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error)); logServer.deviceItemValue(this.device_code,"error" ,String.valueOf(error));
logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + " -> " + error); logServer.deviceExecuteLog(this.device_code,"","","信号error：" + last_error + " -> " + error);
} }
if (put_station != last_put_station) { // if (put_station != last_put_station) {
logServer.deviceItemValue(this.device_code,"put_station" ,String.valueOf(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); // logServer.deviceExecuteLog(this.device_code,"","","信号put_station：" + last_put_station + " -> " + put_station);
} // }
if (!StrUtil.equals(material,last_material)) { // if (!StrUtil.equals(material,last_material)) {
logServer.deviceItemValue(this.device_code,"material", material); // logServer.deviceItemValue(this.device_code,"material", material);
logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + " -> " + material); // logServer.deviceExecuteLog(this.device_code,"","","信号material：" + last_material + " -> " + material);
} // }
if (qty != last_qty) { // if (qty != last_qty) {
logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty)); // logServer.deviceItemValue(this.device_code,"qty" ,String.valueOf(qty));
logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + " -> " + qty); // logServer.deviceExecuteLog(this.device_code,"","","信号qty：" + last_qty + " -> " + qty);
} // }
if (order_qty != last_order_qty) { // if (order_qty != last_order_qty) {
logServer.deviceItemValue(this.device_code,"order_qty" ,String.valueOf(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); // logServer.deviceExecuteLog(this.device_code,"","","order_qty：" + last_order_qty + " -> " + order_qty);
} // }
if (!open_time.equals(last_open_time)) { // if (!open_time.equals(last_open_time)) {
logServer.deviceItemValue(this.device_code,"open_time" ,String.valueOf(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); // logServer.deviceExecuteLog(this.device_code,"","","信号open_time：" + last_open_time + " -> " + open_time);
} // }
if (standby_time != last_standby_time) { // if (standby_time != last_standby_time) {
logServer.deviceItemValue(this.device_code,"standby_time" ,String.valueOf(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); // logServer.deviceExecuteLog(this.device_code,"","","信号standby_time：" + last_standby_time + " -> " + standby_time);
} // }
if (production_time != last_production_time) { // if (production_time != last_production_time) {
logServer.deviceItemValue(this.device_code,"production_time" ,String.valueOf(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); // logServer.deviceExecuteLog(this.device_code,"","","信号production_time：" + last_production_time + " -> " + production_time);
} // }
if (error_time != last_error_time) { // if (error_time != last_error_time) {
logServer.deviceItemValue(this.device_code,"error_time" ,String.valueOf(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); // logServer.deviceExecuteLog(this.device_code,"","","信号error_time：" + last_error_time + " -> " + error_time);
} // }
if (!StrUtil.equals(order_No,last_order_No)) { // if (!StrUtil.equals(order_No,last_order_No)) {
logServer.deviceItemValue(this.device_code,"order_No" ,order_No); // logServer.deviceItemValue(this.device_code,"order_No" ,order_No);
logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + " -> " + order_No); // logServer.deviceExecuteLog(this.device_code,"","","信号order_No：" + last_order_No + " -> " + order_No);
} // }
if (product_code != last_product_code) { // if (product_code != last_product_code) {
logServer.deviceItemValue(this.device_code,"product_code" ,String.valueOf(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); // logServer.deviceExecuteLog(this.device_code,"","","信号product_code：" + last_product_code + " -> " + product_code);
} // }
if (AlongSide != last_AlongSide) { // if (AlongSide != last_AlongSide) {
logServer.deviceItemValue(this.device_code,"AlongSide" ,String.valueOf(AlongSide)); // logServer.deviceItemValue(this.device_code,"AlongSide" ,String.valueOf(AlongSide));
logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide：" + last_AlongSide + " -> " + AlongSide); // logServer.deviceExecuteLog(this.device_code,"","","信号AlongSide：" + last_AlongSide + " -> " + AlongSide);
} // }
if (BshortSide != last_BshortSide) { // if (BshortSide != last_BshortSide) {
logServer.deviceItemValue(this.device_code,"BshortSide" ,String.valueOf(BshortSide)); // logServer.deviceItemValue(this.device_code,"BshortSide" ,String.valueOf(BshortSide));
logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide：" + last_BshortSide + " -> " + BshortSide); // logServer.deviceExecuteLog(this.device_code,"","","信号BshortSide：" + last_BshortSide + " -> " + BshortSide);
} // }
if (Htrapezoidal != last_Htrapezoidal) { // if (Htrapezoidal != last_Htrapezoidal) {
logServer.deviceItemValue(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal)); // logServer.deviceItemValue(this.device_code,"Htrapezoidal" ,String.valueOf(Htrapezoidal));
logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + " -> " + Htrapezoidal); // logServer.deviceExecuteLog(this.device_code,"","","信号Htrapezoidal：" + last_Htrapezoidal + " -> " + Htrapezoidal);
} // }
if (Wthickness != last_Wthickness) { // if (Wthickness != last_Wthickness) {
logServer.deviceItemValue(this.device_code,"Wthickness" ,String.valueOf(Wthickness)); // logServer.deviceItemValue(this.device_code,"Wthickness" ,String.valueOf(Wthickness));
logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + " -> " + Wthickness); // logServer.deviceExecuteLog(this.device_code,"","","信号Wthickness：" + last_Wthickness + " -> " + Wthickness);
} // }
if(grab_station != last_grab_station){ // if(grab_station != last_grab_station){
if(grab_station>0) { // if(grab_station>0) {
GrabPlaceStationRequest request = new GrabPlaceStationRequest(); // GrabPlaceStationRequest request = new GrabPlaceStationRequest();
request.setDevice_code(this.getDevice_code()); // request.setDevice_code(this.getDevice_code());
request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode()); // request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode());
request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName()); // request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName());
List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); // List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station");
List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); // List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station");
request.setGet_station(getDeviceCodeList.get((grab_station)-1)); // request.setGet_station(getDeviceCodeList.get((grab_station)-1));
request.setPut_station(putDeviceCodeList.get((place_station)-1)); // request.setPut_station(putDeviceCodeList.get((place_station)-1));
Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); // Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString());
Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); // Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString());
//
if (ObjectUtil.isEmpty(getDevice)) { // if (ObjectUtil.isEmpty(getDevice)) {
throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); // throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station));
} // }
if (ObjectUtil.isEmpty(putDevice)) { // if (ObjectUtil.isEmpty(putDevice)) {
throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); // throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station));
} // }
//
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; // LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { // if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); // lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver();
request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); // request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); // request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
} // }
if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { // if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver(); // lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver();
request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); // request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); // request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
} // }
//
GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class); // GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class);
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS..."; // message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); // lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
//
if (resp.getCode() == 200) { // if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage(); // message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage();
; // ;
} else { // } else {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage(); // message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage();
; // ;
} // }
} // }
//
} // }
if(place_station != last_place_station){ // if(place_station != last_place_station){
if(place_station>0) { // if(place_station>0) {
GrabPlaceStationRequest request = new GrabPlaceStationRequest(); // GrabPlaceStationRequest request = new GrabPlaceStationRequest();
request.setDevice_code(this.getDevice_code()); // request.setDevice_code(this.getDevice_code());
request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode()); // request.setRequest_method_code(RequestMethodEnum.apply_get_put_station.getCode());
request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName()); // request.setRequest_method_name(RequestMethodEnum.apply_get_put_station.getName());
List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station"); // List<String> getDeviceCodeList = this.getExtraDeviceCodes("link_get_station");
List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station"); // List<String> putDeviceCodeList = this.getExtraDeviceCodes("link_put_station");
request.setGet_station(getDeviceCodeList.get((grab_station)-1)); // request.setGet_station(getDeviceCodeList.get((grab_station)-1));
request.setPut_station(putDeviceCodeList.get((place_station)-1)); // request.setPut_station(putDeviceCodeList.get((place_station)-1));
Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString()); // Device getDevice = deviceAppService.findDeviceByCode(getDeviceCodeList.get(grab_station).toString());
Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString()); // Device putDevice = deviceAppService.findDeviceByCode(putDeviceCodeList.get(place_station).toString());
//
if (ObjectUtil.isEmpty(getDevice)) { // if (ObjectUtil.isEmpty(getDevice)) {
throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station)); // throw new Exception("抓取位未找到对应设备：" + getDeviceCodeList.get(grab_station));
} // }
if (ObjectUtil.isEmpty(putDevice)) { // if (ObjectUtil.isEmpty(putDevice)) {
throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station)); // throw new Exception("放置位找到对应设备：" + putDeviceCodeList.get(grab_station));
} // }
//
LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver; // LnshPalletizingManipulatorSiteDeviceDriver lnshPalletizingManipulatorSiteDeviceDriver;
if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { // if (getDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver(); // lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) getDevice.getDeviceDriver();
request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); // request.setGet_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); // request.setGet_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
} // }
if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) { // if (putDevice.getDeviceDriver() instanceof LnshPalletizingManipulatorSiteDeviceDriver) {
lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver(); // lnshPalletizingManipulatorSiteDeviceDriver = (LnshPalletizingManipulatorSiteDeviceDriver) putDevice.getDeviceDriver();
request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode())); // request.setPut_station_vehicle_code(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getBarcode()));
request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty())); // request.setPut_station_qty(String.valueOf(lnshPalletizingManipulatorSiteDeviceDriver.getEncoder_qty()));
} // }
//
GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class); // GrabPlaceStationResponse resp = JSON.toJavaObject(JSONObject.parseObject(acsToWmsService.applyTask(request)), GrabPlaceStationResponse.class);
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS..."; // message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求LMS...";
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request))); // lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "参数:" + JSON.toJSONString(request)));
//
if (resp.getCode() == 200) { // if (resp.getCode() == 200) {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage(); // message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求成功" + resp.getMessage();
; // ;
} else { // } else {
message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage(); // message = RequestMethodEnum.getName("apply_get_put_station") + "apply_get_put_station 接口请求失败" + resp.getMessage();
; // ;
} // }
} // }
} // }
} catch (Exception var17) { } catch (Exception var17) {
return; return;

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

@@ -746,7 +746,11 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
this.setRequireSucess(true); this.setRequireSucess(true);
} else { } else {
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> 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.writing(map);
this.setIserror(true); this.setIserror(true);
message = RequestMethodEnum.getName("apply_put_full_vehicle") + "apply_put_full_vehicle 接口请求失败" + resp.getMessage();; 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) { if (resp.getCode() == 200) {
this.writing(200); this.writing(200);
this.setRequireSucess(true); 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(); message = RequestMethodEnum.getName("apply_put_empty_vehicle") + "apply_put_empty_vehicle 接口请求成功" + resp.getMessage();
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp))); lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, message + "返回参数:" + JSON.toJSONString(resp)));
} else { } 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<String, Object> map = new LinkedHashMap<>();
map.put("to_command",200);
this.writing(map);
this.setRequireSucess(true);
} else {
Map<String, Object> 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;
}
}
/** /**
* 获取组盘信息 * 获取组盘信息
* *

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

@@ -527,7 +527,6 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
return; return;
} }
log.info("当前RGV的模式为{}",mode);
if (mode == 0) { if (mode == 0) {
this.setIsonline(false); this.setIsonline(false);
this.setIserror(true); this.setIserror(true);
@@ -700,6 +699,12 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
} }
} }
} else { } else {
if(ObjectUtil.isNotEmpty(start_device_code)){
if (addressdevice.getDeviceDriver() instanceof LnshLaminatingMachineDeviceDriver) {
lnshLaminatingMachineDeviceDriver = (LnshLaminatingMachineDeviceDriver) addressdevice.getDeviceDriver();
lnshLaminatingMachineDeviceDriver.writing("to_command", "1");
}
}
sendHeadSignalType(instdto); sendHeadSignalType(instdto);
requireSucess1 = true; requireSucess1 = true;
log.info("申请前工位任务成功,{}",requireSucess1); log.info("申请前工位任务成功,{}",requireSucess1);

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

@@ -32,5 +32,8 @@ public class ApplyTaskResponse extends BaseResponse {
* 是否码满规定托盘数 * 是否码满规定托盘数
*/ */
private int is_satisfy; private int is_satisfy;
/**
* 是否还有所需物料
*/
private String is_needmaterial;
} }

4
acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/data/WmstoAcsData/createOrder/OrderDto.java
View File

@@ -25,7 +25,7 @@ public class OrderDto {
private String standard_size_height4; // 标准尺寸4 private String standard_size_height4; // 标准尺寸4
private String standard_weight; // 标准重量 private String standard_weight; // 标准重量
private String detection_error; // 检测误差值 private String detection_error; // 检测误差值
private String order_number; //订单编号
private String material_model;
} }

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

@@ -356,6 +356,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String order_code = orderDto.getWorkorder_code(); String order_code = orderDto.getWorkorder_code();
String device_code = orderDto.getDevice_code(); String device_code = orderDto.getDevice_code();
String material_code = orderDto.getMaterial_code(); String material_code = orderDto.getMaterial_code();
String order_number=orderDto.getOrder_number();
String qty = orderDto.getPlan_qty(); String qty = orderDto.getPlan_qty();
String product_code = orderDto.getBrick_code(); String product_code = orderDto.getBrick_code();
String AlongSide = orderDto.getA(); String AlongSide = orderDto.getA();
@@ -375,6 +376,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
String detection_error = orderDto.getDetection_error(); String detection_error = orderDto.getDetection_error();
if (StrUtil.isEmpty(order_code)) { if (StrUtil.isEmpty(order_code)) {
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("order_code", order_code); json.put("order_code", order_code);
@@ -506,8 +508,8 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
map.put("to_BshortSide", BshortSide); map.put("to_BshortSide", BshortSide);
map.put("to_Htrapezoidal", Htrapezoidal); map.put("to_Htrapezoidal", Htrapezoidal);
map.put("to_Wthickness", Wthickness); map.put("to_Wthickness", Wthickness);
map.put("to_brick_code", brick_code); map.put("to_brick_code", product_code+formula);
map.put("to_formula", formula); map.put("to_formula", order_number);
// map.put("to_size_error", size_error); // map.put("to_size_error", size_error);
// map.put("to_single_weight", single_weight); // map.put("to_single_weight", single_weight);
// map.put("to_drawing_address", drawing_address); // map.put("to_drawing_address", drawing_address);
@@ -592,14 +594,15 @@ public class WmsToAcsServiceImpl implements WmsToAcsService {
} }
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("to_order_No", order_code); 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_material_code", material_code);
map.put("to_product_code", product_code); map.put("to_product_code", product_code);
map.put("to_AlongSide", AlongSide); map.put("to_AlongSide", AlongSide);
map.put("to_BshortSide", BshortSide); map.put("to_BshortSide", BshortSide);
map.put("to_Htrapezoidal", Htrapezoidal); map.put("to_Htrapezoidal", Htrapezoidal);
map.put("to_Wthickness", Wthickness); 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); map.put("to_feedback",100);
lnshSplitManipulatorDeviceDriver.writing(map); lnshSplitManipulatorDeviceDriver.writing(map);

5
acs/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -83,8 +83,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
private DeviceAppService deviceAppService; private DeviceAppService deviceAppService;
@Autowired @Autowired
private RouteLineService routelineserver; private RouteLineService routelineserver;
@Lazy
@Autowired @Autowired
private AcsToWmsService acstowmsService; private AcsToWmsService acstowmsService;
@Autowired @Autowired
@Lazy @Lazy
private TaskFeedbackService taskFeedbackService; private TaskFeedbackService taskFeedbackService;
@@ -155,7 +158,7 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
@Override @Override
public Map<String, Object> queryAllByCache(Map whereJson, Pageable page) { public Map<String, Object> queryAllByCache(Map whereJson, Pageable page) {
this.reload(); // this.reload();
String task_code = (String) whereJson.get("task_code"); String task_code = (String) whereJson.get("task_code");
String vehicle_code = (String) whereJson.get("vehicle_code"); String vehicle_code = (String) whereJson.get("vehicle_code");
String material_type = (String) whereJson.get("material_type"); String material_type = (String) whereJson.get("material_type");

2
acs/nladmin-system/src/main/java/org/nl/modules/lucene/common/LogMessageConstant.java
View File

@@ -40,5 +40,5 @@ public class LogMessageConstant {
public final static String BACKGROUND_YELLOW = "\u001B[43m"; 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";
} }

12
acs/nladmin-system/src/main/java/org/nl/modules/lucene/service/impl/LuceneExecuteLogServiceImpl.java
View File

@@ -43,12 +43,12 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService {
@Override @Override
public void interfaceExecuteLog(LuceneLogDto luceneLogDto) { public void interfaceExecuteLog(LuceneLogDto luceneLogDto) {
luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc()); // luceneLogDto.setLogType(LogTypeEnum.INTERFACE_LOG.getDesc());
// addIndex(luceneLogDto); //// addIndex(luceneLogDto);
log.info("{}", JSON.toJSONString(luceneLogDto)); // log.info("{}", JSON.toJSONString(luceneLogDto));
} // }
//
private void addIndex(LuceneLogDto luceneLogDto) { // private void addIndex(LuceneLogDto luceneLogDto) {
// IndexWriter indexWriter = LuceneIndexWriter.getIndexWriter(); // IndexWriter indexWriter = LuceneIndexWriter.getIndexWriter();
// //创建一个Document对象 // //创建一个Document对象
// Document document = new Document(); // Document document = new Document();

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

@@ -68,7 +68,8 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
ParamService paramService; ParamService paramService;
@Autowired @Autowired
AutoRunService autoRunService; AutoRunService autoRunService;
@Autowired
AcsToWmsService acsToWmsService;
public NDCSocketConnectionAutoRun() { public NDCSocketConnectionAutoRun() {
this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut); this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut);
@@ -86,10 +87,10 @@ public class NDCSocketConnectionAutoRun extends AbstractAutoRunnable {
System.out.println("1楼NDCAgv链接开始"); System.out.println("1楼NDCAgv链接开始");
ParamService ParamService = SpringContextHolder.getBean(ParamServiceImpl.class); ParamService ParamService = SpringContextHolder.getBean(ParamServiceImpl.class);
InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.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); NDCAgvService NDCAgvService = SpringContextHolder.getBean(NDCAgvService.class);
DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.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); DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
ip = paramService.findByCode(org.nl.acs.AcsConfig.AGVURL).getValue(); ip = paramService.findByCode(org.nl.acs.AcsConfig.AGVURL).getValue();
port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue()); port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());

32
acs/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -73,8 +73,35 @@ https://juejin.cn/post/6844903775631572999
<springProfile name="dev"> <springProfile name="dev">
<root level="info"> <root level="info">
<appender-ref ref="asyncLuceneAppender"/> <appender-ref ref="asyncLuceneAppender"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="asyncFileAppender"/>
</root> </root>
<logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.springframework" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.hibernate" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.quartz" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="com.google" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.redisson" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.nl.modules.wql" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.springframework.data" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
<logger name="org.jinterop" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
</springProfile> </springProfile>
<!--测试环境:打印控制台--> <!--测试环境:打印控制台-->
<springProfile name="test"> <springProfile name="test">
@@ -117,5 +144,8 @@ https://juejin.cn/post/6844903775631572999
<logger name="org.springframework.data" level="ERROR" additivity="true"> <logger name="org.springframework.data" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
</logger> </logger>
<logger name="org.jinterop" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/>
</logger>
</springProfile> </springProfile>
</configuration> </configuration>

260
acs/nladmin-ui/package.json
View File

@@ -1,132 +1,132 @@
{ {
"name": "eladmin-web", "name": "eladmin-web",
"version": "2.6.0", "version": "2.6.0",
"description": "EL-ADMIN 前端源码", "description": "EL-ADMIN 前端源码",
"author": "Zheng Jie", "author": "Zheng Jie",
"license": "Apache-2.0", "license": "Apache-2.0",
"scripts": { "scripts": {
"dev": "vue-cli-service serve", "dev": "vue-cli-service serve",
"build:prod": "vue-cli-service build", "build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging", "build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview", "preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",
"test:unit": "jest --clearCache && vue-cli-service test:unit", "test:unit": "jest --clearCache && vue-cli-service test:unit",
"svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml", "svgo": "svgo -f src/assets/icons/svg --config=src/assets/icons/svgo.yml",
"new": "plop" "new": "plop"
}, },
"husky": { "husky": {
"hooks": { "hooks": {
"pre-commit": "lint-staged" "pre-commit": "lint-staged"
} }
}, },
"lint-staged": { "lint-staged": {
"src/**/*.{js,vue}": [ "src/**/*.{js,vue}": [
"eslint --fix", "eslint --fix",
"git add" "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"
]
}

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

@@ -66,6 +66,11 @@
</div> </div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px"> <el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row> <el-row>
<el-col :span="8">
<el-form-item label="最大数量">
<el-input v-model="form.max_emptypalletnum" />
</el-form-item>
</el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="关联设备" prop="device_code"> <el-form-item label="关联设备" prop="device_code">
<el-select <el-select

4
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -70,7 +70,7 @@
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission"> <crudOperation :permission="permission">
<el-button <!-- <el-button
slot="right" slot="right"
class="filter-item" class="filter-item"
size="mini" size="mini"
@@ -79,7 +79,7 @@
@click="reload" @click="reload"
> >
同步 同步
</el-button> </el-button> -->
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
<el-dialog <el-dialog

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

File diff suppressed because it is too large Load Diff

4
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -68,7 +68,7 @@
> >
新增 新增
</el-button> </el-button>
<el-button <!-- <el-button
slot="right" slot="right"
class="filter-item" class="filter-item"
size="mini" size="mini"
@@ -77,7 +77,7 @@
@click="reload" @click="reload"
> >
同步 同步
</el-button> </el-button> -->
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px"> <el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px">

2
acs/nladmin-ui/src/views/monitor/lucene/index.vue
View File

@@ -16,7 +16,7 @@
<!-- <el-table-column v-if="false" prop="id" label="id"/>--> <!-- <el-table-column v-if="false" prop="id" label="id"/>-->
<el-table-column prop="operate" width="50" label="操作" /> <el-table-column prop="operate" width="50" label="操作" />
<el-table-column prop="device_code" label="设备号" min-width="130" show-overflow-tooltip /> <el-table-column prop="device_code" label="设备号" min-width="130" show-overflow-tooltip />
<!-- <el-table-column prop="trace_id" label="链路追踪" /> --> <el-table-column prop="trace_id" label="链路追踪" />
<el-table-column prop="task_code" label="任务编号" /> <el-table-column prop="task_code" label="任务编号" />
<el-table-column prop="instruct_code" label="指令编号" /> <el-table-column prop="instruct_code" label="指令编号" />
<el-table-column prop="method" label="方法" /> <el-table-column prop="method" label="方法" />

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

@@ -14,14 +14,11 @@
:show-close="false" :show-close="false"
:modal="false" :modal="false"
> >
<el-table :data="arr" style="width: 100%" max-height="500px"> <el-table
<el-table-column label="长字符串字段"> :data="arr"
<template slot-scope="scope"> style="width: 100%"
<span style="white-space: normal;">{{ scope.row.longStringField }}</span> max-height="500px"
</template> >
</el-table-column>
<!-- 其他表格列 -->
</el-table>
<el-table-column <el-table-column
prop="name" prop="name"
label="监控项" label="监控项"
@@ -186,7 +183,7 @@ export default {
size: 5 size: 5
}, },
background: { background: {
backgroundImage: 'url("data:image/svg+xml;base64,PH`N2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")', backgroundImage: 'url("data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDAiIGhlaWdodD0iNDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PHBhdHRlcm4gaWQ9ImdyaWQiIHdpZHRoPSI0MCIgaGVpZ2h0PSI0MCIgcGF0dGVyblVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+PHBhdGggZD0iTSAwIDEwIEwgNDAgMTAgTSAxMCAwIEwgMTAgNDAgTSAwIDIwIEwgNDAgMjAgTSAyMCAwIEwgMjAgNDAgTSAwIDMwIEwgNDAgMzAgTSAzMCAwIEwgMzAgNDAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iI2QwZDBkMCIgb3BhY2l0eT0iMC4yIiBzdHJva2Utd2lkdGg9IjEiLz48cGF0aCBkPSJNIDQwIDAgTCAwIDAgMCA0MCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjZDBkMGQwIiBzdHJva2Utd2lkdGg9IjEiLz48L3BhdHRlcm4+PC9kZWZzPjxyZWN0IHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JpZCkiLz48L3N2Zz4=")',
backgroundRepeat: 'repeat' backgroundRepeat: 'repeat'
}, },
isSilentMode: true, isSilentMode: true,
@@ -473,10 +470,9 @@ export default {
const obj = { name: '行走列', value: data[val] } const obj = { name: '行走列', value: data[val] }
this.arr.push(obj) this.arr.push(obj)
} else if (val === 'task1') { } else if (val === 'task1') {
const obj = { name: '前工位任务', value: data[val] } const obj = { name: '前工位任务号', value: data[val] }
this.arr.push(obj) this.arr.push(obj)
} } else if (val === 'task2') {
else if (val === 'task2') {
const obj = { name: '后工位任务号', value: data[val] } const obj = { name: '后工位任务号', value: data[val] }
this.arr.push(obj) this.arr.push(obj)
} else if (val === 'labeling_qty') { } else if (val === 'labeling_qty') {
@@ -512,44 +508,7 @@ 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)
}else if (val==='modeName'){
const obj = { name: '模式名称', value: data[val] }
this.arr.push(obj)
} }
else if (val==='requireSucess1'){
const obj = { name: '请求成功标记', value: data[val] }
this.arr.push(obj)
}
// const obj = { name: '请求成功标记', value: data[requireSucess1] }
// this.arr.push(obj)
} }
} }
// console.log('arr:', this.arr) // console.log('arr:', this.arr)