提交

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

@@ -291,15 +291,12 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
             }
             if (open_ready_time != last_open_ready_time) {
                 logServer.deviceLog(this.device_code,"open_ready_time" ,String.valueOf(open_ready_time));
-                logServer.deviceLogToacs(this.device_code,"","","信号open_ready_time:" + last_open_ready_time + "->" + open_ready_time);
             }
             if (device_running_time != last_device_running_time) {
                 logServer.deviceLog(this.device_code,"device_running_time" ,String.valueOf(device_running_time));
-                logServer.deviceLogToacs(this.device_code,"","","信号device_running_time:" + last_device_running_time + "->" + device_running_time);
             }
             if (await_time != last_await_time) {
                 logServer.deviceLog(this.device_code,"await_time" ,String.valueOf(await_time));
-                logServer.deviceLogToacs(this.device_code,"","","信号await_time:" + last_await_time + "->" + await_time);
             }
             if (order != last_order) {
                 logServer.deviceLog(this.device_code,"order" ,String.valueOf(order));
@@ -333,7 +330,7 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
             this.setIsonline(true);
             this.setIserror(false);
 
-            if ( mode == 1 && order_finish != last_order_finish && order_finish == 1 && order > 0){
+            if ( mode == 1  && order_finish == 1 && order > 0){
                 ProduceshiftorderDto dto = new ProduceshiftorderDto();
                 dto.setOrder_code(order + "");
                 dto.setOrder_status("2");
@@ -348,7 +345,9 @@ public class HailiangEngravingMachineDeviceDriver extends AbstractOpcDeviceDrive
                 }
                 produceshiftorderService.updateByOrderCode(dto);
                 this.writing("to_confirm_finished","1");
-                this.writing("to_pause","0");
+                this.writing("to_clear","1");
+                this.writing("to_pause","1");
+
             }else {
                 logServer.deviceLogToacs(this.device_code,"","",device_code+":,move:"+move + ",order_finish>"+ order_finish +",last_order_finish>"+last_order_finish);
             }

wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_xj_plc_test/ItemProtocol.java

@@ -208,7 +208,20 @@ public class ItemProtocol {
         list.add(new ItemDto(item_current, "电流", "45240"));
         list.add(new ItemDto(item_material, "当前生产产品编号", "45244"));
         list.add(new ItemDto(item_lack_material, "生产缺料信号", "45248"));
-        list.add(new ItemDto(item_full_material, "生产满料信号", "45252"));
+        list.add(new ItemDto(item_storage_qty, "储料斗数量", "45256"));
+        list.add(new ItemDto(item_feeding_qty, "上料数量", "45260"));
+        list.add(new ItemDto(item_blanking_qty, "下料数量", "45264"));
+        list.add(new ItemDto(item_qualified_qty, "当前生产合格品数量", "45268"));
+        list.add(new ItemDto(item_unqualified_qty, "当前生产不合格数量", "45272"));
+        list.add(new ItemDto(item_finish, "生产完成", "45276"));
+        list.add(new ItemDto(item_task, "任务号", "45280"));
+        list.add(new ItemDto(item_noload_electricity_consumption, "空载电能耗（未生产时）", "45284"));
+        list.add(new ItemDto(item_prod_electricity_consumption, "生产电能耗", "45288"));
+        list.add(new ItemDto(item_gas_consumption, "气压能耗", "45292"));
+        list.add(new ItemDto(item_water_consumption, "水流量能耗", "45296"));
+        list.add(new ItemDto(item_oil_level, "当前液压油位", "45300"));
+        list.add(new ItemDto(item_monthly_electricity_consumption, "本月总电能耗", "45304"));
+        list.add(new ItemDto(item_pause, "设备暂停", "45308"));
 
         return list;
     }
@@ -217,9 +230,18 @@ public class ItemProtocol {
         ArrayList list = new ArrayList();
         list.add(new ItemDto(item_to_heartbeat, "心跳", "45702"));
         list.add(new ItemDto(item_to_command, "下发命令", "45704"));
-
+        list.add(new ItemDto(item_to_feeding, "下发命令", "45706"));
+        list.add(new ItemDto(item_to_task, "任务号", "45710"));
+        list.add(new ItemDto(item_to_pause, "生产暂停", "45714"));
+        list.add(new ItemDto(item_to_clear, "当前产量清零", "45718"));
+        list.add(new ItemDto(item_to_finish, "强制完成", "45722"));
+        list.add(new ItemDto(item_to_open, "设备开机", "45726"));
+        list.add(new ItemDto(item_to_close, "设备关机", "45730"));
+        list.add(new ItemDto(item_to_material, "当前任务生产物料", "45734"));
+        list.add(new ItemDto(item_to_qty, "当前任务生产数量", "45738"));
         return list;
     }
 
+
 }
 

wcs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/AcsToWmsServiceImpl.java

@@ -459,7 +459,6 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
                 result = HttpRequest.post(url)
                         .body(String.valueOf(json))
                         .execute();
-                System.out.println(result);
                 String type = "";
                 if (result.getStatus() == 200) {
                     type = "info";

wcs/hd/nladmin-system/src/main/java/org/nl/acs/order/service/impl/ProduceshiftorderServiceImpl.java

@@ -160,6 +160,7 @@ public class ProduceshiftorderServiceImpl implements ProduceshiftorderService, A
             }
             dto.setOne_qty(BigDecimal.valueOf((Long.parseLong(extra_value))));
             hailiangSpecialDeviceDriver.writing("to_clear", "1");
+            hailiangSpecialDeviceDriver.writing("to_pause", "0");
             hailiangSpecialDeviceDriver.writing("to_one_box_num", extra_value);
             hailiangSpecialDeviceDriver.writing("to_order_prod_num", dto.getQty().toString());
             hailiangSpecialDeviceDriver.writing("to_out_num", "0");

wcs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java

@@ -416,11 +416,13 @@ public class StageActorServiceImpl implements StageActorService {
                     } else if (device.getDeviceDriver() instanceof AgvNdcOneDeviceDriver) {
                         agvNdcOneDeviceDriver = (AgvNdcOneDeviceDriver) device.getDeviceDriver();
                         IAgv oneAgv = SpringContextHolder.getBean(OneAgvPhase.class);
+                        jo.put("isOnline", true);
                         obj.put("device_name", agvNdcOneDeviceDriver.getDevice().getDevice_name());
                         jo.put("address",StageActorUtil.getAddress(storageCellService.findByAddress(agvNdcOneDeviceDriver.getAgvaddr_copy() + "")));
                         jo.put("phaseName", oneAgv.getPhaseName(agvNdcOneDeviceDriver.getPhase()));
                     } else if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) {
                         agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver();
+                        jo.put("isOnline", true);
                         IAgv twoAgv = SpringContextHolder.getBean(TwoAgvPhase.class);
                         obj.put("device_name", agvNdcTwoDeviceDriver.getDevice().getDevice_name());
                         jo.put("address",StageActorUtil.getAddress(storageCellService.findByAddress(agvNdcTwoDeviceDriver.getAgvaddr_copy() + "")));
@@ -429,7 +431,7 @@ public class StageActorServiceImpl implements StageActorService {
                     } else if (device.getDeviceDriver() instanceof HailiangCleaningMachineStorageStationDeviceDriver) {
                         hailiangCleaningMachineStorageStationDeviceDriver = (HailiangCleaningMachineStorageStationDeviceDriver) device.getDeviceDriver();
                         jo.put("mode", StageActorUtil.getMode(hailiangCleaningMachineStorageStationDeviceDriver.getMode()));
-                        jo.put("isOnline", StageActorUtil.getMode(hailiangCleaningMachineStorageStationDeviceDriver.getMode()));
+                        jo.put("isOnline", StageActorUtil.getIsOnline(hailiangCleaningMachineStorageStationDeviceDriver.getMode()));
                         jo.put("isError", hailiangCleaningMachineStorageStationDeviceDriver.getIserror());
                         obj.put("device_name", hailiangCleaningMachineStorageStationDeviceDriver.getDevice().getDevice_name());
                         jo.put("error", hailiangCleaningMachineStorageStationDeviceDriver.getError());
@@ -438,7 +440,7 @@ public class StageActorServiceImpl implements StageActorService {
                         jo.put("material", hailiangCleaningMachineStorageStationDeviceDriver.getMaterial());
                     } else if (device.getDeviceDriver() instanceof HailiangEngravingMachineDeviceDriver) {
                         hailiangEngravingMachineDeviceDriver = (HailiangEngravingMachineDeviceDriver) device.getDeviceDriver();
-                        jo.put("isOnline", StageActorUtil.getMove(hailiangEngravingMachineDeviceDriver.getMove()));
+                        jo.put("isOnline", StageActorUtil.getIsOnline(hailiangEngravingMachineDeviceDriver.getMode()));
                         jo.put("hasGoods",StageActorUtil.getHasGoods(hailiangEngravingMachineDeviceDriver.getMove()));
                         jo.put("empty_req",StageActorUtil.getIsOrNo(hailiangEngravingMachineDeviceDriver.getEmpty_req()));
                         jo.put("mode", StageActorUtil.getMode(hailiangEngravingMachineDeviceDriver.getMode()));

wcs/qd/src/views/acs/monitor/device/index.vue

@@ -44,7 +44,7 @@
       </el-col>
 
       <el-col :span="22" style="margin-left: 30px">
-        <el-scrollbar style="width:1850px;height: 850px;">
+        <el-scrollbar style="width:1850px;height: 1050px;">
           <!--使用draggable组件-->
           <draggable
             :list="arr2"