QCADOOCLS-5723

qcadoo · Sep 15, 2017 · dfa9f71 · dfa9f71
1 parent 25027d2
commit dfa9f71
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 1 deletion.
diff --git a/...n-counting/src/main/resources/productionCounting/locales/productionCounting_pl.properties b/...n-counting/src/main/resources/productionCounting/locales/productionCounting_pl.properties
@@ -1237,7 +1237,7 @@ productionCounting.productionBalance.report.xls.sheet.materialCosts = Koszty mat
 productionCounting.productionBalance.report.xls.sheet.materialCosts.orderNumber = Numer zlecenia
 productionCounting.productionBalance.report.xls.sheet.materialCosts.operationNumber = Numer operacji
 productionCounting.productionBalance.report.xls.sheet.materialCosts.productNumber = Numer produktu
-productionCounting.productionBalance.report.xls.sheet.materialCosts.productName = Nazwa produtku
+productionCounting.productionBalance.report.xls.sheet.materialCosts.productName = Nazwa produktu
 productionCounting.productionBalance.report.xls.sheet.materialCosts.plannedQuantity = Ilość planowana
 productionCounting.productionBalance.report.xls.sheet.materialCosts.usedQuantity = Ilość zużyta
 productionCounting.productionBalance.report.xls.sheet.materialCosts.quantitativeDeviation = Odchylenie ilościowe

diff --git a/...ins-technologies/src/main/java/com/qcadoo/mes/technologies/constants/OperationFields.java b/...ins-technologies/src/main/java/com/qcadoo/mes/technologies/constants/OperationFields.java
@@ -61,4 +61,5 @@ private OperationFields() {
 
     public static final String PRODUCTION_LINE = "productionLine";
 
+    public static final String PRODUCT = "product";
 }
diff --git a/...es/src/main/java/com/qcadoo/mes/technologies/hooks/TechnologyOperationComponentHooks.java b/...es/src/main/java/com/qcadoo/mes/technologies/hooks/TechnologyOperationComponentHooks.java
@@ -23,8 +23,10 @@
  */
 package com.qcadoo.mes.technologies.hooks;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.Set;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +62,7 @@ public class TechnologyOperationComponentHooks {
     public void onCreate(final DataDefinition technologyOperationComponentDD, final Entity technologyOperationComponent) {
         copyCommentAndAttachmentFromOperation(technologyOperationComponent);
         setParentIfRootNodeAlreadyExists(technologyOperationComponent);
+        setOperationOutProduct(technologyOperationComponent);
         copyReferencedTechnology(technologyOperationComponentDD, technologyOperationComponent);
         copyWorkstationsSettingsFromOperation(technologyOperationComponent);
     }
@@ -110,6 +113,27 @@ private void setParentIfRootNodeAlreadyExists(final Entity technologyOperationCo
         technologyOperationComponent.setField(TechnologyOperationComponentFields.PARENT, rootNode);
     }
 
+    private void setOperationOutProduct(Entity technologyOperationComponent) {
+        Entity technology = technologyOperationComponent.getBelongsToField(TechnologyOperationComponentFields.TECHNOLOGY);
+        EntityTree tree = technology.getTreeField(TechnologyFields.OPERATION_COMPONENTS);
+        DataDefinition opocDD = dataDefinitionService.get(TechnologiesConstants.PLUGIN_IDENTIFIER,
+                TechnologiesConstants.MODEL_OPERATION_PRODUCT_OUT_COMPONENT);
+        Entity opoc = opocDD.create();
+        opoc.setField(OperationProductOutComponentFields.QUANTITY, 1);
+        opoc.setField(OperationProductOutComponentFields.SET, false);
+        if(tree == null || tree.isEmpty()){
+            opoc.setField(OperationProductOutComponentFields.PRODUCT, technology.getBelongsToField(TechnologyFields.PRODUCT));
+            technologyOperationComponent.setField(TechnologyOperationComponentFields.OPERATION_PRODUCT_OUT_COMPONENTS, Collections.singletonList(opoc));
+        } else {
+            Entity operation = technologyOperationComponent.getBelongsToField(TechnologyOperationComponentFields.OPERATION);
+            Entity product = operation.getBelongsToField(OperationFields.PRODUCT);
+            if(!Objects.isNull(product)){
+                opoc.setField(OperationProductOutComponentFields.PRODUCT, product);
+                technologyOperationComponent.setField(TechnologyOperationComponentFields.OPERATION_PRODUCT_OUT_COMPONENTS, Collections.singletonList(opoc));
+            }
+        }
+    }
+
     private void copyReferencedTechnology(final DataDefinition technologyOperationComponentDD,
             final Entity technologyOperationComponent) {
         if (!TechnologyOperationComponentFields.REFERENCE_TECHNOLOGY

diff --git a/...s-plugins-technologies/src/main/resources/technologies/locales/technologies_de.properties b/...s-plugins-technologies/src/main/resources/technologies/locales/technologies_de.properties
@@ -55,6 +55,11 @@ technologies.technology.additionalActions.label =
 
 technologies.operation.attachment.label = Anhang
 
+technologies.operation.product.label = Produkt
+
+technologies.operation.product.label.focus = die Nummer von einem Produkt einführen
+technologies.operationDetails.window.mainTab.operation.product.description =
+
 technologies.operation.operationGroup.label = Gruppe
 
 technologies.operation.division.label = Abteilung

diff --git a/...s-plugins-technologies/src/main/resources/technologies/locales/technologies_en.properties b/...s-plugins-technologies/src/main/resources/technologies/locales/technologies_en.properties
@@ -44,6 +44,9 @@ technologies.operation.name.label = Name
 technologies.operation.operationGroup.label.focus = Insert operation group number
 technologies.operation.comment.label = Description
 technologies.operation.attachment.label = Attachment
+technologies.operation.product.label = Product
+technologies.operation.product.label.focus = Insert product number
+technologies.operationDetails.window.mainTab.operation.product.description = Specify the product that is the result of the operation. We will insert it when building a technology tree.
 technologies.operation.operationGroup.label = Group
 technologies.operation.division.label = Division
 technologies.operation.productionLine.label = Production line

diff --git a/...s-plugins-technologies/src/main/resources/technologies/locales/technologies_pl.properties b/...s-plugins-technologies/src/main/resources/technologies/locales/technologies_pl.properties
@@ -44,6 +44,9 @@ technologies.operation.name.label = Nazwa
 technologies.operation.operationGroup.label.focus = Wprowadź numer grupy operacji
 technologies.operation.comment.label = Opis
 technologies.operation.attachment.label = Załącznik
+technologies.operation.product.label = Produkt
+technologies.operation.product.label.focus = Wprowadź numer produktu
+technologies.operationDetails.window.mainTab.operation.product.description = Podaj produkt będący efektem operacji. Podpowiemy go przy budowaniu drzewa technologii.
 technologies.operation.operationGroup.label = Grupa
 technologies.operation.division.label = Dział
 technologies.operation.productionLine.label = Linia produkcyjna

diff --git a/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/model/operation.xml b/mes-plugins/mes-plugins-technologies/src/main/resources/technologies/model/operation.xml
@@ -61,6 +61,7 @@
         <enum name="assignedToOperation" values="01workstations,02workstationTypes"
               default="01workstations" required="true"/>
 
+        <belongsTo name="product" plugin="basic" model="product"/>
         <belongsTo name="workstationType" plugin="basic" model="workstationType"/>
         <belongsTo name="division" plugin="basic" model="division"/>
         <belongsTo name="productionLine" model="productionLine" plugin="productionLines"/>

diff --git a/...lugins/mes-plugins-technologies/src/main/resources/technologies/view/operationDetails.xml b/...lugins/mes-plugins-technologies/src/main/resources/technologies/view/operationDetails.xml
@@ -60,6 +60,21 @@
                     <layoutElement column="1" row="4">
                         <component type="file" name="attachment" field="attachment"/>
                     </layoutElement>
+                    <layoutElement column="1" row="5">
+                        <component type="lookup" name="product" field="product"
+                                   reference="product" hasDescription="true">
+                            <option type="column" name="name" fields="name" link="true"
+                                    width="200"/>
+                            <option type="column" name="ean" fields="ean"/>
+
+                            <option type="searchable" value="name,ean"/>
+                            <option type="orderable" value="name,ean"/>
+
+                            <option type="expression"
+                                    value="'&lt;b&gt;' + #number + '&lt;/b&gt; - ' + #name"/>
+                            <option type="fieldCode" value="number"/>
+                        </component>
+                    </layoutElement>
                     <layoutElement column="2" row="1" height="2">
                         <component type="textarea" name="comment" field="comment"/>
                     </layoutElement>