diff --git a/wcs/hd/logPath_IS_UNDEFINED/2022-07-04.0.log b/wcs/hd/logPath_IS_UNDEFINED/2022-07-04.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wcs/hd/logPath_IS_UNDEFINED/2022-07-07.0.log b/wcs/hd/logPath_IS_UNDEFINED/2022-07-07.0.log new file mode 100644 index 00000000..e69de29b diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java index 9949577e..92f9f289 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_packer_station/HailiangPackerStationDeviceDriver.java @@ -311,8 +311,6 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i logServer.deviceLogToacs(this.device_code, "", "", device_code + ":,move:" + move + ",mode:" + mode + ",requireSucess:" + requireSucess + "开始申请请求取走空料斗任务"); apply_take_empty_task(); } - logServer.deviceLogToacs(this.device_code, "", "", "lack_req:" + lack_req + "move:" + move + "req_task_empty:" + req_task_empty); - } else { logServer.deviceLogToacs(this.device_code, "", "", "是否请求成功：requireSucess:" + requireSucess); } @@ -541,7 +539,8 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i logServer.deviceLogToacs(this.device_code, "", "", device_code + ":关联设备" + link_device + "未找到对应设备工单"); throw new BadRequestException(this.device_code + ":关联设备" + link_device + "未找到对应设备工单"); } - if (order.getIs_needmove().equals("0")) { + + if (StrUtil.isNotEmpty(order.getIs_needmove()) && order.getIs_needmove().equals("0")) { logServer.deviceLogToacs(this.device_code, "", "", device_code + ":关联设备" + link_device + "工单，不需要agv搬运"); return false; } @@ -562,8 +561,9 @@ public class HailiangPackerStationDeviceDriver extends AbstractOpcDeviceDriver i if (num != 0) { continue; } - String material = hailiangEngravingCacheDeviceDriver.getMaterial(); + String material = route_link_device.getMaterial_type(); if (StrUtil.isEmpty(material)) { + logServer.deviceLogToacs(this.device_code, "", "", hailiangEngravingCacheDeviceDriver.getDevice_code() + ":缓存位物料为空"); continue; } if (material.equals(cpbh)) { diff --git a/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java b/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java index aabf37ea..aca823fd 100644 --- a/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java +++ b/wcs/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanUpLogs.java @@ -28,9 +28,19 @@ public class AutoCleanUpLogs { public void run() throws Exception { try { + Date now = DateUtil.parse(DateUtil.now()); + DateTime bzdate = DateUtil.offsetDay(now, -5); + String formatbz = DateUtil.formatDateTime(bzdate); + Query bzquery = new Query().addCriteria(Criteria.where("create_time").lte(formatbz)); + System.out.println("BZ01设备日志开始清除---------------------"); + mongoTemplate.remove(bzquery,"BZ01"); + System.out.println("BZ01设备日志清除成功---------------------"); + + System.out.println("BZ02设备日志开始清除---------------------"); + mongoTemplate.remove(bzquery,"BZ02"); + System.out.println("BZ02设备日志清除成功---------------------"); WQLObject wo = WQLObject.getWQLObject("acs_device"); JSONArray array = wo.query("1=1","device_code").getResultJSONArray(0); - Date now = DateUtil.parse(DateUtil.now()); DateTime dateTime = DateUtil.offsetDay(now, -15); String formatDateTime = DateUtil.formatDateTime(dateTime); Query query = new Query().addCriteria(Criteria.where("create_time").lte(formatDateTime)); @@ -38,6 +48,9 @@ public class AutoCleanUpLogs { for (int i = 0; i < array.size(); i++) { JSONObject jsonObject = array.getJSONObject(i); String device_code = jsonObject.getString("device_code"); + if (device_code.equals("BZ01") || device_code.equals("BZ02")){ + continue; + } mongoTemplate.remove(query,device_code); System.out.println(device_code+"设备日志清除成功---------------------"); } diff --git a/wcs/qd/src/assets/acs/三通一体机.png b/wcs/qd/src/assets/acs/三通一体机.png new file mode 100644 index 00000000..d21399b5 Binary files /dev/null and b/wcs/qd/src/assets/acs/三通一体机.png differ diff --git a/wcs/qd/src/assets/acs/储料仓.png b/wcs/qd/src/assets/acs/储料仓.png new file mode 100644 index 00000000..9ebef5bb Binary files /dev/null and b/wcs/qd/src/assets/acs/储料仓.png differ diff --git a/wcs/qd/src/assets/acs/刻字机.png b/wcs/qd/src/assets/acs/刻字机.png new file mode 100644 index 00000000..2efb8a9b Binary files /dev/null and b/wcs/qd/src/assets/acs/刻字机.png differ diff --git a/wcs/qd/src/assets/acs/包装机1.png b/wcs/qd/src/assets/acs/包装机1.png new file mode 100644 index 00000000..7cb6a898 Binary files /dev/null and b/wcs/qd/src/assets/acs/包装机1.png differ diff --git a/wcs/qd/src/assets/acs/包装机2.png b/wcs/qd/src/assets/acs/包装机2.png new file mode 100644 index 00000000..5eef3e0c Binary files /dev/null and b/wcs/qd/src/assets/acs/包装机2.png differ diff --git a/wcs/qd/src/assets/acs/包装机3.png b/wcs/qd/src/assets/acs/包装机3.png new file mode 100644 index 00000000..0fe952c0 Binary files /dev/null and b/wcs/qd/src/assets/acs/包装机3.png differ diff --git a/wcs/qd/src/assets/acs/包装机4.png b/wcs/qd/src/assets/acs/包装机4.png new file mode 100644 index 00000000..968073df Binary files /dev/null and b/wcs/qd/src/assets/acs/包装机4.png differ diff --git a/wcs/qd/src/assets/acs/推弯成型1.png b/wcs/qd/src/assets/acs/推弯成型1.png new file mode 100644 index 00000000..f08d70d0 Binary files /dev/null and b/wcs/qd/src/assets/acs/推弯成型1.png differ diff --git a/wcs/qd/src/assets/acs/推弯成型2.png b/wcs/qd/src/assets/acs/推弯成型2.png new file mode 100644 index 00000000..c57183de Binary files /dev/null and b/wcs/qd/src/assets/acs/推弯成型2.png differ diff --git a/wcs/qd/src/assets/acs/推弯成型3.png b/wcs/qd/src/assets/acs/推弯成型3.png new file mode 100644 index 00000000..116ba7a4 Binary files /dev/null and b/wcs/qd/src/assets/acs/推弯成型3.png differ diff --git a/wcs/qd/src/assets/acs/清洗机1.png b/wcs/qd/src/assets/acs/清洗机1.png new file mode 100644 index 00000000..6f85780a Binary files /dev/null and b/wcs/qd/src/assets/acs/清洗机1.png differ diff --git a/wcs/qd/src/assets/acs/清洗机2.png b/wcs/qd/src/assets/acs/清洗机2.png new file mode 100644 index 00000000..1bca582c Binary files /dev/null and b/wcs/qd/src/assets/acs/清洗机2.png differ diff --git a/wcs/qd/src/assets/acs/清洗机3.png b/wcs/qd/src/assets/acs/清洗机3.png new file mode 100644 index 00000000..99ed875a Binary files /dev/null and b/wcs/qd/src/assets/acs/清洗机3.png differ diff --git a/wcs/qd/src/assets/acs/清洗机4.png b/wcs/qd/src/assets/acs/清洗机4.png new file mode 100644 index 00000000..f44b4bf9 Binary files /dev/null and b/wcs/qd/src/assets/acs/清洗机4.png differ diff --git a/wcs/qd/src/assets/acs/清洗机5.png b/wcs/qd/src/assets/acs/清洗机5.png new file mode 100644 index 00000000..e45c2874 Binary files /dev/null and b/wcs/qd/src/assets/acs/清洗机5.png differ diff --git a/wcs/qd/src/assets/acs/盘管下料1.png b/wcs/qd/src/assets/acs/盘管下料1.png new file mode 100644 index 00000000..10320952 Binary files /dev/null and b/wcs/qd/src/assets/acs/盘管下料1.png differ diff --git a/wcs/qd/src/assets/acs/盘管下料2.png b/wcs/qd/src/assets/acs/盘管下料2.png new file mode 100644 index 00000000..08b33f3c Binary files /dev/null and b/wcs/qd/src/assets/acs/盘管下料2.png differ diff --git a/wcs/qd/src/assets/acs/盘管下料3.png b/wcs/qd/src/assets/acs/盘管下料3.png new file mode 100644 index 00000000..44555b1e Binary files /dev/null and b/wcs/qd/src/assets/acs/盘管下料3.png differ diff --git a/wcs/qd/src/assets/acs/直管下料1.png b/wcs/qd/src/assets/acs/直管下料1.png new file mode 100644 index 00000000..38bd2804 Binary files /dev/null and b/wcs/qd/src/assets/acs/直管下料1.png differ diff --git a/wcs/qd/src/assets/acs/直管下料2.png b/wcs/qd/src/assets/acs/直管下料2.png new file mode 100644 index 00000000..e99f90c3 Binary files /dev/null and b/wcs/qd/src/assets/acs/直管下料2.png differ diff --git a/wcs/qd/src/assets/acs/直管下料3.png b/wcs/qd/src/assets/acs/直管下料3.png new file mode 100644 index 00000000..44555b1e Binary files /dev/null and b/wcs/qd/src/assets/acs/直管下料3.png differ diff --git a/wcs/qd/src/views/acs/stage/editor/index.vue b/wcs/qd/src/views/acs/stage/editor/index.vue index 52c7a8b5..b915a4ea 100644 --- a/wcs/qd/src/views/acs/stage/editor/index.vue +++ b/wcs/qd/src/views/acs/stage/editor/index.vue @@ -232,41 +232,62 @@ export default { { id: 11, name: '区域横', img1: '区域横' }, { id: 12, name: '区域竖', img1: '区域竖' }, { id: 13, name: '专机', img1: '专机' }, - { id: 14, name: '激', img1: '激' }, - { id: 15, name: '光', img1: '光' }, - { id: 16, name: '区', img1: '区' }, - { id: 17, name: '一', img1: '一' }, - { id: 18, name: '三', img1: '三' }, - { id: 19, name: '下', img1: '下' }, - { id: 20, name: '仓', img1: '仓' }, - { id: 21, name: '伸', img1: '伸' }, - { id: 22, name: '体', img1: '体' }, - { id: 23, name: '储', img1: '储' }, - { id: 24, name: '刻', img1: '刻' }, - { id: 25, name: '加', img1: '加' }, - { id: 26, name: '包', img1: '包' }, - { id: 27, name: '压', img1: '压' }, - { id: 28, name: '品', img1: '品' }, - { id: 29, name: '孔', img1: '孔' }, - { id: 30, name: '字', img1: '字' }, - { id: 31, name: '屑', img1: '屑' }, - { id: 32, name: '工', img1: '工' }, - { id: 33, name: '弯', img1: '弯' }, - { id: 34, name: '拉', img1: '拉' }, - { id: 35, name: '推', img1: '推' }, - { id: 36, name: '料', img1: '料' }, - { id: 37, name: '旋', img1: '旋' }, - { id: 38, name: '无', img1: '无' }, - { id: 39, name: '机', img1: '机' }, - { id: 40, name: '桶', img1: '桶' }, - { id: 41, name: '洗', img1: '洗' }, - { id: 42, name: '清', img1: '清' }, - { id: 43, name: '盘', img1: '盘' }, - { id: 44, name: '直', img1: '直' }, - { id: 45, name: '码', img1: '码' }, - { id: 46, name: '管', img1: '管' }, - { id: 47, name: '装', img1: '装' }, - { id: 48, name: '镗', img1: '镗' } + { id: 14, name: '三通一体机', img1: '三通一体机' }, + { id: 15, name: '储料仓', img1: '储料仓' }, + { id: 16, name: '刻字机', img1: '刻字机' }, + { id: 17, name: '包装机1', img1: '包装机1' }, + { id: 18, name: '包装机2', img1: '包装机2' }, + { id: 19, name: '包装机3', img1: '包装机3' }, + { id: 20, name: '包装机4', img1: '包装机4' }, + { id: 21, name: '推弯成型1', img1: '推弯成型1' }, + { id: 22, name: '推弯成型2', img1: '推弯成型2' }, + { id: 23, name: '推弯成型3', img1: '推弯成型3' }, + { id: 24, name: '清洗机1', img1: '清洗机1' }, + { id: 25, name: '清洗机2', img1: '清洗机2' }, + { id: 26, name: '清洗机3', img1: '清洗机3' }, + { id: 27, name: '清洗机4', img1: '清洗机4' }, + { id: 28, name: '清洗机5', img1: '清洗机5' }, + { id: 29, name: '盘管下料1', img1: '盘管下料1' }, + { id: 30, name: '盘管下料2', img1: '盘管下料2' }, + { id: 31, name: '盘管下料3', img1: '盘管下料3' }, + { id: 32, name: '直管下料1', img1: '直管下料1' }, + { id: 33, name: '直管下料2', img1: '直管下料2' }, + { id: 34, name: '直管下料3', img1: '直管下料3' }, + { id: 35, name: '激', img1: '激' }, + { id: 36, name: '光', img1: '光' }, + { id: 37, name: '下', img1: '下' }, + { id: 38, name: '料', img1: '料' }, + { id: 39, name: '区', img1: '区' }, + { id: 40, name: '三', img1: '三' }, + { id: 41, name: '一', img1: '一' }, + { id: 42, name: '仓', img1: '仓' }, + { id: 43, name: '伸', img1: '伸' }, + { id: 44, name: '体', img1: '体' }, + { id: 45, name: '储', img1: '储' }, + { id: 46, name: '刻', img1: '刻' }, + { id: 47, name: '加', img1: '加' }, + { id: 48, name: '压', img1: '压' }, + { id: 49, name: '品', img1: '品' }, + { id: 50, name: '孔', img1: '孔' }, + { id: 51, name: '字', img1: '字' }, + { id: 52, name: '屑', img1: '屑' }, + { id: 53, name: '工', img1: '工' }, + { id: 54, name: '弯', img1: '弯' }, + { id: 55, name: '拉', img1: '拉' }, + { id: 56, name: '推', img1: '推' }, + { id: 57, name: '旋', img1: '旋' }, + { id: 58, name: '无', img1: '无' }, + { id: 59, name: '机', img1: '机' }, + { id: 60, name: '桶', img1: '桶' }, + { id: 61, name: '洗', img1: '洗' }, + { id: 62, name: '清', img1: '清' }, + { id: 63, name: '盘', img1: '盘' }, + { id: 64, name: '码', img1: '码' }, + { id: 65, name: '直', img1: '直' }, + { id: 66, name: '管', img1: '管' }, + { id: 67, name: '包', img1: '包' }, + { id: 68, name: '装', img1: '装' }, + { id: 69, name: '镗', img1: '镗' } ], arr2: [], stageSelectList: [],