- 新增根据钢卷ID、操作类型和出入库类型删除操作记录的方法 - 新增根据二级库区ID和时间范围查询操作记录的功能 - 在WmsCoilWarehouseOperationLogVo中添加创建时间和关联对象字段 - 实现递归查询子库区ID的功能支持范围查询 - 添加钢卷和库区信息的关联查询和映射 - 在控制器中暴露新的API接口供前端调用
134 lines
5.0 KiB
Java
134 lines
5.0 KiB
Java
package com.klp.controller;
|
|
|
|
import java.util.List;
|
|
import java.util.Arrays;
|
|
import java.util.Date;
|
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.validation.constraints.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import com.klp.common.annotation.RepeatSubmit;
|
|
import com.klp.common.annotation.Log;
|
|
import com.klp.common.core.controller.BaseController;
|
|
import com.klp.common.core.domain.PageQuery;
|
|
import com.klp.common.core.domain.R;
|
|
import com.klp.common.core.validate.AddGroup;
|
|
import com.klp.common.core.validate.EditGroup;
|
|
import com.klp.common.enums.BusinessType;
|
|
import com.klp.common.utils.poi.ExcelUtil;
|
|
import com.klp.domain.vo.WmsCoilWarehouseOperationLogVo;
|
|
import com.klp.domain.bo.WmsCoilWarehouseOperationLogBo;
|
|
import com.klp.service.IWmsCoilWarehouseOperationLogService;
|
|
import com.klp.common.core.page.TableDataInfo;
|
|
|
|
/**
|
|
* 钢卷库区操作记录
|
|
*
|
|
* @author klp
|
|
* @date 2026-03-05
|
|
*/
|
|
@Validated
|
|
@RequiredArgsConstructor
|
|
@RestController
|
|
@RequestMapping("/wms/coilWarehouseOperationLog")
|
|
public class WmsCoilWarehouseOperationLogController extends BaseController {
|
|
|
|
private final IWmsCoilWarehouseOperationLogService iWmsCoilWarehouseOperationLogService;
|
|
|
|
/**
|
|
* 查询钢卷库区操作记录列表
|
|
*/
|
|
@GetMapping("/list")
|
|
public TableDataInfo<WmsCoilWarehouseOperationLogVo> list(WmsCoilWarehouseOperationLogBo bo, PageQuery pageQuery) {
|
|
return iWmsCoilWarehouseOperationLogService.queryPageList(bo, pageQuery);
|
|
}
|
|
|
|
/**
|
|
* 导出钢卷库区操作记录列表
|
|
*/
|
|
@Log(title = "钢卷库区操作记录", businessType = BusinessType.EXPORT)
|
|
@PostMapping("/export")
|
|
public void export(WmsCoilWarehouseOperationLogBo bo, HttpServletResponse response) {
|
|
List<WmsCoilWarehouseOperationLogVo> list = iWmsCoilWarehouseOperationLogService.queryList(bo);
|
|
ExcelUtil.exportExcel(list, "钢卷库区操作记录", WmsCoilWarehouseOperationLogVo.class, response);
|
|
}
|
|
|
|
/**
|
|
* 获取钢卷库区操作记录详细信息
|
|
*
|
|
* @param logId 主键
|
|
*/
|
|
@GetMapping("/{logId}")
|
|
public R<WmsCoilWarehouseOperationLogVo> getInfo(@NotNull(message = "主键不能为空")
|
|
@PathVariable Long logId) {
|
|
return R.ok(iWmsCoilWarehouseOperationLogService.queryById(logId));
|
|
}
|
|
|
|
/**
|
|
* 新增钢卷库区操作记录
|
|
*/
|
|
@Log(title = "钢卷库区操作记录", businessType = BusinessType.INSERT)
|
|
@RepeatSubmit()
|
|
@PostMapping()
|
|
public R<Void> add(@Validated(AddGroup.class) @RequestBody WmsCoilWarehouseOperationLogBo bo) {
|
|
return toAjax(iWmsCoilWarehouseOperationLogService.insertByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 修改钢卷库区操作记录
|
|
*/
|
|
@Log(title = "钢卷库区操作记录", businessType = BusinessType.UPDATE)
|
|
@RepeatSubmit()
|
|
@PutMapping()
|
|
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WmsCoilWarehouseOperationLogBo bo) {
|
|
return toAjax(iWmsCoilWarehouseOperationLogService.updateByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 删除钢卷库区操作记录
|
|
*
|
|
* @param logIds 主键串
|
|
*/
|
|
@Log(title = "钢卷库区操作记录", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/{logIds}")
|
|
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
|
@PathVariable Long[] logIds) {
|
|
return toAjax(iWmsCoilWarehouseOperationLogService.deleteWithValidByIds(Arrays.asList(logIds), true));
|
|
}
|
|
|
|
/**
|
|
* 根据钢卷 ID、操作类型及出入库类型删除钢卷库区操作记录
|
|
*
|
|
* @param coilId 钢卷 ID
|
|
* @param operationType 操作类型
|
|
* @param inOutType 出入库类型
|
|
*/
|
|
@Log(title = "钢卷库区操作记录", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/byCoilId")
|
|
public R<Void> removeByCoilId(@NotNull(message = "钢卷 ID 不能为空")
|
|
@RequestParam Long coilId,
|
|
@NotNull(message = "操作类型不能为空")
|
|
@RequestParam String operationType,
|
|
@NotNull(message = "出入库类型不能为空")
|
|
@RequestParam String inOutType) {
|
|
return toAjax(iWmsCoilWarehouseOperationLogService.deleteByCoilIdAndTypes(coilId, operationType, inOutType));
|
|
}
|
|
|
|
/**
|
|
* 根据二级库区ID和时间范围查询操作记录及钢卷信息
|
|
*
|
|
* @param secondWarehouseId 二级库区ID
|
|
* @param startTime 开始时间
|
|
* @param endTime 结束时间
|
|
*/
|
|
@GetMapping("/byWarehouseAndTime")
|
|
public R<List<WmsCoilWarehouseOperationLogVo>> getByWarehouseAndTime(
|
|
@RequestParam Long secondWarehouseId,
|
|
@RequestParam(required = false) Date startTime,
|
|
@RequestParam(required = false) Date endTime) {
|
|
return R.ok(iWmsCoilWarehouseOperationLogService.queryBySecondWarehouseIdAndTimeRange(secondWarehouseId, startTime, endTime));
|
|
}
|
|
}
|