DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

待检任务检测历史的前后端代码

Browse Source
This commit is contained in:
Joshi
2025-07-25 17:10:33 +08:00
parent 3f455b773a
commit b41c015b57
19 changed files with 251 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckItemController.java
View File

@@ -40,7 +40,6 @@ public class WmsCheckItemController extends BaseController {
/**
* 查询检查项列表
*/
@SaCheckPermission("qc:checkItem:list")
@GetMapping("/list")
public TableDataInfo<WmsCheckItemVo> 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<WmsCheckItemVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

13
klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskController.java
View File

@@ -40,16 +40,21 @@ public class WmsCheckTaskController extends BaseController {
/**
* 查询检查任务列表
*/
@SaCheckPermission("qc:checkTask:list")
@GetMapping("/list")
public TableDataInfo<WmsCheckTaskVo> list(WmsCheckTaskBo bo, PageQuery pageQuery) {
return iWmsCheckTaskService.queryPageList(bo, pageQuery);
}
/**
* 查询检查任务列表
*/
@GetMapping("/listHistory")
public TableDataInfo<WmsCheckTaskVo> 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<WmsCheckTaskVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

23
klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCheckTaskItemController.java
View File

@@ -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<WmsCheckTaskItemVo> 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<WmsCheckTaskItemVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Long[] itemIds) {
return toAjax(iWmsCheckTaskItemService.deleteWithValidByIds(Arrays.asList(itemIds), true));
}
/**
* 单独修改检查项状态（根据checkTaskId和checkItemId）
*/
@PutMapping("/updateStatus")
public R<Void> updateStatus(@RequestBody Map<String, Object> 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);
}
}

6
klp-mes/src/main/java/com/klp/mes/qc/controller/WmsCommonDefectController.java
View File

@@ -40,7 +40,6 @@ public class WmsCommonDefectController extends BaseController {
/**
* 查询常见缺陷列表
*/
@SaCheckPermission("qc:commonDefect:list")
@GetMapping("/list")
public TableDataInfo<WmsCommonDefectVo> 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<WmsCommonDefectVo> 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<Void> remove(@NotEmpty(message = "主键不能为空")

2
klp-mes/src/main/java/com/klp/mes/qc/domain/WmsCheckTaskItem.java
View File

@@ -33,7 +33,7 @@ public class WmsCheckTaskItem extends BaseEntity {
*/
private Long checkItemId;
/**
* 状态：0=禁用，1=启用
* 状态：0=未检测，1=通过，2=不通过
*/
private Integer status;
/**

2
klp-mes/src/main/java/com/klp/mes/qc/domain/bo/WmsCheckTaskItemBo.java
View File

@@ -33,7 +33,7 @@ public class WmsCheckTaskItemBo extends BaseEntity {
private Long checkItemId;
/**
* 状态：0=禁用，1=启用
* 状态：0=未检测，1=通过，2=不通过
*/
private Integer status;

4
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckItemVo.java
View File

@@ -37,5 +37,9 @@ public class WmsCheckItemVo {
@ExcelProperty(value = "备注")
private String remark;
/**
* 检查项状态
*/
private String status;
}

4
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskItemVo.java
View File

@@ -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;
/**

10
klp-mes/src/main/java/com/klp/mes/qc/domain/vo/WmsCheckTaskVo.java
View File

@@ -38,10 +38,18 @@ public class WmsCheckTaskVo {
*/
@ExcelProperty(value = "备注")
private String remark;
private String itemIds;
/**
* 检查项列表
*/
private List<WmsCheckItemVo> itemList;
/**
* 检查项状态（逗号分隔）
*/
private String itemStatus;
/**
* 检查项名称（逗号分隔）
*/
private String itemNames;
}

2
klp-mes/src/main/java/com/klp/mes/qc/mapper/WmsCheckTaskMapper.java
View File

@@ -17,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
public interface WmsCheckTaskMapper extends BaseMapperPlus<WmsCheckTaskMapper, WmsCheckTask, WmsCheckTaskVo> {
Page<WmsCheckTaskVo> selectVoPagePlus(Page<Object> build,@Param("ew") LambdaQueryWrapper<WmsCheckTask> lqw);
WmsCheckTaskVo selectVoByIdPlus(Long taskId);
}

5
klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskItemService.java
View File

@@ -46,4 +46,9 @@ public interface IWmsCheckTaskItemService {
* 校验并批量删除检查任务与检查项关联信息
*/
Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
/**
* 根据checkTaskId和checkItemId修改status
*/
Boolean updateStatusByTaskAndItem(WmsCheckTaskItemBo bo);
}

4
klp-mes/src/main/java/com/klp/mes/qc/service/IWmsCheckTaskService.java
View File

@@ -26,6 +26,10 @@ public interface IWmsCheckTaskService {
* 查询检查任务列表
*/
TableDataInfo<WmsCheckTaskVo> queryPageList(WmsCheckTaskBo bo, PageQuery pageQuery);
/**
* 查询检查任务列表
*/
TableDataInfo<WmsCheckTaskVo> queryPageListHistory(WmsCheckTaskBo bo, PageQuery pageQuery);
/**
* 查询检查任务列表

13
klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskItemServiceImpl.java
View File

@@ -107,4 +107,17 @@ public class WmsCheckTaskItemServiceImpl implements IWmsCheckTaskItemService {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
/**
* 根据checkTaskId和checkItemId修改status
*/
@Override
public Boolean updateStatusByTaskAndItem(WmsCheckTaskItemBo bo) {
LambdaQueryWrapper<WmsCheckTaskItem> 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;
}
}

33
klp-mes/src/main/java/com/klp/mes/qc/service/impl/WmsCheckTaskServiceImpl.java
View File

@@ -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<WmsCheckItemVo> 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<WmsCheckTaskVo> result = baseMapper.selectVoPagePlus(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询检查任务列表
*/
@Override
public TableDataInfo<WmsCheckTaskVo> queryPageListHistory(WmsCheckTaskBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsCheckTask> lqw = buildQueryWrapper(bo);
Page<WmsCheckTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询检查任务列表