liyuqi/202501-Wms-Kate-Wuxi
1
0
Fork 0
forked from BaoKaiWms/202501-Wms-Kate-Wuxi
Code Pull Requests Activity

1. bug修复

Browse Source
This commit is contained in:
梁州 2025-03-29 12:12:12 +08:00
parent bd3b6b339a
commit 947b5746de
3 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java
View File

@ -394,14 +394,13 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
} }
// 当前站台到达的拣选任务 // 当前站台到达的拣选任务
TAppPickTask thisPickTask = pickTaskList.getFirst(); TAppPickTask thisPickTask = pickTaskList.getFirst();
if (confirmWorkRequest.getStockConfirm() == null || confirmWorkRequest.getOrderConfirm() == null) { if (confirmWorkRequest.getOrderConfirm() != null) {
return BaseWmsApiResponse.error("确认信息不全。");
}
// 更新工作信息 // 更新工作信息
String updateWorkResult = updateWorkInfo(confirmWorkRequest); String updateWorkResult = updateWorkInfo(confirmWorkRequest);
if (StringUtils.isNotEmpty(updateWorkResult)) { if (StringUtils.isNotEmpty(updateWorkResult)) {
return BaseWmsApiResponse.error("更新工作信息失败：" + updateWorkResult + "，请重试。"); return BaseWmsApiResponse.error("更新工作信息失败：" + updateWorkResult + "，请重试。");
} }
}
// 更新库存信息 // 更新库存信息
stockDataService.updateStockInfo(confirmWorkRequest.getStockConfirm(), confirmWorkRequest.getStandId(), confirmWorkRequest.getUserName(), "配料拣选"); stockDataService.updateStockInfo(confirmWorkRequest.getStockConfirm(), confirmWorkRequest.getStandId(), confirmWorkRequest.getUserName(), "配料拣选");
// 查询库存获得当前载具中存储的库存列表 // 查询库存获得当前载具中存储的库存列表

7
dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java
View File

@ -681,14 +681,13 @@ public class TaskControllerServiceImpl implements ITaskControllerService {
} }
// 当前站台到达的拣选任务 // 当前站台到达的拣选任务
TAppPickTask thisPickTask = pickTaskList.getFirst(); TAppPickTask thisPickTask = pickTaskList.getFirst();
if (confirmTaskRequest.getTaskConfirm() == null || confirmTaskRequest.getStockConfirm() == null) { if (confirmTaskRequest.getTaskConfirm() != null) {
return BaseWmsApiResponse.error("确认信息不全。");
}
// 更新工作信息 // 更新工作信息
String updateTaskResult = updateTaskInfo(confirmTaskRequest); String updateTaskResult = updateTaskInfo(confirmTaskRequest);
if (StringUtils.isNotEmpty(updateTaskResult)) { if (StringUtils.isNotEmpty(updateTaskResult)) {
return BaseWmsApiResponse.error("更新任务信息失败：" + updateTaskResult + "，请重试。"); return BaseWmsApiResponse.error("更新任务信息失败：" + updateTaskResult + "，请重试。");
} }
}
// 更新库存信息 // 更新库存信息
stockDataService.updateStockInfo(confirmTaskRequest.getStockConfirm(), confirmTaskRequest.getStandId(), confirmTaskRequest.getUserName(), "出库拣选"); stockDataService.updateStockInfo(confirmTaskRequest.getStockConfirm(), confirmTaskRequest.getStandId(), confirmTaskRequest.getUserName(), "出库拣选");
// 查询库存获得当前载具中存储的库存列表 // 查询库存获得当前载具中存储的库存列表
@ -741,7 +740,7 @@ public class TaskControllerServiceImpl implements ITaskControllerService {
} }
outs.setPickNum(outs.getPickNum() + taskConfirm.getRealPickQty()); outs.setPickNum(outs.getPickNum() + taskConfirm.getRealPickQty());
outs.setUserName(confirmTaskRequest.getUserName()); outs.setUserName(confirmTaskRequest.getUserName());
if (Objects.equals(outs.getPickNum(), outs.getNeedNum())) { if (outs.getPickNum() >= outs.getNeedNum()) {
// 生成记录 // 生成记录
TAppOutsRecord record = new TAppOutsRecord( TAppOutsRecord record = new TAppOutsRecord(
outs.getTaskId(), outs.getTaskId(),

6
dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java
View File

@ -760,7 +760,9 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
return result && stock.getGoodsId().equals(work.getGoodsId()); return result && stock.getGoodsId().equals(work.getGoodsId());
}).toList(); }).toList();
if (outStocks.isEmpty()) { if (outStocks.isEmpty()) {
if (work.getWorkStatus() == 2) {
work.setWorkStatus(1); work.setWorkStatus(1);
}
work.setDistributeNum(work.getFinishNum()); work.setDistributeNum(work.getFinishNum());
ifAllFinished = false; ifAllFinished = false;
continue; continue;
@ -770,7 +772,9 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
List<TAppPickTask> pickTasks = allPickTasks.stream().filter(pickTask -> List<TAppPickTask> pickTasks = allPickTasks.stream().filter(pickTask ->
vehicleIds.contains(pickTask.getVehicleId()) && Objects.equals(pickTask.getPickStand(), work.getWorkStand())).toList(); vehicleIds.contains(pickTask.getVehicleId()) && Objects.equals(pickTask.getPickStand(), work.getWorkStand())).toList();
if (pickTasks.isEmpty()) { if (pickTasks.isEmpty()) {
if (work.getWorkStatus() == 2) {
work.setWorkStatus(1); work.setWorkStatus(1);
}
work.setDistributeNum(work.getFinishNum()); work.setDistributeNum(work.getFinishNum());
ifAllFinished = false; ifAllFinished = false;
continue; continue;
@ -803,7 +807,9 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
updateWork.setWorkIndex(work.getWorkIndex()); updateWork.setWorkIndex(work.getWorkIndex());
updateWork.setWorkStatus(work.getWorkStatus()); updateWork.setWorkStatus(work.getWorkStatus());
updateWork.setLackStatus(work.getLackStatus()); updateWork.setLackStatus(work.getLackStatus());
if (work.getWorkStatus() == 1) {
updateWork.setDistributeNum(work.getDistributeNum()); updateWork.setDistributeNum(work.getDistributeNum());
}
if (work.getFinishTime() != null) { if (work.getFinishTime() != null) {
updateWork.setFinishTime(work.getFinishTime()); updateWork.setFinishTime(work.getFinishTime());
} }