Merge remote-tracking branch 'origin/master'

cuilei

3 天以前 af0f58e4b39a363b73587fa1b4cce7be46e203f5

 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;
    }
}