From 07405fce4e7925af05da2468c46602a6b75f0fff Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Sun, 15 Oct 2023 22:25:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B4=A7=E4=BD=8D=E7=A0=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml   | 1 +
 .../distribution/controller/DistributionStockupController.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
index b4f47f8b9..1c349f375 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml
@@ -132,6 +132,7 @@
                 AND  goods_allocation.allocation_status=#{po.allocationStatus}
             </if>
         </where>
+        order by goods_allocation.goods_area_id, goods_allocation.layer_num  asc ,goods_allocation.column_num
     </select>
 
         <select id="selectAllocationInfo" resultType="com.logpm.basicdata.vo.WarehouseAllocationInfoVO">
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
index ea9c4ab82..01932c9a6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
@@ -175,7 +175,7 @@ public class DistributionStockupController extends BladeController {
 	public R<List<User>> listUser() {
 		//获取当前登录用户
 		BladeUser user = AuthUtil.getUser();
-		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "叉车");
+		List<User> cc = distributionStockupService.getRoleList(user.getDeptId(), user.getTenantId(), "拣货员");
 		return R.data(cc);
 	}