|
@ -117,15 +117,16 @@ public class AMHandServiceImpl implements AMHandService { |
|
|
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver(); |
|
|
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device_driver.getDeviceDriver(); |
|
|
int move = standardInspectSiteDeviceDriver.getMove(); |
|
|
int move = standardInspectSiteDeviceDriver.getMove(); |
|
|
TaskDto taskDto = taskService.findByStartAndNextCode(device_code); |
|
|
TaskDto taskDto = taskService.findByStartAndNextCode(device_code); |
|
|
if (move != 0 && ObjectUtil.isNotEmpty(taskDto)) { |
|
|
if (ObjectUtil.isNotEmpty(taskDto)) { |
|
|
status = "2"; |
|
|
status = "2"; |
|
|
status_name = "有任务"; |
|
|
status_name = "有任务"; |
|
|
material_type = "1"; |
|
|
material_type = "1"; |
|
|
} else if (move != 0) { |
|
|
|
|
|
status = "1"; |
|
|
|
|
|
status_name = "有货"; |
|
|
|
|
|
material_type = "1"; |
|
|
|
|
|
} |
|
|
} |
|
|
|
|
|
// } else if (move != 0) {
|
|
|
|
|
|
// status = "1";
|
|
|
|
|
|
// status_name = "有货";
|
|
|
|
|
|
// material_type = "1";
|
|
|
|
|
|
// }
|
|
|
} |
|
|
} |
|
|
JSONObject map = new JSONObject(); |
|
|
JSONObject map = new JSONObject(); |
|
|
map.put("device_id", device_id); |
|
|
map.put("device_id", device_id); |
|
|