diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java index f4994b1..9d3142d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/Wcs2WmsController.java @@ -3,11 +3,14 @@ package com.ruoyi.api.controller; import com.ruoyi.api.domain.wcs2wms.JobParam; import com.ruoyi.api.domain.wcs2wms.ReceiveJob; import com.ruoyi.api.service.IApiService; +import com.ruoyi.bas.port.domain.WcsPort; import com.ruoyi.bas.port.service.IWcsPortService; 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 { @@ -54,13 +57,22 @@ public class Wcs2WmsController { /** * 查询缓存点 - * @param jobParam + * @param wcsPort * @return */ @PostMapping("/selectWcsPort") - @ResponseBody - public AjaxResult selectWcsPort(@RequestBody JobParam jobParam) { - return apiService.selectWcsPort(jobParam); + public AjaxResult selectWcsPort(@RequestBody WcsPort wcsPort) { + return apiService.selectWcsPort(wcsPort); + } + + /** + * 修改缓存点状态 + * @param wcsPort + * @return + */ + @PostMapping("/updateWcsPort") + public AjaxResult updateWcsPort(@RequestBody WcsPort wcsPort) { + return apiService.updateWcsPort(wcsPort); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java index a0026bf..c72310f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IApiService.java @@ -11,9 +11,11 @@ import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskRequest import com.ruoyi.api.domain.agv.genAgvSchedulingTask.GenAgvSchedulingTaskResponse; import com.ruoyi.api.domain.wcs2wms.JobParam; import com.ruoyi.api.domain.wcs2wms.ReceiveJob; +import com.ruoyi.bas.port.domain.WcsPort; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.job.domain.MydoJob; import com.ruoyi.queue.agv.domain.AgvQueue; +import org.aspectj.weaver.loadtime.Aj; import java.util.HashMap; import java.util.List; @@ -100,7 +102,9 @@ public interface IApiService */ AjaxResult cancelMydoJob(JobParam jobParam); - AjaxResult selectWcsPort(JobParam jobParam); + AjaxResult selectWcsPort(WcsPort wcsPort); + + AjaxResult updateWcsPort(WcsPort wcsPort); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java index b97f13f..766409a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ApiServiceImpl.java @@ -411,8 +411,18 @@ public class ApiServiceImpl implements IApiService { } @Override - public AjaxResult selectWcsPort(JobParam jobParam) { - List wcsPorts = wcsPortService.selectWcsPortList(new WcsPort()); + public AjaxResult selectWcsPort(WcsPort wcsPort) { + List wcsPorts = wcsPortService.selectWcsPortList(wcsPort); return AjaxResult.success(wcsPorts); } + + @Override + public AjaxResult updateWcsPort(WcsPort wcsPort) { + int i = wcsPortService.updateWcsPort(wcsPort); + if(i>0){ + return AjaxResult.success(); + }else{ + return AjaxResult.error(); + } + } }