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-10 09:45:53 +08:00
parent 4be42d9ca7
commit e4d638059f
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java
View File

@@ -191,7 +191,7 @@ public class MydoJobHandler {
*/ */
@Scheduled(fixedRate = TIMEINTERVAL_2000) @Scheduled(fixedRate = TIMEINTERVAL_2000)
public void cancelMydoJobHandler_In(){ public void cancelMydoJobHandler_In(){
List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList( List<MydoJob> mydoJobs = mydoJobService.selectInMydoJobList(
new MydoJob().builder() new MydoJob().builder()
.status(TaskStatusEnum.CANCEL.getCode()) .status(TaskStatusEnum.CANCEL.getCode())
.build() .build()
@@ -210,6 +210,16 @@ public class MydoJobHandler {
mydoJobDetailService.deleteMydoJobDetailsByJobId(mydoJob.getJobId()); mydoJobDetailService.deleteMydoJobDetailsByJobId(mydoJob.getJobId());
log.info("【手动作废任务】移除<入库>任务明细，作业号:{}", mydoJob.getJobId()); log.info("【手动作废任务】移除<入库>任务明细，作业号:{}", mydoJob.getJobId());
} }
//任务主表
// MydoJob job = mydoJobService.selectMydoJobByJobId(mydoJob.getJobId());
// if (ObjUtil.isNotNull(job)){
// //移除任务子表
// mydoJobService.insertMydoJobFinish(mydoJob.getJobId());
// mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
// log.info("【手动作废任务】移除<入库>托盘任务，作业号:{}", mydoJob.getJobId());
// }
//库存子表 //库存子表
List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(mydoJob.getTrayCode()); List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(mydoJob.getTrayCode());
if (!stocks.isEmpty()){ if (!stocks.isEmpty()){
@@ -222,7 +232,8 @@ public class MydoJobHandler {
//恢复货位状态 //恢复货位状态
//入库 //入库
if (mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN){ if (mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN ||
mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY){
basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_AVAILABLE); basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_AVAILABLE);
BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode()); BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode());
if (ObjUtil.isNotNull(stockInfo)){ if (ObjUtil.isNotNull(stockInfo)){
@@ -324,7 +335,7 @@ public class MydoJobHandler {
*/ */
@Scheduled(fixedRate = TIMEINTERVAL_2000) @Scheduled(fixedRate = TIMEINTERVAL_2000)
public void cancelMydoJobHandler_Move(){ public void cancelMydoJobHandler_Move(){
List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList( List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
new MydoJob().builder() new MydoJob().builder()
.status(TaskStatusEnum.CANCEL.getCode()) .status(TaskStatusEnum.CANCEL.getCode())
.inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE) .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
@@ -382,7 +393,7 @@ public class MydoJobHandler {
*/ */
@Scheduled(fixedRate = TIMEINTERVAL_2000) @Scheduled(fixedRate = TIMEINTERVAL_2000)
public void cancelMydoJobHandler_Inventory(){ public void cancelMydoJobHandler_Inventory(){
List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList( List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
new MydoJob().builder() new MydoJob().builder()
.status(TaskStatusEnum.CANCEL.getCode()) .status(TaskStatusEnum.CANCEL.getCode())
.build() .build()
@@ -597,7 +608,7 @@ public class MydoJobHandler {
*/ */
@Scheduled(fixedRate = TIMEINTERVAL_2000) @Scheduled(fixedRate = TIMEINTERVAL_2000)
public void manualCompleteMydoJobHandler_In(){ public void manualCompleteMydoJobHandler_In(){
List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList( List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
new MydoJob().builder() new MydoJob().builder()
.status(TaskStatusEnum.MANUAL_FINISHED.getCode()) .status(TaskStatusEnum.MANUAL_FINISHED.getCode())
.build() .build()
@@ -627,7 +638,8 @@ public class MydoJobHandler {
//恢复货位状态 //恢复货位状态
//入库 //入库
if (mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN && if ((mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN ||
mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY) &&
mydoJob.getInOrOut() != TaskType.TASKTYPE_PICK_STOCK_MOVE && mydoJob.getInOrOut() != TaskType.TASKTYPE_PICK_STOCK_MOVE &&
mydoJob.getInOrOut() != TaskType.TASKTYPE_INVENTORY_BACK mydoJob.getInOrOut() != TaskType.TASKTYPE_INVENTORY_BACK
){ ){
@@ -799,7 +811,7 @@ public class MydoJobHandler {
*/ */
@Scheduled(fixedRate = TIMEINTERVAL_2000) @Scheduled(fixedRate = TIMEINTERVAL_2000)
public void manualCompleteMydoJobHandler_Move(){ public void manualCompleteMydoJobHandler_Move(){
List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList( List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
new MydoJob().builder() new MydoJob().builder()
.status(TaskStatusEnum.MANUAL_FINISHED.getCode()) .status(TaskStatusEnum.MANUAL_FINISHED.getCode())
.inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE) .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)