Merge remote-tracking branch 'origin/master'

src/main/java/com/mushiny/heli/xnr/service/ICQAService.java

@@ -91,6 +91,7 @@ public class ICQAService {
         }
         data.put("SKUNAME",CommonUtils.parseString("NAME",sku));
         data.put("AMOUNT",CommonUtils.parseString("AMOUNT",sku));
+        data.put("Stock",CommonUtils.parseString("AMOUNT", sku));
         data.putAll(podOrder);
 
         return data;

src/main/java/com/mushiny/heli/xnr/service/Sql_Table.java

@@ -130,7 +130,7 @@ public interface Sql_Table {
 
     String SQL_QUERY_PODORDRTASK_ICQA = "select WMS_ICQA_PODORDER.* from WMS_ICQA_PODORDER, WMS_ICQA_ORDERPOSITION                \n" +
             "   where WMS_ICQA_PODORDER.TASKPOSITIONID = WMS_ICQA_ORDERPOSITION.ID\n" +
-            //"   and WMS_ICQA_PODORDER.STATE = 'Available' \n" +
+            "   and WMS_ICQA_ORDERPOSITION.STATE='Available'" +
             "   and WMS_ICQA_PODORDER.POD_ID=? and WMS_ICQA_PODORDER.POD_FACE=?\n" +
             "   ORDER BY WMS_ICQA_PODORDER.CREATED_DATE DESC limit 1";