feat: 新增废料管理并完善合同导出

云

7 天以前 fd1efdba56dbf07943b82c971694579af034fc5a

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/wm/materialstock/MesWmMaterialStockMapper.java

@@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstock;

import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.wm.materialstock.vo.MesWmMaterialStockListReqVO;
@@ -19,6 +20,11 @@
@Mapper
public interface MesWmMaterialStockMapper extends BaseMapperX<MesWmMaterialStockDO> {

    default MesWmMaterialStockDO lockById(Long id) {
        return selectOne(new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .eq(MesWmMaterialStockDO::getId, id).last("FOR UPDATE"));
    }

    default PageResult<MesWmMaterialStockDO> selectPage(MesWmMaterialStockPageReqVO reqVO,
                                                         Collection<Long> itemTypeIds,
                                                         Collection<Long> itemIds,
@@ -26,6 +32,7 @@
        LambdaQueryWrapperX<MesWmMaterialStockDO> wrapper = new LambdaQueryWrapperX<MesWmMaterialStockDO>()
                .inIfPresent(MesWmMaterialStockDO::getItemTypeId, itemTypeIds)
                .inIfPresent(MesWmMaterialStockDO::getItemId, itemIds)
                .eqIfPresent(MesWmMaterialStockDO::getItemId, reqVO.getMdmItemId())
                .likeIfPresent(MesWmMaterialStockDO::getBatchCode, reqVO.getBatchCode())
                .eqIfPresent(MesWmMaterialStockDO::getBatchId, reqVO.getBatchId())
                .eqIfPresent(MesWmMaterialStockDO::getWarehouseId, reqVO.getWarehouseId())
@@ -33,6 +40,14 @@
                .eqIfPresent(MesWmMaterialStockDO::getAreaId, reqVO.getAreaId())
                .eqIfPresent(MesWmMaterialStockDO::getVendorId, reqVO.getVendorId())
                .eqIfPresent(MesWmMaterialStockDO::getFrozen, reqVO.getFrozen());
        if (StrUtil.isNotBlank(reqVO.getItemName())) {
            String keyword = "%" + reqVO.getItemName().trim() + "%";
            wrapper.apply("item_id IN (SELECT id FROM mdm_item WHERE (name LIKE {0} OR code LIKE {0}) AND deleted = 0)", keyword);
        }
        if (StrUtil.isNotBlank(reqVO.getVendorName())) {
            wrapper.apply("vendor_id IN (SELECT id FROM srm_supplier WHERE name LIKE {0} AND deleted = 0)",
                    "%" + reqVO.getVendorName().trim() + "%");
        }
        wrapper.ne(MesWmMaterialStockDO::getQuantity, BigDecimal.ZERO)
                .orderByAsc(MesWmMaterialStockDO::getReceiptTime);
        // 虚拟仓过滤（Service 层已将 virtualFilter 解析为 virtualWarehouseId）