From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/controller/TaskWrkLogController.java | 51 +++++----------------------------------------------
1 files changed, 5 insertions(+), 46 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..9b925e5 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkLogController.java
@@ -1,6 +1,5 @@
package com.zy.asrs.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -10,15 +9,12 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
-import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.TaskWrkLog;
-import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.TaskWrkLogService;
-import com.zy.common.utils.HttpHandler;
+import com.zy.asrs.service.ToWmsService;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -27,15 +23,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 +134,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