From b41c015b57a51691d704e1793d1210e0be7522a8 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 25 Jul 2025 17:10:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E6=A3=80=E4=BB=BB=E5=8A=A1=E6=A3=80?= =?UTF-8?q?=E6=B5=8B=E5=8E=86=E5=8F=B2=E7=9A=84=E5=89=8D=E5=90=8E=E7=AB=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qc/controller/WmsCheckItemController.java | 6 - .../qc/controller/WmsCheckTaskController.java | 13 +- .../WmsCheckTaskItemController.java | 23 +- .../controller/WmsCommonDefectController.java | 6 - .../klp/mes/qc/domain/WmsCheckTaskItem.java | 2 +- .../mes/qc/domain/bo/WmsCheckTaskItemBo.java | 2 +- .../klp/mes/qc/domain/vo/WmsCheckItemVo.java | 4 + .../mes/qc/domain/vo/WmsCheckTaskItemVo.java | 4 +- .../klp/mes/qc/domain/vo/WmsCheckTaskVo.java | 10 +- .../klp/mes/qc/mapper/WmsCheckTaskMapper.java | 2 + .../qc/service/IWmsCheckTaskItemService.java | 5 + .../mes/qc/service/IWmsCheckTaskService.java | 4 + .../impl/WmsCheckTaskItemServiceImpl.java | 13 ++ .../service/impl/WmsCheckTaskServiceImpl.java | 33 ++- .../mapper/qc/WmsCheckTaskMapper.xml | 12 ++ klp-ui/src/api/mes/qc/checkTask.js | 11 + klp-ui/src/api/mes/qc/checkTaskItem.js | 8 + klp-ui/src/views/mes/qc/history/index.vue | 200 ++++++------------ klp-ui/src/views/mes/qc/task/index.vue | 67 +++++- 19 files changed, 251 insertions(+), 174 deletions(-) diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java index cc2289b4..6ce74419 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java @@ -40,7 +40,6 @@ public class WmsCheckItemController extends BaseController { /** * 查询检查项列表 */ - @SaCheckPermission("qc:checkItem:list") @GetMapping("/list") public TableDataInfo list(WmsCheckItemBo bo, PageQuery pageQuery) { return iWmsCheckItemService.queryPageList(bo, pageQuery); @@ -49,7 +48,6 @@ public class WmsCheckItemController extends BaseController { /** * 导出检查项列表 */ - @SaCheckPermission("qc:checkItem:export") @Log(title = "检查项", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WmsCheckItemBo bo, HttpServletResponse response) { @@ -62,7 +60,6 @@ public class WmsCheckItemController extends BaseController { * * @param itemId 主键 */ - @SaCheckPermission("qc:checkItem:query") @GetMapping("/{itemId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long itemId) { @@ -72,7 +69,6 @@ public class WmsCheckItemController extends BaseController { /** * 新增检查项 */ - @SaCheckPermission("qc:checkItem:add") @Log(title = "检查项", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +79,6 @@ public class WmsCheckItemController extends BaseController { /** * 修改检查项 */ - @SaCheckPermission("qc:checkItem:edit") @Log(title = "检查项", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +91,6 @@ public class WmsCheckItemController extends BaseController { * * @param itemIds 主键串 */ - @SaCheckPermission("qc:checkItem:remove") @Log(title = "检查项", businessType = BusinessType.DELETE) @DeleteMapping("/{itemIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java index bd10d238..7317a3f4 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java @@ -40,16 +40,21 @@ public class WmsCheckTaskController extends BaseController { /** * 查询检查任务列表 */ - @SaCheckPermission("qc:checkTask:list") @GetMapping("/list") public TableDataInfo list(WmsCheckTaskBo bo, PageQuery pageQuery) { return iWmsCheckTaskService.queryPageList(bo, pageQuery); } + /** + * 查询检查任务列表 + */ + @GetMapping("/listHistory") + public TableDataInfo listHistory(WmsCheckTaskBo bo, PageQuery pageQuery) { + return iWmsCheckTaskService.queryPageListHistory(bo, pageQuery); + } /** * 导出检查任务列表 */ - @SaCheckPermission("qc:checkTask:export") @Log(title = "检查任务", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WmsCheckTaskBo bo, HttpServletResponse response) { @@ -62,7 +67,6 @@ public class WmsCheckTaskController extends BaseController { * * @param taskId 主键 */ - @SaCheckPermission("qc:checkTask:query") @GetMapping("/{taskId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long taskId) { @@ -72,7 +76,6 @@ public class WmsCheckTaskController extends BaseController { /** * 新增检查任务 */ - @SaCheckPermission("qc:checkTask:add") @Log(title = "检查任务", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +86,6 @@ public class WmsCheckTaskController extends BaseController { /** * 修改检查任务 */ - @SaCheckPermission("qc:checkTask:edit") @Log(title = "检查任务", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +98,6 @@ public class WmsCheckTaskController extends BaseController { * * @param taskIds 主键串 */ - @SaCheckPermission("qc:checkTask:remove") @Log(title = "检查任务", businessType = BusinessType.DELETE) @DeleteMapping("/{taskIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java index 67d0dcb7..737f8067 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java @@ -2,6 +2,7 @@ package com.klp.mes.qc.controller; import java.util.List; import java.util.Arrays; +import java.util.Map; import lombok.RequiredArgsConstructor; import javax.servlet.http.HttpServletResponse; @@ -40,7 +41,6 @@ public class WmsCheckTaskItemController extends BaseController { /** * 查询检查任务与检查项关联列表 */ - @SaCheckPermission("qc:checkTaskItem:list") @GetMapping("/list") public TableDataInfo list(WmsCheckTaskItemBo bo, PageQuery pageQuery) { return iWmsCheckTaskItemService.queryPageList(bo, pageQuery); @@ -49,7 +49,6 @@ public class WmsCheckTaskItemController extends BaseController { /** * 导出检查任务与检查项关联列表 */ - @SaCheckPermission("qc:checkTaskItem:export") @Log(title = "检查任务与检查项关联", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WmsCheckTaskItemBo bo, HttpServletResponse response) { @@ -62,7 +61,6 @@ public class WmsCheckTaskItemController extends BaseController { * * @param itemId 主键 */ - @SaCheckPermission("qc:checkTaskItem:query") @GetMapping("/{itemId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long itemId) { @@ -72,7 +70,6 @@ public class WmsCheckTaskItemController extends BaseController { /** * 新增检查任务与检查项关联 */ - @SaCheckPermission("qc:checkTaskItem:add") @Log(title = "检查任务与检查项关联", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +80,6 @@ public class WmsCheckTaskItemController extends BaseController { /** * 修改检查任务与检查项关联 */ - @SaCheckPermission("qc:checkTaskItem:edit") @Log(title = "检查任务与检查项关联", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,11 +92,26 @@ public class WmsCheckTaskItemController extends BaseController { * * @param itemIds 主键串 */ - @SaCheckPermission("qc:checkTaskItem:remove") @Log(title = "检查任务与检查项关联", businessType = BusinessType.DELETE) @DeleteMapping("/{itemIds}") public R remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] itemIds) { return toAjax(iWmsCheckTaskItemService.deleteWithValidByIds(Arrays.asList(itemIds), true)); } + + /** + * 单独修改检查项状态（根据checkTaskId和checkItemId） + */ + @PutMapping("/updateStatus") + public R updateStatus(@RequestBody Map params) { + Long checkTaskId = params.get("checkTaskId") instanceof Number ? ((Number)params.get("checkTaskId")).longValue() : Long.valueOf(params.get("checkTaskId").toString()); + Long checkItemId = params.get("checkItemId") instanceof Number ? ((Number)params.get("checkItemId")).longValue() : Long.valueOf(params.get("checkItemId").toString()); + Integer status = params.get("status") instanceof Number ? ((Number)params.get("status")).intValue() : Integer.valueOf(params.get("status").toString()); + WmsCheckTaskItemBo bo = new WmsCheckTaskItemBo(); + bo.setCheckTaskId(checkTaskId); + bo.setCheckItemId(checkItemId); + bo.setStatus(status); + boolean result = iWmsCheckTaskItemService.updateStatusByTaskAndItem(bo); + return toAjax(result); + } } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java index a8a4997f..4b184299 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java @@ -40,7 +40,6 @@ public class WmsCommonDefectController extends BaseController { /** * 查询常见缺陷列表 */ - @SaCheckPermission("qc:commonDefect:list") @GetMapping("/list") public TableDataInfo list(WmsCommonDefectBo bo, PageQuery pageQuery) { return iWmsCommonDefectService.queryPageList(bo, pageQuery); @@ -49,7 +48,6 @@ public class WmsCommonDefectController extends BaseController { /** * 导出常见缺陷列表 */ - @SaCheckPermission("qc:commonDefect:export") @Log(title = "常见缺陷", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(WmsCommonDefectBo bo, HttpServletResponse response) { @@ -62,7 +60,6 @@ public class WmsCommonDefectController extends BaseController { * * @param defectId 主键 */ - @SaCheckPermission("qc:commonDefect:query") @GetMapping("/{defectId}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long defectId) { @@ -72,7 +69,6 @@ public class WmsCommonDefectController extends BaseController { /** * 新增常见缺陷 */ - @SaCheckPermission("qc:commonDefect:add") @Log(title = "常见缺陷", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -83,7 +79,6 @@ public class WmsCommonDefectController extends BaseController { /** * 修改常见缺陷 */ - @SaCheckPermission("qc:commonDefect:edit") @Log(title = "常见缺陷", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -96,7 +91,6 @@ public class WmsCommonDefectController extends BaseController { * * @param defectIds 主键串 */ - @SaCheckPermission("qc:commonDefect:remove") @Log(title = "常见缺陷", businessType = BusinessType.DELETE) @DeleteMapping("/{defectIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java index 7f29c7a3..9c9899ad 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java @@ -33,7 +33,7 @@ public class WmsCheckTaskItem extends BaseEntity { */ private Long checkItemId; /** - * 状态：0=禁用，1=启用 + * 状态：0=未检测，1=通过，2=不通过 */ private Integer status; /** diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java index 272be2ae..29c732fc 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java @@ -33,7 +33,7 @@ public class WmsCheckTaskItemBo extends BaseEntity { private Long checkItemId; /** - * 状态：0=禁用，1=启用 + * 状态：0=未检测，1=通过，2=不通过 */ private Integer status; diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java index fe857520..9fda362b 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java @@ -37,5 +37,9 @@ public class WmsCheckItemVo { @ExcelProperty(value = "备注") private String remark; + /** + * 检查项状态 + */ + private String status; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java index de5c6283..30df0b79 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java @@ -38,9 +38,9 @@ public class WmsCheckTaskItemVo { private Long checkItemId; /** - * 状态：0=禁用，1=启用 + * 状态：0=未检测，1=通过，2=不通过 */ - @ExcelProperty(value = "状态：0=禁用，1=启用") + @ExcelProperty(value = "状态：0=未检测，1=通过，2=不通过") private Integer status; /** diff --git a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java index e28c0000..5724a1ae 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java @@ -38,10 +38,18 @@ public class WmsCheckTaskVo { */ @ExcelProperty(value = "备注") private String remark; - + private String itemIds; /** * 检查项列表 */ private List itemList; + /** + * 检查项状态（逗号分隔） + */ + private String itemStatus; + /** + * 检查项名称（逗号分隔） + */ + private String itemNames; } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java index eb36d0e0..a0219bab 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java @@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param; public interface WmsCheckTaskMapper extends BaseMapperPlus { Page selectVoPagePlus(Page build,@Param("ew") LambdaQueryWrapper lqw); + + WmsCheckTaskVo selectVoByIdPlus(Long taskId); } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java index a5e092f5..cdb4222d 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java @@ -46,4 +46,9 @@ public interface IWmsCheckTaskItemService { * 校验并批量删除检查任务与检查项关联信息 */ Boolean deleteWithValidByIds(Collection ids, Boolean isValid); + + /** + * 根据checkTaskId和checkItemId修改status + */ + Boolean updateStatusByTaskAndItem(WmsCheckTaskItemBo bo); } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java index 9ca2209c..01a018c6 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java @@ -26,6 +26,10 @@ public interface IWmsCheckTaskService { * 查询检查任务列表 */ TableDataInfo queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery); + /** + * 查询检查任务列表 + */ + TableDataInfo queryPageListHistory(WmsCheckTaskBo bo, PageQuery pageQuery); /** * 查询检查任务列表 diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java index f37858ca..94b475d5 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java @@ -107,4 +107,17 @@ public class WmsCheckTaskItemServiceImpl implements IWmsCheckTaskItemService { } return baseMapper.deleteBatchIds(ids) > 0; } + + /** + * 根据checkTaskId和checkItemId修改status + */ + @Override + public Boolean updateStatusByTaskAndItem(WmsCheckTaskItemBo bo) { + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(WmsCheckTaskItem::getCheckTaskId, bo.getCheckTaskId()); + lqw.eq(WmsCheckTaskItem::getCheckItemId, bo.getCheckItemId()); + WmsCheckTaskItem update = new WmsCheckTaskItem(); + update.setStatus(bo.getStatus()); + return baseMapper.update(update, lqw) > 0; + } } diff --git a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java index 3268d6c6..dde497c7 100644 --- a/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java +++ b/klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java @@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; import com.klp.mes.qc.domain.WmsCheckTaskItem; +import com.klp.mes.qc.domain.vo.WmsCheckItemVo; +import com.klp.mes.qc.mapper.WmsCheckItemMapper; import com.klp.mes.qc.mapper.WmsCheckTaskItemMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,6 +20,7 @@ import com.klp.mes.qc.mapper.WmsCheckTaskMapper; import com.klp.mes.qc.service.IWmsCheckTaskService; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Collection; @@ -39,8 +42,25 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { * 查询检查任务 */ @Override - public WmsCheckTaskVo queryById(Long taskId){ - return baseMapper.selectVoById(taskId); + public WmsCheckTaskVo queryById(Long taskId) { + WmsCheckTaskVo vo = baseMapper.selectVoByIdPlus(taskId); + if (vo != null && vo.getItemIds() != null) { + String[] ids = vo.getItemIds().split(","); + String[] names = vo.getItemNames() != null ? vo.getItemNames().split(",") : new String[ids.length]; + String[] statusArr = vo.getItemStatus() != null ? vo.getItemStatus().split(",") : new String[ids.length]; + List itemList = new ArrayList<>(); + for (int i = 0; i < ids.length; i++) { + if (!ids[i].isEmpty()) { + WmsCheckItemVo item = new WmsCheckItemVo(); + item.setItemId(Long.valueOf(ids[i])); + if (names.length > i) item.setItemName(names[i]); + if (statusArr.length > i) item.setStatus(statusArr[i]); + itemList.add(item); + } + } + vo.setItemList(itemList); + } + return vo; } /** @@ -52,6 +72,15 @@ public class WmsCheckTaskServiceImpl implements IWmsCheckTaskService { Page result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw); return TableDataInfo.build(result); } + /** + * 查询检查任务列表 + */ + @Override + public TableDataInfo queryPageListHistory(WmsCheckTaskBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } /** * 查询检查任务列表 diff --git a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml index b2376456..f8af543d 100644 --- a/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml +++ b/klp-mes/src/main/resources/mapper/qc/WmsCheckTaskMapper.xml @@ -19,9 +19,21 @@ FROM wms_check_task t LEFT JOIN wms_check_task_item ti ON t.task_id = ti.check_task_id AND ti.del_flag = 0 LEFT JOIN wms_check_item i ON ti.check_item_id = i.item_id AND i.del_flag = 0 + WHERE t.del_flag = 0 + AND EXISTS ( + SELECT 1 FROM wms_check_task_item ti2 WHERE ti2.check_task_id = t.task_id AND ti2.status = 0 AND ti2.del_flag = 0 + ) ${ew.customSqlSegment} GROUP BY t.task_id + diff --git a/klp-ui/src/api/mes/qc/checkTask.js b/klp-ui/src/api/mes/qc/checkTask.js index 39893c93..9342bb1f 100644 --- a/klp-ui/src/api/mes/qc/checkTask.js +++ b/klp-ui/src/api/mes/qc/checkTask.js @@ -41,4 +41,15 @@ export function delCheckTask(taskId) { url: '/qc/checkTask/' + taskId, method: 'delete' }) + +//查看历史任务 +} + +// 查询历史检查任务列表 +export function listHistoryCheckTask(query) { + return request({ + url: '/qc/checkTask/listHistory', + method: 'get', + params: query + }) } diff --git a/klp-ui/src/api/mes/qc/checkTaskItem.js b/klp-ui/src/api/mes/qc/checkTaskItem.js index 1681c129..49e3e41e 100644 --- a/klp-ui/src/api/mes/qc/checkTaskItem.js +++ b/klp-ui/src/api/mes/qc/checkTaskItem.js @@ -42,3 +42,11 @@ export function delCheckTaskItem(itemId) { method: 'delete' }) } + +export function updateCheckTaskItemStatus(data) { + return request({ + url: '/qc/checkTaskItem/updateStatus', + method: 'put', + data // 需要包含checkTaskId、checkItemId、status + }) +} diff --git a/klp-ui/src/views/mes/qc/history/index.vue b/klp-ui/src/views/mes/qc/history/index.vue index 25e2a172..9b238da2 100644 --- a/klp-ui/src/views/mes/qc/history/index.vue +++ b/klp-ui/src/views/mes/qc/history/index.vue @@ -1,6 +1,6 @@ - - - - - - - - - - -
- 确 定 - 取 消 -
+ + + + + {{ detailData.taskName }} + {{ detailData.remark }} + +
+
+ {{ item.itemName }} + + 未检测 + 通过 + 不通过 + 未知 + +
+
+ + + + 关 闭 + diff --git a/klp-ui/src/views/mes/qc/task/index.vue b/klp-ui/src/views/mes/qc/task/index.vue index 59b55b14..e4fee232 100644 --- a/klp-ui/src/views/mes/qc/task/index.vue +++ b/klp-ui/src/views/mes/qc/task/index.vue @@ -106,16 +106,48 @@ 取 消 + + + + + {{ detailData.taskName }} + {{ detailData.remark }} + +
+
+ {{ item.itemName }} + + 未检测 + 通过 + 不通过 + 未知 + +
+
+ 通过 + 不通过 +
+
+ + + + 关 闭 + +