|
|
|
@ -1,5 +1,6 @@ |
|
|
|
package org.nl.acs.ext.wms.service.impl; |
|
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil; |
|
|
|
import cn.hutool.core.util.ObjectUtil; |
|
|
|
import cn.hutool.core.util.StrUtil; |
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
@ -41,6 +42,8 @@ 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.exception.BadRequestException; |
|
|
|
import org.nl.utils.SecurityUtils; |
|
|
|
import org.nl.utils.SpringContextHolder; |
|
|
|
import org.nl.wql.core.bean.WQLObject; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
@ -69,7 +72,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { |
|
|
|
JSONObject resultJson = new JSONObject(); |
|
|
|
log.info("createFromWms--------------:输入参数：" + tasks.toString()); |
|
|
|
logServer.log("", "createFromWms", "info", tasks.toString(), "", "", "", ""); |
|
|
|
try{ |
|
|
|
try { |
|
|
|
JSONArray errArr = new JSONArray(); |
|
|
|
for (int i = 0; i < tasks.size(); i++) { |
|
|
|
JSONObject task = tasks.getJSONObject(i); |
|
|
|
@ -153,7 +156,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { |
|
|
|
continue; |
|
|
|
} |
|
|
|
|
|
|
|
if(TaskService.checkSameTaskByCode(task_code)){ |
|
|
|
if (TaskService.checkSameTaskByCode(task_code)) { |
|
|
|
JSONObject json = new JSONObject(); |
|
|
|
json.put("task_code", task_code); |
|
|
|
json.put("message", "不能存在相同的任务号!"); |
|
|
|
@ -227,7 +230,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { |
|
|
|
resultJson.put("message", "操作成功"); |
|
|
|
resultJson.put("data", new JSONObject()); |
|
|
|
log.info("createFromWms--------------:输出参数：" + resultJson.toString()); |
|
|
|
logServer.log("", "createFromWms", "info",tasks.toString(), resultJson.toString(), "200", "", ""); |
|
|
|
logServer.log("", "createFromWms", "info", tasks.toString(), resultJson.toString(), "200", "", ""); |
|
|
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
@ -236,7 +239,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { |
|
|
|
resultJson.put("message", e.getMessage()); |
|
|
|
resultJson.put("data", new JSONObject()); |
|
|
|
log.info("createFromWms--------------:输出参数：" + resultJson.toString()); |
|
|
|
logServer.log("", "createFromWms", "error",tasks.toString(), resultJson.toString(), "400", "", ""); |
|
|
|
logServer.log("", "createFromWms", "error", tasks.toString(), resultJson.toString(), "400", "", ""); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@ -330,9 +333,9 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { |
|
|
|
electricFenceDeviceDriver = (ElectricFenceDeviceDriver) device.getDeviceDriver(); |
|
|
|
if (electricFenceDeviceDriver.getSuspended()) { |
|
|
|
throw new RuntimeException("交通管制无法进入"); |
|
|
|
} else if (StrUtil.equals(type,"1")) { |
|
|
|
} else if (StrUtil.equals(type, "1")) { |
|
|
|
electricFenceDeviceDriver.setSuspended(true); |
|
|
|
} else if (StrUtil.equals(type,"2")) { |
|
|
|
} else if (StrUtil.equals(type, "2")) { |
|
|
|
electricFenceDeviceDriver.setSuspended(false); |
|
|
|
} |
|
|
|
} |
|
|
|
@ -938,4 +941,60 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { |
|
|
|
return resultJson; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public Map<String, Object> gccCancelTask(String whereJson) { |
|
|
|
try { |
|
|
|
log.info("gccCancelTask 请求参数：{}", whereJson); |
|
|
|
JSONObject param = JSONObject.fromObject(whereJson); |
|
|
|
String taskCode = param.optString("task_code"); |
|
|
|
if (StrUtil.isBlank(taskCode)) { |
|
|
|
throw new BadRequestException("任务号不能为空，操作失败！"); |
|
|
|
} |
|
|
|
|
|
|
|
TaskDto task = TaskService.findByCode(taskCode); |
|
|
|
if (task == null) { |
|
|
|
throw new BadRequestException(taskCode + "不存在，操作失败！"); |
|
|
|
} |
|
|
|
if ("2".equals(task.getTask_status())) { |
|
|
|
throw new BadRequestException(taskCode + "已完成，操作失败！"); |
|
|
|
} |
|
|
|
|
|
|
|
Instruction inst = InstructionService.findByTaskcode(taskCode); |
|
|
|
if (ObjectUtil.isNotEmpty(inst)) { |
|
|
|
if (Integer.parseInt(inst.getExecute_status()) >= 2) { |
|
|
|
throw new BadRequestException("AGV已取货完成，无法取消！"); |
|
|
|
} |
|
|
|
InstructionService.cancel(inst.getInstruction_id()); |
|
|
|
} |
|
|
|
|
|
|
|
String currentUsername = SecurityUtils.getCurrentUsername(); |
|
|
|
String now = DateUtil.now(); |
|
|
|
task.setUpdate_time(now); |
|
|
|
task.setUpdate_by(currentUsername); |
|
|
|
task.setTask_status("3"); |
|
|
|
|
|
|
|
WQLObject wo = WQLObject.getWQLObject("acs_task"); |
|
|
|
JSONObject json = JSONObject.fromObject(task); |
|
|
|
wo.update(json); |
|
|
|
//清理缓存
|
|
|
|
for (int i = 0; i < TaskService.findAllTaskFromCache().size(); i++) { |
|
|
|
TaskDto taskDto = TaskService.findAllTaskFromCache().get(i); |
|
|
|
if (taskDto.getTask_code().equals(taskCode)) { |
|
|
|
TaskService.findAllTaskFromCache().remove(i); |
|
|
|
} |
|
|
|
} |
|
|
|
} catch (Exception e) { |
|
|
|
JSONObject resultJson = new JSONObject(); |
|
|
|
resultJson.put("status", HttpStatus.BAD_REQUEST.value()); |
|
|
|
resultJson.put("message", e.getMessage()); |
|
|
|
log.info("gccCancelTask 响应参数：{}", resultJson); |
|
|
|
return resultJson; |
|
|
|
} |
|
|
|
|
|
|
|
JSONObject resultJson = new JSONObject(); |
|
|
|
resultJson.put("status", HttpStatus.OK.value()); |
|
|
|
resultJson.put("message", "操作成功！"); |
|
|
|
log.info("gccCancelTask 响应参数：{}", resultJson); |
|
|
|
return resultJson; |
|
|
|
} |
|
|
|
} |
|
|
|
|
张江玮
1 year ago