Projects >> mes >>eaa73f351080a30e0cc9d135b455e83d92e62efd

Chunk
Conflicting content 
        productionRecord.setField("loggings", loggings1);

        List recOpProdInComponents = Lists.newArrayList(addRecordOperationProductInComponent(
<<<<<<< HEAD
                getProductByNumber("000018"), new BigDecimal("150"), new BigDecimal("152"), new BigDecimal("2")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000019"), new BigDecimal("600"),
                new BigDecimal("600"), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000020"), new BigDecimal("2400"),
                new BigDecimal("2400"), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000021"), new BigDecimal("2400"),
                new BigDecimal("2400"), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000022"), new BigDecimal("600"),
                new BigDecimal("600"), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000023"), new BigDecimal("600"),
                new BigDecimal("600"), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000024"), new BigDecimal("150"),
                new BigDecimal("182"), new BigDecimal("32")));

        productionRecord.setField("recordOperationProductInComponents", recOpProdInComponents);

        List recOpProdOutComponents1 = Lists.newArrayList(addRecordOperationProductOutComponent(
                getProductByNumber("000017"), new BigDecimal("150"), new BigDecimal("150"), BigDecimal.ZERO));

        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000019"), new BigDecimal("600"),
                new BigDecimal("600"), BigDecimal.ZERO));
        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000022"), new BigDecimal("600"),
                new BigDecimal("600"), BigDecimal.ZERO));
        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000023"), new BigDecimal("600"),
                new BigDecimal("600"), BigDecimal.ZERO));
=======
                getProductByNumber("000018"), new BigDecimal(QUANTITY_150_L), new BigDecimal("152"), new BigDecimal("2")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000019"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), new BigDecimal("0")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000020"), new BigDecimal(
                QUANTITY_2400_L), new BigDecimal(QUANTITY_2400_L), new BigDecimal("0")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000021"), new BigDecimal(
                QUANTITY_2400_L), new BigDecimal(QUANTITY_2400_L), new BigDecimal("0")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000022"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), new BigDecimal("0")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000023"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), new BigDecimal("0")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000024"), new BigDecimal(
                QUANTITY_150_L), new BigDecimal("182"), new BigDecimal("32")));

        productionRecord.setField("recordOperationProductInComponents", recOpProdInComponents);

        List recOpProdOutComponents1 = Lists
                .newArrayList(addRecordOperationProductOutComponent(getProductByNumber("000017"), new BigDecimal(QUANTITY_150_L),
                        new BigDecimal(QUANTITY_150_L), new BigDecimal("0")));

        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000019"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), new BigDecimal("0")));
        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000022"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), new BigDecimal("0")));
        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000023"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), new BigDecimal("0")));
>>>>>>> e24b4a262559b52c4c481e404828617bac5656b7

        productionRecord.setField("recordOperationProductOutComponents", recOpProdOutComponents1);
Solution content 
        productionRecord.setField("loggings", loggings1);

        List recOpProdInComponents = Lists.newArrayList(addRecordOperationProductInComponent(
                getProductByNumber("000018"), new BigDecimal(QUANTITY_150_L), new BigDecimal("152"), new BigDecimal("2")));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000019"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000020"), new BigDecimal(
                QUANTITY_2400_L), new BigDecimal(QUANTITY_2400_L), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000021"), new BigDecimal(
                QUANTITY_2400_L), new BigDecimal(QUANTITY_2400_L), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000022"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000023"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), BigDecimal.ZERO));
        recOpProdInComponents.add(addRecordOperationProductInComponent(getProductByNumber("000024"), new BigDecimal(
                QUANTITY_150_L), new BigDecimal("182"), new BigDecimal("32")));

        productionRecord.setField("recordOperationProductInComponents", recOpProdInComponents);

        List recOpProdOutComponents1 = Lists.newArrayList(addRecordOperationProductOutComponent(
                getProductByNumber("000017"), new BigDecimal(QUANTITY_150_L), new BigDecimal(QUANTITY_150_L), BigDecimal.ZERO));

        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000019"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), BigDecimal.ZERO));
        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000022"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), BigDecimal.ZERO));
        recOpProdOutComponents1.add(addRecordOperationProductOutComponent(getProductByNumber("000023"), new BigDecimal(
                QUANTITY_600_L), new BigDecimal(QUANTITY_600_L), BigDecimal.ZERO));

        productionRecord.setField("recordOperationProductOutComponents", recOpProdOutComponents1);
File
TestSamplesLoader.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable