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 566efab..cb07b69 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 @@ -150,7 +150,7 @@ public class DefaultAutoAllocator extends DefaultBaseManager implements AutoAllo } //星侃客户按客户排序 if(item.getCompany().getId()==4){ - hql+=" order by inventory.location.code "; + hql+=" order by inventory.itemKeyInventory.itemKey.lotInfo.propC1,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){