feat(delivery): 添加发货单明细中的入场钢卷号显示功能
- 引入 WmsMaterialCoil 和 WmsMaterialCoilMapper 依赖 - 在 WmsDeliveryWaybillDetailVo 中新增 enterCoilNo 字段 - 实现分页查询时根据 coilId 关联查询入场钢卷号 - 为每个明细记录设置对应的入场钢卷号信息
This commit is contained in:
@@ -40,6 +40,11 @@ public class WmsDeliveryWaybillDetailVo extends BaseEntity {
|
||||
@ExcelDictFormat(readConverterExp = "钢=卷基础信息在钢卷表中")
|
||||
private Long coilId;
|
||||
|
||||
/**
|
||||
* 入场钢卷号
|
||||
*/
|
||||
private String enterCoilNo;
|
||||
|
||||
/**
|
||||
* 品名(如:冷硬钢卷、冷轧钢卷)
|
||||
*/
|
||||
|
||||
@@ -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<WmsDeliveryWaybillDetailVo> queryPageList(WmsDeliveryWaybillDetailBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsDeliveryWaybillDetail> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsDeliveryWaybillDetailVo> 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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user