From 10bcc1f2afff2663dc6f0319643cccf91f66f2be 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 11:05:55 +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 --- .../com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java | 2 +- ruoyi-ui/src/lang/hu.js | 1 + ruoyi-ui/src/lang/zh.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) 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 0c8ac8e..eb6897d 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 @@ -226,7 +226,7 @@ public class MydoJobServiceImpl implements IMydoJobService { return AjaxResult.warn("任务不存在"); } BasWarehouse basWarehouse = basWarehouseService.selectBasWarehouseByWarehouseId(job.getWarehouseId()); - if("1".equals(basWarehouse.getWarehouseType())) { + if("2".equals(basWarehouse.getWarehouseType())) { if ("1".equals(job.getStatus()) || "2".equals(job.getStatus())) { return AjaxResult.warn("任务未开始"); } diff --git a/ruoyi-ui/src/lang/hu.js b/ruoyi-ui/src/lang/hu.js index 8b09f0e..14dd9fc 100644 --- a/ruoyi-ui/src/lang/hu.js +++ b/ruoyi-ui/src/lang/hu.js @@ -316,6 +316,7 @@ export default { // 物料信息 materialCode: '物料编码', + materialDesc: '物料名称', stockId: '库存ID', lotNo: '批次号', outQuantity: '出库数量', diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index fdc23b2..b24e827 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -327,6 +327,7 @@ export default { // 物料信息 materialCode: '物料编码', + materialDesc:'物料名称', stockId: '库存ID', lotNo: '批次号', outQuantity: '出库数量',