From cccebc0ce02f4c520fe1bc15b92ecd38398e6e20 Mon Sep 17 00:00:00 2001 From: liuhanqing Date: Tue, 12 Aug 2025 11:24:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/impl/ToWcsServiceImpl.java | 3 ++- .../api/service/impl/ToWmsServiceImpl.java | 6 ++--- .../CheckDifferenceRecordController.java | 9 ++++--- .../CheckDifferenceRecordServiceImpl.java | 9 ++++--- .../service/impl/CheckStockinServiceImpl.java | 11 ++++---- .../service/impl/MydoJobServiceImpl.java | 13 +++++++--- .../ruoyi/pda/controller/PdaController.java | 23 ++++++++-------- .../com/ruoyi/pda/service/PdaServiceImp.java | 4 +-- .../impl/ReceiveStockinServiceImpl.java | 9 ++++--- .../impl/ReceiveStockinDetailServiceImpl.java | 3 ++- .../resources/i18n/messages_en_US.properties | 24 +++++++++++++++++ .../resources/i18n/messages_zh_CN.properties | 26 ++++++++++++++++++- ruoyi-ui/src/views/check/flat/index.vue | 4 +-- 13 files changed, 102 insertions(+), 42 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java index ac9b5b0..4ba2d45 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java @@ -16,6 +16,7 @@ import com.ruoyi.bas.tag.service.IBasTagService; import com.ruoyi.bas.taskNo.service.IBasTaskNoService; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.job.mydojob.domain.MydoJob; import com.ruoyi.job.mydojob.service.IMydoJobService; import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail; @@ -114,6 +115,6 @@ public class ToWcsServiceImpl implements IToWcsService { if ("1".equals(requestLog.getIsSuccessful())){ return AjaxResult.success(); } - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message17")); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java index e7366ab..85748e7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java @@ -189,7 +189,7 @@ public class ToWmsServiceImpl implements IToWmsService { List basContainers = basContainerService.selectBasContainerList(basContainerParam); if (basContainers.isEmpty()){ log.error("没有该料架 {}", wmsJobRequest.getContainerCode()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message11")); } //修改绑定点位 BasContainer basContainer = basContainers.get(0); @@ -212,7 +212,7 @@ public class ToWmsServiceImpl implements IToWmsService { break; default: log.error("作业类型错误"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message12")); } return AjaxResult.success(); } @@ -225,7 +225,7 @@ public class ToWmsServiceImpl implements IToWmsService { BasCargoSpace basCargoSpace = basCargoSpaceService.selectEmptyCargoSpaceByWarehouseId(warehouseId); if (basCargoSpace == null){ log.error("没有空货位"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message20")); }else { mydoJob.setCargoSpaceId(basCargoSpace.getCargoSpaceId()); mydoJob.setFaultFlag("1"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java index 06fad65..4faff57 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/controller/CheckDifferenceRecordController.java @@ -11,6 +11,7 @@ import cn.hutool.core.util.StrUtil; import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.bas.warehouse.domain.BasWarehouse; import com.ruoyi.bas.warehouse.service.IBasWarehouseService; +import com.ruoyi.common.utils.MessageUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; @@ -143,7 +144,7 @@ public class CheckDifferenceRecordController extends BaseController { // 根据stockId、trayCode、oldQuantity查找库存记录 if (StrUtil.isEmpty(record.getStockId())) { log.error("没有找到该库存ID：{}" , record.getStockId()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message15")); } BasStock queryStock = new BasStock(); @@ -152,7 +153,7 @@ public class CheckDifferenceRecordController extends BaseController { if (stocks.isEmpty()) { log.error("没有在库存中找到该条记录：库存ID {}, 托盘号 {}", record.getStockId() , record.getTrayCode()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message15")); } // 更新库存数量和状态 @@ -164,7 +165,7 @@ public class CheckDifferenceRecordController extends BaseController { // 检查物料ID是否存在 if (record.getProductId() == null || record.getProductId().trim().isEmpty()) { log.error("物料ID不能为空"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message16")); } // 创建新的库存记录 @@ -214,7 +215,7 @@ public class CheckDifferenceRecordController extends BaseController { if (stocks.isEmpty()) { log.error("要删除的库存不存在"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message15")); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java index bc5ceeb..47ecbe4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java @@ -9,6 +9,7 @@ import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService; 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.stock.stock.domain.BasStock; import com.ruoyi.stock.stock.service.IBasStockService; import lombok.extern.slf4j.Slf4j; @@ -76,7 +77,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS BasStock basStock = basStockService.selectBasStockByStockId(stockId); if (!"1".equals(basStock.getProductStatus())){ log.warn("库存非正常状态{}",basStock.getStockId()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message10")); } if (basStock.getQuantity().equals(checkDifferenceRecord.getNewQuantity())){ return AjaxResult.success(); @@ -96,14 +97,14 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS List stocks = basStockService.selectBasStockList(queryStock); if (!stocks.isEmpty()) { log.warn("该物料已存在{}",checkDifferenceRecord.getProductId()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message8")); } BasCargoSpace queryCargoSpace = new BasCargoSpace(); queryCargoSpace.setWarehouseId(checkDifferenceRecord.getWarehouseId()); List cargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(queryCargoSpace); if (cargoSpaces.isEmpty()){ log.warn("没有货位"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message9")); } checkDifferenceRecord.setCargoSpaceId(cargoSpaces.get(0).getCargoSpaceId()); checkDifferenceRecord.setOldQuantity("0"); @@ -111,7 +112,7 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS BasStock basStock = basStockService.selectBasStockByStockId(checkDifferenceRecord.getStockId()); if (!"1".equals(basStock.getProductStatus())){ log.warn("库存非正常状态 productId:{} status:{}",basStock.getProductId(),basStock.getProductStatus()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message10")); } basStock.setProductStatus("2"); basStockService.updateBasStock(basStock); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java index 766a3a1..2222d52 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/check/stockcheck/service/impl/CheckStockinServiceImpl.java @@ -21,6 +21,7 @@ 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.MessageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.UUID; import com.ruoyi.in.stockin.domain.InStockin; @@ -114,7 +115,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService //作废 if (!"1".equals(old.getStatus())){ log.error("单据状态非未执行状态!"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message21")); } checkStockinMapper.updateCheckStockin(checkStockin); //插入历史单据 @@ -122,12 +123,12 @@ public class CheckStockinServiceImpl implements ICheckStockinService }else if ("2".equals(checkStockin.getStatus())){ if (StrUtil.isEmpty(checkStockin.getSpare1())){ log.error("请选择出口!"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message22")); } //审核 if (!"1".equals(old.getStatus())){ log.error("单据状态非未执行状态!"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message21")); } checkStockinMapper.updateCheckStockin(checkStockin); @@ -135,7 +136,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService //确认 if (!"3".equals(old.getStatus())){ log.error("单据状态非正执行状态!"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message23")); } checkStockinMapper.updateCheckStockin(checkStockin); insertCheckStockinHistory(checkStockin); @@ -234,7 +235,7 @@ public class CheckStockinServiceImpl implements ICheckStockinService CheckStockin currentCheckStock = selectCheckStockinByStockGuid(checkStockin.getStockGuid()); if (ObjUtil.isNull(currentCheckStock)){ log.warn("单据不存在! stockGudi:{}",checkStockin.getStockGuid()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message27")); } HashMap map = new HashMap<>(); map.put("v_stock_check_id", currentCheckStock.getStockCheckId()); 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 023aee8..cde2ed8 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 @@ -199,6 +199,11 @@ public class MydoJobServiceImpl implements IMydoJobService { inStockinDetail.setScanNum(Convert.toStr(subtract)); inStockinDetailService.updateInStockinDetail(inStockinDetail); } + //修改货位状态 + BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(job.getCargoSpaceId()); + basCargoSpace.setStatus("1"); + basCargoSpaceService.updateBasCargoSpace(basCargoSpace); + mydoJob.setStatus("5"); updateMydoJob(mydoJob); //插入历史表 @@ -206,7 +211,7 @@ public class MydoJobServiceImpl implements IMydoJobService { } //通知wcs AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); - if (!ajaxResult.isSuccess()){ + if (ajaxResult.isSuccess()){ return AjaxResult.success(); }else { throw new RuntimeException(Convert.toStr(ajaxResult.get("msg"))); @@ -238,7 +243,7 @@ public class MydoJobServiceImpl implements IMydoJobService { } AjaxResult ajaxResult = iToWcsService.cancelTaskByTaskNo(job.getTaskNo()); if (!ajaxResult.isSuccess()){ - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message17")); } BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId()); if("2".equals(basWarehouse.getWarehouseType())) { @@ -432,7 +437,7 @@ public class MydoJobServiceImpl implements IMydoJobService { if("2".equals(basWarehouse.getWarehouseType()) && Integer.parseInt(job.getStatus())<3){ log.error("只能完成正执行的作业"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message14")); } TrayCodeMakeSure trayCodeMakeSure = new TrayCodeMakeSure(); trayCodeMakeSure.setTrayCode(job.getTrayCode()); @@ -450,7 +455,7 @@ public class MydoJobServiceImpl implements IMydoJobService { MydoJob job = selectMydoJobByJobId(jobId); if (job == null) { log.error("任务不存在"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message28")); } MydoJobDetail mydoJobDetail = new MydoJobDetail(); mydoJobDetail.setJobId(jobId); 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 34475cf..7aa91ff 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 @@ -12,6 +12,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.in.stockin.service.IInStockinService; import com.ruoyi.in.stockindetail.domain.InStockinDetail; @@ -83,11 +84,11 @@ public class PdaController extends BaseController { BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId()); if (basWarehouse == null) { log.error("仓库不存在"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message18")); } if ("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())) { log.error("请选择高架库货位"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message19")); } if ("2".equals(basWarehouse.getWarehouseType())) { BasCargoSpace basCargoSpace = new BasCargoSpace(); @@ -96,7 +97,7 @@ public class PdaController extends BaseController { List basCargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(basCargoSpace); if (basCargoSpaces.isEmpty()) { log.error("此仓库没有空余货位"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message20")); } else { trayCodeMsg.setCargoSpaceId(basCargoSpaces.get(0).getCargoSpaceId()); } @@ -134,7 +135,7 @@ public class PdaController extends BaseController { return AjaxResult.success(basStockList); } else { log.error("此区域没有空托盘库存"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message25")); } } @@ -152,15 +153,15 @@ public class PdaController extends BaseController { BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId()); if (basWarehouse == null) { log.error("仓库不存在"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message18")); } if ("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())) { log.error("请选择高架库货位"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message19")); } if ("2".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getExitId())) { log.error("请选择出口"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message22")); } if("2".equals(basWarehouse.getWarehouseType())){ BasStock basStock = new BasStock(); @@ -168,7 +169,7 @@ public class PdaController extends BaseController { List basStockList = basStockService.selectKtpStock(basStock); if(basStockList.isEmpty()){ log.warn("此区域没有空托盘库存或此用户没有该区域权限"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message26")); }else{ trayCodeMsg.setCargoSpaceId(basStockList.get(0).getCargoSpaceId()); } @@ -251,11 +252,11 @@ public class PdaController extends BaseController { BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(trayCodeMsg.getWarehouseId()); if (basWarehouse == null) { log.error("仓库不存在"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message18")); } if ("1".equals(basWarehouse.getWarehouseType()) && StrUtil.isEmpty(trayCodeMsg.getCargoSpaceId())) { log.error("请选择高架库货位"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message19")); } if ("2".equals(basWarehouse.getWarehouseType())) { BasCargoSpace basCargoSpace = new BasCargoSpace(); @@ -264,7 +265,7 @@ public class PdaController extends BaseController { List basCargoSpaces = basCargoSpaceService.selectBasCargoSpaceList(basCargoSpace); if (basCargoSpaces.isEmpty()) { log.error("此仓库没有空余货位"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message20")); } else { trayCodeMsg.setCargoSpaceId(basCargoSpaces.get(0).getCargoSpaceId()); } 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 0c9ab87..d8ab888 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 @@ -827,8 +827,8 @@ public class PdaServiceImp implements PdaService { BasContainerDetails basContainerDetails = new BasContainerDetails(); basContainerDetails.setContainerId(startPoint); List basContainerDetails1 = basContainerDetailsService.selectBasContainerDetailsList(basContainerDetails); - if (basContainerDetails1.size() == 0) { - return AjaxResult.error("此起点无料架，请检查"); + if (basContainerDetails1.isEmpty()) { + return AjaxResult.error(MessageUtils.message("error.message31")); } BasContainerDetails basContainer = basContainerDetails1.get(0); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java index 31749f4..362cea0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockin/service/impl/ReceiveStockinServiceImpl.java @@ -18,6 +18,7 @@ import com.ruoyi.bas.basJobId.service.IBasJobIdService; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.domain.ExtraField; +import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.in.stockin.domain.InStockin; @@ -97,7 +98,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService { List productVoList = receiveStockVo.getProductVoList(); if (CollUtil.isEmpty(productVoList)){ - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message30")); } ReceiveStockin receiveStockin = new ReceiveStockin(); receiveStockin.setStockinGuid(IdUtil.fastSimpleUUID()); @@ -176,7 +177,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService public AjaxResult analyseExportFile(List list) { if (CollUtil.isEmpty(list)){ log.error("导入数据为空"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message24")); } List collect = list.stream().map(ReceiveProductVo::getProductId).collect(Collectors.toList()); List result = iBasProductService.selectBasProductListByProductIds(collect); @@ -211,7 +212,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService if (first.isPresent()){ ReceiveStockinDetail receiveStockinDetail = first.get(); log.error("编号:{}未质检", receiveStockinDetail.getProductId()); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message29")); } InStockin inStockin = getInStockinByReceiveStockin(receiveStockin); @@ -237,7 +238,7 @@ public class ReceiveStockinServiceImpl implements IReceiveStockinService } }else { log.error("单据不存在"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message27")); } }catch (Exception e){ throw new RuntimeException(e); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java index 0b3f846..7ecf12d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/receive/stockindetail/service/impl/ReceiveStockinDetailServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.json.JSONUtil; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.domain.ExtraField; +import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.in.stockin.domain.InStockin; import com.ruoyi.receive.stockin.domain.ReceiveStockin; import com.ruoyi.receive.stockin.domain.vo.ReceiveStockCreateInVo; @@ -134,7 +135,7 @@ public class ReceiveStockinDetailServiceImpl implements IReceiveStockinDetailSer public AjaxResult qualityInspection(ReceiveStockQualityInsVo receiveStockQualityInsVo) { if (CollUtil.isEmpty(receiveStockQualityInsVo.getList())) { log.error("请选择质检项"); - return AjaxResult.error(); + return AjaxResult.error(MessageUtils.message("error.message13")); } for (ReceiveStockDetailQualityInsVo receiveStockDetailQualityInsVo : receiveStockQualityInsVo.getList()) { ReceiveStockinDetail receiveStockinDetail = selectReceiveStockinDetailByStockinDetailId(receiveStockDetailQualityInsVo.getStockinDetailId()); diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties index 67675e4..52cc597 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties @@ -71,6 +71,30 @@ error.message4=没有该拣选工位绑定的电子标签 error.message5=容器码不能为空 error.message6=起始点位不能为空 error.message7=目标点位不能为空 +error.message8=物料已存在 +error.message9=没有货位 +error.message10=库存非正常状态 +error.message11=没有该料架 +error.message12=作业类型错误 +error.message13=请选择质检项 +error.message14=只能完成正执行的作业 +error.message15=没有找到该库存 +error.message16=物料不能为空 +error.message17=取消ctu任务失败 +error.message18=仓库不存在 +error.message19=请选择高架库货位 +error.message20=此仓库没有空余货位 +error.message21=单据状态非未执行状态! +error.message23=单据状态未执行状态! +error.message22=请选择出口 +error.message24=导入数据为空 +error.message25=此区域没有空托盘库存 +error.message26=此区域没有空托盘库存或此用户没有该区域权限 +error.message27=单据不存在 +error.message28=任务不存在 +error.message29=未质检完成 +error.message30=无质检信息 +error.message31=此起点无料架，请检查 #ViewStockWarning search.ViewStockWarning.stockId=Stock ID diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties index 1e0ddf0..b666809 100644 --- a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties +++ b/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties @@ -69,6 +69,30 @@ error.message4=没有该拣选工位绑定的电子标签 error.message5=容器码不能为空 error.message6=起始点位不能为空 error.message7=目标点位不能为空 +error.message8=物料已存在 +error.message9=没有货位 +error.message10=库存非正常状态 +error.message11=没有该料架 +error.message12=作业类型错误 +error.message13=请选择质检项 +error.message14=只能完成正执行的作业 +error.message15=没有找到该库存 +error.message16=物料不能为空 +error.message17=取消ctu任务失败 +error.message18=仓库不存在 +error.message19=请选择高架库货位 +error.message20=此仓库没有空余货位 +error.message21=单据状态非未执行状态! +error.message23=单据状态未执行状态! +error.message22=请选择出口 +error.message24=导入数据为空 +error.message25=此区域没有空托盘库存 +error.message26=此区域没有空托盘库存或此用户没有该区域权限 +error.message27=单据不存在 +error.message28=任务不存在 +error.message29=未质检完成 +error.message30=无质检信息 +error.message31=此起点无料架，请检查 #ViewStockWarning search.ViewStockWarning.stockId=库存ID @@ -432,4 +456,4 @@ search.ViewStockDetail.spare7=高MM search.ViewStockDetail.spare8=体积m³ search.ViewStockDetail.remark=备注 search.ViewStockDetail.stockStatus=库存状态 -search.ViewStockDetail.productStatus=物料状态 \ No newline at end of file +search.ViewStockDetail.productStatus=物料状态 diff --git a/ruoyi-ui/src/views/check/flat/index.vue b/ruoyi-ui/src/views/check/flat/index.vue index 0341757..3b375c6 100644 --- a/ruoyi-ui/src/views/check/flat/index.vue +++ b/ruoyi-ui/src/views/check/flat/index.vue @@ -194,7 +194,7 @@ v-for="item in productOptions" :key="item.productId" :label="item.productName" - :value="item.productName" + :value="item.productId" /> @@ -467,7 +467,7 @@ export default { this.pdData= { newQuantity: this.addForm.quantity, warehouseId: this.addForm.warehouseId, - productId: this.addForm.productId, + productId: this.addForm.extraField.productId, recordType: 2 } addDifference(this.pdData).then(response => {