From cdf731337a51ce457c048ddf3e4e0f620da71da0 Mon Sep 17 00:00:00 2001 From: Krzysztof Nadolski Date: Fri, 22 Jun 2018 17:14:31 +0200 Subject: [PATCH 01/15] QCADOOCLS-6233 --- .../listener/TechnologyValidationAspect.java | 1 + .../TechnologyStateChangeFields.java | 2 + .../listener/TechnologyValidationService.java | 75 ++++++++++- .../tree/ProductStructureTreeService.java | 125 ++++++++---------- .../locales/technologies_cn.properties | 2 - .../locales/technologies_de.properties | 2 - .../locales/technologies_en.properties | 2 - .../locales/technologies_pl.properties | 1 - 8 files changed, 127 insertions(+), 83 deletions(-) diff --git a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/aop/listener/TechnologyValidationAspect.java b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/aop/listener/TechnologyValidationAspect.java index 55a484ebe8..2386601a3b 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/aop/listener/TechnologyValidationAspect.java +++ b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/aop/listener/TechnologyValidationAspect.java @@ -76,6 +76,7 @@ public void preValidationOnAcceptingOrChecking(final StateChangeContext stateCha // technologyValidationService.checkIfAllReferenceTechnologiesAreAceepted(stateChangeContext); technologyValidationService.checkTopComponentsProducesProductForTechnology(stateChangeContext); technologyValidationService.checkIfOperationsUsesSubOperationsProds(stateChangeContext); + technologyValidationService.checkTechnologyCycles(stateChangeContext); if (PluginUtils.isEnabled("timeNormsForOperations")) { technologyValidationService.checkIfTreeOperationIsValid(stateChangeContext); } diff --git a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/constants/TechnologyStateChangeFields.java b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/constants/TechnologyStateChangeFields.java index c20740f59c..2246380762 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/constants/TechnologyStateChangeFields.java +++ b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/constants/TechnologyStateChangeFields.java @@ -48,4 +48,6 @@ private TechnologyStateChangeFields() { public static final String REASON_TYPE = "reasonType"; + public static final String DATE_AND_TIME = "dateAndTime"; + } diff --git a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java index 1d61e25677..f7f4397af3 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java +++ b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java @@ -24,15 +24,24 @@ package com.qcadoo.mes.technologies.states.listener; import static com.qcadoo.mes.basic.constants.ProductFields.UNIT; -import static com.qcadoo.mes.technologies.constants.TechnologyFields.*; - -import java.util.*; +import static com.qcadoo.mes.technologies.constants.TechnologyFields.OPERATION_COMPONENTS; +import static com.qcadoo.mes.technologies.constants.TechnologyFields.PRODUCT; +import static com.qcadoo.mes.technologies.constants.TechnologyFields.STATE; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Lists; import com.qcadoo.localization.api.TranslationService; +import com.qcadoo.mes.basic.constants.ProductFields; import com.qcadoo.mes.states.StateChangeContext; import com.qcadoo.mes.states.messages.constants.StateMessageType; import com.qcadoo.mes.technologies.ProductQuantitiesService; @@ -42,8 +51,13 @@ import com.qcadoo.mes.technologies.constants.TechnologyFields; import com.qcadoo.mes.technologies.constants.TechnologyOperationComponentFields; import com.qcadoo.mes.technologies.states.constants.TechnologyState; +import com.qcadoo.mes.technologies.tree.ProductStructureTreeService; import com.qcadoo.mes.technologies.tree.TechnologyTreeValidationService; -import com.qcadoo.model.api.*; +import com.qcadoo.model.api.DataDefinition; +import com.qcadoo.model.api.Entity; +import com.qcadoo.model.api.EntityList; +import com.qcadoo.model.api.EntityTree; +import com.qcadoo.model.api.EntityTreeNode; import com.qcadoo.model.api.validators.ErrorMessage; @Service @@ -65,6 +79,9 @@ public class TechnologyValidationService { @Autowired private ProductQuantitiesService productQuantitiyService; + @Autowired + private ProductStructureTreeService productStructureTreeService; + public void checkIfTechnologyIsNotUsedInActiveOrder(final StateChangeContext stateContext) { final Entity technology = stateContext.getOwner(); if (technologyService.isTechnologyUsedInActiveOrder(technology)) { @@ -372,4 +389,54 @@ public boolean checkIfTechnologyTreeIsSet(final StateChangeContext stateChangeCo } return true; } + + public boolean checkTechnologyCycles(StateChangeContext stateChangeContext) { + final Entity technology = stateChangeContext.getOwner(); + List usedTechnologies = new ArrayList<>(); + usedTechnologies.add(technology.getId()); + Entity product = technology.getBelongsToField(TechnologyFields.PRODUCT); + Entity operation = productStructureTreeService.findOperationForProductAndTechnology(product, technology); + return checkCycleForSubProducts(stateChangeContext, operation, usedTechnologies); + } + + private boolean checkCycleForSubProducts(final StateChangeContext stateChangeContext, final Entity operation, + final List usedTechnologies) { + EntityList productInComponents = operation + .getHasManyField(TechnologyOperationComponentFields.OPERATION_PRODUCT_IN_COMPONENTS); + for (Entity productInComp : productInComponents) { + Entity product = productInComp.getBelongsToField(OperationProductInComponentFields.PRODUCT); + Entity subOperation = productStructureTreeService.findOperationForProductWithinChildren(product, operation); + Entity subTechnology = productStructureTreeService.findTechnologyForProduct(product); + if (subTechnology != null) { + if (usedTechnologies.contains(subTechnology.getId())) { + stateChangeContext.addValidationError( + "technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForTechnology", + product.getStringField(ProductFields.NUMBER) + " " + product.getStringField(ProductFields.NAME)); + return false; + } else { + if (subOperation == null) { + Entity operationForTechnology = productStructureTreeService.findOperationForProductAndTechnology(product, + subTechnology); + usedTechnologies.add(subTechnology.getId()); + boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, operationForTechnology, + usedTechnologies); + if (!hasNotCycle) { + return false; + } + } else { + boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, subOperation, usedTechnologies); + if (!hasNotCycle) { + return false; + } + } + } + } else if (subOperation != null) { + boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, subOperation, usedTechnologies); + if (!hasNotCycle) { + return false; + } + } + } + return true; + } } diff --git a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/tree/ProductStructureTreeService.java b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/tree/ProductStructureTreeService.java index 434c706d17..4b52130bf5 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/tree/ProductStructureTreeService.java +++ b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/tree/ProductStructureTreeService.java @@ -32,6 +32,7 @@ import org.springframework.stereotype.Service; import com.google.common.collect.Lists; +import com.qcadoo.mes.basic.constants.ProductFields; import com.qcadoo.mes.states.constants.StateChangeStatus; import com.qcadoo.mes.technologies.constants.OperationProductInComponentFields; import com.qcadoo.mes.technologies.constants.OperationProductOutComponentFields; @@ -39,6 +40,8 @@ import com.qcadoo.mes.technologies.constants.TechnologiesConstants; import com.qcadoo.mes.technologies.constants.TechnologyFields; import com.qcadoo.mes.technologies.constants.TechnologyOperationComponentFields; +import com.qcadoo.mes.technologies.states.constants.TechnologyStateChangeFields; +import com.qcadoo.mes.technologies.states.constants.TechnologyStateStringValues; import com.qcadoo.model.api.DataDefinition; import com.qcadoo.model.api.DataDefinitionService; import com.qcadoo.model.api.Entity; @@ -78,7 +81,7 @@ private Entity addChild(final List tree, final Entity child, final Entit return savedChild; } - private Entity findOperationForProductAndTechnology(final Entity product, final Entity technology) { + public Entity findOperationForProductAndTechnology(final Entity product, final Entity technology) { Entity operationProductOutComponent = dataDefinitionService .get(TechnologiesConstants.PLUGIN_IDENTIFIER, TechnologiesConstants.MODEL_OPERATION_PRODUCT_OUT_COMPONENT).find() .createAlias(OperationProductOutComponentFields.OPERATION_COMPONENT, "c", JoinType.INNER) @@ -92,7 +95,7 @@ private Entity findOperationForProductAndTechnology(final Entity product, final } } - private Entity findOperationForProductWithinChildren(final Entity product, final Entity toc) { + public Entity findOperationForProductWithinChildren(final Entity product, final Entity toc) { Entity operationProductOutComponent = dataDefinitionService .get(TechnologiesConstants.PLUGIN_IDENTIFIER, TechnologiesConstants.MODEL_OPERATION_PRODUCT_OUT_COMPONENT).find() .createAlias(OperationProductOutComponentFields.OPERATION_COMPONENT, "c", JoinType.INNER) @@ -106,13 +109,13 @@ private Entity findOperationForProductWithinChildren(final Entity product, final } } - private Entity findTechnologyForProduct(final Entity product) { + public Entity findTechnologyForProduct(final Entity product) { DataDefinition technologyDD = dataDefinitionService.get(TechnologiesConstants.PLUGIN_IDENTIFIER, TechnologiesConstants.MODEL_TECHNOLOGY); return technologyDD.find().add(SearchRestrictions.isNull(TechnologyFields.TECHNOLOGY_TYPE)) .add(SearchRestrictions.belongsTo(ProductStructureTreeNodeFields.PRODUCT, product)) - .add(SearchRestrictions.or(SearchRestrictions.eq("state", "02accepted"), - SearchRestrictions.eq("state", "05checked"))) + .add(SearchRestrictions.or(SearchRestrictions.eq(TechnologyFields.STATE, TechnologyStateStringValues.ACCEPTED), + SearchRestrictions.eq(TechnologyFields.STATE, TechnologyStateStringValues.CHECKED))) .addOrder(SearchOrders.desc(TechnologyFields.MASTER)).addOrder(SearchOrders.asc(TechnologyFields.NUMBER)) .setMaxResults(1).uniqueResult(); } @@ -136,7 +139,7 @@ private BigDecimal findQuantityOfProductInOperation(final Entity product, final } private void generateTreeForSubproducts(final Entity operation, final Entity technology, final List tree, - final Entity parent, final ViewDefinitionState view, final List usedTechnologies, final Entity mainTechnology) { + final Entity parent, final ViewDefinitionState view, final Entity mainTechnology) { EntityList productInComponents = operation .getHasManyField(TechnologyOperationComponentFields.OPERATION_PRODUCT_IN_COMPONENTS); DataDefinition treeNodeDD = dataDefinitionService.get(TechnologiesConstants.PLUGIN_IDENTIFIER, @@ -149,52 +152,40 @@ private void generateTreeForSubproducts(final Entity operation, final Entity tec Entity subTechnology = findTechnologyForProduct(product); if (subTechnology != null) { - if (!usedTechnologies.contains(subTechnology.getId())) { - if (subOperation == null) { - Entity operationForTechnology = findOperationForProductAndTechnology(product, subTechnology); - Entity technologyGroup = subTechnology.getBelongsToField(TechnologyFields.TECHNOLOGY_GROUP); - BigDecimal standardPerformanceTechnology = subTechnology - .getDecimalField(TechnologyFields.STANDARD_PERFORMANCE_TECHNOLOGY); - - child.setField(ProductStructureTreeNodeFields.TECHNOLOGY, subTechnology); - child.setField(ProductStructureTreeNodeFields.MAIN_TECHNOLOGY, mainTechnology); - child.setField(ProductStructureTreeNodeFields.OPERATION, operationForTechnology); - child.setField(ProductStructureTreeNodeFields.PRODUCT, product); - child.setField(ProductStructureTreeNodeFields.QUANTITY, quantity); - child.setField(ProductStructureTreeNodeFields.DIVISION, - operationForTechnology.getBelongsToField(TechnologyOperationComponentFields.DIVISION)); - child.setField(ProductStructureTreeNodeFields.TECHNOLOGY_GROUP, technologyGroup); - child.setField(ProductStructureTreeNodeFields.STANDARD_PERFORMANCE_TECHNOLOGY, - standardPerformanceTechnology); - child = addChild(tree, child, parent, L_COMPONENT); - usedTechnologies.add(subTechnology.getId()); - generateTreeForSubproducts(operationForTechnology, subTechnology, tree, child, view, usedTechnologies, - mainTechnology); - } else { - - child.setField(ProductStructureTreeNodeFields.TECHNOLOGY, technology); - child.setField(ProductStructureTreeNodeFields.MAIN_TECHNOLOGY, mainTechnology); - child.setField(ProductStructureTreeNodeFields.PRODUCT, product); - child.setField(ProductStructureTreeNodeFields.QUANTITY, quantity); - child.setField(ProductStructureTreeNodeFields.OPERATION, subOperation); - child.setField(ProductStructureTreeNodeFields.DIVISION, - subOperation.getBelongsToField(TechnologyOperationComponentFields.DIVISION)); - child = addChild(tree, child, parent, L_INTERMEDIATE); - if (view != null) { - FormComponent productStructureForm = (FormComponent) view - .getComponentByReference("productStructureForm"); - productStructureForm.addMessage( - "technologies.technologyDetails.window.productStructure.productStructureForm.technologyAndOperationExists", - MessageType.INFO, false, - product.getStringField("number") + " " + product.getStringField("name")); - } - generateTreeForSubproducts(subOperation, technology, tree, child, view, usedTechnologies, mainTechnology); + if (subOperation == null) { + Entity operationForTechnology = findOperationForProductAndTechnology(product, subTechnology); + Entity technologyGroup = subTechnology.getBelongsToField(TechnologyFields.TECHNOLOGY_GROUP); + BigDecimal standardPerformanceTechnology = subTechnology + .getDecimalField(TechnologyFields.STANDARD_PERFORMANCE_TECHNOLOGY); + + child.setField(ProductStructureTreeNodeFields.TECHNOLOGY, subTechnology); + child.setField(ProductStructureTreeNodeFields.MAIN_TECHNOLOGY, mainTechnology); + child.setField(ProductStructureTreeNodeFields.OPERATION, operationForTechnology); + child.setField(ProductStructureTreeNodeFields.PRODUCT, product); + child.setField(ProductStructureTreeNodeFields.QUANTITY, quantity); + child.setField(ProductStructureTreeNodeFields.DIVISION, + operationForTechnology.getBelongsToField(TechnologyOperationComponentFields.DIVISION)); + child.setField(ProductStructureTreeNodeFields.TECHNOLOGY_GROUP, technologyGroup); + child.setField(ProductStructureTreeNodeFields.STANDARD_PERFORMANCE_TECHNOLOGY, standardPerformanceTechnology); + child = addChild(tree, child, parent, L_COMPONENT); + generateTreeForSubproducts(operationForTechnology, subTechnology, tree, child, view, mainTechnology); + } else { + child.setField(ProductStructureTreeNodeFields.TECHNOLOGY, technology); + child.setField(ProductStructureTreeNodeFields.MAIN_TECHNOLOGY, mainTechnology); + child.setField(ProductStructureTreeNodeFields.PRODUCT, product); + child.setField(ProductStructureTreeNodeFields.QUANTITY, quantity); + child.setField(ProductStructureTreeNodeFields.OPERATION, subOperation); + child.setField(ProductStructureTreeNodeFields.DIVISION, + subOperation.getBelongsToField(TechnologyOperationComponentFields.DIVISION)); + child = addChild(tree, child, parent, L_INTERMEDIATE); + if (view != null) { + FormComponent productStructureForm = (FormComponent) view.getComponentByReference("productStructureForm"); + productStructureForm.addMessage( + "technologies.technologyDetails.window.productStructure.productStructureForm.technologyAndOperationExists", + MessageType.INFO, false, + product.getStringField(ProductFields.NUMBER) + " " + product.getStringField(ProductFields.NAME)); } - } else if (view != null) { - FormComponent productStructureForm = (FormComponent) view.getComponentByReference("productStructureForm"); - productStructureForm.addMessage( - "technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForTechnology", - MessageType.INFO, false, product.getStringField("number") + " " + product.getStringField("name")); + generateTreeForSubproducts(subOperation, technology, tree, child, view, mainTechnology); } } else { Entity technologyGroup = technology.getBelongsToField(TechnologyFields.TECHNOLOGY_GROUP); @@ -213,31 +204,28 @@ private void generateTreeForSubproducts(final Entity operation, final Entity tec subOperation.getBelongsToField(TechnologyOperationComponentFields.DIVISION)); child = addChild(tree, child, parent, L_INTERMEDIATE); - generateTreeForSubproducts(subOperation, technology, tree, child, view, usedTechnologies, mainTechnology); + generateTreeForSubproducts(subOperation, technology, tree, child, view, mainTechnology); } else { child.setField(ProductStructureTreeNodeFields.OPERATION, operation); child.setField(ProductStructureTreeNodeFields.DIVISION, operation.getBelongsToField(TechnologyOperationComponentFields.DIVISION)); - child.setField(ProductStructureTreeNodeFields.TECHNOLOGY_GROUP, technologyGroup); - child.setField(ProductStructureTreeNodeFields.STANDARD_PERFORMANCE_TECHNOLOGY, standardPerformanceTechnology); addChild(tree, child, parent, L_MATERIAL); } } } - } public EntityTree generateProductStructureTree(final ViewDefinitionState view, final Entity technology) { + Entity product = technology.getBelongsToField(TechnologyFields.PRODUCT); + Entity operation = findOperationForProductAndTechnology(product, technology); Entity technologyFromDB = technology.getDataDefinition().get(technology.getId()); EntityTree tree = technologyFromDB.getTreeField(TechnologyFields.PRODUCT_STRUCTURE_TREE); if (tree.getRoot() != null) { Date productStructureCreateDate = tree.getRoot().getDateField(ProductStructureTreeNodeFields.CREATE_DATE); - Entity product = technology.getBelongsToField(TechnologyFields.PRODUCT); - Entity operation = findOperationForProductAndTechnology(product, technology); List treeEntities = tree.find().list().getEntities(); Entity technologyStateChange = getLastTechnologyStateChange(technologyFromDB); - if (productStructureCreateDate.before(technologyStateChange.getDateField("dateAndTime")) + if (productStructureCreateDate.before(technologyStateChange.getDateField(TechnologyStateChangeFields.DATE_AND_TIME)) || checkSubTechnologiesSubstitution(treeEntities) || checkIfSubTechnologiesChanged(operation, productStructureCreateDate)) { deleteProductStructureTree(treeEntities); @@ -248,8 +236,6 @@ public EntityTree generateProductStructureTree(final ViewDefinitionState view, f DataDefinition treeNodeDD = dataDefinitionService.get(TechnologiesConstants.PLUGIN_IDENTIFIER, TechnologiesConstants.MODEL_PRODUCT_STRUCTURE_TREE_NODE); Entity root = treeNodeDD.create(); - Entity product = technology.getBelongsToField(TechnologyFields.PRODUCT); - Entity operation = findOperationForProductAndTechnology(product, technology); BigDecimal quantity = findQuantityOfProductInOperation(product, operation); Entity technologyGroup = technology.getBelongsToField(TechnologyFields.TECHNOLOGY_GROUP); BigDecimal standardPerformanceTechnology = technology.getDecimalField(TechnologyFields.STANDARD_PERFORMANCE_TECHNOLOGY); @@ -266,10 +252,7 @@ public EntityTree generateProductStructureTree(final ViewDefinitionState view, f List productStructureList = new ArrayList<>(); root = addChild(productStructureList, root, null, L_FINAL_PRODUCT); - List usedTechnologies = new ArrayList<>(); - usedTechnologies.add(technology.getId()); - - generateTreeForSubproducts(operation, technology, productStructureList, root, view, usedTechnologies, technology); + generateTreeForSubproducts(operation, technology, productStructureList, root, view, technology); return EntityTreeUtilsService.getDetachedEntityTree(productStructureList); } @@ -300,9 +283,7 @@ private boolean checkSubTechnologiesSubstitution(List treeEntities) { } return false; } - /* - We don't support cycles in here - */ + private boolean checkIfSubTechnologiesChanged(Entity operation, Date productStructureCreateDate) { for (Entity productInComp : operation .getHasManyField(TechnologyOperationComponentFields.OPERATION_PRODUCT_IN_COMPONENTS)) { @@ -312,7 +293,8 @@ private boolean checkIfSubTechnologiesChanged(Entity operation, Date productStru if (subTechnology != null) { Entity technologyStateChange = getLastTechnologyStateChange(subTechnology); - if (productStructureCreateDate.before(technologyStateChange.getDateField("dateAndTime"))) { + if (productStructureCreateDate + .before(technologyStateChange.getDateField(TechnologyStateChangeFields.DATE_AND_TIME))) { return true; } if (subOperation == null) { @@ -339,8 +321,8 @@ private boolean checkIfSubTechnologiesChanged(Entity operation, Date productStru private Entity getLastTechnologyStateChange(Entity technology) { return technology.getHasManyField(TechnologyFields.STATE_CHANGES).find() - .add(SearchRestrictions.eq("status", StateChangeStatus.SUCCESSFUL.getStringValue())) - .addOrder(SearchOrders.desc("dateAndTime")).setMaxResults(1).uniqueResult(); + .add(SearchRestrictions.eq(TechnologyStateChangeFields.STATUS, StateChangeStatus.SUCCESSFUL.getStringValue())) + .addOrder(SearchOrders.desc(TechnologyStateChangeFields.DATE_AND_TIME)).setMaxResults(1).uniqueResult(); } public EntityTree getOperationComponentsFromTechnology(final Entity technology) { @@ -382,7 +364,7 @@ private Entity getEntityById(final List tree, final Long id) { return null; } - private Entity addChildTOC(final List tree, final Entity child, final Entity parent, final Entity product, + private void addChildTOC(final List tree, final Entity child, final Entity parent, final Entity product, String type) { child.setField(TechnologyOperationComponentFields.PARENT, parent); child.setField(TechnologyOperationComponentFields.PRIORITY, 1); @@ -400,6 +382,5 @@ private Entity addChildTOC(final List tree, final Entity child, final En parent.setField(TechnologyOperationComponentFields.CHILDREN, children); } tree.add(child); - return child; } } diff --git a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_cn.properties b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_cn.properties index 41e1251547..cd5808b9a5 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_cn.properties +++ b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_cn.properties @@ -446,8 +446,6 @@ technologies.technology.ribbon.message.technologyIsSynchronized = 工艺已同 technologies.product.info.notUsed = 产品未在任何工艺中使用。 technologies.technologyDetails.window.productStructure.productStructureForm.technologyAndOperationExists = 产品{0}自带工艺。请确保当前工艺正确。 technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForTechnology = 产品{0}既是工序的输出产品，也是工艺输出的成品。请确保当前工艺正确。 -technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForOperation = 产品{0}既是工序的输入产品，也是其输出产品。 请确保当前工艺正确。 - ### REPORT diff --git a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_de.properties b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_de.properties index 9a36634f72..8186ffc87b 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_de.properties +++ b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_de.properties @@ -574,11 +574,9 @@ technologies.technology.ribbon.message.technologyIsSynchronized = Die Technik wi technologies.product.info.notUsed = Das Produkt wurde in keiner Technik verwendet technologies.technologyDetails.window.productStructure.productStructureForm.technologyAndOperationExists = Das Produkt {0} hat eine eigene, festgelegte Technik. Überprüfe, ob die aktuelle Technik korrekt ist. technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForTechnology = Das Produkt {0} ist gleichzeitig das Ausgangsprodukt der Operation und das Endprodukt der Technik. Überprüfen Sie, ob die aktuelle Technik korrekt ist. -technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForOperation = Das Produkt {0} ist gleichzeitig das Ausgangsprodukt der Operation und das Endprodukt der Technik. Überprüfen Sie, ob die aktuelle Technik korrekt ist. ### REPORT - technologies.technologiesTechnologyDetails.report.title = Details der Technik technologies.technologiesTechnologyDetails.report.fileName = Details_der Technik technologies.technologiesTechnologyDetails.report.panel.technology.name = Name: diff --git a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_en.properties b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_en.properties index 90658f6f03..4495a12ceb 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_en.properties +++ b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_en.properties @@ -462,8 +462,6 @@ technologies.technology.ribbon.message.technologyIsSynchronized = Technology is technologies.product.info.notUsed = The product has not been used in any technology technologies.technologyDetails.window.productStructure.productStructureForm.technologyAndOperationExists = Product {0} has its own technology. Make sure that current technology is correct. technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForTechnology = Product {0} is out product for operation and final product of technology at the same time. Make sure that current technology is correct. -technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForOperation = Product {0} is in and out product for operation at the same time. Make sure that current technology is correct. - ### REPORT diff --git a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_pl.properties b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_pl.properties index 74be12f7d7..c4d1e1bab1 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_pl.properties +++ b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/locales/technologies_pl.properties @@ -468,7 +468,6 @@ technologies.technology.ribbon.message.technologyIsSynchronized = Technologia je technologies.product.info.notUsed = Produkt nie został użyty w żadnej technologii technologies.technologyDetails.window.productStructure.productStructureForm.technologyAndOperationExists = Produkt {0} posiada zdefiniowaną własną technologię. Upewnij się, że bieżąca technologia jest poprawna. technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForTechnology = Produkt {0} jest jednocześnie produktem wyjściowym operacji i produktem końcowym technologii. Upewnij się, że bieżąca technologia jest poprawna. -technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForOperation = Produkt {0} jest jednocześnie produktem wyjściowym i wejściowym operacji. Upewnij się, że bieżąca technologia jest poprawna. ### REPORT From 66a6e79b734a0e49b5509000274d2f46c56e68f6 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 29 Jun 2018 15:05:02 +0200 Subject: [PATCH 02/15] CM append -DEV suffix to scripts & artifacts version --- mes-application/pom.xml | 86 +++++++++---------- mes-plugins/mes-pack-open-source/pom.xml | 2 +- .../mes-plugins-assignment-to-shift/pom.xml | 10 +-- .../pom.xml | 8 +- .../pom.xml | 4 +- mes-plugins/mes-plugins-basic/pom.xml | 2 +- .../pom.xml | 6 +- .../mes-plugins-cmms-machine-parts/pom.xml | 8 +- .../mes-plugins-column-extension/pom.xml | 2 +- .../mes-plugins-cost-calculation/pom.xml | 6 +- .../pom.xml | 8 +- .../pom.xml | 6 +- .../pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 6 +- mes-plugins/mes-plugins-deliveries/pom.xml | 12 +-- .../pom.xml | 4 +- .../mes-plugins-gantt-for-operation/pom.xml | 4 +- .../mes-plugins-gantt-for-shifts/pom.xml | 4 +- .../pom.xml | 6 +- .../mes-plugins-line-changeover-norms/pom.xml | 4 +- mes-plugins/mes-plugins-master-orders/pom.xml | 8 +- .../pom.xml | 4 +- .../pom.xml | 6 +- mes-plugins/mes-plugins-material-flow/pom.xml | 4 +- .../mes-plugins-material-requirements/pom.xml | 4 +- .../pom.xml | 4 +- .../pom.xml | 6 +- .../pom.xml | 6 +- .../pom.xml | 8 +- .../mes-plugins-operational-tasks/pom.xml | 4 +- mes-plugins/mes-plugins-orders/pom.xml | 4 +- .../pom.xml | 4 +- .../mes-plugins-production-counting/pom.xml | 12 +-- .../mes-plugins-production-lines/pom.xml | 4 +- .../mes-plugins-production-per-shift/pom.xml | 8 +- .../mes-plugins-production-scheduling/pom.xml | 6 +- .../pom.xml | 6 +- mes-plugins/mes-plugins-states/pom.xml | 4 +- mes-plugins/mes-plugins-stoppage/pom.xml | 4 +- .../pom.xml | 6 +- .../pom.xml | 6 +- .../pom.xml | 4 +- .../mes-plugins-tech-subcontracting/pom.xml | 4 +- mes-plugins/mes-plugins-technologies/pom.xml | 6 +- .../pom.xml | 4 +- mes-plugins/mes-plugins-wage-groups/pom.xml | 4 +- .../pom.xml | 6 +- mes-plugins/mes-plugins-work-plans/pom.xml | 8 +- mes-plugins/pom.xml | 2 +- pom.xml | 4 +- 51 files changed, 178 insertions(+), 178 deletions(-) diff --git a/mes-application/pom.xml b/mes-application/pom.xml index 82c3c6b44c..345cf8d1c0 100644 --- a/mes-application/pom.xml +++ b/mes-application/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-application @@ -23,212 +23,212 @@ com.qcadoo.mes mes-plugins-deliveries - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-scheduling - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-states - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-requirements - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-work-plans - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-stoppage - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-minimal-affordable-quantity - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-gantt-for-shifts - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-gantt-for-operation - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow-resources - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow-multitransfers - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-time-norms-for-operations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-product - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-operation - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-calculation - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-simple-material-balance - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-basic-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-materials - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-lines - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-operation-time-calculations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-operation-cost-calculations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-per-shift - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-deviation-causes-reporting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-line-changeover-norms - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-line-changeover-norms-for-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-wage-groups - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-assignment-to-shift - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-operation-in-order - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-avg-labor-cost-calc-for-order - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-operational-tasks - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-operational-tasks-for-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-column-extension - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-deliveries-to-material-flow - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cat-numbers-in-deliveries - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-master-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cmms-machine-parts - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-warehouse-minimal-state - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo diff --git a/mes-plugins/mes-pack-open-source/pom.xml b/mes-plugins/mes-pack-open-source/pom.xml index f113dbc8aa..205b9e3694 100644 --- a/mes-plugins/mes-pack-open-source/pom.xml +++ b/mes-plugins/mes-pack-open-source/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-pack-open-source diff --git a/mes-plugins/mes-plugins-assignment-to-shift/pom.xml b/mes-plugins/mes-plugins-assignment-to-shift/pom.xml index 85d2d4504f..f125d10e82 100644 --- a/mes-plugins/mes-plugins-assignment-to-shift/pom.xml +++ b/mes-plugins/mes-plugins-assignment-to-shift/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-assignment-to-shift @@ -18,22 +18,22 @@ com.qcadoo.mes mes-plugins-wage-groups - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-master-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-states - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-avg-labor-cost-calc-for-order/pom.xml b/mes-plugins/mes-plugins-avg-labor-cost-calc-for-order/pom.xml index ba6c48973d..ea54689d3b 100644 --- a/mes-plugins/mes-plugins-avg-labor-cost-calc-for-order/pom.xml +++ b/mes-plugins/mes-plugins-avg-labor-cost-calc-for-order/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-avg-labor-cost-calc-for-order @@ -18,17 +18,17 @@ com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-assignment-to-shift - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-operation-in-order - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-basic-production-counting/pom.xml b/mes-plugins/mes-plugins-basic-production-counting/pom.xml index 4ec3e340fa..50b2cbb52c 100644 --- a/mes-plugins/mes-plugins-basic-production-counting/pom.xml +++ b/mes-plugins/mes-plugins-basic-production-counting/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-basic-production-counting @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-basic/pom.xml b/mes-plugins/mes-plugins-basic/pom.xml index b22ad0942a..be639ae349 100644 --- a/mes-plugins/mes-plugins-basic/pom.xml +++ b/mes-plugins/mes-plugins-basic/pom.xml @@ -5,7 +5,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-basic diff --git a/mes-plugins/mes-plugins-cat-numbers-in-deliveries/pom.xml b/mes-plugins/mes-plugins-cat-numbers-in-deliveries/pom.xml index e6a67cca0a..65a7c2572d 100644 --- a/mes-plugins/mes-plugins-cat-numbers-in-deliveries/pom.xml +++ b/mes-plugins/mes-plugins-cat-numbers-in-deliveries/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-cat-numbers-in-deliveries @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-product-catalog-numbers - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-deliveries - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-cmms-machine-parts/pom.xml b/mes-plugins/mes-plugins-cmms-machine-parts/pom.xml index 54a992314e..5b9f5104e3 100644 --- a/mes-plugins/mes-plugins-cmms-machine-parts/pom.xml +++ b/mes-plugins/mes-plugins-cmms-machine-parts/pom.xml @@ -6,7 +6,7 @@ mes-plugins com.qcadoo.mes - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-cmms-machine-parts @@ -23,17 +23,17 @@ com.qcadoo.mes mes-plugins-material-flow-resources - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-warehouse-minimal-state - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-lines - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-column-extension/pom.xml b/mes-plugins/mes-plugins-column-extension/pom.xml index 75b023b2d2..4e52f36497 100644 --- a/mes-plugins/mes-plugins-column-extension/pom.xml +++ b/mes-plugins/mes-plugins-column-extension/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-column-extension diff --git a/mes-plugins/mes-plugins-cost-calculation/pom.xml b/mes-plugins/mes-plugins-cost-calculation/pom.xml index 79b514a96b..ca5812dd6c 100644 --- a/mes-plugins/mes-plugins-cost-calculation/pom.xml +++ b/mes-plugins/mes-plugins-cost-calculation/pom.xml @@ -5,7 +5,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-cost-calculation @@ -17,12 +17,12 @@ com.qcadoo.mes mes-plugins-cost-norms-for-materials - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-operation-cost-calculations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-cost-norms-for-materials/pom.xml b/mes-plugins/mes-plugins-cost-norms-for-materials/pom.xml index adf4e3b1fb..cc38e0877d 100644 --- a/mes-plugins/mes-plugins-cost-norms-for-materials/pom.xml +++ b/mes-plugins/mes-plugins-cost-norms-for-materials/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-cost-norms-for-materials @@ -18,18 +18,18 @@ com.qcadoo.mes mes-plugins-basic-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-product - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow-resources - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-cost-norms-for-operation-in-order/pom.xml b/mes-plugins/mes-plugins-cost-norms-for-operation-in-order/pom.xml index 3f958518c1..d25aa4cff7 100644 --- a/mes-plugins/mes-plugins-cost-norms-for-operation-in-order/pom.xml +++ b/mes-plugins/mes-plugins-cost-norms-for-operation-in-order/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-cost-norms-for-operation-in-order @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-operation - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-cost-norms-for-operation/pom.xml b/mes-plugins/mes-plugins-cost-norms-for-operation/pom.xml index bbbf8a6828..70770d6d08 100644 --- a/mes-plugins/mes-plugins-cost-norms-for-operation/pom.xml +++ b/mes-plugins/mes-plugins-cost-norms-for-operation/pom.xml @@ -5,7 +5,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-cost-norms-for-operation @@ -17,7 +17,7 @@ com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-cost-norms-for-product/pom.xml b/mes-plugins/mes-plugins-cost-norms-for-product/pom.xml index 21cfb5a0e7..772532f008 100644 --- a/mes-plugins/mes-plugins-cost-norms-for-product/pom.xml +++ b/mes-plugins/mes-plugins-cost-norms-for-product/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-cost-norms-for-product @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-deliveries-to-material-flow/pom.xml b/mes-plugins/mes-plugins-deliveries-to-material-flow/pom.xml index 8e317a7bd0..367b3cbbc6 100644 --- a/mes-plugins/mes-plugins-deliveries-to-material-flow/pom.xml +++ b/mes-plugins/mes-plugins-deliveries-to-material-flow/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-deliveries-to-material-flow @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-deliveries - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow-resources - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-deliveries/pom.xml b/mes-plugins/mes-plugins-deliveries/pom.xml index e8219156a6..0be8f390ae 100644 --- a/mes-plugins/mes-plugins-deliveries/pom.xml +++ b/mes-plugins/mes-plugins-deliveries/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-deliveries @@ -18,27 +18,27 @@ com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-states - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-column-extension - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow-resources - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-deviation-causes-reporting/pom.xml b/mes-plugins/mes-plugins-deviation-causes-reporting/pom.xml index 11a7985bb2..ee64fc65d2 100644 --- a/mes-plugins/mes-plugins-deviation-causes-reporting/pom.xml +++ b/mes-plugins/mes-plugins-deviation-causes-reporting/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-deviation-causes-reporting @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-production-per-shift - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-gantt-for-operation/pom.xml b/mes-plugins/mes-plugins-gantt-for-operation/pom.xml index e328651876..2b1e828739 100644 --- a/mes-plugins/mes-plugins-gantt-for-operation/pom.xml +++ b/mes-plugins/mes-plugins-gantt-for-operation/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-gantt-for-operation @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-production-scheduling - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-gantt-for-shifts/pom.xml b/mes-plugins/mes-plugins-gantt-for-shifts/pom.xml index 5d3ffc2e88..b90a9786a9 100644 --- a/mes-plugins/mes-plugins-gantt-for-shifts/pom.xml +++ b/mes-plugins/mes-plugins-gantt-for-shifts/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-gantt-for-shifts @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-line-changeover-norms-for-orders/pom.xml b/mes-plugins/mes-plugins-line-changeover-norms-for-orders/pom.xml index 1e877530a9..990e8d2d9d 100644 --- a/mes-plugins/mes-plugins-line-changeover-norms-for-orders/pom.xml +++ b/mes-plugins/mes-plugins-line-changeover-norms-for-orders/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-line-changeover-norms-for-orders @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-line-changeover-norms - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-line-changeover-norms/pom.xml b/mes-plugins/mes-plugins-line-changeover-norms/pom.xml index 4a8fc41b9f..3b53a981f9 100644 --- a/mes-plugins/mes-plugins-line-changeover-norms/pom.xml +++ b/mes-plugins/mes-plugins-line-changeover-norms/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-line-changeover-norms @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-master-orders/pom.xml b/mes-plugins/mes-plugins-master-orders/pom.xml index 779de8333d..962e47e47d 100644 --- a/mes-plugins/mes-plugins-master-orders/pom.xml +++ b/mes-plugins/mes-plugins-master-orders/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-master-orders @@ -14,18 +14,18 @@ qcadoo-plugin Qcadoo MES :: Plugins :: Master orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-line-changeover-norms-for-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-material-flow-multitransfers/pom.xml b/mes-plugins/mes-plugins-material-flow-multitransfers/pom.xml index ad4387db75..1b0765c29a 100644 --- a/mes-plugins/mes-plugins-material-flow-multitransfers/pom.xml +++ b/mes-plugins/mes-plugins-material-flow-multitransfers/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-material-flow-multitransfers @@ -19,7 +19,7 @@ com.qcadoo.mes mes-plugins-material-flow-resources - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-material-flow-resources/pom.xml b/mes-plugins/mes-plugins-material-flow-resources/pom.xml index 9b7cc2fe1a..9ac4b6f96b 100644 --- a/mes-plugins/mes-plugins-material-flow-resources/pom.xml +++ b/mes-plugins/mes-plugins-material-flow-resources/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-material-flow-resources @@ -19,13 +19,13 @@ com.qcadoo.mes mes-plugins-material-flow - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-product - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-material-flow/pom.xml b/mes-plugins/mes-plugins-material-flow/pom.xml index 4534c18f77..fd5f1a6719 100644 --- a/mes-plugins/mes-plugins-material-flow/pom.xml +++ b/mes-plugins/mes-plugins-material-flow/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-material-flow @@ -19,7 +19,7 @@ com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-material-requirements/pom.xml b/mes-plugins/mes-plugins-material-requirements/pom.xml index fa31db5ac2..bb0798c618 100644 --- a/mes-plugins/mes-plugins-material-requirements/pom.xml +++ b/mes-plugins/mes-plugins-material-requirements/pom.xml @@ -5,7 +5,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-material-requirements @@ -17,7 +17,7 @@ com.qcadoo.mes mes-plugins-basic-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-minimal-affordable-quantity/pom.xml b/mes-plugins/mes-plugins-minimal-affordable-quantity/pom.xml index 4cd8245105..afdfaf4be7 100644 --- a/mes-plugins/mes-plugins-minimal-affordable-quantity/pom.xml +++ b/mes-plugins/mes-plugins-minimal-affordable-quantity/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-minimal-affordable-quantity @@ -19,7 +19,7 @@ com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-operation-cost-calculations/pom.xml b/mes-plugins/mes-plugins-operation-cost-calculations/pom.xml index 8ec3275b01..19fbbd10d3 100644 --- a/mes-plugins/mes-plugins-operation-cost-calculations/pom.xml +++ b/mes-plugins/mes-plugins-operation-cost-calculations/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-operation-cost-calculations @@ -19,12 +19,12 @@ com.qcadoo.mes mes-plugins-operation-time-calculations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-norms-for-operation - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-operation-time-calculations/pom.xml b/mes-plugins/mes-plugins-operation-time-calculations/pom.xml index 06a9fe43eb..b7ae986d64 100644 --- a/mes-plugins/mes-plugins-operation-time-calculations/pom.xml +++ b/mes-plugins/mes-plugins-operation-time-calculations/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-operation-time-calculations @@ -19,12 +19,12 @@ com.qcadoo.mes mes-plugins-time-norms-for-operations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-operational-tasks-for-orders/pom.xml b/mes-plugins/mes-plugins-operational-tasks-for-orders/pom.xml index a5599af8ba..b4555e1727 100644 --- a/mes-plugins/mes-plugins-operational-tasks-for-orders/pom.xml +++ b/mes-plugins/mes-plugins-operational-tasks-for-orders/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-operational-tasks-for-orders @@ -18,17 +18,17 @@ com.qcadoo.mes mes-plugins-operational-tasks - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-scheduling - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-requirements - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-operational-tasks/pom.xml b/mes-plugins/mes-plugins-operational-tasks/pom.xml index 72415c1e07..426ccf5184 100644 --- a/mes-plugins/mes-plugins-operational-tasks/pom.xml +++ b/mes-plugins/mes-plugins-operational-tasks/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-operational-tasks @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-orders/pom.xml b/mes-plugins/mes-plugins-orders/pom.xml index f75bb83cd6..d5f7e62d83 100644 --- a/mes-plugins/mes-plugins-orders/pom.xml +++ b/mes-plugins/mes-plugins-orders/pom.xml @@ -5,7 +5,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-orders @@ -17,7 +17,7 @@ com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-product-catalog-numbers/pom.xml b/mes-plugins/mes-plugins-product-catalog-numbers/pom.xml index 4998afdba4..9aeb377f82 100644 --- a/mes-plugins/mes-plugins-product-catalog-numbers/pom.xml +++ b/mes-plugins/mes-plugins-product-catalog-numbers/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-product-catalog-numbers @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-production-counting/pom.xml b/mes-plugins/mes-plugins-production-counting/pom.xml index 1b94a05a47..74a49c7638 100644 --- a/mes-plugins/mes-plugins-production-counting/pom.xml +++ b/mes-plugins/mes-plugins-production-counting/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-production-counting @@ -18,27 +18,27 @@ com.qcadoo.mes mes-plugins-operation-time-calculations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-basic-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-states - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-cost-calculation - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-production-lines/pom.xml b/mes-plugins/mes-plugins-production-lines/pom.xml index dbb1bfbf75..76c0d4a499 100644 --- a/mes-plugins/mes-plugins-production-lines/pom.xml +++ b/mes-plugins/mes-plugins-production-lines/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-production-lines @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-production-per-shift/pom.xml b/mes-plugins/mes-plugins-production-per-shift/pom.xml index ee1f2616f4..4819f53b08 100644 --- a/mes-plugins/mes-plugins-production-per-shift/pom.xml +++ b/mes-plugins/mes-plugins-production-per-shift/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-production-per-shift @@ -19,17 +19,17 @@ com.qcadoo.mes mes-plugins-line-changeover-norms-for-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-assignment-to-shift - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-production-scheduling/pom.xml b/mes-plugins/mes-plugins-production-scheduling/pom.xml index 77adf2fc83..8008e32240 100644 --- a/mes-plugins/mes-plugins-production-scheduling/pom.xml +++ b/mes-plugins/mes-plugins-production-scheduling/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-production-scheduling @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-operation-time-calculations - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-simple-material-balance/pom.xml b/mes-plugins/mes-plugins-simple-material-balance/pom.xml index c44a7fdf7e..7a4aaaaaed 100644 --- a/mes-plugins/mes-plugins-simple-material-balance/pom.xml +++ b/mes-plugins/mes-plugins-simple-material-balance/pom.xml @@ -5,7 +5,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-simple-material-balance @@ -17,12 +17,12 @@ com.qcadoo.mes mes-plugins-material-requirements - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-material-flow - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-states/pom.xml b/mes-plugins/mes-plugins-states/pom.xml index 7faa811100..bdc8ef2d50 100644 --- a/mes-plugins/mes-plugins-states/pom.xml +++ b/mes-plugins/mes-plugins-states/pom.xml @@ -5,7 +5,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-states @@ -17,7 +17,7 @@ com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-stoppage/pom.xml b/mes-plugins/mes-plugins-stoppage/pom.xml index 5a5c302f67..69149e861d 100644 --- a/mes-plugins/mes-plugins-stoppage/pom.xml +++ b/mes-plugins/mes-plugins-stoppage/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-stoppage @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-tech-subcontr-for-deliveries/pom.xml b/mes-plugins/mes-plugins-tech-subcontr-for-deliveries/pom.xml index 7abc323027..af1b149ad2 100644 --- a/mes-plugins/mes-plugins-tech-subcontr-for-deliveries/pom.xml +++ b/mes-plugins/mes-plugins-tech-subcontr-for-deliveries/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-tech-subcontr-for-deliveries @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-tech-subcontracting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-deliveries - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-tech-subcontr-for-oper-tasks/pom.xml b/mes-plugins/mes-plugins-tech-subcontr-for-oper-tasks/pom.xml index 322e4fa858..a5ec64a566 100644 --- a/mes-plugins/mes-plugins-tech-subcontr-for-oper-tasks/pom.xml +++ b/mes-plugins/mes-plugins-tech-subcontr-for-oper-tasks/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-tech-subcontr-for-oper-tasks @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-tech-subcontracting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-operational-tasks-for-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-tech-subcontr-for-production-counting/pom.xml b/mes-plugins/mes-plugins-tech-subcontr-for-production-counting/pom.xml index 679da5f5dd..628ea15a8e 100644 --- a/mes-plugins/mes-plugins-tech-subcontr-for-production-counting/pom.xml +++ b/mes-plugins/mes-plugins-tech-subcontr-for-production-counting/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-tech-subcontr-for-production-counting @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-tech-subcontracting/pom.xml b/mes-plugins/mes-plugins-tech-subcontracting/pom.xml index b4c40da4fd..57f17262af 100644 --- a/mes-plugins/mes-plugins-tech-subcontracting/pom.xml +++ b/mes-plugins/mes-plugins-tech-subcontracting/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-tech-subcontracting @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-simple-material-balance - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-technologies/pom.xml b/mes-plugins/mes-plugins-technologies/pom.xml index 2e6eb56bb6..5e429e27e6 100644 --- a/mes-plugins/mes-plugins-technologies/pom.xml +++ b/mes-plugins/mes-plugins-technologies/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-technologies @@ -18,12 +18,12 @@ com.qcadoo.mes mes-plugins-states - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-lines - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV net.objecthunter diff --git a/mes-plugins/mes-plugins-time-norms-for-operations/pom.xml b/mes-plugins/mes-plugins-time-norms-for-operations/pom.xml index 93d0f97216..a7f2953e00 100644 --- a/mes-plugins/mes-plugins-time-norms-for-operations/pom.xml +++ b/mes-plugins/mes-plugins-time-norms-for-operations/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-time-norms-for-operations @@ -19,7 +19,7 @@ com.qcadoo.mes mes-plugins-technologies - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-wage-groups/pom.xml b/mes-plugins/mes-plugins-wage-groups/pom.xml index 45d0d75ee3..b00c4d0ab9 100644 --- a/mes-plugins/mes-plugins-wage-groups/pom.xml +++ b/mes-plugins/mes-plugins-wage-groups/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-wage-groups @@ -18,7 +18,7 @@ com.qcadoo.mes mes-plugins-basic - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-warehouse-minimal-state/pom.xml b/mes-plugins/mes-plugins-warehouse-minimal-state/pom.xml index 2e0a488d11..291202e01a 100644 --- a/mes-plugins/mes-plugins-warehouse-minimal-state/pom.xml +++ b/mes-plugins/mes-plugins-warehouse-minimal-state/pom.xml @@ -6,7 +6,7 @@ mes-plugins com.qcadoo.mes - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-warehouse-minimal-state @@ -18,13 +18,13 @@ com.qcadoo.mes mes-plugins-material-flow-resources - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-deliveries - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/mes-plugins-work-plans/pom.xml b/mes-plugins/mes-plugins-work-plans/pom.xml index c9569d2d42..44c3e8d497 100644 --- a/mes-plugins/mes-plugins-work-plans/pom.xml +++ b/mes-plugins/mes-plugins-work-plans/pom.xml @@ -6,7 +6,7 @@ com.qcadoo.mes mes-plugins - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins-work-plans @@ -18,17 +18,17 @@ com.qcadoo.mes mes-plugins-orders - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-column-extension - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV com.qcadoo.mes mes-plugins-production-counting - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV diff --git a/mes-plugins/pom.xml b/mes-plugins/pom.xml index 9ed053851f..4259081385 100644 --- a/mes-plugins/pom.xml +++ b/mes-plugins/pom.xml @@ -7,7 +7,7 @@ com.qcadoo.mes mes - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV mes-plugins diff --git a/pom.xml b/pom.xml index 186addc410..d6bdc5893f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ com.qcadoo.mes mes - 1.5-SNAPSHOT + 1.5-SNAPSHOT-DEV pom Qcadoo MES @@ -41,7 +41,7 @@ - 1.9.9 + 1.9.10-DEV ${project.version} 1.5 1.5-SNAPSHOT From b088a69af16c876c2337d3e90a7031aa0d6e178f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katarzyna=20Ma=C5=82yszek?= Date: Mon, 2 Jul 2018 12:34:31 +0200 Subject: [PATCH 03/15] QCADOOCLS-6193 --- .../hooks/CostNormsGeneratorHooks.java | 25 +++++++++++++++++++ .../view/costNormsGenerator.xml | 3 +++ 2 files changed, 28 insertions(+) create mode 100644 mes-plugins/mes-plugins-material-flow-resources/src/main/java/com/qcadoo/mes/materialFlowResources/hooks/CostNormsGeneratorHooks.java diff --git a/mes-plugins/mes-plugins-material-flow-resources/src/main/java/com/qcadoo/mes/materialFlowResources/hooks/CostNormsGeneratorHooks.java b/mes-plugins/mes-plugins-material-flow-resources/src/main/java/com/qcadoo/mes/materialFlowResources/hooks/CostNormsGeneratorHooks.java new file mode 100644 index 0000000000..77ff83ec3c --- /dev/null +++ b/mes-plugins/mes-plugins-material-flow-resources/src/main/java/com/qcadoo/mes/materialFlowResources/hooks/CostNormsGeneratorHooks.java @@ -0,0 +1,25 @@ +package com.qcadoo.mes.materialFlowResources.hooks; + +import org.springframework.stereotype.Service; + +import com.qcadoo.mes.materialFlowResources.constants.CostNormsGeneratorFields; +import com.qcadoo.model.api.Entity; +import com.qcadoo.view.api.ViewDefinitionState; +import com.qcadoo.view.api.components.FormComponent; +import com.qcadoo.view.api.components.LookupComponent; +import com.qcadoo.view.api.components.lookup.FilterValueHolder; + +@Service +public class CostNormsGeneratorHooks { + + public void onBeforeRender(final ViewDefinitionState view) { + LookupComponent productLookup = (LookupComponent) view.getComponentByReference("productsLookup"); + FormComponent form = (FormComponent) view.getComponentByReference("form"); + Entity generator = form.getEntity(); + String costSource = generator.getStringField(CostNormsGeneratorFields.COSTS_SOURCE); + FilterValueHolder filterValueHolder = productLookup.getFilterValue(); + filterValueHolder.put("costSource", costSource); + productLookup.setFilterValue(filterValueHolder); + + } +} diff --git a/mes-plugins/mes-plugins-material-flow-resources/src/main/resources/materialFlowResources/view/costNormsGenerator.xml b/mes-plugins/mes-plugins-material-flow-resources/src/main/resources/materialFlowResources/view/costNormsGenerator.xml index 4f54b83e09..32a82dcb53 100644 --- a/mes-plugins/mes-plugins-material-flow-resources/src/main/resources/materialFlowResources/view/costNormsGenerator.xml +++ b/mes-plugins/mes-plugins-material-flow-resources/src/main/resources/materialFlowResources/view/costNormsGenerator.xml @@ -138,5 +138,8 @@ + From 56599c208fdc05c47e2cc479a261b7b08cc67680 Mon Sep 17 00:00:00 2001 From: Krzysztof Nadolski Date: Thu, 5 Jul 2018 12:34:57 +0200 Subject: [PATCH 04/15] QCADOOCLS-6238 --- .../listener/TechnologyValidationService.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java index f7f4397af3..177fb027eb 100644 --- a/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java +++ b/mes-plugins/mes-plugins-technologies/src/main/java/com/qcadoo/mes/technologies/states/listener/TechnologyValidationService.java @@ -28,7 +28,6 @@ import static com.qcadoo.mes.technologies.constants.TechnologyFields.PRODUCT; import static com.qcadoo.mes.technologies.constants.TechnologyFields.STATE; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -392,7 +391,7 @@ public boolean checkIfTechnologyTreeIsSet(final StateChangeContext stateChangeCo public boolean checkTechnologyCycles(StateChangeContext stateChangeContext) { final Entity technology = stateChangeContext.getOwner(); - List usedTechnologies = new ArrayList<>(); + Set usedTechnologies = new HashSet<>(); usedTechnologies.add(technology.getId()); Entity product = technology.getBelongsToField(TechnologyFields.PRODUCT); Entity operation = productStructureTreeService.findOperationForProductAndTechnology(product, technology); @@ -400,15 +399,20 @@ public boolean checkTechnologyCycles(StateChangeContext stateChangeContext) { } private boolean checkCycleForSubProducts(final StateChangeContext stateChangeContext, final Entity operation, - final List usedTechnologies) { + final Set usedTechnologies) { EntityList productInComponents = operation .getHasManyField(TechnologyOperationComponentFields.OPERATION_PRODUCT_IN_COMPONENTS); for (Entity productInComp : productInComponents) { + Set copyUsedTechnologies = new HashSet<>(usedTechnologies); Entity product = productInComp.getBelongsToField(OperationProductInComponentFields.PRODUCT); Entity subOperation = productStructureTreeService.findOperationForProductWithinChildren(product, operation); Entity subTechnology = productStructureTreeService.findTechnologyForProduct(product); + if (subTechnology == null && stateChangeContext.getOwner().getBelongsToField(TechnologyFields.PRODUCT).getId() + .equals(product.getId())) { + subTechnology = stateChangeContext.getOwner(); + } if (subTechnology != null) { - if (usedTechnologies.contains(subTechnology.getId())) { + if (copyUsedTechnologies.contains(subTechnology.getId())) { stateChangeContext.addValidationError( "technologies.technologyDetails.window.productStructure.productStructureForm.duplicateProductForTechnology", product.getStringField(ProductFields.NUMBER) + " " + product.getStringField(ProductFields.NAME)); @@ -417,21 +421,21 @@ private boolean checkCycleForSubProducts(final StateChangeContext stateChangeCon if (subOperation == null) { Entity operationForTechnology = productStructureTreeService.findOperationForProductAndTechnology(product, subTechnology); - usedTechnologies.add(subTechnology.getId()); + copyUsedTechnologies.add(subTechnology.getId()); boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, operationForTechnology, - usedTechnologies); + copyUsedTechnologies); if (!hasNotCycle) { return false; } } else { - boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, subOperation, usedTechnologies); + boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, subOperation, copyUsedTechnologies); if (!hasNotCycle) { return false; } } } } else if (subOperation != null) { - boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, subOperation, usedTechnologies); + boolean hasNotCycle = checkCycleForSubProducts(stateChangeContext, subOperation, copyUsedTechnologies); if (!hasNotCycle) { return false; } From e4c710b4df1d1ef1804ab2d074b62c6c1e864000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katarzyna=20Ma=C5=82yszek?= Date: Thu, 5 Jul 2018 13:21:09 +0200 Subject: [PATCH 05/15] QCADOOCLS-6242 --- .../masterOrders/GenerationOrderResult.java | 19 +++++++++++++++---- .../locales/masterOrders_en.properties | 1 + .../locales/masterOrders_pl.properties | 1 + 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/GenerationOrderResult.java b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/GenerationOrderResult.java index a6471d2a36..e4be16197d 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/GenerationOrderResult.java +++ b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/GenerationOrderResult.java @@ -1,12 +1,12 @@ package com.qcadoo.mes.masterOrders; +import java.util.List; + import com.google.common.collect.Lists; import com.qcadoo.localization.api.TranslationService; import com.qcadoo.view.api.ComponentState; import com.qcadoo.view.api.ViewDefinitionState; -import java.util.List; - public class GenerationOrderResult { private TranslationService translationService; @@ -23,6 +23,8 @@ public GenerationOrderResult(TranslationService translationService) { private List ordersWithoutGeneratedSubOrders = Lists.newArrayList(); + private List productsWithoutAcceptedTechnologies = Lists.newArrayList(); + public void addNotGeneratedProductError(MasterOrderProductErrorContainer err) { productOrderErrors.add(err); } @@ -39,6 +41,10 @@ public void addOrderWithoutGeneratedSubOrders(String number) { ordersWithoutGeneratedSubOrders.add(number); } + public void addProductWithoutAcceptedTechnology(String number) { + productsWithoutAcceptedTechnologies.add(number); + } + public void showMessage(ViewDefinitionState view) { if (!generatedOrderNumbers.isEmpty()) { view.addMessage("masterOrders.masterOrder.generationOrder.generatedOrderNumbers", ComponentState.MessageType.INFO, @@ -51,8 +57,8 @@ public void showMessage(ViewDefinitionState view) { } if (!ordersWithoutGeneratedSubOrders.isEmpty()) { - view.addMessage("masterOrders.masterOrder.generationOrder.ordersWithoutGeneratedSubOrders", ComponentState.MessageType.INFO, false, - String.join(", ", ordersWithoutGeneratedSubOrders)); + view.addMessage("masterOrders.masterOrder.generationOrder.ordersWithoutGeneratedSubOrders", + ComponentState.MessageType.INFO, false, String.join(", ", ordersWithoutGeneratedSubOrders)); } if (!productOrderErrors.isEmpty()) { @@ -70,5 +76,10 @@ public void showMessage(ViewDefinitionState view) { view.addTranslatedMessage(msg.toString(), ComponentState.MessageType.INFO, false); }); } + + if (!productsWithoutAcceptedTechnologies.isEmpty()) { + view.addMessage("masterOrders.masterOrder.generationOrder.productsWithoutAcceptedTechnologies", + ComponentState.MessageType.INFO, false, String.join(", ", productsWithoutAcceptedTechnologies)); + } } } diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties index 2cfe53bc58..a482efbaca 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties @@ -332,3 +332,4 @@ masterOrders.masterOrderDetails.window.ordersTab.orders.column.deadline = Deadli masterOrders.masterOrderDetails.window.ordersTab.orders.column.ordersGroupNumber = Orders group masterOrders.masterOrder.generationOrder.ordersWithoutGeneratedSubOrders = An error occurred while generating orders for components for : {0} +masterOrders.masterOrder.generationOrder.productsWithoutAcceptedTechnologies = Cannot generate orders for products: {0} - only checked technologies exist. diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties index 227b67c693..552c9bc1db 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties @@ -296,6 +296,7 @@ qcadooView.ribbon.orders.generateOrders.message = Zaznacz pozycje, które chcesz masterOrders.masterOrder.generationOrder.generatedOrderNumbers = Wygenerowano zlecenia : {0} masterOrders.masterOrder.generationOrder.productNumbersForNotGeneratedOrders = Nie powiodło się generowanie zlecenia dla produktu: {0}, zlecenie nadrzędne: {1}, ilość: {2} masterOrders.masterOrder.generationOrder.ordersWithoutPps = Nie udało się wygenerować planu na zmiany dla zleceń {0} +masterOrders.masterOrder.generationOrder.productsWithoutAcceptedTechnologies = Nie wygenerowano zleceń dla produktów: {0} - posiadają one tylko sprawdzone technologie. masterOrders.masterOrderDto.state.value.01new = Nowe masterOrders.masterOrderDto.state.value.02inExecution = W realizacji From e51f6ab199f49f22693bf74ff30b427afa9bbf09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Katarzyna=20Ma=C5=82yszek?= Date: Fri, 6 Jul 2018 10:41:40 +0200 Subject: [PATCH 06/15] QCADOOCLS-6240 --- ...OrdersFromMOProductsGenerationService.java | 23 ++++++++----- .../constants/ParameterFieldsMO.java | 10 +++--- .../hooks/OrderDetailsHooksMO.java | 10 ++++-- .../listeners/OrderDetailsListenersMO.java | 34 +++++++++++++++++++ .../locales/masterOrders_de.properties | 1 + .../locales/masterOrders_en.properties | 1 + .../locales/masterOrders_pl.properties | 3 ++ .../masterOrders/model/masterOrderDto.xml | 1 + .../model/masterOrderPositionDto.xml | 2 +- .../view/masterOrderPositionsList.xml | 6 ++-- .../masterOrders/view/masterOrdersList.xml | 6 ++-- .../masterOrderDefinitionsParameters.xml | 7 ++++ .../view/tabExtensions/orderDetails.xml | 3 ++ .../src/main/resources/qcadoo-plugin.xml | 5 +++ 14 files changed, 91 insertions(+), 21 deletions(-) create mode 100644 mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/listeners/OrderDetailsListenersMO.java diff --git a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/OrdersFromMOProductsGenerationService.java b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/OrdersFromMOProductsGenerationService.java index 54c7c39458..63c53c90df 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/OrdersFromMOProductsGenerationService.java +++ b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/OrdersFromMOProductsGenerationService.java @@ -30,6 +30,7 @@ import com.qcadoo.mes.masterOrders.constants.MasterOrderProductFields; import com.qcadoo.mes.masterOrders.constants.MasterOrdersConstants; import com.qcadoo.mes.masterOrders.constants.OrderFieldsMO; +import com.qcadoo.mes.masterOrders.constants.ParameterFieldsMO; import com.qcadoo.mes.orders.OrderService; import com.qcadoo.mes.orders.TechnologyServiceO; import com.qcadoo.mes.orders.constants.OrderFields; @@ -121,25 +122,25 @@ private void generateOrder(boolean generatePPS, boolean automaticPps, Generation generateSubOrders(result, order); if (order.isValid() && generatePPS && automaticPps && !parameter.getBooleanField(ORDERS_GENERATION_NOT_COMPLETE_DATES)) { - List orders = getOrderAndSubOrders(order.getId()); + List orders = getOrderAndSubOrders(order.getId()); Collections.reverse(orders); Integer lastLevel = null; Date lastDate = null; for (Entity ord : orders) { - if(Objects.isNull(lastLevel)) { + if (Objects.isNull(lastLevel)) { } Date calculatedOrderStartDate = null; if (Objects.isNull(ord.getDateField(OrderFields.DATE_FROM))) { Optional maybeOrder = findLastOrder(ord); - if(maybeOrder.isPresent()) { + if (maybeOrder.isPresent()) { calculatedOrderStartDate = ord.getDateField(OrderFields.FINISH_DATE); } else { calculatedOrderStartDate = new DateTime().toDate(); } } else { Optional maybeOrder = findPreviousOrder(ord); - if(maybeOrder.isPresent()) { + if (maybeOrder.isPresent()) { calculatedOrderStartDate = maybeOrder.get().getDateField(OrderFields.FINISH_DATE); } else { @@ -149,9 +150,9 @@ private void generateOrder(boolean generatePPS, boolean automaticPps, Generation try { Date finishDate = tryGeneratePPS(ord, calculatedOrderStartDate); - if(Objects.nonNull(lastDate) && finishDate.after(lastDate)) { + if (Objects.nonNull(lastDate) && finishDate.after(lastDate)) { lastDate = finishDate; - } else if(Objects.isNull(lastDate)) { + } else if (Objects.isNull(lastDate)) { lastDate = finishDate; } } catch (Exception ex) { @@ -187,6 +188,7 @@ public Optional findNextOrder(final Entity order) { .addOrder(SearchOrders.asc(OrderFields.START_DATE)).setMaxResults(1).uniqueResult(); return Optional.ofNullable(nextOrder); } + /* * override by aspect */ @@ -339,9 +341,12 @@ public Entity createOrder(final Entity masterOrderProduct) { boolean fillOrderDescriptionBasedOnTechnology = dataDefinitionService .get(BasicConstants.PLUGIN_IDENTIFIER, BasicConstants.MODEL_PARAMETER).find().setMaxResults(1).uniqueResult() .getBooleanField(ParameterFieldsO.FILL_ORDER_DESCRIPTION_BASED_ON_TECHNOLOGY_DESCRIPTION); - - String orderDescription = orderService.buildOrderDescription(masterOrder, technology, - fillOrderDescriptionBasedOnTechnology); + String orderDescription; + if (parameter.getBooleanField(ParameterFieldsMO.COPY_DESCRIPTION)) { + orderDescription = masterOrder.getStringField(MasterOrderFields.DESCRIPTION); + } else { + orderDescription = orderService.buildOrderDescription(masterOrder, technology, fillOrderDescriptionBasedOnTechnology); + } order.setField(OrderFields.DESCRIPTION, orderDescription); return order; } diff --git a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/constants/ParameterFieldsMO.java b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/constants/ParameterFieldsMO.java index 9337e0863c..b557ad9f44 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/constants/ParameterFieldsMO.java +++ b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/constants/ParameterFieldsMO.java @@ -3,19 +3,19 @@ * Copyright (c) 2010 Qcadoo Limited * Project: Qcadoo MES * Version: 1.4 - * + *

* This file is part of Qcadoo. - * + *

* Qcadoo is free software; you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published * by the Free Software Foundation; either version 3 of the License, * or (at your option) any later version. - * + *

* This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU Affero General Public License for more details. - * + *

* You should have received a copy of the GNU Affero General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -29,6 +29,8 @@ private ParameterFieldsMO() { } + public static final String COPY_DESCRIPTION = "copyDescription"; + public static final String SAME_ORDER_NUMBER = "sameOrderNumber"; public static final String MASTER_ORDER_DEFINITIONS = "masterOrderDefinitions"; diff --git a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/hooks/OrderDetailsHooksMO.java b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/hooks/OrderDetailsHooksMO.java index 4cd8471bea..d396d7b86a 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/hooks/OrderDetailsHooksMO.java +++ b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/hooks/OrderDetailsHooksMO.java @@ -202,9 +202,13 @@ private void fillMasterOrderFields(final ViewDefinitionState view, final Entity technologyPrototypeLookup.requestComponentUpdateState(); technologyPrototypeLookup.performEvent(view, "onSelectedEntityChange", ""); } - - String orderDescription = orderService.buildOrderDescription(masterOrder, masterOrderTechnology, - fillOrderDescriptionBasedOnTechnology); + String orderDescription; + if (parameter.getBooleanField(ParameterFieldsMO.COPY_DESCRIPTION)) { + orderDescription = masterOrder.getStringField(MasterOrderFields.DESCRIPTION); + } else { + orderDescription = orderService.buildOrderDescription(masterOrder, masterOrderTechnology, + fillOrderDescriptionBasedOnTechnology); + } if ((Strings.nullToEmpty((String) descriptionField.getFieldValue())).isEmpty()) { descriptionField.setFieldValue(""); diff --git a/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/listeners/OrderDetailsListenersMO.java b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/listeners/OrderDetailsListenersMO.java new file mode 100644 index 0000000000..2cdd3bf74d --- /dev/null +++ b/mes-plugins/mes-plugins-master-orders/src/main/java/com/qcadoo/mes/masterOrders/listeners/OrderDetailsListenersMO.java @@ -0,0 +1,34 @@ +package com.qcadoo.mes.masterOrders.listeners; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.qcadoo.mes.basic.ParameterService; +import com.qcadoo.mes.masterOrders.constants.MasterOrderFields; +import com.qcadoo.mes.masterOrders.constants.OrderFieldsMO; +import com.qcadoo.mes.masterOrders.constants.ParameterFieldsMO; +import com.qcadoo.mes.orders.constants.OrderFields; +import com.qcadoo.model.api.Entity; +import com.qcadoo.view.api.ComponentState; +import com.qcadoo.view.api.ViewDefinitionState; +import com.qcadoo.view.api.components.FormComponent; + +@Service +public class OrderDetailsListenersMO { + + @Autowired + private ParameterService parameterService; + + public void updateDescription(final ViewDefinitionState view, final ComponentState state, final String[] args) { + if (parameterService.getParameter().getBooleanField(ParameterFieldsMO.COPY_DESCRIPTION)) { + FormComponent form = (FormComponent) view.getComponentByReference("form"); + Entity order = form.getEntity(); + Entity masterOrder = order.getBelongsToField(OrderFieldsMO.MASTER_ORDER); + if (masterOrder != null) { + order.setField(OrderFields.DESCRIPTION, masterOrder.getStringField(MasterOrderFields.DESCRIPTION)); + form.setEntity(order); + } + } + + } +} diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_de.properties b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_de.properties index 915e2f8ead..e7f964f1b7 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_de.properties +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_de.properties @@ -335,3 +335,4 @@ masterOrders.masterOrderDetails.window.ordersTab.orders.column.deadline = masterOrders.masterOrderDetails.window.ordersTab.orders.column.ordersGroupNumber = masterOrders.masterOrder.generationOrder.ordersWithoutGeneratedSubOrders = +basic.parameter.copyDescription.label = diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties index a482efbaca..3f8d8aaf04 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_en.properties @@ -333,3 +333,4 @@ masterOrders.masterOrderDetails.window.ordersTab.orders.column.ordersGroupNumber masterOrders.masterOrder.generationOrder.ordersWithoutGeneratedSubOrders = An error occurred while generating orders for components for : {0} masterOrders.masterOrder.generationOrder.productsWithoutAcceptedTechnologies = Cannot generate orders for products: {0} - only checked technologies exist. +basic.parameter.copyDescription.label = Copy description from master order diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties index 552c9bc1db..9aa84bbd6e 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/locales/masterOrders_pl.properties @@ -96,6 +96,7 @@ masterOrders.masterOrderDefinition.number.label = Numer basic.parameter.sameOrderNumber.label = Taki sam numer zlecenia produkcyjnego i nadrzędnego basic.parameter.ordersGenerationNotCompleteDates.label = Nie ustalaj dat w generowanych zleceniach basic.parameter.masterOrderDefinitions.label = Definicje zleceń nadrzędnych +basic.parameter.copyDescription.label = Kopiuj opis ze zlecenia nadrzędnego orders.order.masterOrder.label = Zlecenie nadrzędne orders.order.masterOrder.label.focus = Wybierz zlecenie nadrzędne @@ -336,3 +337,5 @@ masterOrders.masterOrderDetails.window.ordersTab.orders.column.deadline = Termin masterOrders.masterOrderDetails.window.ordersTab.orders.column.ordersGroupNumber = Grupa zleceń masterOrders.masterOrder.generationOrder.ordersWithoutGeneratedSubOrders = Wystąpił błąd podczas generowańia zleceń na komponenty dla : {0} +masterOrders.masterOrderPositionDto.description.label = Opis +masterOrders.masterOrderDto.description.label = Opis \ No newline at end of file diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderDto.xml b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderDto.xml index 3948443661..64cac198f7 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderDto.xml +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderDto.xml @@ -42,6 +42,7 @@ + diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderPositionDto.xml b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderPositionDto.xml index 20afbbd694..1e7b7ac84d 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderPositionDto.xml +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/model/masterOrderPositionDto.xml @@ -56,7 +56,7 @@ - + diff --git a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/view/masterOrderPositionsList.xml b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/view/masterOrderPositionsList.xml index 72ca3f3992..7c86c5eaf4 100644 --- a/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/view/masterOrderPositionsList.xml +++ b/mes-plugins/mes-plugins-master-orders/src/main/resources/masterOrders/view/masterOrderPositionsList.xml @@ -88,6 +88,8 @@ width="80" classesNames="wrap-date"/>