| | |
| | | import com.ruoyi.common.utils.StringUtils; |
| | | import com.ruoyi.production.bean.dto.ProductionOperationTaskDto; |
| | | import com.ruoyi.production.bean.vo.ProductionOperationTaskVo; |
| | | import com.ruoyi.production.enums.MajorCategoryEnum; |
| | | import com.ruoyi.production.mapper.ProductionOrderMapper; |
| | | import com.ruoyi.production.mapper.ProductionOrderRoutingOperationMapper; |
| | | import com.ruoyi.production.mapper.ProductionOperationTaskMapper; |
| | |
| | | IPage<ProductionOperationTaskVo> result = baseMapper.pageProductionOperationTask(voPage, dto); |
| | | fillOperationTypes(result.getRecords()); |
| | | fillUserNames(result.getRecords()); |
| | | fillMajorCategories(result.getRecords()); |
| | | return result; |
| | | } |
| | | |
| | |
| | | List<ProductionOperationTaskVo> result = BeanUtil.copyToList(this.list(buildQueryWrapper(dto)), ProductionOperationTaskVo.class); |
| | | fillOperationTypes(result); |
| | | fillUserNames(result); |
| | | fillMajorCategories(result); |
| | | return result; |
| | | } |
| | | |
| | | /** |
| | | * 填充产品大类。工单本身不存大类,按产品名称用统一的 {@link MajorCategoryEnum} 规则推导, |
| | | * 与报工写入时的判定口径保持一致;非乐器(如红木等原料)保持为空。 |
| | | */ |
| | | private void fillMajorCategories(List<ProductionOperationTaskVo> records) { |
| | | if (CollectionUtils.isEmpty(records)) { |
| | | return; |
| | | } |
| | | for (ProductionOperationTaskVo vo : records) { |
| | | if (vo == null) { |
| | | continue; |
| | | } |
| | | vo.setMajorCategory(MajorCategoryEnum.match(vo.getProductName())); |
| | | } |
| | | } |
| | | |
| | | @Override |
| | | public ProductionOperationTaskVo getProductionOperationTaskInfo(Long id) { |
| | | // 获取生产工序任务详情 |