diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java index 11cbc6ddc..8fd1c03d2 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java @@ -67,14 +67,21 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { JSONObject param = new JSONObject(); if (ObjectUtil.isNotEmpty(device_code)) { param.put("device_code",device_code); + } else { + // 不为空则只需要查询专机设备 + JSONObject jsonStr = WQL.getWO("QMD_BI_FAULT").addParam("flag", "3").process().uniqueResult(0); + String str = jsonStr.getString("str"); + param.put("device_code",str); } // 调用acs接口获取设备 JSONObject result = SpringContextHolder.getBean(WmsToAcsServiceImpl.class).realTimefaultInfo(param); JSONArray data = result.getJSONArray("data"); + JSONObject test1 = new JSONObject(); + // 根据入参处理对应数据 - ArrayList objects = new ArrayList<>(); + JSONArray objects = new JSONArray(); for (int i = 0; i < data.size(); i++) { JSONObject json = data.getJSONObject(i); @@ -89,6 +96,35 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { if (ObjectUtil.isEmpty(jsonDevice)) continue; + // 单独处理agv报警 + if (StrUtil.equals(json.getString("fault_type"), "agv_error_type")) { + + String[] fault_codes = json.getString("fault_code").split(","); + + if (fault_codes.length > 1) { + // 根据每个报警码找找对应解决信息 + StringBuilder stringBuilder = new StringBuilder(); + + for (int j = 0; j < fault_codes.length; j++) { + JSONObject jsonFault = faultTab.query("fault_type = '" + json.getString("fault_type") + "' and fault_code = '" + fault_codes[j] + "'").uniqueResult(0); + + stringBuilder.append(jsonFault.getString("solve_mode")); + + if (fault_codes.length-1 > j) { + stringBuilder.append(","); + } + } + + jsonDevice.put("fault_code", "1"); + jsonDevice.put("fault_info", json.getString("fault_info")); + jsonDevice.put("fault_type", json.getString("fault_type")); + jsonDevice.put("solve_mode", stringBuilder); + } + + + } + + // 获取报警码 JSONObject jsonFault = faultTab.query("fault_type = '" + json.getString("fault_type") + "' and fault_code = '" + json.getString("fault_code") + "'").uniqueResult(0); @@ -121,11 +157,13 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { } // 组织分页查询并返回 - Map json = PageUtil.toPage( - PageUtil.toPage(page.getPageNumber(), page.getPageSize(), objects), - objects.size() - ); +// Map json = PageUtil.toPage( +// PageUtil.toPage(page.getPageNumber(), page.getPageSize(), objects), +// objects.size() +// ); + JSONObject json = new JSONObject(); + json.put("content", objects); return json; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql index 1bc5da646..3c86ec3c6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/wql/QMD_BI_FAULT.wql @@ -88,5 +88,18 @@ ENDQUERY ENDIF + IF 输入.flag = "3" + QUERY + SELECT + GROUP_CONCAT(device_code) AS str + FROM + EM_BI_MonitorDevice + WHERE + is_crux = '1' + + ENDSELECT + ENDQUERY + ENDIF + diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index ffbe8af0f..ba03b637c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -474,7 +474,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject point_jo = rowArr.getJSONObject(i); JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0); - if (pointArr.size() == 8) { + // TODO pointArr.size() == 8 + if (pointArr.size() == 4) { JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0); point_code = jsonNewRow.getString("point_code"); break; @@ -514,7 +515,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { JSONObject point_jo = rowArr.getJSONObject(i); JSONArray pointArr = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' and IFNULL(vehicle_code,'') = '' order by out_order_seq ASC").getResultJSONArray(0); - if (pointArr.size() == 8) { + // TODO pointArr.size() == 8 + if (pointArr.size() == 4) { JSONObject jsonNewRow = WQLObject.getWQLObject("sch_base_point").query("row_num = '" + point_jo.getString("row_num") + "' AND point_type ='9' AND is_delete = '0' and lock_type = '1' order by out_order_seq,layer_num").uniqueResult(0); point_code = jsonNewRow.getString("point_code"); break; @@ -598,8 +600,12 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { throw new BadRequestException("客户不存在请检查!"); } + JSONObject data = new JSONObject(); + data.put("is_auto_table",jsonCust.getString("is_auto_table")); + // 判断是否贴标 if (!StrUtil.equals(jsonCust.getString("is_auto_table"), "1")) { + result.put("data", data); return result; } @@ -644,7 +650,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (Integer.valueOf(label_num_down) >= Integer.valueOf(now_num)) { result.put("message", "标签纸数量过低，请更换!"); } - + result.put("data", data); } else if (type.equals("2")) { //捆扎申请 @@ -676,7 +682,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { } // 判断是否需要捆扎 - String is_lash = whereJson.getString("is_lash"); // TODO 此字段未跟acs确认，需要确认 + String is_lash = whereJson.getString("is_bind"); if (StrUtil.equals(is_lash, "1")) { // 获取系统参数:捆扎米数 diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java index 354986fac..dca1a64bf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/SendOutTask.java @@ -61,13 +61,16 @@ public class SendOutTask extends AbstractAcsTask { .task_code(json.getString("task_code")) .task_type(json.getString("acs_task_type")) .start_device_code(json.getString("point_code1")) - .next_device_code(jsonPoint.getString("device_code")) + // TODO .next_device_code(jsonPoint.getString("device_code")) + .next_device_code(json.getString("point_code2")) + .agv_system_type("1") .vehicle_code(json.getString("vehicle_code")) .priority(json.getString("priority")) .remark(json.getString("remark")) - .start_height(start_high) - .next_height(next_high) + // TODO 暂时不上线 +// .start_height(start_high) +// .next_height(next_high) .build(); resultList.add(dto); System.out.println(resultList.toString()); diff --git a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue index ec0b4c707..a5e491d5d 100644 --- a/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue +++ b/lms/nladmin-ui/src/views/wms/agvrush/charge/index.vue @@ -98,6 +98,7 @@ type="success" icon="el-icon-position" size="mini" + :loading="chargeLoading" @click="charge_task(agvObj)" > AGV充电 @@ -109,6 +110,7 @@ type="success" icon="el-icon-position" size="mini" + :loading="chargeLoading" @click="charge_task(agvObj)" > AGV充电 @@ -136,6 +138,7 @@ export default { form: { flag: '1' }, + chargeLoading: false, listA1: [], listLk: [], agvList: [ @@ -185,11 +188,15 @@ export default { } }, charge_task(data) { + this.chargeLoading = true sendAgvChargeTask(data).then(res => { + this.chargeLoading = false this.$message({ message: '下发成功', type: 'success' }) + }).catch(() => { + this.chargeLoading = false }) } } diff --git a/lms/nladmin-ui/src/views/wms/agvrush/devicecharge/index.vue b/lms/nladmin-ui/src/views/wms/agvrush/devicecharge/index.vue index af27106bb..b4bf611c4 100644 --- a/lms/nladmin-ui/src/views/wms/agvrush/devicecharge/index.vue +++ b/lms/nladmin-ui/src/views/wms/agvrush/devicecharge/index.vue @@ -84,7 +84,7 @@ - + @@ -132,7 +132,6 @@ export default { add: false, reset: true }, - size: 20, idField: 'device_id', sort: 'device_id,desc', crudMethod: { ...crudFaultdevice } @@ -141,7 +140,7 @@ export default { data() { return { permission: {}, - syncLoading: false, + tableData: [], rules: { } } @@ -171,8 +170,8 @@ export default { initStatus() { const data = this.crud.query crudFaultdevice.deviceCharge(data).then(res => { - this.crud.data = res.content - this.crud.page.size = 10 + // this.crud.data = res.content + this.tableData = res.content }) }, formatType1(row) {