Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

# Conflicts:
#	modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1174,11 +1174,12 @@ public class WmsHqlPack {
         //作业流程id（对应作业记录明细里自增的id）
         HqlPack.getNumEqualPack(wmsActionLogDetails.getAlId(),"alId",result);
         HqlPack.getNumEqualPack(wmsActionLogDetails.getSeq(),"seq",result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getOkSeq(), "okSeq", result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getNgSeq(), "ngSeq", result);
+        HqlPack.getNumEqualPack(wmsActionLogDetails.getValueType(), "valueType", result);
 
         getStringBuilderPack(wmsActionLogDetails, result);
 
-        HqlPack.getOrderByPack(new Object[]{1}, new String[]{"seq"}, result);
-
-        return  result.toString();
+        return result.toString();
     }
 }