art: 物料拉动 物料选择问题

zhangherong

3 天以前 f6f57c7c14c43c7b0b660790e84a8797be96d871

art: 物料拉动 物料选择问题

 src/main/java/org/jeecg/modules/pms/mapper/PmsProcessBillMaterialsDetailMapper.java

@@ -24,4 +24,12 @@
     * @return
     */
    List<PmsProcessBillMaterialsDetail> queryByMaterialNumber(String materialNumber);

    /**
     * 物料拉动选择物料使用
     * 根据热处理毛坯物料查询
     * @param materialNumber 热处理物料编码
     * @return
     */
    List<PmsProcessBillMaterialsDetail> queryByMaterialNumberOnly(String materialNumber);
}

 src/main/java/org/jeecg/modules/pms/mapper/xml/PmsProcessBillMaterialsDetailMapper.xml

@@ -23,4 +23,9 @@
                       and t1.material_id = t2.id)

    </select>
    <select id="queryByMaterialNumberOnly" resultType="org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail">
        select DISTINCT t1.material_number, t1.material_name, t1.production_unit
        from pms_process_bill_materials_detail t1
        where t1.material_number = #{materialNumber}
    </select>
</mapper>

 src/main/java/org/jeecg/modules/pms/service/impl/PmsProcessBillMaterialsDetailServiceImpl.java

@@ -54,6 +54,11 @@
        if (StringUtils.isBlank(materialNumber)) {
            return Collections.emptyList();
        }
        return this.getBaseMapper().queryByMaterialNumber(materialNumber);
        List<PmsProcessBillMaterialsDetail> list = this.getBaseMapper().queryByMaterialNumber(materialNumber);
        if (CollectionUtil.isEmpty(list)) {
            //如果是热处理，则代表选择排产工单生产的毛坯
            return this.getBaseMapper().queryByMaterialNumberOnly(materialNumber);
        }
        return list;
    }
}