Joshi
74d0cfedf4
- 在ApsPlanDetailController中新增/coils/{planSheetId}接口
- 实现queryCoilsByPlanSheetId方法查询指定排产单关联的钢卷
- 集成WmsCoilContractRel和WmsMaterialCoilService相关服务
- 根据排产日期筛选钢卷创建时间范围
- 添加日期范围计算工具方法支持天级别时间筛选
108 lines
3.7 KiB
Java
108 lines
3.7 KiB
Java
package com.klp.aps.controller;
|
|
|
|
import java.util.List;
|
|
import java.util.Arrays;
|
|
|
|
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.aps.domain.vo.ApsPlanDetailVo;
|
|
import com.klp.aps.domain.bo.ApsPlanDetailBo;
|
|
import com.klp.aps.service.IApsPlanDetailService;
|
|
import com.klp.common.core.page.TableDataInfo;
|
|
import com.klp.domain.vo.WmsMaterialCoilVo;
|
|
|
|
/**
|
|
* 排产单明细
|
|
*
|
|
* @author klp
|
|
* @date 2026-03-26
|
|
*/
|
|
@Validated
|
|
@RequiredArgsConstructor
|
|
@RestController
|
|
@RequestMapping("/aps/planDetail")
|
|
public class ApsPlanDetailController extends BaseController {
|
|
|
|
private final IApsPlanDetailService iApsPlanDetailService;
|
|
|
|
/**
|
|
* 查询排产单明细列表
|
|
*/
|
|
@GetMapping("/list")
|
|
public TableDataInfo<ApsPlanDetailVo> list(ApsPlanDetailBo bo, PageQuery pageQuery) {
|
|
return iApsPlanDetailService.queryPageList(bo, pageQuery);
|
|
}
|
|
|
|
/**
|
|
* 导出排产单明细列表
|
|
*/
|
|
@Log(title = "排产单明细", businessType = BusinessType.EXPORT)
|
|
@PostMapping("/export")
|
|
public void export(ApsPlanDetailBo bo, HttpServletResponse response) {
|
|
List<ApsPlanDetailVo> list = iApsPlanDetailService.queryList(bo);
|
|
ExcelUtil.exportExcel(list, "排产单明细", ApsPlanDetailVo.class, response);
|
|
}
|
|
|
|
/**
|
|
* 获取排产单明细详细信息
|
|
*
|
|
* @param planDetailId 主键
|
|
*/
|
|
@GetMapping("/{planDetailId}")
|
|
public R<ApsPlanDetailVo> getInfo(@NotNull(message = "主键不能为空")
|
|
@PathVariable Long planDetailId) {
|
|
return R.ok(iApsPlanDetailService.queryById(planDetailId));
|
|
}
|
|
|
|
/**
|
|
* 新增排产单明细
|
|
*/
|
|
@Log(title = "排产单明细", businessType = BusinessType.INSERT)
|
|
@RepeatSubmit()
|
|
@PostMapping()
|
|
public R<Void> add(@Validated(AddGroup.class) @RequestBody ApsPlanDetailBo bo) {
|
|
return toAjax(iApsPlanDetailService.insertByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 修改排产单明细
|
|
*/
|
|
@Log(title = "排产单明细", businessType = BusinessType.UPDATE)
|
|
@RepeatSubmit()
|
|
@PutMapping()
|
|
public R<Void> edit(@Validated(EditGroup.class) @RequestBody ApsPlanDetailBo bo) {
|
|
return toAjax(iApsPlanDetailService.updateByBo(bo));
|
|
}
|
|
|
|
/**
|
|
* 删除排产单明细
|
|
*
|
|
* @param planDetailIds 主键串
|
|
*/
|
|
@Log(title = "排产单明细", businessType = BusinessType.DELETE)
|
|
@DeleteMapping("/{planDetailIds}")
|
|
public R<Void> remove(@NotEmpty(message = "主键不能为空")
|
|
@PathVariable Long[] planDetailIds) {
|
|
return toAjax(iApsPlanDetailService.deleteWithValidByIds(Arrays.asList(planDetailIds), true));
|
|
}
|
|
|
|
// 根据排产单ID查询排产日期以及明细绑定的orderId,再根据这个orderId和排查时间查询返回钢卷
|
|
@GetMapping("/coils/{planSheetId}")
|
|
public R<List<WmsMaterialCoilVo>> getCoilsByPlanSheetId(@NotNull(message = "排产单ID不能为空")
|
|
@PathVariable Long planSheetId) {
|
|
return R.ok(iApsPlanDetailService.queryCoilsByPlanSheetId(planSheetId));
|
|
}
|
|
}
|