changeset:   8430:aac92384d7b6
tag:         tip
user:        Guillermo Alvarez de Eulate <guillermo.alvarez@openbravo.com>
date:        Wed Nov 29 11:22:54 2017 +0100
summary:     Fixed issue 37415 backport of 37308: Using attributes, if several att set instances are found pick one with stock.

diff -r dc63edc4b19a -r aac92384d7b6 src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java	Thu Nov 23 19:19:52 2017 +0530
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java	Wed Nov 29 11:22:54 2017 +0100
@@ -1220,6 +1220,8 @@
       JSONObject jsonOrderLine, OrderLine orderLine, JSONObject jsonorder, long lineNo,
       BigDecimal qty, Locator bin, AttributeSetInstance attributeSetInstance, int i)
       throws JSONException {
+    String orderOrganizationId = jsonorder.getString("organization");
+
     ShipmentInOutLine line = OBProvider.getInstance().get(ShipmentInOutLine.class);
     String shipmentLineId = OBMOBCUtils.getUUIDbyString(orderLine.getId() + lineNo + i);
     JSONPropertyToEntity.fillBobFromJSON(shplineentity, line, jsonOrderLine,
@@ -1241,12 +1243,12 @@
         "attSetInstanceDesc")) {
       line.setAttributeSetValue(AttributesUtils.fetchAttributeSetValue(
           jsonOrderLine.get("attSetInstanceDesc").toString(), jsonOrderLine
-              .getJSONObject("product").get("id").toString()));
+              .getJSONObject("product").get("id").toString(), orderOrganizationId));
     } else if (OBMOBCUtils.isJsonObjectPropertyStringPresentNotNullAndNotEmptyString(jsonOrderLine,
         "attributeValue")) {
       line.setAttributeSetValue(AttributesUtils.fetchAttributeSetValue(
           jsonOrderLine.get("attributeValue").toString(), jsonOrderLine.getJSONObject("product")
-              .get("id").toString()));
+              .get("id").toString(), orderOrganizationId));
     } else {
       line.setAttributeSetValue(attributeSetInstance);
     }
@@ -1333,12 +1335,13 @@
           "attSetInstanceDesc")) {
         orderline.setAttributeSetValue(AttributesUtils.fetchAttributeSetValue(
             jsonOrderLine.get("attSetInstanceDesc").toString(),
-            jsonOrderLine.getJSONObject("product").get("id").toString()));
+            jsonOrderLine.getJSONObject("product").get("id").toString(), order.getOrganization()
+                .getId()));
       } else if (OBMOBCUtils.isJsonObjectPropertyStringPresentNotNullAndNotEmptyString(
           jsonOrderLine, "attributeValue")) {
         orderline.setAttributeSetValue(AttributesUtils.fetchAttributeSetValue(
             jsonOrderLine.get("attributeValue").toString(), jsonOrderLine.getJSONObject("product")
-                .get("id").toString()));
+                .get("id").toString(), order.getOrganization().getId()));
       }
 
       lineReferences.add(orderline);
diff -r dc63edc4b19a -r aac92384d7b6 src/org/openbravo/retail/posterminal/utility/AttributesUtils.java
--- a/src/org/openbravo/retail/posterminal/utility/AttributesUtils.java	Thu Nov 23 19:19:52 2017 +0530
+++ b/src/org/openbravo/retail/posterminal/utility/AttributesUtils.java	Wed Nov 29 11:22:54 2017 +0100
@@ -29,21 +29,25 @@
 import org.openbravo.model.common.plm.AttributeUse;
 import org.openbravo.model.common.plm.AttributeValue;
 import org.openbravo.model.common.plm.Product;
+import org.openbravo.model.materialmgmt.onhandquantity.StorageDetail;
 
 public class AttributesUtils {
 
   private static final Logger log = Logger.getLogger(AttributesUtils.class);
 
-  public static AttributeSetInstance fetchAttributeSetValue(String attributeValue, String productId) {
+  public static AttributeSetInstance fetchAttributeSetValue(String attributeValue,
+      String productId, String posTerminalOrganizationId) {
     AttributeSetInstance attrSetInst = null;
     String validatedAttributeSetInstanceDescription = "";
     Product product = OBDal.getInstance().get(Product.class, productId);
+    // Ensure that product is configured to use attributes
     if (product.getAttributeSet() != null) {
       try {
         if (StringUtils.isNotEmpty(attributeValue) || StringUtils.isNotBlank(attributeValue)) {
+          // Generate a valid description for given values
           validatedAttributeSetInstanceDescription = AttributesUtils
               .generateValidAttSetInstanceDescription(attributeValue, product);
-
+          // Try to find an Att Set Intance Id with given description
           OBCriteria<AttributeSetInstance> attrSICrit = OBDal.getInstance().createCriteria(
               AttributeSetInstance.class);
           attrSICrit.add(Restrictions.eq(AttributeSetInstance.PROPERTY_DESCRIPTION,
@@ -51,20 +55,54 @@
           attrSICrit.addOrderBy("id", false);
           List<AttributeSetInstance> attrSIList = attrSICrit.list();
           if (attrSIList.isEmpty() && attrSIList.size() == 0) {
+            // Att Set instance Id not found -> Create New One
             attrSetInst = AttributesUtils.createAttributeSetValue(
                 validatedAttributeSetInstanceDescription, product);
             return attrSetInst;
+          } else if (attrSIList.size() == 1) {
+            // Just one Att Set instance Id found -> Use it
+            attrSetInst = attrSIList.get(0);
+            return attrSetInst;
           } else {
-            attrSetInst = attrSIList.get(0);
+            // Issue 37308: We have found several Att Set Instances with the same description.
+            // Lets try to find one which have stock
+            // inside the warehouses used by the store
+            StringBuilder stDetailWhereClause = new StringBuilder();
+            stDetailWhereClause.append(" as e WHERE ");
+            stDetailWhereClause.append("e.attributeSetValue.id in ( ");
+            stDetailWhereClause.append("  select id from AttributeSetInstance attseti ");
+            stDetailWhereClause.append("  where attseti.description = :attsetdescription ");
+            stDetailWhereClause.append(") AND ");
+            stDetailWhereClause.append("e.quantityOnHand > 0 AND ");
+            stDetailWhereClause.append("e.storageBin.warehouse.id in ( ");
+            stDetailWhereClause.append("  select warehouse.id from OrganizationWarehouse orgwh ");
+            stDetailWhereClause.append("  where orgwh.organization.id = :orgid ");
+            stDetailWhereClause.append(") ");
+            stDetailWhereClause.append("ORDER BY e.quantityOnHand desc, e.attributeSetValue.id ");
+            OBQuery<StorageDetail> querySdetail = OBDal.getInstance().createQuery(
+                StorageDetail.class, stDetailWhereClause.toString());
+            querySdetail.setNamedParameter("attsetdescription",
+                validatedAttributeSetInstanceDescription);
+            querySdetail.setNamedParameter("orgid", posTerminalOrganizationId);
+            List<StorageDetail> lstSDResults = querySdetail.list();
+            if (lstSDResults.size() > 0) {
+              // Pick the first one (query was ordered by qtyOnHand and Att Set instance id)
+              attrSetInst = lstSDResults.get(0).getAttributeSetValue();
+            } else {
+              // There is no stock. Use the first one found in Att Set instance table
+              attrSetInst = attrSIList.get(0);
+            }
             return attrSetInst;
           }
         } else {
+          // return null because given values are empty
           return attrSetInst;
         }
       } catch (Exception e) {
         throw new OBException(e.getMessage(), e);
       }
     } else {
+      // Product is not configured to use attributes
       log.warn("Warning: Trying to fetch an Attribute Set instance for a product which is not configured to use attributes. ("
           + product.getIdentifier() + ")");
       return null;