diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 13e6304..898c921 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -93,10 +93,11 @@ public class WmsHqlPack { /** * 查询任务合并的移库单明细 查询条件封装 * + * @param colName * @param orderNos * @return */ - public static String packWmsOrderDetailsByOrderNos(List orderNos) { + public static String packWmsOrderDetailsByOrderNos(String colName, List orderNos) { StringBuffer result = new StringBuffer(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) { @@ -105,7 +106,7 @@ public class WmsHqlPack { orderNoStr.deleteCharAt(orderNoStr.length() - 1); result.append(" and model.isDeleted=" + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() + " and model.isValid=" + CommonEnumUtil.IS_VAILD.VAILD.getValue() + - " and model.orderNo in (" + orderNoStr + ")" + " order by model.partNo,model.orderNo"); + " and model.orderNo in (" + orderNoStr + ")" + " order by model." + colName + ",model.orderNo"); return result.toString(); }