From 31cf33c94ff4eebb9f77f3820facf64ee5f962c5 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 4 Nov 2025 08:38:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B2=A1=E6=9C=89=E5=88=86?= =?UTF-8?q?=E9=85=8D=E8=B4=A7=E4=BD=8D=E7=9A=84=E6=89=8B=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=E5=BA=9F=E5=92=8C=E6=89=8B=E5=8A=A8=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MydoJobServiceImpl.java | 36 ++++++++++--------- ruoyi-ui/src/views/check/stockCheck/index.vue | 18 ++++++---- ruoyi-ui/src/views/in/job/index.vue | 22 ++++++------ ruoyi-ui/src/views/in/stockIn/index.vue | 7 ++-- 4 files changed, 45 insertions(+), 38 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 b1f43de..7f0b1c5 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 @@ -9,7 +9,6 @@ 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; @@ -17,9 +16,6 @@ import com.ruoyi.check.stockcheckdetail.domain.CheckStockinDetail; import com.ruoyi.check.stockcheckdetail.service.ICheckStockinDetailService; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.in.erp.domain.TransferBillCallback; import com.ruoyi.in.erp.service.ITransferBillCallbackService; import com.ruoyi.in.stockindetail.domain.InStockinDetail; import com.ruoyi.in.stockindetail.service.IInStockinDetailService; @@ -28,11 +24,8 @@ import com.ruoyi.job.mydojob.mapper.MydoJobMapper; import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService; -import com.ruoyi.out.exception.domain.OutExceptionRecord; -import com.ruoyi.out.exception.service.IOutExceptionRecordService; import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail; import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService; -import com.ruoyi.pda.domain.TrayCodeMakeSure; import com.ruoyi.pda.mapper.PdaMapper; import com.ruoyi.pda.service.PdaService; import com.ruoyi.stock.stock.domain.BasStock; @@ -46,7 +39,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; /** * 任务表Service业务层处理 @@ -186,17 +178,20 @@ public class MydoJobServiceImpl implements IMydoJobService { if (!"1".equals(job.getStatus())) { return AjaxResult.warn("只能作废未开始的任务"); } - if ("1".equals(job.getInOrOut())) { + if ("3".equals(job.getInOrOut())) { mydoJob.setStatus("5"); updateMydoJob(mydoJob); - //修改货位状态 - BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); - basCargoSpace.setStatus("1"); - basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + if (StrUtil.isNotEmpty(mydoJob.getCargoSpaceId())) { + //修改货位状态 + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); + basCargoSpace.setStatus("1"); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + } + //插入历史表 insertHistory(mydoJob.getJobId()); - } else if ("2".equals(job.getInOrOut())|| "3".equals(job.getInOrOut())){ + } else if ("1".equals(job.getInOrOut()) || "2".equals(job.getInOrOut())) { MydoJobDetail param = new MydoJobDetail(); param.setJobId(jobId); List mydoJobDetails = mydoJobDetailService.selectMydoJobDetailList(param); @@ -211,9 +206,12 @@ public class MydoJobServiceImpl implements IMydoJobService { inStockinDetailService.updateInStockinDetail(inStockinDetail); } //修改货位状态 - BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); - basCargoSpace.setStatus("1"); - basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + if (StrUtil.isNotEmpty(mydoJob.getCargoSpaceId())) { + //修改货位状态 + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); + basCargoSpace.setStatus("1"); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + } mydoJob.setStatus("5"); mydoJob.setFinishTime(DateUtil.formatDateTime(new Date())); @@ -250,6 +248,10 @@ public class MydoJobServiceImpl implements IMydoJobService { if (mydoJob == null) { return AjaxResult.warn("任务不存在"); } + if (StrUtil.isEmpty(mydoJob.getCargoSpaceId())){ + return AjaxResult.warn("未分配货位"); + } + if ("5".equals(mydoJob.getInOrOut())){ //盘点入库 diff --git a/ruoyi-ui/src/views/check/stockCheck/index.vue b/ruoyi-ui/src/views/check/stockCheck/index.vue index f6b3e08..c907b1f 100644 --- a/ruoyi-ui/src/views/check/stockCheck/index.vue +++ b/ruoyi-ui/src/views/check/stockCheck/index.vue @@ -110,7 +110,7 @@ - + @@ -132,6 +132,9 @@ + + + @@ -162,9 +165,7 @@ - - - +