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

rev:删除驱动里面电气信号变化记录日志

Browse Source
This commit is contained in:
gengby
2024-01-03 09:00:59 +08:00
parent 16b4e1bef3
commit 3ee52d3fbc
35 changed files with 37 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/box_palletizing_manipulator/BoxPalletizingManipulatorDeviceDriver.java
View File

@@ -44,8 +44,6 @@ public class BoxPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDriv
@Autowired
TaskService taskserver = SpringContextHolder.getBean("taskServiceImpl");
@Autowired
DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@Autowired
AcsToWmsService acsToWmsService = SpringContextHolder.getBean("acsToWmsServiceImpl");
@Autowired
DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class);
@@ -110,30 +108,6 @@ public class BoxPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDriv
walk_y = this.itemProtocol.getWalk_y();
error = this.itemProtocol.getError();
task = this.itemProtocol.getTask();
if (mode != last_mode) {
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (move != last_move) {
logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
}
if (action != last_action) {
logServer.deviceItemValue(this.device_code, "action", String.valueOf(action));
logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action);
}
if (error != last_error) {
logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (walk_y != last_walk_y) {
logServer.deviceItemValue(this.device_code, "walk_y", String.valueOf(walk_y));
logServer.deviceExecuteLog(this.device_code, "", "", "信号walk_y：" + last_walk_y + "->" + walk_y);
}
if (task != last_task) {
logServer.deviceItemValue(this.device_code, "task", String.valueOf(task));
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task);
}
} catch (Exception var17) {
return;

9
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_hr_ssx/HailiangHrSsxDeviceDriver.java
View File

@@ -45,7 +45,6 @@ import java.util.Map;
@RequiredArgsConstructor
public class HailiangHrSsxDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo {
protected ItemProtocol itemProtocol = new ItemProtocol(this);
DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@Autowired
DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
@Autowired
@@ -100,9 +99,6 @@ public class HailiangHrSsxDeviceDriver extends AbstractOpcDeviceDriver implement
task = this.itemProtocol.getTask();
barcode = this.itemProtocol.getBarcode();
to_command = this.itemProtocol.getToCommand();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
}
if (move != last_move) {
message = null;
requireSucess = false;
@@ -142,15 +138,10 @@ public class HailiangHrSsxDeviceDriver extends AbstractOpcDeviceDriver implement
dto.setError_info(ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task + "复位请求标记");
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);
}
if (mode == 0) {

8
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_lettering_package_device/HailiangOldLetteringPackageDeviceDriver.java
View File

@@ -45,8 +45,6 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
@Autowired
AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class);
@Autowired
DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@Autowired
ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
@Autowired
DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
@@ -94,9 +92,6 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
error = this.itemProtocol.getError();
order = this.itemProtocol.getOrder();
finish = this.itemProtocol.getOrder_finish();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
}
if (error != last_error) {
if (error != 0) {
@@ -106,13 +101,11 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
dto.setError_info(ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
}
if (finish != last_finish) {
if (mode == 2 && finish == 1) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), -1);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号finish：" + last_finish + "->" + finish);
}
// 修改工单状态为生产中
@@ -138,7 +131,6 @@ public class HailiangOldLetteringPackageDeviceDriver extends AbstractOpcDeviceDr
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);
}
if (!this.itemProtocol.getIsonline()) {

7
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_receiving_station/HailiangOldPackageReceivingStationDeviceDriver.java
View File

@@ -37,7 +37,6 @@ import java.util.Map;
public class HailiangOldPackageReceivingStationDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
protected ItemProtocol itemProtocol = new ItemProtocol(this);
DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@Autowired
DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
@@ -98,9 +97,7 @@ public class HailiangOldPackageReceivingStationDeviceDriver extends AbstractOpcD
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -109,12 +106,10 @@ public class HailiangOldPackageReceivingStationDeviceDriver extends AbstractOpcD
dto.setError_info(ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);
}
if (!this.itemProtocol.getIsonline()) {

11
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_package_ssx/HailiangLetteringPackageSsxDeviceDriver.java
View File

@@ -42,7 +42,6 @@ import java.util.regex.Pattern;
public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, IssuedDeviceOrderInfo {
protected ItemProtocol itemProtocol = new ItemProtocol(this);
DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@Autowired
DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
@@ -90,9 +89,7 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
task = this.itemProtocol.getTask();
barcode = this.itemProtocol.getBarcode();
to_command = this.itemProtocol.getToCommand();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
}
if (move != last_move){
message = null;
requireSucess =false;
@@ -109,15 +106,11 @@ public class HailiangLetteringPackageSsxDeviceDriver extends AbstractOpcDeviceDr
dto.setError_info(ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task + "复位请求标记");
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);
}
if (mode == 0) {

7
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_palletizing_station/HailiangOldPalletizingStationDriver.java
View File

@@ -59,8 +59,6 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
@Autowired
ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
@Autowired
DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
@Autowired
LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class);
Boolean isonline = true;
int hasGoods = 0;
@@ -117,9 +115,7 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
number = this.itemProtocol.getNumber();
error = this.itemProtocol.getError();
boxtype = this.itemProtocol.getBoxtype();
if (mode != last_mode) {
}
if(!ObjectUtil.equal(barcodeArr,last_barcodeArr)){
lucene.deviceExecuteLog(new LuceneLogDto(this.device_code,"码垛工位当前最新条码:"+barcodeArr.toString()));
@@ -130,7 +126,6 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
}
} catch (Exception var17) {
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage());
return;
}
@@ -173,6 +168,7 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
}
@Override
public void writing(String param, String value) {
String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + param;
@@ -232,6 +228,7 @@ public class HailiangOldPalletizingStationDriver extends AbstractOpcDeviceDriver
public void setDeviceStatus(JSONObject data) {
}
@Override
public String toString() {
return "";
}

36
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_stacking_manipulator/HailiangOldStackingManipulatorDriver.java
View File

@@ -62,8 +62,6 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
@Autowired
ProduceshiftorderService produceshiftorderService = SpringContextHolder.getBean(ProduceshiftorderService.class);
@Autowired
DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
@Autowired
LuceneExecuteLogService lucene = SpringContextHolder.getBean(LuceneExecuteLogService.class);
//心跳
@@ -142,43 +140,13 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
putStation = this.getItemProtocol().getPutStation();
encoder_qty = this.getItemProtocol().getEncoder_qty();
boxtype = this.getItemProtocol().getBoxtype();
if (mode != last_mode) {
logServer.deviceItemValue(this.device_code, "mode", String.valueOf(mode));
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (status != last_status) {
logServer.deviceItemValue(this.device_code, "status", String.valueOf(status));
logServer.deviceExecuteLog(this.device_code, "", "", "信号status：" + last_status + "->" + status);
}
if (action != last_action) {
vehicleInfoRequireSuccess = false;
singlePlacementRequireSuccess =false;
stackingRequireSuccess = false;
logServer.deviceItemValue(this.device_code, "action", String.valueOf(action));
logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action);
}
if (error != last_error) {
logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
// if (getStation != last_getStation) {
// logServer.deviceItemValue(this.device_code, "getStation", String.valueOf(getStation));
// logServer.deviceExecuteLog(this.device_code, "", "", "信号getStation：" + last_getStation + "->" + getStation);
// }
// if (putStation != last_putStation) {
// logServer.deviceItemValue(this.device_code, "putStation", String.valueOf(putStation));
// logServer.deviceExecuteLog(this.device_code, "", "", "信号putStation：" + last_putStation + "->" + putStation);
// }
// if (encoder_qty != last_encoder_qty) {
// logServer.deviceItemValue(this.device_code, "encoder_qty", String.valueOf(encoder_qty));
// logServer.deviceExecuteLog(this.device_code, "", "", "信号encoder_qty：" + last_encoder_qty + "->" + encoder_qty);
// }
// if (boxtype != last_boxtype) {
// logServer.deviceItemValue(this.device_code, "boxtype", String.valueOf(boxtype));
// logServer.deviceExecuteLog(this.device_code, "", "", "信号boxtype：" + last_boxtype + "->" + boxtype);
// }
} catch (Exception var17) {
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage());
}
if (!this.itemProtocol.getIsonline()) {
this.setIsonline(false);
@@ -450,6 +418,7 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
}
//写入kep点位值
@Override
public void writing(String param, String value) {
String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + param;
@@ -480,6 +449,7 @@ public class HailiangOldStackingManipulatorDriver extends AbstractOpcDeviceDrive
}
@Override
public String toString() {
return "";
}

7
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_old/hailiang_old_unboxing_machine/HailiangOldUnboxingMachineDeviceDriver.java
View File

@@ -37,7 +37,6 @@ import java.util.Map;
public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor {
protected ItemProtocol itemProtocol = new ItemProtocol(this);
DeviceExecuteLogService logServer = SpringContextHolder.getBean("deviceExecuteLogServiceImpl");
@Autowired
DeviceErrorLogService deviceErrorLogService = SpringContextHolder.getBean(DeviceErrorLogServiceImpl.class);
@@ -86,9 +85,7 @@ public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDri
qty = this.itemProtocol.getQty();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
}
if (error != last_error) {
if (error != 0) {
@@ -98,13 +95,11 @@ public class HailiangOldUnboxingMachineDeviceDriver extends AbstractOpcDeviceDri
dto.setError_info(ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);
}
if (!this.itemProtocol.getIsonline()) {

54
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java
View File

@@ -264,11 +264,8 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
}
if (mode != last_mode) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"："+ last_move + "->" + move);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -278,12 +275,9 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
deviceErrorLogService.create(dto);
}
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (task_finish != last_task_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task_finish") + SignalEnum.getDescByCode("task_finish") +"："+ last_task_finish + "->" + task_finish);
}
if (task != last_task) {
if (task > 0) {
JSONObject param = new JSONObject();
@@ -291,50 +285,8 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
param.put("position_code", this.device_code);
acsToWmsService.feedCacheLineTask(param);
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") + SignalEnum.getDescByCode("task") +"："+ last_task + "->" + task);
}
if (matching_barcode != last_matching_barcode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("matching_barcode") + SignalEnum.getDescByCode("matching_barcode") +"："+ last_matching_barcode + "->" + matching_barcode);
}
if (prepare_ready != last_prepare_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("prepare_ready") + SignalEnum.getDescByCode("prepare_ready") +"："+ last_prepare_ready + "->" + prepare_ready);
}
if (in_ready != last_in_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("in_ready") + SignalEnum.getDescByCode("in_ready") +"："+ last_in_ready + "->" + in_ready);
}
if (in_finish != last_in_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("in_finish") + SignalEnum.getDescByCode("in_finish") +"："+ last_in_finish + "->" + in_finish);
}
if (out_ready != last_out_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("out_ready") + SignalEnum.getDescByCode("out_ready") +"："+ last_out_ready + "->" + out_ready);
}
if (checking != last_checking) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("checking") + SignalEnum.getDescByCode("checking") +"："+ last_checking + "->" + checking);
}
if (check_finish != last_check_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("check_finish") + SignalEnum.getDescByCode("check_finish") +"："+ last_check_finish + "->" + check_finish);
}
if (check_compel_finish != last_check_compel_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("check_compel_finish") + SignalEnum.getDescByCode("check_compel_finish") +"："+ last_check_compel_finish + "->" + check_compel_finish);
}
if (matching_barcode_fail != last_matching_barcode_fail) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("matching_barcode_fail") + SignalEnum.getDescByCode("matching_barcode_fail") +"："+ last_matching_barcode_fail + "->" + matching_barcode_fail);
}
if (pause != last_pause) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("pause") + SignalEnum.getDescByCode("pause") +"："+ last_pause + "->" + pause);
}
if (hoist_target_layer != last_hoist_target_layer) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("hoist_target_layer") + SignalEnum.getDescByCode("hoist_target_layer") +"："+ last_hoist_target_layer + "->" + hoist_target_layer);
}
if (task_type != last_task_type) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task_type") + SignalEnum.getDescByCode("task_type") +"："+ last_task_type + "->" + task_type);
}
if (prepare_barcode != last_prepare_barcode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("prepare_barcode") + SignalEnum.getDescByCode("prepare_barcode") +"："+ last_prepare_barcode + "->" + prepare_barcode);
}
if (docking_barcode != last_docking_barcode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("docking_barcode") + SignalEnum.getDescByCode("docking_barcode") +"："+ last_docking_barcode + "->" + docking_barcode);
}
if (isonline != last_isonline) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("isonline") + SignalEnum.getDescByCode("isonline") +"："+ last_isonline + "->" + isonline);

20
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_feeding_line/HailiangCleaningFeedingLineDriver.java
View File

@@ -124,33 +124,18 @@ public class HailiangCleaningFeedingLineDriver extends AbstractOpcDeviceDriver i
allowed_in = this.itemProtocol.getItem_allowed_in();
error = this.itemProtocol.getItem_error();
in_pcsn = this.itemProtocol.getItem_in_pcsn();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (is_open != last_is_open) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_open") + SignalEnum.getDescByCode("is_open") +"："+ last_is_open + "->" + is_open);
}
if (in_ready != last_in_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("in_ready") + SignalEnum.getDescByCode("in_ready") +"："+ last_in_ready + "->" + in_ready);
}
if (all_ready != last_all_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("all_ready") + SignalEnum.getDescByCode("all_ready") +"："+ last_all_ready + "->" + all_ready);
}
if (task_finish != last_task_finish) {
if (task_finish == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task_finish") + SignalEnum.getDescByCode("task_finish") +"："+ + last_task_finish + "->" + task_finish);
}
if (allowed_in != last_allowed_in) {
if (allowed_in == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("allowed_in") + SignalEnum.getDescByCode("allowed_in") +"："+ last_allowed_in + "->" + allowed_in);
}
if (in_pcsn != last_in_pcsn) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("in_pcsn") +"："+ last_in_pcsn + "->" + in_pcsn);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -159,7 +144,6 @@ public class HailiangCleaningFeedingLineDriver extends AbstractOpcDeviceDriver i
dto.setError_info(ErrorUtil.getDictDetail("clean_up_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}

29
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine/HailiangCleaningMachineDeviceDriver.java
View File

@@ -106,33 +106,7 @@ public class HailiangCleaningMachineDeviceDriver extends AbstractOpcDeviceDriver
order_real_time = this.itemProtocol.getItem_order_real_time();
is_start = this.itemProtocol.getItem_is_start();
pause = this.itemProtocol.getItem_pause();
if (running != last_running) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号running：" + last_running + "->" + running);
}
if (prepare != last_prepare) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号prepare：" + last_prepare + "->" + prepare);
}
if (ready != last_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号ready：" + last_ready + "->" + ready);
}
if (order_finish != last_order_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order_finish：" + last_order_finish + "->" + order_finish);
}
if (open_ready_time != last_open_ready_time) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号open_ready_time：" + last_open_ready_time + "->" + open_ready_time);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
}
if (order_real_time != last_order_real_time) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order_real_time：" + last_order_real_time + "->" + order_real_time);
}
if (is_start != last_is_start) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号is_start：" + last_is_start + "->" + is_start);
}
if (pause != last_pause) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号pause：" + last_pause + "->" + pause);
}
if (error != last_error) {
if (error != 0) {
@@ -142,7 +116,6 @@ public class HailiangCleaningMachineDeviceDriver extends AbstractOpcDeviceDriver
dto.setError_info(ErrorUtil.getDictDetail("clean_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
} catch (Exception var17) {

20
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_machine_storage_station/HailiangCleaningMachineStorageStationDeviceDriver.java
View File

@@ -126,12 +126,7 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
silo_weight = this.itemProtocol.getItem_silo_weight();
full_number = this.itemProtocol.getItem_full_number();
silo_material_no = this.itemProtocol.getItem_silo_material_no();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (running != last_running) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_running") + SignalEnum.getDescByCode("is_running") +"："+ last_running + "->" + running);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -140,11 +135,8 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
dto.setError_info(ErrorUtil.getDictDetail("clean_mach_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (is_open != last_is_open) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_open") + SignalEnum.getDescByCode("is_open") +"："+ last_is_open + "->" + is_open);
}
if (silo_weight != last_silo_weight) {
if (is_open == 1) {
Map<String, Integer> feedNumMap = new HashMap<>();
@@ -154,14 +146,8 @@ public class HailiangCleaningMachineStorageStationDeviceDriver extends AbstractO
fm.put(this.device_code, feedNumMap);
acsToWmsService.feedDeviceNum2(fm);
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("silo_weight") + SignalEnum.getDescByCode("silo_weight") +"："+ last_silo_weight + "->" + silo_weight);
}
if (full_number != last_full_number) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("full_number") + SignalEnum.getDescByCode("full_number") +"："+ last_full_number + "->" + full_number);
}
if (silo_material_no != last_silo_material_no) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("silo_material_no") + SignalEnum.getDescByCode("silo_material_no") +"："+ last_silo_material_no + "->" + silo_material_no);
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17 + ",inst == null :" + ObjectUtil.isEmpty(inst));

49
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_cleaning_put_line/HailiangCleaningPutLineDeviceDriver.java
View File

@@ -208,58 +208,14 @@ public class HailiangCleaningPutLineDeviceDriver extends AbstractOpcDeviceDriver
device_running_time = this.itemProtocol.getItem_device_running_time();
await_time = this.itemProtocol.getItem_await_time();
barcode = stringToascii(barcode_1) + stringToascii(barcode_2) + stringToascii(barcode_3) + stringToascii(barcode_4);
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (move != last_move) {
if (move == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"："+ last_move + "->" + move);
}
if (is_open != last_is_open) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_open") + SignalEnum.getDescByCode("is_open") +"："+ last_is_open + "->" + is_open);
}
if (put_line_ready != last_put_line_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("line_ready") + SignalEnum.getDescByCode("line_ready") +"："+ last_put_line_ready + "->" + put_line_ready);
}
if (all_ready != last_all_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("all_ready") + SignalEnum.getDescByCode("all_ready") +"："+ last_all_ready + "->" + all_ready);
}
if (in_line_ready != last_in_line_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("line_ready") + SignalEnum.getDescByCode("line_ready") +"："+ last_in_line_ready + "->" + in_line_ready);
}
if (empty_req != last_empty_req) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("empty_req") + SignalEnum.getDescByCode("empty_req") +"："+ last_empty_req + "->" + empty_req);
}
if (full_req != last_full_req) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("full_req") + SignalEnum.getDescByCode("full_req") +"："+ last_full_req + "->" + full_req);
}
if (compel_full_req != last_compel_full_req) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("compel_full_req") + SignalEnum.getDescByCode("compel_full_req") +"："+ last_compel_full_req + "->" + compel_full_req);
}
if (is_up != last_is_up) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_up") + SignalEnum.getDescByCode("is_up") +"："+ last_is_up + "->" + is_up);
}
if (now_weight != last_now_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_weight") + SignalEnum.getDescByCode("now_weight") +"："+ last_now_weight + "->" + now_weight);
}
if (full_weight != last_full_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("full_weight") + SignalEnum.getDescByCode("full_weight") +"："+ last_full_weight + "->" + full_weight);
}
if (in_pcsn != last_in_pcsn) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("in_pcsn") + SignalEnum.getDescByCode("in_pcsn") +"："+ last_in_pcsn + "->" + in_pcsn);
}
if (all_num != last_all_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("all_num") + SignalEnum.getDescByCode("all_num") +"："+ last_all_num + "->" + all_num);
}
if (all_weight != last_all_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("all_weight") + SignalEnum.getDescByCode("all_weight") +"："+ last_all_weight + "->" + all_weight);
}
if (barcode != last_barcode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("barcode") + "："+ last_barcode + "->" + barcode);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -268,7 +224,6 @@ public class HailiangCleaningPutLineDeviceDriver extends AbstractOpcDeviceDriver
dto.setError_info(ErrorUtil.getDictDetail("clean_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
} catch (Exception var17) {

60
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_ealing_machine/EalingMachineDeviceDriver.java
View File

@@ -134,66 +134,6 @@ public class EalingMachineDeviceDriver extends AbstractOpcDeviceDriver implement
no_pass_bag_num = this.itemProtocol.getItem_no_pass_bag_num();
order = this.itemProtocol.getItem_order();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode + "复位请求标记");
}
if (ealing_error != last_ealing_error) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("ealing_error") + SignalEnum.getDescByCode("ealing_error") +"："+ last_ealing_error + "->" + ealing_error + "复位请求标记");
}
if (ealing_running != last_ealing_running) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_running") + SignalEnum.getDescByCode("is_running") +"："+ last_ealing_running + "->" + ealing_running + "复位请求标记");
}
if (order_finish != last_order_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_finish") + SignalEnum.getDescByCode("order_finish") +"："+ last_order_finish + "->" + order_finish + "复位请求标记");
}
if (ealing_shape != last_ealing_shape) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("ealing_shape") + SignalEnum.getDescByCode("ealing_shape") +"："+ last_ealing_shape + "->" + ealing_shape + "复位请求标记");
}
if (ealing_ready != last_ealing_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("ealing_ready") + SignalEnum.getDescByCode("ealing_ready") +"："+ last_ealing_ready + "->" + ealing_ready + "复位请求标记");
}
if (all_ready != last_all_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("all_ready") + SignalEnum.getDescByCode("all_ready") +"："+ last_all_ready + "->" + all_ready + "复位请求标记");
}
if (order_compel_finish != last_order_compel_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_compel_finish") + SignalEnum.getDescByCode("order_compel_finish") +"："+ last_order_compel_finish + "->" + order_compel_finish + "复位请求标记");
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("ealing_error") + SignalEnum.getDescByCode("ealing_error") +"："+ last_error + "->" + error + "复位请求标记");
}
if (now_order_box_num != last_now_order_box_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_order_box_num") + SignalEnum.getDescByCode("now_order_box_num") +"："+ last_now_order_box_num + "->" + now_order_box_num + "复位请求标记");
}
if (now_order_bag_num != last_now_order_bag_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_order_bag_num") + SignalEnum.getDescByCode("now_order_bag_num") +"："+ last_now_order_bag_num + "->" + now_order_bag_num + "复位请求标记");
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") + SignalEnum.getDescByCode("task") +"："+ last_task + "->" + task + "复位请求标记");
}
if (now_one_bag_of_box != last_now_one_bag_of_box) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_one_bag_of_box") + SignalEnum.getDescByCode("now_one_bag_of_box") +"："+ last_now_one_bag_of_box + "->" + now_one_bag_of_box + "复位请求标记");
}
if (now_bag_weight != last_now_bag_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_bag_weight") + SignalEnum.getDescByCode("now_bag_weight") +"："+ last_now_bag_weight + "->" + now_bag_weight + "复位请求标记");
}
if (now_box_weight != last_now_box_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_box_weight") + SignalEnum.getDescByCode("now_box_weight") +"："+ last_now_box_weight + "->" + now_box_weight + "复位请求标记");
}
// if (pass_box_num != last_pass_box_num) {
// logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("pass_box_num") + SignalEnum.getDescByCode("pass_box_num") +"："+ last_pass_box_num + "->" + pass_box_num + "复位请求标记");
// }
// if (no_pass_box_num != last_no_pass_box_num) {
// logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("no_pass_box_num") + SignalEnum.getDescByCode("no_pass_box_num") +"："+ last_no_pass_box_num + "->" + no_pass_box_num + "复位请求标记");
// }
// if (pass_bag_num != last_pass_bag_num) {
// logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("pass_bag_num") + SignalEnum.getDescByCode("pass_bag_num") +"："+ last_pass_bag_num + "->" + pass_bag_num + "复位请求标记");
// }
// if (no_pass_bag_num != last_no_pass_bag_num) {
// logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("no_pass_bag_num") + SignalEnum.getDescByCode("no_pass_bag_num") +"："+ last_no_pass_bag_num + "->" + no_pass_bag_num + "复位请求标记");
// }
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"："+ last_order + "->" + order + "复位请求标记");
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);

6
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_cache/HailiangEngravingCacheDeviceDriver.java
View File

@@ -79,12 +79,6 @@ public class HailiangEngravingCacheDeviceDriver extends AbstractOpcDeviceDriver
device_code = this.getDeviceCode();
move = this.itemProtocol.getItem_move();
mode = this.itemProtocol.getItem_mode();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"："+ last_move + "->" + move);
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17 + ",inst == null :" + ObjectUtil.isEmpty(inst));

48
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_in/HailiangEngravingInDeviceDriver.java
View File

@@ -260,40 +260,15 @@ public class HailiangEngravingInDeviceDriver extends AbstractOpcDeviceDriver imp
if (mode != last_mode) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
//lucene.deviceExecuteLog(new LuceneLogDto(this.device_code, ItemProtocol.item_mode, mode, last_mode));
}
if (gd_move != last_gd_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"："+ last_gd_move + "->" + gd_move);
}
if (status != last_status) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("status") + SignalEnum.getDescByCode("status") +"："+ last_status + "->" + status);
}
if (is_open != last_is_open) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_open") + SignalEnum.getDescByCode("is_open") +"："+ last_is_open + "->" + is_open);
}
if (is_running != last_is_running) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_running") + SignalEnum.getDescByCode("is_running") +"："+ last_is_running + "->" + is_running);
}
if (empty_req != last_empty_req) {
if (empty_req == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("empty_req") + SignalEnum.getDescByCode("empty_req") +"："+ last_empty_req + "->" + empty_req);
}
if (fl_move != last_fl_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"："+ last_fl_move + "->" + fl_move);
}
if (allow_put != last_allow_put) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("allow_put") + SignalEnum.getDescByCode("allow_put") +"："+ last_allow_put + "->" + allow_put);
}
if (line_ready != last_line_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("line_ready") + SignalEnum.getDescByCode("line_ready") +"："+ last_line_ready + "->" + line_ready);
}
if (fl_full_req != last_fl_full_req) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("full_req") + SignalEnum.getDescByCode("full_req") +"："+ last_fl_full_req + "->" + fl_full_req);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -305,7 +280,6 @@ public class HailiangEngravingInDeviceDriver extends AbstractOpcDeviceDriver imp
if (error == 1 || error == 51) {
feedDeviceStatusFlag = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (fl_error != last_fl_error) {
if (fl_error != 0) {
@@ -318,30 +292,10 @@ public class HailiangEngravingInDeviceDriver extends AbstractOpcDeviceDriver imp
if (fl_error == 1 || fl_error == 51) {
feedDeviceStatusFlag = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") +"："+ last_task + "->" + task);
}
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (engraving_weight != last_engraving_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("engraving_weight") + SignalEnum.getDescByCode("engraving_weight") +"："+ last_engraving_weight + "->" + engraving_weight);
}
if (engraving_all_weight != last_engraving_all_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("engraving_all_weight") + SignalEnum.getDescByCode("engraving_all_weight") +"："+ last_engraving_all_weight + "->" + engraving_all_weight);
}
if (fl_now_weight != last_fl_now_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("fl_now_weight") + SignalEnum.getDescByCode("fl_now_weight") +"："+ last_fl_now_weight + "->" + fl_now_weight);
}
if (fl_full_weight != last_fl_full_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("fl_full_weight") + SignalEnum.getDescByCode("fl_full_weight") +"："+ last_fl_full_weight + "->" + fl_full_weight);
}
if (isonline != last_isonline) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("isonline") + SignalEnum.getDescByCode("isonline") +"："+ last_isonline + "->" + isonline);
}
if (!this.itemProtocol.getIsonline() && !feedDeviceStatusFlag) {

51
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_engraving_machine/HailiangEngravingMachineDeviceDriver.java
View File

@@ -215,47 +215,19 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
if (mode != last_mode) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"："+ last_move + "->" + move);
}
if (status != last_status) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("status") + SignalEnum.getDescByCode("status") +"："+ last_status + "->" + status);
}
if (is_open != last_is_open) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_open") + SignalEnum.getDescByCode("is_open") +"："+ last_is_open + "->" + is_open);
}
if (is_running != last_is_running) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_running") + SignalEnum.getDescByCode("is_running") +"："+ last_is_running + "->" + is_running);
}
if (empty_req != last_empty_req) {
if (empty_req == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("empty_req") + SignalEnum.getDescByCode("empty_req") +"："+ last_empty_req + "->" + empty_req);
}
if (full_req != last_full_req) {
if (full_req == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("full_req") + SignalEnum.getDescByCode("full_req") +"："+ last_full_req + "->" + full_req);
}
if (full_finish != last_full_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("full_finish") + SignalEnum.getDescByCode("full_finish") +"："+ last_full_finish + "->" + full_finish);
}
if (order_finish != last_order_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_finish") + SignalEnum.getDescByCode("order_finish") +"："+ last_order_finish + "->" + order_finish);
}
if (engraving_prepare != last_engraving_prepare) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("engraving_prepare") + SignalEnum.getDescByCode("engraving_prepare") +"："+ last_engraving_prepare + "->" + engraving_prepare);
}
if (engraving_ready != last_engraving_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("engraving_ready") + SignalEnum.getDescByCode("engraving_ready") +"："+ last_engraving_ready + "->" + engraving_ready);
}
if (line_ready != last_line_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("line_ready") + SignalEnum.getDescByCode("line_ready") +"："+ last_line_ready + "->" + line_ready);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -267,32 +239,15 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
if (error == 1 || error == 51) {
feedDeviceStatusFlag = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (order_now != last_order_now) {
if (order > 0) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), order_now);
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_now") + SignalEnum.getDescByCode("order_now") +"："+ last_order_now + "->" + order_now);
}
if (one_now != last_one_now) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("one_now") + SignalEnum.getDescByCode("one_now") +"："+ last_one_now + "->" + one_now);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") + SignalEnum.getDescByCode("task") +"："+ last_task + "->" + task);
}
if (port_full_num != last_port_full_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("port_full_num") + SignalEnum.getDescByCode("port_full_num") +"："+ last_port_full_num + "->" + port_full_num);
}
if (lettering_silo_number != last_lettering_silo_number) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("line_ready") + SignalEnum.getDescByCode("line_ready") +"："+ last_lettering_silo_number + "->" + lettering_silo_number);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"："+ last_order + "->" + order);
}
if (isonline != last_isonline) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("isonline") + SignalEnum.getDescByCode("isonline") +"："+ last_isonline + "->" + isonline);
}
if (!this.itemProtocol.getIsonline() && !feedDeviceStatusFlag) {

43
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_frame_weighing/HailiangFrameWeighingDriver.java
View File

@@ -151,48 +151,6 @@ public class HailiangFrameWeighingDriver extends AbstractOpcDeviceDriver impleme
now_weigh = this.itemProtocol.getItem_now_weigh();
acs_get_now_weigh = this.itemProtocol.getItem_acs_get_now_weigh();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (weigh_ready != last_weigh_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号weigh_ready：" + last_weigh_ready + "->" + weigh_ready);
}
if (all_ready != last_all_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号all_ready：" + last_all_ready + "->" + all_ready);
}
if (hand_weigh != last_hand_weigh) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号hand_weigh：" + last_hand_weigh + "->" + hand_weigh);
}
if (frame_weighing_one != last_frame_weighing_one) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号frame_weighing_one：" + last_frame_weighing_one + "->" + frame_weighing_one);
}
if (frame_weighing_two != last_frame_weighing_two) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号frame_weighing_two：" + last_frame_weighing_two + "->" + frame_weighing_two);
}
if (in_one != last_in_one) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号in_one：" + last_in_one + "->" + in_one);
}
if (in_two != last_in_two) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号in_two：" + last_in_two + "->" + in_two);
}
if (in_three != last_in_three) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号in_three：" + last_in_three + "->" + in_three);
}
if (in_four != last_in_four) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号in_four：" + last_in_four + "->" + in_four);
}
if (agv_working != last_agv_working) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号agv_working：" + last_agv_working + "->" + agv_working);
}
if (heartbeat != last_heartbeat) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号heartbeat：" + last_heartbeat + "->" + heartbeat);
}
if (now_weigh != last_now_weigh) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号now_weigh：" + last_now_weigh + "->" + now_weigh);
}
if (acs_get_now_weigh != last_acs_get_now_weigh) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号acs_get_now_weigh：" + last_acs_get_now_weigh + "->" + acs_get_now_weigh);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -201,7 +159,6 @@ public class HailiangFrameWeighingDriver extends AbstractOpcDeviceDriver impleme
dto.setError_info(ErrorUtil.getDictDetail("clean_up_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}

22
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java
View File

@@ -108,7 +108,6 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl
if (mode != last_mode) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (error != last_error) {
@@ -122,14 +121,12 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl
if (error == 1 || error == 51 || error == 0) {
feedDeviceStatusFlag = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (finish != last_finish) {
if (mode == 1 && finish == 1) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), -1);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号finish：" + last_finish + "->" + finish);
}
if (order_compel_finish != last_order_compel_finish) {
@@ -140,35 +137,18 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl
map.put("to_order", "0");
this.writing(map);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号order_compel_finish：" + last_order_compel_finish + "->" + order_compel_finish);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
}
if (now_order_prod_num != last_now_order_prod_num) {
if (mode == 1 && order > 0 && order_prod_allnum > 0) {
if (produceshiftorderService.findByCodeFromCache(String.valueOf(order)) != null) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num);
}
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号now_order_prod_num：" + last_now_order_prod_num + "->" + now_order_prod_num);
}
if (now_one_box_num != last_now_one_box_num) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号now_one_box_num：" + last_now_one_box_num + "->" + now_one_box_num);
}
if (line_stock_num != last_line_stock_num) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号line_stock_num：" + last_line_stock_num + "->" + line_stock_num);
}
if (order_prod_allnum != last_order_prod_allnum) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order_prod_allnum：" + last_order_prod_allnum + "->" + order_prod_allnum);
}
if (isonline != last_isonline) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", "信号isonline：" + last_isonline + "->" + isonline);
}
if (!this.itemProtocol.getIsonline() && !feedDeviceStatusFlag) {

21
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java
View File

@@ -108,27 +108,6 @@ public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDevic
order = this.itemProtocol.getOrder();
empty_put_finish = this.itemProtocol.getEmpty_put_finish();
empty_start = this.itemProtocol.getEmpty_start();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
}
if (empty_put_finish != last_empty_put_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号empty_put_finish：" + last_empty_put_finish + "->" + empty_put_finish);
}
if (empty_start != last_empty_start) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号empty_start：" + last_empty_start + "->" + empty_start);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17 + ",inst == null :" + ObjectUtil.isEmpty(inst));

21
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java
View File

@@ -127,33 +127,12 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice
task = this.itemProtocol.getTask();
order = this.itemProtocol.getOrder();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (move != last_move) {
if (move == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (full_number != last_full_number) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号full_number：" + last_full_number + "->" + full_number);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task);
}
if (agv_take_finish != last_agv_take_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号agv_take_finish：" + last_agv_take_finish + "->" + agv_take_finish);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17 + ",inst == null :" + ObjectUtil.isEmpty(inst));

13
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pick_station/HailiangOldSpecialPickStationDeviceDriver.java
View File

@@ -69,19 +69,6 @@ public class HailiangOldSpecialPickStationDeviceDriver extends AbstractOpcDevice
now_one_prod_num = this.itemProtocol.getItem_now_one_box_num();
order = this.itemProtocol.getOrder();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
}
if (now_one_prod_num != last_now_one_prod_num) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号now_one_prod_num：" + last_now_one_prod_num + "->" + now_one_prod_num);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
} catch (Exception var17) {
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号出现异常:" + var17.getMessage());
}

13
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java
View File

@@ -124,15 +124,6 @@ public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDevice
task = this.getItemProtocol().getTask();
storage_stock_num = this.getItemProtocol().getStorage_stock_num();
order = this.getItemProtocol().getOrder();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task);
}
if (storage_stock_num != last_storage_stock_num) {
if (order > 0 && this.itemProtocol.getIsonline() && ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))) {
@@ -143,10 +134,6 @@ public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDevice
if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("min_num")) && storage_stock_num == Integer.parseInt(String.valueOf(this.getDevice().getExtraValue().get("min_num"))) && Integer.parseInt(String.valueOf(this.getDevice().getExtraValue().get("min_num"))) != -1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号storage_stock_num：" + last_storage_stock_num + "->" + storage_stock_num);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
}
} catch (Exception var17) {
var17.printStackTrace();

50
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java
View File

@@ -196,64 +196,28 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i
now_seal_box_num = this.itemProtocol.getItem_now_seal_box_num();
order = this.itemProtocol.getItem_order();
isonline = this.itemProtocol.getIsonline();
if (now_bag_num != last_now_bag_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_bag_num") + SignalEnum.getDescByCode("now_bag_num") +"："+ last_now_bag_num + "->" + now_bag_num);
}
if (now_seal_box_num != last_now_seal_box_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_seal_box_num") + SignalEnum.getDescByCode("now_seal_box_num") +"："+ last_now_seal_box_num + "->" + now_seal_box_num);
}
if (cache_weight != last_cache_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("cache_weight") + SignalEnum.getDescByCode("cache_weight") +"："+ last_cache_weight + "->" + cache_weight);
}
if (now_up_box_num != last_now_up_box_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_up_box_num") + SignalEnum.getDescByCode("now_up_box_num") +"："+ last_now_up_box_num + "->" + now_up_box_num);
}
if (now_bag_num_of_box != last_now_bag_num_of_box) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_bag_num_of_box") + SignalEnum.getDescByCode("now_bag_num_of_box") +"："+ last_now_bag_num_of_box + "->" + now_bag_num_of_box);
}
if (mode != last_mode) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"："+ last_mode + "->" + mode);
}
if (agv_abutment_error != last_agv_abutment_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号agv_abutment_error：" + last_agv_abutment_error + "->" + agv_abutment_error);
}
if (out_num != last_out_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("out_num") + SignalEnum.getDescByCode("out_num") +"："+ last_out_num + "->" + out_num);
}
if (packer_error != last_packer_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号packer_error：" + last_packer_error + "->" + packer_error);
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"："+ last_move + "->" + move);
}
if (packer_ready != last_packer_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("packer_ready") + SignalEnum.getDescByCode("packer_ready") +"："+ last_packer_ready + "->" + packer_ready);
}
if (lack_req != last_lack_req) {
if (lack_req == 0) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("lack_req") + SignalEnum.getDescByCode("lack_req") +"："+ last_lack_req + "->" + lack_req);
}
if (hopper_already != last_hopper_already) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("hopper_already") + SignalEnum.getDescByCode("hopper_already") +"："+ last_hopper_already + "->" + hopper_already);
}
if (req_task_empty != last_req_task_empty) {
if (req_task_empty == 0) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("req_task_empty") + SignalEnum.getDescByCode("req_task_empty") +"："+ last_req_task_empty + "->" + req_task_empty);
}
if (hopper_removed != last_hopper_removed) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("hopper_removed") + SignalEnum.getDescByCode("hopper_removed") +"：" + last_hopper_removed + "->" + hopper_removed);
}
if (order_finish != last_order_finish) {
if (order_finish == 1) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), -1);
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_finish") + SignalEnum.getDescByCode("order_finish") +"：" + last_order_finish + "->" + order_finish);
}
if (error != last_error) {
@@ -265,18 +229,14 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i
deviceErrorLogService.create(dto);
}
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (order_now != last_order_now) {
if (mode == 1 && order > 0) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), order_now);
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_now") + SignalEnum.getDescByCode("order_now") +"：" + last_order_now + "->" + order_now);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order);
}
// if (isonline != last_isonline) {
// logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("isonline") + SignalEnum.getDescByCode("isonline") +"：" + last_isonline + "->" + isonline);
// feedDeviceStatusFlag = false;

28
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java
View File

@@ -115,8 +115,6 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
if (mode != last_mode) {
feedDeviceStatusFlag = false;
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_mode, String.valueOf(this.last_mode), String.valueOf(this.mode)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_mode + "->" + mode);
}
if (error != last_error) {
@@ -130,15 +128,12 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
if (error == 1 || error == 51 || error == 0) {
feedDeviceStatusFlag = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (finish != last_finish) {
if (mode == 1 && finish == 1) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), -1);
}
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_finish, String.valueOf(this.last_finish), String.valueOf(this.finish)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_finish") + SignalEnum.getDescByCode("order_finish") +"：" + last_finish + "->" + finish);
}
if (order_compel_finish != last_order_compel_finish) {
@@ -149,37 +144,16 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
map.put("to_order", "0");
this.writing(map);
}
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_order_compel_finish, String.valueOf(this.last_order_compel_finish), String.valueOf(this.order_compel_finish)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_compel_finish") + SignalEnum.getDescByCode("order_compel_finish") +"：" + last_order_compel_finish + "->" + order_compel_finish);
}
if (order != last_order) {
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_order, String.valueOf(this.last_order), String.valueOf(this.order)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order);
}
if (now_order_prod_num != last_now_order_prod_num) {
if (mode == 1 && order > 0 && order_prod_allnum > 0) {
if (produceshiftorderService.findByCodeFromCache(String.valueOf(order)) != null) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), now_order_prod_num);
}
}
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_now_order_prod_num, String.valueOf(this.last_now_order_prod_num), String.valueOf(this.now_order_prod_num)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_order_prod_num") + SignalEnum.getDescByCode("now_order_prod_num") +"：" + last_now_order_prod_num + "->" + now_order_prod_num);
}
if (now_one_box_num != last_now_one_box_num) {
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_now_one_box_num, String.valueOf(this.last_now_one_box_num), String.valueOf(this.now_one_box_num)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_one_box_num") + SignalEnum.getDescByCode("now_one_box_num") +"：" + last_now_one_box_num + "->" + now_one_box_num);
}
if (line_stock_num != last_line_stock_num) {
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_line_stock_num, String.valueOf(this.last_line_stock_num), String.valueOf(this.line_stock_num)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("line_stock_num") + SignalEnum.getDescByCode("line_stock_num") +"：" + last_line_stock_num + "->" + line_stock_num);
}
if (order_prod_allnum != last_order_prod_allnum) {
luceneExecuteLogService.deviceExecuteLog(new LuceneLogDto(this.getDevice().getOpc_server_code(), this.getDevice().getOpc_plc_code(), this.device_code, ItemProtocol.item_order_prod_allnum, String.valueOf(this.last_order_prod_allnum), String.valueOf(this.order_prod_allnum)));
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_prod_allnum") + SignalEnum.getDescByCode("order_prod_allnum") +"：" + last_order_prod_allnum + "->" + order_prod_allnum);
}
if (isonline != last_isonline) {
feedDeviceStatusFlag = false;

21
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java
View File

@@ -108,27 +108,6 @@ public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDr
order = this.itemProtocol.getOrder();
empty_put_finish = this.itemProtocol.getEmpty_put_finish();
empty_start = this.itemProtocol.getEmpty_start();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_mode + "->" + mode);
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"：" + last_move + "->" + move);
}
if (empty_put_finish != last_empty_put_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("empty_put_finish") + SignalEnum.getDescByCode("empty_put_finish") +"：" + last_empty_put_finish + "->" + empty_put_finish);
}
if (empty_start != last_empty_start) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("empty_start") + SignalEnum.getDescByCode("empty_start") +"：" + last_empty_start + "->" + empty_start);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") + SignalEnum.getDescByCode("task") +"：" + last_task + "->" + task);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
} catch (Exception var17) {
var17.printStackTrace();

22
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java
View File

@@ -128,32 +128,10 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri
task = this.itemProtocol.getTask();
order = this.itemProtocol.getOrder();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_mode + "->" + mode);
}
if (move != last_move) {
if (move == 1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"：" + last_move + "->" + move);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (full_number != last_full_number) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("full_station_number") + SignalEnum.getDescByCode("full_station_number") +"：" + last_full_number + "->" + full_number);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") + SignalEnum.getDescByCode("task") +"：" + last_task + "->" + task);
}
if (agv_take_finish != last_agv_take_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("agv_take_finish") + SignalEnum.getDescByCode("agv_take_finish") +"：" + last_agv_take_finish + "->" + agv_take_finish);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order);
}
} catch (Exception var17) {

13
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pick_station/HailiangSpecialPickStationDeviceDriver.java
View File

@@ -76,19 +76,6 @@ public class HailiangSpecialPickStationDeviceDriver extends AbstractOpcDeviceDri
order = this.itemProtocol.getOrder();
isonline = this.itemProtocol.getIsonline();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_mode + "->" + mode);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order);
}
if (now_one_box_num != now_one_box_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("now_one_box_num") + SignalEnum.getDescByCode("now_one_box_num") +"：" + last_now_one_box_num + "->" + now_one_box_num);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17 + ",inst == null :" + ObjectUtil.isEmpty(inst));

13
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java
View File

@@ -121,18 +121,6 @@ public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDri
task = this.itemProtocol.getTask();
storage_stock_num = this.itemProtocol.getStorage_stock_num();
order = this.itemProtocol.getOrder();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_mode + "->" + mode);
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") + SignalEnum.getDescByCode("task") +"：" + last_task + "->" + task);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order);
}
if (error != last_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (storage_stock_num != last_storage_stock_num) {
if (order > 0 && this.itemProtocol.getIsonline() && ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))) {
Map<String, Integer> feedNumMap = new HashMap<>();
@@ -142,7 +130,6 @@ public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDri
if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("min_num")) && storage_stock_num == Integer.parseInt(String.valueOf(this.getDevice().getExtraValue().get("min_num"))) && Integer.parseInt(String.valueOf(this.getDevice().getExtraValue().get("min_num"))) != -1) {
requireSucess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("storage_stock_num") + SignalEnum.getDescByCode("storage_stock_num") +"：" + last_storage_stock_num + "->" + storage_stock_num);
}
} catch (Exception var17) {

76
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_stacking_station/HailiangStackingStationDriver.java
View File

@@ -167,17 +167,8 @@ public class HailiangStackingStationDriver extends AbstractOpcDeviceDriver imple
if (mode != last_mode) {
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_mode + "->" + mode);
}
if (line_power_status != last_line_power_status) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_line_power_status + "->" + line_power_status);
}
if (line_ready != last_line_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_line_ready + "->" + line_ready);
}
if (all_ready != last_all_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_all_ready + "->" + all_ready);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -187,79 +178,18 @@ public class HailiangStackingStationDriver extends AbstractOpcDeviceDriver imple
deviceErrorLogService.create(dto);
}
feedDeviceStatusFlag = false;
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"：" + last_move + "->" + move);
}
if (finish != last_finish) {
if (finish == 1) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), -1);
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_finish") + SignalEnum.getDescByCode("order_finish") +"：" + last_finish + "->" + finish);
}
if (is_full_1 != last_is_full_1) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("is_full") + SignalEnum.getDescByCode("is_full") +"：" + last_is_full_1 + "->" + is_full_1);
}
if (is_full_2 != last_is_full_2) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号is_full_2：" + last_is_full_2 + "->" + is_full_2);
}
if (is_full_3 != last_is_full_3) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号is_full_3：" + last_is_full_3 + "->" + is_full_3);
}
if (is_full_4 != last_is_full_4) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号is_full_4：" + last_is_full_4 + "->" + is_full_4);
}
if (move_1 != last_move_1) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("move") + SignalEnum.getDescByCode("move") +"：" + + last_move_1 + "->" + move_1);
}
if (move_2 != last_move_2) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号move_2：" + last_move_2 + "->" + move_2);
}
if (move_3 != last_move_3) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号move_3：" + last_move_3 + "->" + move_3);
}
if (move_4 != last_move_4) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号move_4：" + last_move_4 + "->" + move_4);
}
if (lane_error != last_lane_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号lane_error：" + last_lane_error + "->" + lane_error);
}
if (pallet_num_1 != last_pallet_num_1) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号pallet_num_1：" + last_pallet_num_1 + "->" + pallet_num_1);
}
if (pallet_num_2 != last_pallet_num_2) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号pallet_num_2：" + last_pallet_num_2 + "->" + pallet_num_2);
}
if (pallet_num_3 != last_pallet_num_3) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号pallet_num_3：" + last_pallet_num_3 + "->" + pallet_num_3);
}
if (pallet_num_4 != last_pallet_num_4) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号pallet_num_4：" + last_pallet_num_4 + "->" + pallet_num_4);
}
if (material_1 != last_material_1) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号material_1：" + last_material_1 + "->" + material_1);
}
if (material_2 != last_material_2) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号material_2：" + last_material_2 + "->" + material_2);
}
if (material_3 != last_material_3) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号material_3：" + last_material_3 + "->" + material_3);
}
if (material_4 != last_material_4) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号material_4：" + last_material_4 + "->" + material_4);
}
if (order_now != last_order_now) {
if (order > 0) {
MonitoringLargeScreenData.orderData.put(String.valueOf(order), order_now);
}
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_now") + SignalEnum.getDescByCode("order_now") +"：" + last_order_now + "->" + order_now);
}
if (tray_now != last_tray_now) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("tray_now") + SignalEnum.getDescByCode("tray_now") +"：" + last_tray_now + "->" + tray_now);
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order);
}
if (isonline != last_isonline) {

29
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_unboxing_machine/UnboxingMachineDeviceDriver.java
View File

@@ -106,24 +106,6 @@ public class UnboxingMachineDeviceDriver extends AbstractOpcDeviceDriver impleme
task = this.itemProtocol.getItem_task();
order = this.itemProtocol.getItem_order();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("mode") + SignalEnum.getDescByCode("mode") +"：" + last_mode + "->" + mode + "复位请求标记");
}
if (unboxing_error != last_unboxing_error) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号unboxing_error：" + last_unboxing_error + "->" + unboxing_error + "复位请求标记");
}
if (unboxing_running != last_unboxing_running) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("unboxing_running") + SignalEnum.getDescByCode("unboxing_running") +"：" + last_unboxing_running + "->" + unboxing_running + "复位请求标记");
}
if (unboxing_ready != last_unboxing_ready) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("unboxing_ready") + SignalEnum.getDescByCode("unboxing_ready") +"：" + last_unboxing_ready + "->" + unboxing_ready + "复位请求标记");
}
if (order_finish != last_order_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_finish") + SignalEnum.getDescByCode("order_finish") +"：" + last_order_finish + "->" + order_finish + "复位请求标记");
}
if (order_compel_finish != last_order_compel_finish) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_compel_finish") + SignalEnum.getDescByCode("order_compel_finish") +"：" + last_order_compel_finish + "->" + order_compel_finish + "复位请求标记");
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -132,17 +114,8 @@ public class UnboxingMachineDeviceDriver extends AbstractOpcDeviceDriver impleme
dto.setError_info(ErrorUtil.getDictDetail("unbox_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error + "复位请求标记");
}
if (now_order_num != last_now_order_num) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order_now") + SignalEnum.getDescByCode("order_now") +"：" + last_now_order_num + "->" + now_order_num + "复位请求标记");
}
if (task != last_task) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("task") + SignalEnum.getDescByCode("task") +"：" + last_task + "->" + task + "复位请求标记");
}
if (order != last_order) {
logServer.deviceExecuteLog(this.device_code, "", "", SignalEnum.getNameByCode("order") + SignalEnum.getDescByCode("order") +"：" + last_order + "->" + order + "复位请求标记");
}
} catch (Exception var17) {
var17.printStackTrace();
logServer.deviceExecuteLog(this.device_code, "", "", "读取信号值时出现异常:" + var17);

3
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/photoelectric_inspection_site/PhotoelectricInspectionSiteDeviceDriver.java
View File

@@ -134,9 +134,6 @@ public class PhotoelectricInspectionSiteDeviceDriver extends AbstractOpcDeviceDr
try {
device_code = this.getDeviceCode();
move = this.itemProtocol.getMove();
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
}
} catch (Exception var17) {
var17.printStackTrace();

39
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/siemens_conveyor/SiemensConveyorDeviceDriver.java
View File

@@ -179,31 +179,7 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
to_length = this.itemProtocol.getTo_length();
to_weight = this.itemProtocol.getTo_weight();
to_height = this.itemProtocol.getTo_height();
// if(heartbeat != last_heartbeat){
// logServer.deviceExecuteLog(this.device_code, "", "", "heartbeat：" + last_heartbeat + "->" + heartbeat);
// }
if (to_strap_times != last_to_strap_times) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号to_strap_times：" + last_to_strap_times + "->" + to_strap_times);
}
if (to_length != last_to_length) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号to_length：" + last_to_length + "->" + to_length);
}
if (to_weight != last_to_weight) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号to_weight：" + last_to_weight + "->" + to_weight);
}
if (to_height != last_to_height) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号to_height：" + last_to_height + "->" + to_height);
}
if (to_command != last_to_command) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号to_command：" + last_to_command + "->" + to_command);
}
if (to_target != last_to_target) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号to_target：" + last_to_target + "->" + to_target);
}
if (to_task != last_to_task) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号to_task：" + last_to_task + "->" + to_task);
}
if (mode != last_mode) {
//Boolean flag = ObjectUtil.isEmpty(this.device.getExtraValue().get("special_flag")) ? false : Boolean.valueOf(this.device.getExtraValue().get("special_flag").toString());
@@ -222,8 +198,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
requireSucess = false;
requireEmptyInSuccess = false;
}
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
}
if (move != last_move) {
message = null;
@@ -239,13 +213,8 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
this.requiresShipDeviceUpdate = false;
}
}
logServer.deviceItemValue(this.device_code, "move", String.valueOf(move));
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
}
if (carrier_direction != last_carrier_direction) {
logServer.deviceItemValue(this.device_code, "carrier_direction", String.valueOf(carrier_direction));
logServer.deviceExecuteLog(this.device_code, "", "", "信号carrier_direction：" + last_carrier_direction + "->" + carrier_direction);
}
if (error != last_error) {
if (error != 0) {
DeviceErrorLogDto dto = new DeviceErrorLogDto();
@@ -254,12 +223,6 @@ public class SiemensConveyorDeviceDriver extends AbstractOpcDeviceDriver impleme
dto.setError_info(ErrorUtil.getDictDetail("ssx_error_type", String.valueOf(error)));
deviceErrorLogService.create(dto);
}
logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
}
if (task != last_task) {
logServer.deviceItemValue(this.device_code, "task", String.valueOf(task));
logServer.deviceExecuteLog(this.device_code, "", "", "信号task：" + last_task + "->" + task);
}
if (move != 0 && task > 0) {

8
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_autodoor/StandardAutodoorDeviceDriver.java
View File

@@ -50,19 +50,13 @@ public class StandardAutodoorDeviceDriver extends AbstractOpcDeviceDriver implem
device_code = this.getDevice().getDevice_code();
open = this.itemProtocol.getOpen();
close = this.itemProtocol.getClose();
if (open != last_open) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号open：" + last_open + "->" + open);
}
if (close != last_close) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号close：" + last_close + "->" + close);
}
last_open = open;
last_close = close;
}
@Override
public void writing(String param, String value) {
String to_param = this.getDevice().getOpc_server_code() + "." + this.getDevice().getOpc_plc_code() + "." + this.getDevice().getDevice_code()
+ "." + param;

10
wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_inspect_site/StandardInspectSiteDeviceDriver.java
View File

@@ -140,16 +140,6 @@ public class StandardInspectSiteDeviceDriver extends AbstractOpcDeviceDriver imp
task = this.itemProtocol.getTask();
hasGoods = this.itemProtocol.getMove();
if (mode != last_mode) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记");
}
if (move != last_move) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号move：" + last_move + "->" + move);
}
if (action != last_action) {
logServer.deviceExecuteLog(this.device_code, "", "", "信号action：" + last_action + "->" + action);
}
} catch (Exception var17) {