lsy/FT577-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消整托出库的自动空托回流

Browse Source
This commit is contained in:
FT577-Server
2026-10-15 09:38:50 +08:00
parent adf9a49b9f
commit b9469d414a
1 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ruoyi-admin/src/main/java/com/ruoyi/pda/service/impl/PdaServiceImpl.java
View File

@@ -759,9 +759,10 @@ public class PdaServiceImpl implements IPdaService {
String taskNo; String taskNo;
int taskType; int taskType;
if (stocks.isEmpty()){ if (stocks.isEmpty()){
jobId = basJobIdService.getId(JobIdType.MYDOJOB_STOCKIN_EMPTY_PALLET); // jobId = basJobIdService.getId(JobIdType.MYDOJOB_STOCKIN_EMPTY_PALLET);
taskNo = basTaskNoService.getTaskNo(TaskIdType.TASK_STOCKIN_EMPTY_PALLET); // taskNo = basTaskNoService.getTaskNo(TaskIdType.TASK_STOCKIN_EMPTY_PALLET);
taskType = TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY; // taskType = TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY;
return AjaxResult.success("【整托出库】确认成功，回流数量:0");
}else{ }else{
jobId = basJobIdService.getId(JobIdType.MYDOJOB_PICK_RETURN); jobId = basJobIdService.getId(JobIdType.MYDOJOB_PICK_RETURN);
taskNo = basTaskNoService.getTaskNo(TaskIdType.TASK_STOCKIN_BACK); taskNo = basTaskNoService.getTaskNo(TaskIdType.TASK_STOCKIN_BACK);
@@ -785,10 +786,15 @@ public class PdaServiceImpl implements IPdaService {
} }
if (cargoParam == null) { if (cargoParam == null) {
log.warn("【货位分配】该类型托盘立库中无可用货位"); log.warn("【回流入库-货位分配】该类型托盘立库中无可用货位");
return AjaxResult.error("【货位分配失败】该类型托盘立库中无可用货位"); return AjaxResult.error("【货位分配失败】该类型托盘立库中无可用货位");
} }
if (basCargoSpaceService.selectBasCargoSpaceIsFull(cargoParam, 10)){
log.warn("【回流入库-货位分配】该类型托盘立库中无可用货位,预留空位:{}", 10);
return AjaxResult.error("【货位分配失败】该类型托盘立库中无可分配货位");
}
BasCargoSpace cargoStockin = basCargoSpaceService.selectBasCargoSpaceForStockin(cargoParam); BasCargoSpace cargoStockin = basCargoSpaceService.selectBasCargoSpaceForStockin(cargoParam);
//>>>生成wms的入库主作业 //>>>生成wms的入库主作业
@@ -808,15 +814,15 @@ public class PdaServiceImpl implements IPdaService {
.trayType(type) .trayType(type)
.build(); .build();
mydoJobService.insertMydoJob(mydoJobBack); mydoJobService.insertMydoJob(mydoJobBack);//tip:此处不生成子作业，任务完成后直接使用库存中的版辊更新状态
log.info("【wms出库回流】<回流入库>作业，作业号:{}，任务号:{}，托盘号:{}，分配货位:{}",mydoJobBack.getJobId() ,mydoJobBack.getTaskNo() ,mydoJobBack.getTrayCode(), cargoStockin.getCargoSpaceId()); log.info("【wms出库回流】<回流入库>作业，作业号:{}，任务号:{}，托盘号:{}，分配货位:{}",mydoJobBack.getJobId() ,mydoJobBack.getTaskNo() ,mydoJobBack.getTrayCode(), cargoStockin.getCargoSpaceId());
return AjaxResult.success("确认成功"); return AjaxResult.success("【拣选出库】确认成功，回流数量:");
}else{ }else{
log.info("【提示】<常规入库>wms已存在该条码作业，请确认该条码的任务状态后重试，托盘号:{}",mydoJob.getTrayCode()); log.info("【提示】<常规入库>wms已存在该条码作业，请确认该条码的任务状态后重试，托盘号:{}",mydoJob.getTrayCode());
} }
return AjaxResult.success("确认失败"); return AjaxResult.error("确认失败");
} }
@@ -1002,20 +1008,20 @@ public class PdaServiceImpl implements IPdaService {
int trayType = mydoJobService.getTrayTypeByTrayCode(trayCode); int trayType = mydoJobService.getTrayTypeByTrayCode(trayCode);
//空托盘回流 //空托盘回流
if (stocks.isEmpty()){ if (stocks.isEmpty()){
inTrayMsgService.insertInTrayMsg( // inTrayMsgService.insertInTrayMsg(
new InTrayMsg().builder() // new InTrayMsg().builder()
.trayCode(trayCode) // .trayCode(trayCode)
.quantity(BigDecimal.ONE) // .quantity(BigDecimal.ONE)
.productId(ProductType.EMPTY_TRAY) // .productId(ProductType.EMPTY_TRAY)
.warehouseId("01") // .warehouseId("01")
.rollerNumber(ProductType.EMPTY_TRAY) // .rollerNumber(ProductType.EMPTY_TRAY)
.trayType(trayType) // .trayType(trayType)
.status(1) // .status(1)
.createTime(DateUtil.date()) // .createTime(DateUtil.date())
.build() // .build()
); // );
//
log.info("【空托回流绑定】<回流入库>生成绑定信息成功,托盘号:{}", trayCode); // log.info("【空托回流绑定】<回流入库>生成绑定信息成功,托盘号:{}", trayCode);
}else{ }else{
for (BasStock stock : stocks){ for (BasStock stock : stocks){