From d75a7fbc24e42b961db1f76197dfc4c8e9f87719 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Fri, 10 Jan 2025 14:11:26 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/material/basic/mapper/BmQrBoxMapper.java | 2 +- .../bonus/material/basic/service/impl/BmQrBoxServiceImpl.java | 2 +- .../main/java/com/bonus/material/ma/domain/vo/MachineVo.java | 3 --- .../src/main/resources/mapper/material/basic/BmQrBoxMapper.xml | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java index 04f8efd5..50772637 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmQrBoxMapper.java @@ -57,7 +57,7 @@ public interface BmQrBoxMapper { * @param boxId 标准箱id * @return 标准箱物资的绑定批次 buyTask */ - Long getBoxBindMaBuyTaskByBoxId(Long boxId); + String getBoxBindMaBuyTaskByBoxId(Long boxId); /** * 查询此机具是否已经被标准箱绑定过 diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 98601532..1e014e24 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -361,7 +361,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { if (null == machineVo.getBuyTask()) { return AjaxResult.error("物资未关联采购批次，请完善后重试!"); } - Long boxBindMaBuyTaskId = bmQrBoxMapper.getBoxBindMaBuyTaskByBoxId(bmQrBoxInfo.getBoxId()); + String boxBindMaBuyTaskId = bmQrBoxMapper.getBoxBindMaBuyTaskByBoxId(bmQrBoxInfo.getBoxId()); if (null != boxBindMaBuyTaskId && !Objects.equals(boxBindMaBuyTaskId, machineVo.getBuyTask())) { return AjaxResult.error("该物资批次与标准箱已存在批次不匹配，请完善后重试!"); } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java index b91a4ca5..8cdd489a 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/vo/MachineVo.java @@ -42,7 +42,4 @@ public class MachineVo extends Machine { @ApiModelProperty("状态名称") private String statusName; - @ApiModelProperty("购置批次") - private Long buyTask; - } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml index bf969b57..82351bd9 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmQrBoxMapper.xml @@ -256,7 +256,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt.type_id = #{maTypeId} - select mm.buy_task from