diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java index 5ce228f..002c999 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskIssueMobController.java @@ -38,7 +38,7 @@ public class ProTaskIssueMobController extends BaseController { * 至少提供workstationId、taskId两个参数 */ ///@PreAuthorize("@ss.hasPermi('mes:pro:taskissue:list')") - @GetMapping("/getIssueList") + @GetMapping("/getlist") public AjaxResult getIssueList(ProTaskIssue proTaskIssue) { List list = proTaskIssueService.selectProTaskIssueList(proTaskIssue); return AjaxResult.success(list); diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskMobController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskMobController.java index e2c4879..9878aec 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskMobController.java @@ -8,8 +8,12 @@ import com.ktg.mes.md.domain.MdWorkstation; import com.ktg.mes.md.service.IMdWorkstationService; import com.ktg.mes.pro.domain.ProFeedback; import com.ktg.mes.pro.domain.ProTask; +import com.ktg.mes.pro.domain.ProTaskIssue; import com.ktg.mes.pro.service.IProFeedbackService; +import com.ktg.mes.pro.service.IProTaskIssueService; import com.ktg.mes.pro.service.IProTaskService; +import com.ktg.mes.wm.service.IWmIssueHeaderService; +import com.ktg.mes.wm.service.IWmIssueLineService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -31,6 +35,21 @@ public class ProTaskMobController extends BaseController { @Autowired private IMdWorkstationService mdWorkstationService; + @Autowired + private IProTaskIssueService proTaskIssueService; + + @Autowired + private IWmIssueHeaderService wmIssueHeaderService; + + @Autowired + private IWmIssueLineService wmIssueLineService; + + @GetMapping("/getlist") + public AjaxResult getIssueList(ProTaskIssue proTaskIssue) { + List list = proTaskIssueService.selectProTaskIssueList(proTaskIssue); + return AjaxResult.success(list); + } + /** * 查询工作站的生产任务 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTransOrderMobController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTransOrderMobController.java new file mode 100644 index 0000000..f9fda99 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTransOrderMobController.java @@ -0,0 +1,25 @@ +package com.ktg.mes.pro.controller; + +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.mes.pro.domain.ProTransOrder; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Api("用户信息管理") +@RestController +@RequestMapping("/mobile/pro/transorder") +public class ProTransOrderMobController extends BaseController { + + @ApiOperation("获取流转单清单") + @GetMapping("/getList") + public AjaxResult getList(ProTransOrder proTransOrder){ + return AjaxResult.success(); + } + +}