diff --git a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java index 4ccdfcb..566efab 100644 --- a/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java +++ b/src/main/java/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.java @@ -153,6 +153,8 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo hql+=" order by inventory.location.code "; }else if(item.getCompany().getId()==3){ hql+=" order by inventory.itemKeyInventory.itemKey.lotInfo.propN1 desc,inventory.itemKeyInventory.itemKey.lotInfo.propLC1 desc,inventory.location.code,inventory.itemKeyInventory.itemKey.lotInfo.propC1 "; + }else if(item.getCompany().getId()==23){ + hql+=" order by inventory.location.row "; }else{ hql+=" order by inventory.itemKeyInventory.itemKey.lotInfo.propC1,inventory.location.code "; } diff --git a/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.class b/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.class deleted file mode 100644 index 5df9b7d..0000000 Binary files a/target/hrbwms/WEB-INF/classes/com/dev/swms/server/service/picking/allocate/DefaultAutoAllocator.class and /dev/null differ