From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 07 七月 2025 19:42:26 +0800
Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了，单据状态还是作业中，现在作业中的单据是可以删除的，我不小心把这个单据删除了，怎么恢复？ 36.每个界面点下一页都没反应，点第二页是有变化的，之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息（客户名称、收件人、地址、电话等），现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java
index 13d5fcf..c2e5956 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/LocUtils.java
@@ -51,7 +51,7 @@
List<Loc> locs = new ArrayList<>();
List<Map<String, Object>> list = viewTaskDetlMapper.getList(mat.getMatnr(), batch, uniqueFields);
for (Map<String, Object> map : list) {
- Task task = taskService.getById(map.get("task_id").toString());
+ Task task = taskService.getById(map.get("taskId").toString());
if (task == null) {
continue;
}
@@ -73,7 +73,7 @@
List<Loc> locs2 = new ArrayList<>();
List<Map<String, Object>> list2 = viewLocDetlMapper.getList(mat.getMatnr(), batch, uniqueFields, null);
for (Map<String, Object> map : list2) {
- Loc one = locService.getById(map.get("loc_id").toString());
+ Loc one = locService.getById(map.get("locId").toString());
if (one == null) {
continue;
}
@@ -357,4 +357,25 @@
return locs;
}
+ // 閲嶅啓ctu搴撹幏鍙栧簱浣�
+ public Loc getGlobalEmptyLocToCtu(Integer locTypeHeight) {
+ LocTypeHeightType locTypeHeightType = LocTypeHeightType.get(locTypeHeight);
+ if (locTypeHeightType == null) {
+ throw new CoolException("搴撲綅楂樺害绫诲瀷寮傚父");
+ }
+ //鑾峰彇搴撲綅楂樺害
+ LocType locType = locTypeService.getOne(new LambdaQueryWrapper<LocType>().eq(LocType::getFlag, locTypeHeightType.flag));
+ //绗﹀悎搴撲綅楂樺害鐨勫簱浣嶉泦鍚�
+ List<Long> locIdList = locTypeBindService.getLocIdListByType(locType);
+
+ LambdaQueryWrapper<Loc> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.in(Loc::getId, locIdList);
+ queryWrapper.eq(Loc::getLocStsId, LocStsType.O.val());
+ queryWrapper.le(Loc::getRow1,26);
+ queryWrapper.orderByAsc(Loc::getLev1).orderByDesc(Loc::getBay1).orderByAsc(Loc::getRow1);
+ queryWrapper.last("limit 1");
+
+ return locService.getOne(queryWrapper);
+ }
+
}
--
Gitblit v1.9.1