diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index e956902e..a475fb92 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -657,6 +657,23 @@ public class WmsMaterialCoilController extends BaseController { return toAjax(iWmsMaterialCoilService.fixMaterialMismatchCoils(coilId)); } + /** + * 根据入场钢卷号查询最早的热轧卷板材质 + * 前端传入某个入场钢卷号,查询该组钢卷中是否有热轧卷板 + * 如果有,返回最早创建的热轧卷板的材质信息 + * + * @param enterCoilNo 入场钢卷号 + * @return 材质信息 + */ + @GetMapping("/queryEarliestHotRolledMaterial") + public R queryEarliestHotRolledMaterial(@NotBlank(message = "入场钢卷号不能为空") @RequestParam String enterCoilNo) { + String material = iWmsMaterialCoilService.queryEarliestHotRolledMaterial(enterCoilNo); + if (material == null) { + return R.fail("未找到该入场钢卷号对应的热轧卷板材质"); + } + return R.ok(material, "查询成功"); + } + } diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java index 1aab252c..35462b01 100644 --- a/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java +++ b/klp-wms/src/main/java/com/klp/mapper/WmsMaterialCoilMapper.java @@ -127,5 +127,12 @@ List selectDeliveryExportListByCoilIds(@Param(" * 分页查询材质异常的钢卷 */ IPage selectMaterialMismatchCoilsPage(IPage page); + + /** + * 根据入场钢卷号查询最早的热轧卷板材质 + * @param enterCoilNo 入场钢卷号 + * @return 材质信息 + */ + String selectEarliestHotRolledMaterial(@Param("enterCoilNo") String enterCoilNo); } diff --git a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java index 06c107fa..4f9a8ec6 100644 --- a/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java +++ b/klp-wms/src/main/java/com/klp/service/IWmsMaterialCoilService.java @@ -304,6 +304,16 @@ public interface IWmsMaterialCoilService { */ Boolean fixMaterialMismatchCoils(Long coilId); + /** + * 根据入场钢卷号查询最早的热轧卷板材质 + * 用于前端传入某个入场钢卷号,查询该组钢卷中是否有热轧卷板 + * 如果有,返回最早创建的热轧卷板的材质信息 + * + * @param enterCoilNo 入场钢卷号 + * @return 材质信息,如果没有热轧卷板则返回null + */ + String queryEarliestHotRolledMaterial(String enterCoilNo); + /** * 退火报表导出数据列表(按 coilIds) * diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 221fddf4..28cc1b09 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -5514,6 +5514,22 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { return dto; } + @Override + public String queryEarliestHotRolledMaterial(String enterCoilNo) { + if (StringUtils.isBlank(enterCoilNo)) { + throw new RuntimeException("入场钢卷号不能为空"); + } + + // 查询该入场钢卷号下最早创建的热轧卷板的材质 + String material = baseMapper.selectEarliestHotRolledMaterial(enterCoilNo); + + if (StringUtils.isBlank(material)) { + // 找不到返回空值说明这个钢卷号对应的组没有热轧卷板 + return null; + } + + return material; + } } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index 82fec970..e80b5102 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -1068,5 +1068,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) + + +