新火炬后端单体项目初始化代码
Houjie
4 天以前 088e145409aa4f3a4e4fb355843d2e6a6c02f8cb
src/main/java/org/jeecg/modules/mes/controller/MesProductionWorkOrderController.java
@@ -16,6 +16,9 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.enums.ProductionTypeEnum;
import org.jeecg.modules.base.service.IFactoryService;
import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum;
import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
@@ -66,6 +69,8 @@
    private IEamProcessCheckDetailService eamProcessCheckDetailService;
    @Autowired
    private IEamEquipmentService eamEquipmentService;
    @Autowired
    private IFactoryService factoryService;
    /**
     * 分页列表查询
@@ -222,6 +227,14 @@
        if (!ProductionWorkOrderStatus.PUBLISHED.name().equals(workOrder.getWorkOrderStatus())) {
            return Result.error("当前工单状态不能进行齐套性检查!");
        }
        Factory factory = factoryService.getById(workOrder.getFactoryId());
        String productionType = factory.getProductionType();
        if (ProductionTypeEnum.HEATTREATMENT.name().equals(productionType)) {
            //热处理产线
            List<MesKittingCompletenessCheck> list = mesProductionWorkOrderService.workOrderCompletenessCheckOnHeatTreatment(workOrder);
            return Result.ok(list);
        }
        //其余产线
        List<MesKittingCompletenessCheck> list = mesProductionWorkOrderService.workOrderCompletenessCheck(workOrder);
        return Result.ok(list);
    }