From d30b9dd0fc52d19397c8051af4a57d5a51948ddd Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 24 Jun 2025 17:00:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MydoJobServiceImpl.java | 46 +++++++++++++------ .../ruoyi/pda/controller/PdaController.java | 2 + .../com/ruoyi/pda/service/PdaServiceImp.java | 5 ++ .../mapper/job/MydoJobFinishMapper.xml | 4 +- ruoyi-ui/src/views/check/job/in/index.vue | 4 +- ruoyi-ui/src/views/check/job/out/index.vue | 3 +- ruoyi-ui/src/views/stock/management/index.vue | 12 ++--- 7 files changed, 51 insertions(+), 25 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 b56b7e7..5822aea 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 @@ -183,28 +183,44 @@ public class MydoJobServiceImpl implements IMydoJobService { if (job == null) { return AjaxResult.warn("任务不存在"); } - MydoJobDetail param = new MydoJobDetail(); - param.setJobId(jobId); - List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); - if (CollUtil.isNotEmpty(mydoJobDetails)) { - List list = new ArrayList<>(); - for (MydoJobDetail mydoJobDetail : mydoJobDetails) { - list.add(getStockByInStockinDetail(mydoJobDetail, job)); - } - basStockService.insertBasStockList(list); - mydoJob.setStatus("4"); - updateMydoJob(mydoJob); + if (job.getInOrOut().equals("5")){ + //料箱盘点入库作业 + //修改货位 BasCargoSpace basCargoSpace = new BasCargoSpace(); - basCargoSpace.setStatus("2"); + basCargoSpace.setStatus("5"); basCargoSpace.setTrayCode(job.getTrayCode()); basCargoSpace.setCargoSpaceId(job.getCargoSpaceId()); basCargoSpaceService.updateBasCargoSpace(basCargoSpace); - //插入历史表 - insertHistory(mydoJob.getJobId()); + + return AjaxResult.success(); + + }else { + //正常入库作业 + + MydoJobDetail param = new MydoJobDetail(); + param.setJobId(jobId); + List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); + if (CollUtil.isNotEmpty(mydoJobDetails)) { + List list = new ArrayList<>(); + for (MydoJobDetail mydoJobDetail : mydoJobDetails) { + list.add(getStockByInStockinDetail(mydoJobDetail, job)); + } + basStockService.insertBasStockList(list); + mydoJob.setStatus("4"); + updateMydoJob(mydoJob); + //修改货位 + BasCargoSpace basCargoSpace = new BasCargoSpace(); + basCargoSpace.setStatus("2"); + basCargoSpace.setTrayCode(job.getTrayCode()); + basCargoSpace.setCargoSpaceId(job.getCargoSpaceId()); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + //插入历史表 + insertHistory(mydoJob.getJobId()); + } + return AjaxResult.success(); } - return AjaxResult.success(); } private BasStock getStockByInStockinDetail(MydoJobDetail mydoJobDetail, MydoJob mydoJob) { 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 af75ac1..f0ed70e 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 @@ -237,6 +237,7 @@ public class PdaController extends BaseController { * @param trayCodeMakeSure 托盘信息 * @return */ + @PreAuthorize("@ss.hasPermi('pda:out:outMakeSure')") @PostMapping("/outMakeSure") @ResponseBody public AjaxResult outMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { @@ -248,6 +249,7 @@ public class PdaController extends BaseController { * @param trayCodeMakeSure 托盘信息 * @return */ + @PreAuthorize("@ss.hasPermi('pda:check:checkMakeSure')") @PostMapping("/checkMakeSure") @ResponseBody public AjaxResult checkMakeSure(@RequestBody TrayCodeMakeSure trayCodeMakeSure) { 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 0cb31d3..85e43e2 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 @@ -252,12 +252,17 @@ public class PdaServiceImp implements PdaService { public AjaxResult checkMakeSure(TrayCodeMakeSure trayCodeMakeSure) { List mydoJobDetailList = trayCodeMakeSure.getMydoJobDetailList(); if(CollUtil.isNotEmpty(mydoJobDetailList)){ + boolean flag = mydoJobDetailList.stream().anyMatch(x -> StrUtil.isEmpty(x.getStockId()) && "0".equals(x.getInQuantity())); + if (flag){ + return AjaxResult.warn("新增库存，存在为0的数量"); + } for (MydoJobDetail mydoJobDetail : mydoJobDetailList) { CheckCommitRecord checkCommitRecord = new CheckCommitRecord(); checkCommitRecord.setQuantity(mydoJobDetail.getInQuantity()); checkCommitRecord.setTrayCode(trayCodeMakeSure.getTrayCode()); checkCommitRecord.setStockId(mydoJobDetail.getStockId()); checkCommitRecord.setSpare1(mydoJobDetail.getInOrOutDId()); + checkCommitRecord.setSpare2(mydoJobDetail.getProductId()); checkCommitRecordService.insertCheckCommitRecord(checkCommitRecord); } } diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml index 5e0dbf6..9168036 100644 --- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobFinishMapper.xml @@ -93,8 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and class_id = #{classId} and warehouse_id = #{warehouseId} and fault_flag = #{faultFlag} - and mj.in_or_out >=20 - and mj.in_or_out < 20 + and in_or_out >=20 + and in_or_out < 20 diff --git a/ruoyi-ui/src/views/check/job/in/index.vue b/ruoyi-ui/src/views/check/job/in/index.vue index 12c400b..942e588 100644 --- a/ruoyi-ui/src/views/check/job/in/index.vue +++ b/ruoyi-ui/src/views/check/job/in/index.vue @@ -514,7 +514,7 @@ export default { // 手动完成/作废 handleCompletedManually(row) { - console.log("1111") + //console.log("1111") const jobIds = this.ids; if (jobIds.length === 0) { this.$modal.msgError("请选择要操作的数据"); @@ -531,11 +531,13 @@ export default { //手动作废 manualInvalidation(data).then(response => { this.$modal.msgSuccess("操作成功"); + this.getList(); }) }else if (row.type === 'completed'){ //手动完成 manualCompleted(data).then(response => { this.$modal.msgSuccess("操作成功"); + this.getList(); }) } }, diff --git a/ruoyi-ui/src/views/check/job/out/index.vue b/ruoyi-ui/src/views/check/job/out/index.vue index 01e0299..a9973cb 100644 --- a/ruoyi-ui/src/views/check/job/out/index.vue +++ b/ruoyi-ui/src/views/check/job/out/index.vue @@ -320,7 +320,8 @@ - + + // 英文描述 diff --git a/ruoyi-ui/src/views/stock/management/index.vue b/ruoyi-ui/src/views/stock/management/index.vue index 72b5acc..e5b5059 100644 --- a/ruoyi-ui/src/views/stock/management/index.vue +++ b/ruoyi-ui/src/views/stock/management/index.vue @@ -17,8 +17,8 @@ @keyup.enter.native="handleQuery" /> - - + + - + @@ -323,8 +323,8 @@ - - + +