lsy/FT577-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

现场调试修改

Browse Source
This commit is contained in:
lsymicc
2026-09-16 10:58:32 +08:00
parent 5f8add5b10
commit 674a910df6
3 changed files with 5 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java
View File

@@ -1,10 +1,7 @@
package com.ruoyi.api.controller;
import cn.hutool.json.JSONUtil;
import com.ruoyi.api.domain.RequestLog;
import com.ruoyi.api.domain.wcs2wms.JobParam;
import com.ruoyi.api.domain.wcs2wms.ReceiveJob;
import com.ruoyi.api.domain.wcs2wms.stockout.StockoutReceive;
import com.ruoyi.api.service.IApiService;
import com.ruoyi.api.service.IRequestLogService;
import com.ruoyi.bas.port.domain.WcsPort;
@@ -13,8 +10,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/wcs2wms/api")
public class Wcs2WmsController {
@@ -102,9 +97,9 @@ public class Wcs2WmsController {
* @param jobParam
* @return
*/
@PostMapping("/manuallyCompeleteMydoJob")
public AjaxResult manuallyCompeleteMydoJob(@RequestBody JobParam jobParam) {
return apiService.manuallyCompeleteTask(jobParam.getTaskNo());
@PostMapping("/manualCompeleteMydoJob")
public AjaxResult manualCompeleteMydoJob(@RequestBody JobParam jobParam) {
return apiService.manualCompeleteTask(jobParam.getTaskNo());
}

21
ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java
View File

@@ -1,41 +1,22 @@
package com.ruoyi.api.service;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.api.domain.RequestLog;
import com.ruoyi.api.domain.agv.agvCallback.AgvCallbackRequest;
import com.ruoyi.api.domain.agv.agvCallback.AgvCallbackResponse;
import com.ruoyi.api.domain.agv.cancelTask.CancelTaskRequest;
import com.ruoyi.api.domain.agv.cancelTask.CancelTaskResponse;
import com.ruoyi.api.domain.agv.continueTask.ContinueTaskRequest;
import com.ruoyi.api.domain.agv.continueTask.ContinueTaskResponse;
import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskRequest;
import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskResponse;
import com.ruoyi.api.domain.agv.genAgvSchedulingTask.PositionCodeData;
import com.ruoyi.api.domain.wcs2wms.JobParam;
import com.ruoyi.api.domain.wcs2wms.ReceiveJob;
import com.ruoyi.api.domain.wcs2wms.exception.TaskExceptionRequest;
import com.ruoyi.api.domain.wcs2wms.stockout.StockoutReceive;
import com.ruoyi.bas.port.domain.WcsPort;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.job.TaskException;
import com.ruoyi.job.domain.MydoJob;
import com.ruoyi.queue.agv.domain.AgvQueue;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static com.ruoyi.common.Constant.*;
import static com.ruoyi.common.Constant.CANCEL_TASK_URL;
/**
* 接口记录Service接口
*
@@ -125,7 +106,7 @@ public interface IApiService
AjaxResult requestWmsSpace(MydoJob mydoJob);
AjaxResult manuallyCompeleteTask(String taskNo);
AjaxResult manualCompeleteTask(String taskNo);
AjaxResult cancelTask(String taskNo);

2
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java
View File

@@ -505,7 +505,7 @@ public class ApiServiceImpl implements IApiService {
public AjaxResult manuallyCompeleteTask(String taskNo) {
public AjaxResult manualCompeleteTask(String taskNo) {
return mydoJobService.manuallyCompeleteTask(taskNo);
}