diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java index 1d5c6864..e10151c2 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java @@ -40,6 +40,11 @@ public class WmsDeliveryWaybillDetailVo extends BaseEntity { @ExcelDictFormat(readConverterExp = "钢=卷基础信息在钢卷表中") private Long coilId; + /** + * 入场钢卷号 + */ + private String enterCoilNo; + /** * 品名(如:冷硬钢卷、冷轧钢卷) */ diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java index ea4dfa29..7abb8b2e 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryWaybillDetailServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; import com.klp.common.exception.ServiceException; import com.klp.domain.WmsDeliveryWaybill; +import com.klp.domain.WmsMaterialCoil; import com.klp.mapper.WmsDeliveryWaybillMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -17,6 +18,7 @@ import com.klp.domain.vo.WmsDeliveryWaybillDetailVo; import com.klp.domain.WmsDeliveryWaybillDetail; import com.klp.domain.vo.WmsCoilBindInfoVo; import com.klp.mapper.WmsDeliveryWaybillDetailMapper; +import com.klp.mapper.WmsMaterialCoilMapper; import com.klp.service.IWmsDeliveryWaybillDetailService; import java.util.List; @@ -38,6 +40,8 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD private final WmsDeliveryWaybillMapper wmsDeliveryWaybillMapper; + private final WmsMaterialCoilMapper wmsMaterialCoilMapper; + /** * 查询发货单明细 */ @@ -53,6 +57,19 @@ public class WmsDeliveryWaybillDetailServiceImpl implements IWmsDeliveryWaybillD public TableDataInfo queryPageList(WmsDeliveryWaybillDetailBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + + // 为每个明细查询入场钢卷号 + if (result.getRecords() != null && !result.getRecords().isEmpty()) { + result.getRecords().forEach(detail -> { + if (detail.getCoilId() != null) { + WmsMaterialCoil materialCoil = wmsMaterialCoilMapper.selectById(detail.getCoilId()); + if (materialCoil != null) { + detail.setEnterCoilNo(materialCoil.getEnterCoilNo()); + } + } + }); + } + return TableDataInfo.build(result); }