From 1a1e3398d15027a65e56e0ed82e54f3a4feea0b6 Mon Sep 17 00:00:00 2001 From: ZY <zc857179121@qq.com> Date: 星期五, 25 四月 2025 09:49:25 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 47 ++++++----------------------------------------- 1 files changed, 6 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java index a12b7b1..1e807e6 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java @@ -14,6 +14,8 @@ import com.zy.asrs.entity.TaskWrkLog; import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.TaskWrkLogService; +import com.zy.asrs.service.TaskWrkReportService; +import com.zy.asrs.service.ToWmsService; import com.zy.common.utils.HttpHandler; import com.zy.common.web.BaseController; import lombok.extern.slf4j.Slf4j; @@ -27,15 +29,12 @@ @RestController public class TaskWrkLogController extends BaseController { - @Value("${wms.url}") - private String wmsUrl; - @Value("${wms.TaskExecCallback}") - private String TaskExecCallback; - @Autowired - private ApiLogService apiLogService; @Autowired private TaskWrkLogService taskWrkLogService; + + @Autowired + private ToWmsService toWmsService; @RequestMapping(value = "/taskWrkLog/{id}/auth") @ManagerAuth @@ -141,41 +140,7 @@ public R resubmitTheTask(@RequestParam String taskNo) { TaskWrkLog taskWrk = taskWrkLogService.selectOne(new EntityWrapper<TaskWrkLog>().eq("task_no", taskNo)); if (!Cools.isEmpty(taskWrk)) { - HashMap<String, Object> headParam = new HashMap<>(); - if (taskWrk.getStatus().equals(TaskStatusType.OVER.id)) {//瀹屾垚 - headParam.put("Result", 1); - } else if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) { - headParam.put("Result", 2); - } - String response = ""; - Boolean bool = false; - try { - headParam.put("TaskNo", taskWrk.getTaskNo()); - log.info("閲嶆柊涓婃姤浠诲姟瀹岀粨={}", taskWrk); - response = new HttpHandler.Builder() - // .setHeaders(headParam) - .setUri(wmsUrl) - .setPath(TaskExecCallback) - .setJson(JSON.toJSONString(headParam)) - .build() - .doPost(); - JSONObject jsonObject = JSON.parseObject(response); - - if (jsonObject.get("ReturnStatus").equals(0)) { - bool = true; - } - } catch (Exception e) { - log.error("閲嶆柊涓婃姤浠诲姟瀹岀粨澶辫触{},杩斿洖鍊�={}", taskWrk, response); - } finally { - apiLogService.save("閲嶆柊涓婃姤浠诲姟瀹岀粨" - , wmsUrl + TaskExecCallback - , null - , "127.0.0.1" - , JSON.toJSONString(headParam) - , response - , bool - ); - } + toWmsService.addReportLog(taskWrk); } return R.ok(); } -- Gitblit v1.9.1