diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/NdxySpecialDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/NdxySpecialDeviceDriver.java index 320509c..916fe67 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/NdxySpecialDeviceDriver.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/ndxy_special/NdxySpecialDeviceDriver.java @@ -173,75 +173,75 @@ public class NdxySpecialDeviceDriver extends AbstractOpcDeviceDriver implements this.execute_log.setResource(this.device_code, this.device.getDevice_name()); this.execute_log.log("设备:" + device_code + ",last_error -> error:" + last_error + "->" + error); } - //判断当前设备是否为入库位 - if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("put_storage"))) { - if (StrUtil.equals(this.getDevice().getExtraValue().get("put_storage").toString(), "true")) { - int moveNumber = 0; - if (this.move != 0) { - moveNumber += 1; - } - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))) { - Object[] arr = (Object[]) this.getDevice().getExtraValue().get("link_device_code"); - String[] str_arr = new String[arr.length]; - for (int j = 0; j < arr.length; j++) { - str_arr[j] = (String) arr[j]; - } - for (int j = 0; j < str_arr.length; j++) { - String device_code = str_arr[j]; - Device relevance_device = appService.findDeviceByCode(device_code); - StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; - if (relevance_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) relevance_device.getDeviceDriver(); - if (standardInspectSiteDeviceDriver.getMove() != 0) { - moveNumber += 1; - } - } - } - } - if (moveNumber == 3 && ObjectUtil.isNotEmpty(taskServer.findByNextCode(this.device_code))){ - this.checked = false; - this.choose = false; - } - if (moveNumber >= 4) { - this.checked = false; - this.choose = false; - } - } - } +// //判断当前设备是否为入库位 +// if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("put_storage"))) { +// if (StrUtil.equals(this.getDevice().getExtraValue().get("put_storage").toString(), "true")) { +// int moveNumber = 0; +// if (this.move != 0) { +// moveNumber += 1; +// } +// DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); +// if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))) { +// Object[] arr = (Object[]) this.getDevice().getExtraValue().get("link_device_code"); +// String[] str_arr = new String[arr.length]; +// for (int j = 0; j < arr.length; j++) { +// str_arr[j] = (String) arr[j]; +// } +// for (int j = 0; j < str_arr.length; j++) { +// String device_code = str_arr[j]; +// Device relevance_device = appService.findDeviceByCode(device_code); +// StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; +// if (relevance_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { +// standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) relevance_device.getDeviceDriver(); +// if (standardInspectSiteDeviceDriver.getMove() != 0) { +// moveNumber += 1; +// } +// } +// } +// } +// if (moveNumber == 3 && ObjectUtil.isNotEmpty(taskServer.findByNextCode(this.device_code))){ +// this.checked = false; +// this.choose = false; +// } +// if (moveNumber >= 4) { +// this.checked = false; +// this.choose = false; +// } +// } +// } //判断当前设备是否为出库位 - if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("outbound"))) { - this.choose = false; - if (StrUtil.equals(this.getDevice().getExtraValue().get("outbound").toString(), "true")) { - int moveNumber = 0; - if (this.move == 0) { - moveNumber += 1; - } - DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); - if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))) { - Object[] arr = (Object[]) this.getDevice().getExtraValue().get("link_device_code"); - String[] str_arr = new String[arr.length]; - for (int j = 0; j < arr.length; j++) { - str_arr[j] = (String) arr[j]; - } - for (int j = 0; j < str_arr.length; j++) { - String device_code = str_arr[j]; - Device relevance_device = appService.findDeviceByCode(device_code); - StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; - if (relevance_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { - standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) relevance_device.getDeviceDriver(); - if (standardInspectSiteDeviceDriver.getMove() == 0) { - moveNumber += 1; - } - } - } - } - if (moveNumber == 2) { - this.choose = false; - this.checked = false; - } - } - } +// if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("outbound"))) { +// this.choose = false; +// if (StrUtil.equals(this.getDevice().getExtraValue().get("outbound").toString(), "true")) { +// int moveNumber = 0; +// if (this.move == 0) { +// moveNumber += 1; +// } +// DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); +// if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("link_device_code"))) { +// Object[] arr = (Object[]) this.getDevice().getExtraValue().get("link_device_code"); +// String[] str_arr = new String[arr.length]; +// for (int j = 0; j < arr.length; j++) { +// str_arr[j] = (String) arr[j]; +// } +// for (int j = 0; j < str_arr.length; j++) { +// String device_code = str_arr[j]; +// Device relevance_device = appService.findDeviceByCode(device_code); +// StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; +// if (relevance_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { +// standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) relevance_device.getDeviceDriver(); +// if (standardInspectSiteDeviceDriver.getMove() == 0) { +// moveNumber += 1; +// } +// } +// } +// } +// if (moveNumber == 2) { +// this.choose = false; +// this.checked = false; +// } +// } +// } // if (this.choose) { // this.checked = false; @@ -284,17 +284,17 @@ public class NdxySpecialDeviceDriver extends AbstractOpcDeviceDriver implements break; case 2: //入库 - if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("apply_task"))) { - if (!requireSucess && this.move != 0 && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(), "true")) { - standby(); - } - } +// if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("apply_task"))) { +// if (!requireSucess && this.move != 0 && StrUtil.equals(this.getDevice().getExtraValue().get("apply_task").toString(), "true")) { +// standby(); +// } +// } //出库 - else if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("outbound"))) { - if (!requireSucess && this.checked && this.move != 0 && StrUtil.equals(this.getDevice().getExtraValue().get("outbound").toString(), "true")) { - outbound(); - } - } +// else if (ObjectUtil.isNotEmpty(this.getDevice().getExtraValue().get("outbound"))) { +// if (!requireSucess && this.checked && this.move != 0 && StrUtil.equals(this.getDevice().getExtraValue().get("outbound").toString(), "true")) { +// outbound(); +// } +// } break; case 3: diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java index aef2718..23b1a77 100644 --- a/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java @@ -27,6 +27,7 @@ import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; import org.nl.acs.route.service.RouteLineService; +import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.acs.task.service.impl.TaskServiceImpl; @@ -44,6 +45,7 @@ import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; import java.util.HashMap; +import java.util.List; import java.util.Map; @@ -60,7 +62,10 @@ public class NdxyHandServiceImpl implements NdxyHandService { private final PasswordEncoder passwordEncoder; private final DeviceService deviceService; private final DeviceAppService deviceAppService; + private final RouteLineService routeLineService; private final AgvService agvService; + InstructionService instructionService = null; + @Override public Map queryArea(Map whereJson) { @@ -126,6 +131,10 @@ public class NdxyHandServiceImpl implements NdxyHandService { status = "3"; status_name = "已选择"; } + if (ndxySpecialDeviceDriver.getChecked() && ndxySpecialDeviceDriver.getHasGoods() == 1) { + status = "4"; + status_name = "已选择且有货"; + } Device device_code1 = deviceAppService.findDeviceByCode(devicejo.optString("device_code")); jo.put("status", status); @@ -242,6 +251,10 @@ public class NdxyHandServiceImpl implements NdxyHandService { status = "3"; status_name = "已选择"; } + if (ndxySpecialDeviceDriver.getChecked() && ndxySpecialDeviceDriver.getHasGoods() == 1) { + status = "4"; + status_name = "已选择且有货"; + } Device device_code1 = deviceAppService.findDeviceByCode(devicejo.optString("device_code")); jo.put("status", status); jo.put("status_name", status_name); @@ -397,12 +410,12 @@ public class NdxyHandServiceImpl implements NdxyHandService { @Override public Map queryInst(Map jsonObject) { //查询位完成的指令 - JSONObject resultJson = new JSONObject(); HashMap map = new HashMap<>(); String key = jsonObject.get("keyword"); String start_point = jsonObject.get("start_devicecode"); String next_point = jsonObject.get("next_devicecode"); + String type = jsonObject.get("type"); map.put("flag", "4"); if (StrUtil.isNotEmpty(key)) { map.put("key", "%" + key + "%"); @@ -414,10 +427,40 @@ public class NdxyHandServiceImpl implements NdxyHandService { map.put("next_point", "%" + next_point + "%"); } JSONArray resultArr = WQL.getWO("QNDXY_QUERY003").addParamMap(map).addParamMap((HashMap) jsonObject).process().getResultJSONArray(0); - resultJson.put("code", "1"); - resultJson.put("desc", "查询成功"); - resultJson.put("result", resultArr); - return resultJson; + JSONArray array = new JSONArray(); + if (type.equals("1")) { + for (int i = 0; i < resultArr.size(); i++) { + JSONObject js = resultArr.getJSONObject(i); + Device device = deviceAppService.findDeviceByCode(js.getString("next_devicecode")); + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("put_storage"))) { + if (StrUtil.equals(device.getExtraValue().get("put_storage").toString(),"true")) { + array.add(js); + } + } + } + JSONObject resultJson = new JSONObject(); + resultJson.put("code", "1"); + resultJson.put("desc", "查询成功"); + resultJson.put("result", array); + return resultJson; + } + if (type.equals("2")) { + for (int i = 0; i < resultArr.size(); i++) { + JSONObject js = resultArr.getJSONObject(i); + Device device = deviceAppService.findDeviceByCode(js.getString("start_devicecode")); + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("outbound"))) { + if (StrUtil.equals(device.getExtraValue().get("outbound").toString(), "true")) { + array.add(js); + } + } + } + JSONObject resultJson = new JSONObject(); + resultJson.put("code", "1"); + resultJson.put("desc", "查询成功"); + resultJson.put("result", array); + return resultJson; + } + return null; } @Override @@ -483,6 +526,7 @@ public class NdxyHandServiceImpl implements NdxyHandService { String key = jsonObject.get("keyword"); String start_point = jsonObject.get("start_devicecode"); String next_point = jsonObject.get("next_devicecode"); + String type = jsonObject.get("type"); HashMap map = new HashMap<>(); map.put("flag", "2"); if (StrUtil.isNotEmpty(key)) { @@ -496,11 +540,41 @@ public class NdxyHandServiceImpl implements NdxyHandService { } //查询有任务 但是没有指令的任务 JSONArray result = WQL.getWO("QNDXY_QUERY003").addParamMap(map).process().getResultJSONArray(0); - JSONObject resultJson = new JSONObject(); - resultJson.put("code", "1"); - resultJson.put("desc", "查询成功"); - resultJson.put("result", result); - return resultJson; + JSONArray array = new JSONArray(); + if (type.equals("1")) { + for (int i = 0; i < result.size(); i++) { + JSONObject js = result.getJSONObject(i); + Device device = deviceAppService.findDeviceByCode(js.getString("next_devicecode")); + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("put_storage"))) { + if (StrUtil.equals(device.getExtraValue().get("put_storage").toString(),"true")) { + array.add(js); + } + } + } + JSONObject resultJson = new JSONObject(); + resultJson.put("code", "1"); + resultJson.put("desc", "查询成功"); + resultJson.put("result", array); + return resultJson; + } + if (type.equals("2")) { + for (int i = 0; i < result.size(); i++) { + JSONObject js = result.getJSONObject(i); + Device device = deviceAppService.findDeviceByCode(js.getString("start_devicecode")); + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("outbound"))) { + if (StrUtil.equals(device.getExtraValue().get("outbound").toString(), "true")) { + array.add(js); + } + } + } + JSONObject resultJson = new JSONObject(); + resultJson.put("code", "1"); + resultJson.put("desc", "查询成功"); + resultJson.put("result", array); + return resultJson; + } + + return null; } @@ -509,9 +583,10 @@ public class NdxyHandServiceImpl implements NdxyHandService { //修改任务的状态 String device_code = jsonObject.get("device_code"); String type = jsonObject.get("status_type"); + String number = jsonObject.get("number"); JSONObject resultJson = new JSONObject(); DeviceService deviceService = SpringContextHolder.getBean(DeviceServiceImpl.class); - + TaskService taskService = SpringContextHolder.getBean(TaskServiceImpl.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); Device device = appService.findDeviceByCode(device_code); //纽迪希亚专用 @@ -521,51 +596,177 @@ public class NdxyHandServiceImpl implements NdxyHandService { //选中 if (type.equals("1")) { - int num = 0; - JSONArray acs_deviceja = WQLObject.getWQLObject("acs_device").query("region = '" + dto.getRegion() + "'", "seq_num,device_name").getResultJSONArray(0); - for (int i = 0; i < acs_deviceja.size(); i++) { - JSONObject devicejo = acs_deviceja.getJSONObject(i); - String deviceCode = devicejo.optString("device_code"); - Device device1 = appService.findDeviceByCode(deviceCode); - if (device1.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { - ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device1.getDeviceDriver(); - if (ndxySpecialDeviceDriver.getChecked()) { - num++; + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("outbound"))) { + if (StrUtil.equals(device.getExtraValue().get("outbound").toString(), "true")) { + + for (int i = 0; i < Integer.parseInt(number); i++) { + TaskDto taskDto = new TaskDto(); + String now = DateUtil.now(); + taskDto.setTask_id(IdUtil.simpleUUID()); + taskDto.setCreate_by(device.getDevice_code()); + taskDto.setUpdate_by(device.getDevice_code()); + + taskDto.setTask_status("0"); + taskDto.setPriority("1"); + String next_device_code = ""; + List list = routeLineService.getShortPathLinesByCode(device_code, "normal"); + for (int j = 0; j < list.size(); j++) { + RouteLineDto routeLineDto = list.get(j); + next_device_code = routeLineDto.getNext_device_code(); + } + + if (StrUtil.isEmpty(next_device_code)) { + throw new RuntimeException("该设备未找到对应路由"); + } + + taskDto.setStart_point_code(device_code); + taskDto.setStart_device_code(device_code); + taskDto.setNext_point_code(next_device_code); + taskDto.setNext_device_code(next_device_code); + taskDto.setUpdate_time(now); + taskDto.setCreate_time(now); + String task_code = CodeUtil.getNewCode("TASK_NO"); + taskDto.setTask_code("-" + task_code); + + WQLObject wo = WQLObject.getWQLObject("acs_task"); + JSONObject json = JSONObject.fromObject(taskDto); + wo.insert(json); + + } + //纽迪希亚专用 + if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { + ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver(); + ndxySpecialDeviceDriver.setChecked(true); + } + + resultJson.put("code", "1"); + resultJson.put("desc", "更新成功"); + resultJson.put("result", new JSONObject()); + + return resultJson; + } + } + //判断当前设备是否为入库位 + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("put_storage"))) { + if (StrUtil.equals(device.getExtraValue().get("put_storage").toString(), "true")) { + int moveNumber = 0; + //纽迪希亚专用 + if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { + ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver(); + + if (ndxySpecialDeviceDriver.getMove() != 0) { + moveNumber += 1; + } + //查询关联设备 + if (ObjectUtil.isNotEmpty(device.getExtraValue().get("link_device_code"))) { + Object[] arr = (Object[]) device.getExtraValue().get("link_device_code"); + String[] str_arr = new String[arr.length]; + for (int j = 0; j < arr.length; j++) { + str_arr[j] = (String) arr[j]; + } + //获得每个关联设备 + for (int j = 0; j < str_arr.length; j++) { + String link_device_code = str_arr[j]; + Device relevance_device = appService.findDeviceByCode(link_device_code); + StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver; + if (relevance_device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver) { + standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) relevance_device.getDeviceDriver(); + if (standardInspectSiteDeviceDriver.getMove() != 0) { + moveNumber += 1; + } + } + } + } + for (int i = 0; i < 5 - moveNumber; i++) { + TaskDto taskDto = new TaskDto(); + String now = DateUtil.now(); + taskDto.setTask_id(IdUtil.simpleUUID()); + taskDto.setCreate_by(device.getDevice_code()); + taskDto.setUpdate_by(device.getDevice_code()); + + taskDto.setTask_status("0"); + taskDto.setPriority("1"); + String start_device_code = ""; + List list = routeLineService.getPathLinesByCode(device_code, "normal"); + for (int j = 0; j < list.size(); j++) { + RouteLineDto routeLineDto = list.get(j); + start_device_code = routeLineDto.getDevice_code(); + } + + if (StrUtil.isEmpty(start_device_code)) { + throw new RuntimeException("该设备未找到对应路由"); + } + + taskDto.setStart_point_code(start_device_code); + taskDto.setStart_device_code(start_device_code); + taskDto.setNext_point_code(device_code); + taskDto.setNext_device_code(device_code); + taskDto.setUpdate_time(now); + taskDto.setCreate_time(now); + String task_code = CodeUtil.getNewCode("TASK_NO"); + taskDto.setTask_code("-" + task_code); + + WQLObject wo = WQLObject.getWQLObject("acs_task"); + JSONObject json = JSONObject.fromObject(taskDto); + wo.insert(json); + + } + + ndxySpecialDeviceDriver.setChecked(true); + + resultJson.put("code", "1"); + resultJson.put("desc", "更新成功"); + resultJson.put("result", new JSONObject()); + + return resultJson; } } } - if (num != 0) { - resultJson.put("code", "0"); - resultJson.put("desc", "只能选择一个站点"); - resultJson.put("result", new JSONObject()); - return resultJson; - } - - //纽迪希亚专用 - if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { - ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver(); - if (ndxySpecialDeviceDriver.getChecked()) { - resultJson.put("code", "0"); - resultJson.put("desc", "该站点已经被选中"); - resultJson.put("result", new JSONObject()); - return resultJson; - } - - ndxySpecialDeviceDriver.setChecked(true); - - try { - Thread.sleep(1000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - if (!ndxySpecialDeviceDriver.getChecked() && !ndxySpecialDeviceDriver.getChoose()) { - resultJson.put("code", "0"); - resultJson.put("desc", "该条线不满足运输条件"); - resultJson.put("result", new JSONObject()); - return resultJson; - } - } +// int num = 0; +// JSONArray acs_deviceja = WQLObject.getWQLObject("acs_device").query("region = '" + dto.getRegion() + "'", "seq_num,device_name").getResultJSONArray(0); +// for (int i = 0; i < acs_deviceja.size(); i++) { +// JSONObject devicejo = acs_deviceja.getJSONObject(i); +// String deviceCode = devicejo.optString("device_code"); +// Device device1 = appService.findDeviceByCode(deviceCode); +// if (device1.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { +// ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device1.getDeviceDriver(); +// if (ndxySpecialDeviceDriver.getChecked()) { +// num++; +// } +// } +// } +// if (num != 0) { +// resultJson.put("code", "0"); +// resultJson.put("desc", "只能选择一个站点"); +// resultJson.put("result", new JSONObject()); +// return resultJson; +// } +// +// //纽迪希亚专用 +// if (device.getDeviceDriver() instanceof NdxySpecialDeviceDriver) { +// ndxySpecialDeviceDriver = (NdxySpecialDeviceDriver) device.getDeviceDriver(); +// if (ndxySpecialDeviceDriver.getChecked()) { +// resultJson.put("code", "0"); +// resultJson.put("desc", "该站点已经被选中"); +// resultJson.put("result", new JSONObject()); +// return resultJson; +// } +// +// ndxySpecialDeviceDriver.setChecked(true); +// +// try { +// Thread.sleep(1000); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// } +// +// if (!ndxySpecialDeviceDriver.getChecked() && !ndxySpecialDeviceDriver.getChoose()) { +// resultJson.put("code", "0"); +// resultJson.put("desc", "该条线不满足运输条件"); +// resultJson.put("result", new JSONObject()); +// return resultJson; +// } +// } } //强制完成 if (type.equals("2")) { @@ -804,7 +1005,6 @@ public class NdxyHandServiceImpl implements NdxyHandService { return jo; } - @Override public Map createChargingTask(Map whereJson) { String type = whereJson.get("type"); diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java index 60da2d4..1f5fc44 100644 --- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java +++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java @@ -46,7 +46,7 @@ public class ToAgvDevice { if (ObjectUtil.isNotEmpty(inst)) { row.put("transportOrder", inst.getTask_code()); } else { - row.put("transportOrder", agvDto.getTransportOrder()); + row.put("transportOrder", ""); } row.put("energyLevel", agvDto.getEnergyLevel()); row.put("device_status",agvDto.getState()); diff --git a/qd/src/views/acs/route/routeLine/index.vue b/qd/src/views/acs/route/routeLine/index.vue index fa4c052..07b4c29 100644 --- a/qd/src/views/acs/route/routeLine/index.vue +++ b/qd/src/views/acs/route/routeLine/index.vue @@ -90,6 +90,7 @@ v-model="form.device_code" filterable clearable + reserveKeyword multiple placeholder="请选择" style="width: 370px;" @@ -108,6 +109,7 @@ v-model="form.next_device_code" filterable clearable + reserveKeyword multiple placeholder="请选择" style="width: 370px;" diff --git a/qd/src/views/acs/task/taskFeedback/index.vue b/qd/src/views/acs/task/taskFeedback/index.vue index 2b4a286..3a030d8 100644 --- a/qd/src/views/acs/task/taskFeedback/index.vue +++ b/qd/src/views/acs/task/taskFeedback/index.vue @@ -119,7 +119,7 @@ - + @@ -195,7 +195,7 @@ export default { create_time: [ { required: true, message: '创建时间不能为空', trigger: 'blur' } ] - } } + }} }, methods: { // 钩子：在获取表格数据之前执行，false 则代表不获取数据