From f1ceb86a5080dd64d499488da9ec2d7f0435a1f5 Mon Sep 17 00:00:00 2001 From: "JinLu.Yin" <411641505@qq.com> Date: Fri, 8 Jul 2022 21:24:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A6=E6=8E=A7=E5=B1=8F=E7=AB=AF=E7=94=9F?= =?UTF-8?q?=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pro/controller/ProTaskMobController.java | 43 +++++++++++++++++++ .../resources/mapper/pro/ProTaskMapper.xml | 1 + 2 files changed, 44 insertions(+) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskMobController.java 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 new file mode 100644 index 0000000..27ed588 --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProTaskMobController.java @@ -0,0 +1,43 @@ +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.ProTask; +import com.ktg.mes.pro.service.IProTaskService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/mobile/pro/protask") +public class ProTaskMobController extends BaseController { + + @Autowired + private IProTaskService proTaskService; + + /** + * 查询工作站的生产任务 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:protask:list')") + @GetMapping("/getTaskList") + public AjaxResult list(ProTask proTask) + { + List list = proTaskService.selectProTaskList(proTask); + return AjaxResult.success(list); + } + + /** + * 获取生产任务详细信息 + */ + @PreAuthorize("@ss.hasPermi('mes:pro:protask:query')") + @GetMapping(value = "/{taskId}") + public AjaxResult getInfo(@PathVariable("taskId") Long taskId) + { + return AjaxResult.success(proTaskService.selectProTaskByTaskId(taskId)); + } +} diff --git a/ktg-mes/src/main/resources/mapper/pro/ProTaskMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProTaskMapper.xml index 69ee6af..010c237 100644 --- a/ktg-mes/src/main/resources/mapper/pro/ProTaskMapper.xml +++ b/ktg-mes/src/main/resources/mapper/pro/ProTaskMapper.xml @@ -80,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and end_time = #{endTime} and color_code = #{colorCode} and request_date = #{requestDate} + order by request_date asc