From d0226747665355acecd5b4f2b5c0beb020586729 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 17 一月 2025 15:37:32 +0800
Subject: [PATCH] # 23. PDA拣货单据，勾选或点击确认按钮后，完成当前单据 （已完成） 24. PDA出库成功后，界面数据重置，避免重复操作 （已修复） 25. PDA接口请求，添加一个Loading遮档 （已修复） 27. 非平库单据，在平库可做入库操作 （已修复） 28. 平库已组拖数据，组拖完成后依然可组拖 （已修复） 29. 平库入库后，订单明细没有添加（已修复） 30. 平库入库后，单据类型没有修改（已修复） 31. 没有绑定播种位，不能进行播种，前后端都需加判定（已修复） 33. 平库入库未修改入库已完成数量（已修复） 34. cacheSite缓存站点逻辑需重新梳理，入库生成波次时（已完成） 35. PDA添加发货确认，默认全选 （已修复） 36. 大屏获取任务时，是由容器到达的拖盘码确认通知 （已修复） 37. 拣货单序号不显示 问题修复 （已修复） 42. pda发货确认，添加不同颜色区分是否全部完成拣货，绿色全部拣货完成，红色完成部分拣货（已修复） 43. CTU入库完成后，订单明细没有删除，执行中数量清空（已修复） 44. 平库入库完成后，历史档明细完成数量没有更新 （已修复） 45. PDA料号不显示 （已修复） 46. 发货完成后，波次管理数据未加入历史档 （已修复）
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java | 33 +++++++++------------------------
1 files changed, 9 insertions(+), 24 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
index 0d6e371..953f7f6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskTimer.java
@@ -67,6 +67,9 @@
private CacheSiteService cacheSiteService;
+ /**
+ * 鍏ュ簱鎵ц浠诲姟
+ */
@Scheduled(cron = "0/3 * * * * ? ")
@Transactional(rollbackFor = Exception.class)
public void inExecute() {
@@ -155,19 +158,6 @@
task.setTaskSts(TaskStsType.UPDATED_OUT.id);//200.搴撳瓨鏇存柊瀹屾垚
if (!taskService.updateById(task)) {
throw new CoolException("搴撳瓨鏇存柊澶辫触");
- } else {
- //CacheSite 閲婃斁宸茶鍗犵敤鐨勯�氶亾 //fixme 鎾鍔熻兘瀹屾垚鍚庯紝闇�瑕佸皢杩欓噷娉ㄩ噴鎺�
-// List<TaskDetl> detls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().eq(TaskDetl::getTaskId, task.getId()));
-// if (!Collections.isEmpty(detls)) {
-// List<Long> waveIds = detls.stream().map(TaskDetl::getWaveId).collect(Collectors.toList());
-// List<Order> orders = orderService.list(new LambdaQueryWrapper<Order>().in(Order::getWaveId, waveIds));
-// List<Long> orderIds = orders.stream().map(Order::getId).collect(Collectors.toList());
-// cacheSiteService.update(new LambdaUpdateWrapper<CacheSite>()
-// .in(CacheSite::getOrderId, orderIds)
-// .set(CacheSite::getSiteStatus, 0)
-// .set(CacheSite::getOrderId, null)
-// .set(CacheSite::getOrderNo, null));
-// }
}
}
} catch (Exception e) {
@@ -216,10 +206,9 @@
if (!locDetlService.save(locDetl)) {
throw new CoolException("鎻掑叆搴撳瓨鏄庣粏澶辫触");
}
- //fixme 鏆傛椂鍏抽棴HOSTID,鍚庣画鎵撳紑鏈烘瀯ID
+
//娣诲姞搴撳瓨鏄庣粏鎵╁睍瀛楁
-// List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
- List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()));
+ List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
for (TaskDetlField detlField : detlFields) {
LocDetlField locDetlField = new LocDetlField();
locDetlField.setDetlId(locDetl.getId());
@@ -232,10 +221,8 @@
}
}
}
- //fixme 鏆傛椂鍏抽棴HOSTID,鍚庣画鎵撳紑鏈烘瀯ID
//缁勬墭閫氱煡妗ｈ浆鍘嗗彶妗�
-// List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
- List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()));
+ List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, task.getBarcode()).eq(WaitPakin::getHostId, hostId));
if (waitPakins.isEmpty()) {
throw new CoolException("缁勬墭閫氱煡妗ｄ笉瀛樺湪");
}
@@ -342,8 +329,7 @@
private void executeTask53(Task task) {
Long hostId = task.getHostId();
//fixme 灏嗕换鍔″綋鍓�
-// Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()));
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getLocNo, task.getTargetLoc()).eq(Loc::getHostId, hostId));
if (loc == null) {
throw new CoolException("搴撲綅涓嶅瓨鍦�");
}
@@ -355,6 +341,7 @@
loc.setLocStsId(LocStsType.F.val());
loc.setUpdateTime(new Date());
loc.setBarcode(task.getBarcode());
+
if (!locService.updateById(loc)) {
throw new CoolException("搴撲綅鐘舵�佹洿鏂板け璐�");
}
@@ -385,9 +372,7 @@
}
//娣诲姞搴撳瓨鏄庣粏鎵╁睍瀛楁
- //fixme 娉ㄩ噴
-// List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
- List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()));
+ List<TaskDetlField> detlFields = taskDetlFieldService.list(new LambdaQueryWrapper<TaskDetlField>().eq(TaskDetlField::getDetlId, taskDetl.getId()).eq(TaskDetlField::getHostId, hostId));
for (TaskDetlField detlField : detlFields) {
LocDetlField locDetlField = new LocDetlField();
locDetlField.setDetlId(locDetl.getId());
--
Gitblit v1.9.1