From ef1aea2bdbc1169d6d76d478874912699ae00b66 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Fri, 27 Dec 2024 15:17:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=9F=E4=BE=83=E5=AE=A2=E6=88=B7=E5=88=86?=
 =?UTF-8?q?=E9=85=8D=E8=A7=84=E5=88=99=20=E5=85=88=E8=BF=9B=E5=85=88?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E5=BA=93=E4=BD=8D=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/service/picking/allocate/DefaultAutoAllocator.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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){