From fd5ae47572e093d3b18d55a61ed525b40ba76475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=80=A1=E8=93=89?= <377046077@qq.com> Date: Thu, 24 Jul 2025 09:05:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E6=8C=81=E6=9C=BA=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MydoJobServiceImpl.java | 16 ++++++++++++++-- .../ruoyi/pda/controller/PdaController.java | 12 +++++++----- .../com/ruoyi/pda/service/PdaServiceImp.java | 2 +- .../resources/mapper/job/MydoJobMapper.xml | 2 -- ruoyi-ui/src/lang/en.js | 1 + ruoyi-ui/src/views/job/outJobManagement.vue | 18 ++++++++++++++++++ 6 files changed, 41 insertions(+), 10 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java index 7a47b6f..0c8ac8e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java @@ -16,6 +16,8 @@ import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace; import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; import com.ruoyi.bas.taskNo.service.IBasTaskNoService; +import com.ruoyi.bas.warehouse.domain.BasWarehouse; +import com.ruoyi.bas.warehouse.service.IBasWarehouseService; import com.ruoyi.check.difference.domain.CheckDifferenceRecord; import com.ruoyi.check.difference.service.ICheckDifferenceRecordService; import com.ruoyi.common.annotation.DataScope; @@ -71,6 +73,8 @@ public class MydoJobServiceImpl implements IMydoJobService { private IOutExceptionRecordService outExceptionRecordService; @Autowired private PdaService pdaService; + @Autowired + private IBasWarehouseService basWarehouseService; /** @@ -221,8 +225,11 @@ public class MydoJobServiceImpl implements IMydoJobService { if (job == null) { return AjaxResult.warn("任务不存在"); } - if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) { - return AjaxResult.warn("任务未开始"); + BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId()); + if("1".equals(basWarehouse.getWarehouseType())) { + if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) { + return AjaxResult.warn("任务未开始"); + } } if ("1".equals(job.getInOrOut()) || "4".equals(job.getInOrOut())) { //空料箱入库 托盘垛入库 @@ -405,6 +412,11 @@ public class MydoJobServiceImpl implements IMydoJobService { public AjaxResult OuthandFinish(String[] jobIds) { for (String jobId : jobIds) { MydoJob job = selectMydoJobByJobId(jobId); + BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId()); + + if("1".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){ + return AjaxResult.error("只能完成正执行的作业"); + } TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure(); trayCodeMakeSure.setTrayCode(job.getTrayCode()); pdaService.outMakeSure(trayCodeMakeSure); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java index bd9817c..a783278 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java @@ -308,13 +308,15 @@ public class PdaController extends BaseController { if(!basWarehouses.isEmpty()){ for(BasWarehouse basWarehouse : basWarehouses){ - //高架库 if("1".equals(basWarehouse.getWarehouseType())){ MydoJob mydoJob = new MydoJob(); mydoJob.setWarehouseId(basWarehouse.getWarehouseId()); mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode()); mydoJob.setInOut(trayCodeMsg.getInOut()); +// if("1".equals(trayCodeMsg.getInOut())){ + mydoJob.setStatus("1"); +// } List mydoJobs = mydoJobService.selectMydoJobList(mydoJob); //将mydoJob添加进mydoJobArrayList mydoJobArrayList.addAll(mydoJobs); @@ -324,19 +326,19 @@ public class PdaController extends BaseController { MydoJob mydoJob = new MydoJob(); if("4".equals(trayCodeMsg.getInOut())){ mydoJob.setInOut("4"); - }else{ + }else if("2".equals(trayCodeMsg.getInOut())){ mydoJob.setInOut("2"); + }else{ + List list = new ArrayList<>(Arrays.asList("21", "22", "23","24","25","26")); + mydoJob.setInOutIds(list); } - mydoJob.setWarehouseId(basWarehouse.getWarehouseId()); mydoJob.setCargoSpaceId(trayCodeMsg.getTrayCode()); mydoJob.setStatus("3"); List mydoJobs2 = mydoJobService.selectMydoJobList(mydoJob); mydoJobArrayList.addAll(mydoJobs2); } - } - } return AjaxResult.success(mydoJobArrayList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java index 9242daf..709352d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java @@ -231,7 +231,7 @@ public class PdaServiceImp implements PdaService { //判断任务是否存在 MydoJob mydoJobParam = new MydoJob(); mydoJobParam.setTrayCode(trayCodeMakeSure.getTrayCode()); - mydoJobParam.setStatus("3"); +// mydoJobParam.setStatus("3"); List mydoJobList = mydoJobService.selectMydoJobList(mydoJobParam); if (CollUtil.isEmpty(mydoJobList)) { return AjaxResult.warn("任务不存在"); diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml index 95d5057..455cfe6 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml @@ -94,8 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item} - - ${params.warehouseDataScope} diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index c9152bb..a7db06f 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -354,6 +354,7 @@ export default { // Material Information materialCode: 'Material Code', + materialDesc: 'Material Desc', stockId: 'Stock ID', lotNo: 'Lot No.', outQuantity: 'Out Quantity', diff --git a/ruoyi-ui/src/views/job/outJobManagement.vue b/ruoyi-ui/src/views/job/outJobManagement.vue index bcc908a..c4c4b3b 100644 --- a/ruoyi-ui/src/views/job/outJobManagement.vue +++ b/ruoyi-ui/src/views/job/outJobManagement.vue @@ -155,6 +155,7 @@ + @@ -370,6 +371,14 @@ export default { this.$modal.msgError("请选择需要手动完成的任务"); return; } + // // 检查选中任务的状态是否为3(执行中) + // const invalidTasks = this.mydoJobList.filter(item => + // this.ids.includes(item.jobId) && item.status !== '3' + // ); + // if (invalidTasks.length > 0) { + // this.$modal.msgError("只能手动完成状态为[执行中]的作业"); + // return; + // } this.$modal.confirm('是否确认手动完成选中的任务？').then(() => { return handFinish(this.ids.join(',')); }).then(() => { @@ -383,6 +392,14 @@ export default { this.$modal.msgError("请选择需要手动作废的任务"); return; } + // 检查选中任务的状态是否小于3(未执行) + const invalidTasks = this.mydoJobList.filter(item => + this.ids.includes(item.jobId) && item.status >= '3' + ); + if (invalidTasks.length > 0) { + this.$modal.msgError("只能手动作废状态为[未执行]的作业"); + return; + } this.$modal.confirm('是否确认手动作废选中的任务？').then(() => { return hangInvalidJob(this.ids.join(',')); }).then(() => { @@ -390,6 +407,7 @@ export default { this.getList(); }).catch(() => {}); } + } }