Projects >> mes >>dffbef7e44b778c4278780d4f7b415540c74abba

Chunk
Conflicting content 
        if (recordForm.getEntityId() == null) {
            return;
        }
<<<<<<< HEAD

        Long orderId = (Long) recordForm.getEntity().getField("order");
        Entity order = dataDefinitionService.get(OrdersConstants.PLUGIN_IDENTIFIER, MODEL_ORDER).get(orderId);
        
        view.getComponentByReference("order").setEnabled(false);
        view.getComponentByReference("orderOperationComponent").setEnabled(false);
        
=======
        Entity record = recordForm.getEntity();
        Long orderId = (Long) record.getField("order");
        Entity order = dataDefinitionService.get(OrdersConstants.PLUGIN_IDENTIFIER, MODEL_ORDER).get(orderId);

>>>>>>> a0ca0b7dfff9922410fa3baa5d319dfa84b51635
        view.getComponentByReference("recordOperationProductOutComponent").setEnabled(
                getBooleanValue(order.getField("registerQuantityOutProduct")));
        view.getComponentByReference("recordOperationProductInComponent").setEnabled(
Solution content 
        if (recordForm.getEntityId() == null) {
            return;
        }

        Long orderId = (Long) recordForm.getEntity().getField("order");
        Entity order = dataDefinitionService.get(OrdersConstants.PLUGIN_IDENTIFIER, MODEL_ORDER).get(orderId);
        
        view.getComponentByReference("order").setEnabled(false);
        view.getComponentByReference("orderOperationComponent").setEnabled(false);

        view.getComponentByReference("recordOperationProductOutComponent").setEnabled(
                getBooleanValue(order.getField("registerQuantityOutProduct")));
        view.getComponentByReference("recordOperationProductInComponent").setEnabled(
File
ProductionRecordViewService.java
Developer's decision
Version 1
Kind of conflict
Cast expression
Method invocation
Variable
Chunk
Conflicting content 
    }

    private void setComponentVisible(final String recordingType, final ViewDefinitionState view) {
<<<<<<< HEAD
        view.getComponentByReference("orderOperationComponent").setEnabled(PARAM_RECORDING_TYPE_FOREACH.equals(recordingType));
        
        view.getComponentByReference("borderLayoutConsumedTimeForEach").setVisible(PARAM_RECORDING_TYPE_FOREACH.equals(recordingType));
        view.getComponentByReference("borderLayoutConsumedTimeCumulated").setVisible(PARAM_RECORDING_TYPE_CUMULATED.equals(recordingType));
=======
        view.getComponentByReference("orderOperationComponent").setVisible(
                PARAM_RECORDING_TYPE_FOREACH.equals(recordingType) || PARAM_RECORDING_TYPE_CUMULATED.equals(recordingType));
        view.getComponentByReference("borderLayoutConsumedTimeForEach").setVisible(
                PARAM_RECORDING_TYPE_FOREACH.equals(recordingType));
        view.getComponentByReference("borderLayoutConsumedTimeCumulated").setVisible(
                PARAM_RECORDING_TYPE_CUMULATED.equals(recordingType));
>>>>>>> a0ca0b7dfff9922410fa3baa5d319dfa84b51635
        view.getComponentByReference("operationNoneLabel").setVisible(
                !PARAM_RECORDING_TYPE_CUMULATED.equals(recordingType) && !PARAM_RECORDING_TYPE_FOREACH.equals(recordingType));
Solution content 
    }

    private void setComponentVisible(final String recordingType, final ViewDefinitionState view) {
        view.getComponentByReference("orderOperationComponent").setEnabled(PARAM_RECORDING_TYPE_FOREACH.equals(recordingType));
        
        view.getComponentByReference("borderLayoutConsumedTimeForEach").setVisible(PARAM_RECORDING_TYPE_FOREACH.equals(recordingType));
        view.getComponentByReference("borderLayoutConsumedTimeCumulated").setVisible(PARAM_RECORDING_TYPE_CUMULATED.equals(recordingType));
        view.getComponentByReference("operationNoneLabel").setVisible(
                !PARAM_RECORDING_TYPE_CUMULATED.equals(recordingType) && !PARAM_RECORDING_TYPE_FOREACH.equals(recordingType));
File
ProductionRecordViewService.java
Developer's decision
Version 1
Kind of conflict
Method invocation