rev 碟盘机驱动

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

@@ -111,10 +111,10 @@ public class ConveyorPressStationDeviceDriver extends AbstractOpcDeviceDriver im
     String message;
     int weight = 0;
     int last_weight = 0;
-    String material;
-    String last_material;
-    int barcode;
-    int last_barcode;
+    String material=null;
+    String last_material=null;
+    int barcode=0;
+    int last_barcode=0;
 
     @Override
     public Device getDevice() {

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_fold_disc_site/ItemProtocol.java

@@ -152,16 +152,15 @@ public class ItemProtocol {
 
     public static List<ItemDto> getReadableItemDtos() {
         ArrayList list = new ArrayList();
-        list.add(new ItemDto(item_heartbeat, "心跳", "DB51.B0"));
-        list.add(new ItemDto(item_mode, "工作模式", "DB51.B1", Boolean.valueOf(true)));
-        list.add(new ItemDto(item_move, "光电开关信号", "DB51.B2"));
-        list.add(new ItemDto(item_action, "取放信号", "DB51.B3"));
-        list.add(new ItemDto(item_ioaction, "进出信号", "DB51.B4"));
-        list.add(new ItemDto(item_error, "报警信号", "DB51.B5"));
-        list.add(new ItemDto(item_task, "任务号", "DB51.D6"));
-        list.add(new ItemDto(item_weight, "重量", "DB51.D10"));
-        list.add(new ItemDto(item_material, "物料", "DB51.STRING14.50"));
-        list.add(new ItemDto(item_barcode, "条码", "DB51.W66"));
+        list.add(new ItemDto(item_heartbeat, "心跳", "DB120.B0"));
+        list.add(new ItemDto(item_mode, "工作模式", "DB120.B1", Boolean.valueOf(true)));
+        list.add(new ItemDto(item_status, "设备状态", "DB120.B2"));
+        list.add(new ItemDto(item_open_time, "开机时间", "DB120.STRING4.50"));
+        list.add(new ItemDto(item_close_time, "关机时间", "DB120.D56"));
+        list.add(new ItemDto(item_standby_time, "待机时间", "DB120.D60"));
+        list.add(new ItemDto(item_production_time, "生产时间", "DB120.D64"));
+        list.add(new ItemDto(item_error_time, "故障时间", "DB120.D68"));
+        list.add(new ItemDto(item_container_qty, "托盘数", "DB120.D72"));
         return list;
     }