From a431d047c4639009bd0ab897152f9d0cd11a12cb Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 5 Jul 2025 21:27:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../material/basic/service/impl/BmQrBoxServiceImpl.java | 6 +++--- .../material/lease/service/impl/LeaseTaskServiceImpl.java | 3 ++- .../src/main/resources/mapper/material/ma/MachineMapper.xml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) 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 76fe14a1..6496f960 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 @@ -302,7 +302,7 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { @Override @Transactional(rollbackFor = Exception.class) public AjaxResult appReceive(BmQrBoxInfo bmQrBoxInfo) { - int result = 0; + /* int result = 0; // 用来存储每个 taskId 的出现次数 Map taskIdCountMap = new HashMap<>(); final List bmQrBoxInfos = bmQrBoxMapper.find(new BmQrBoxInfo().setBoxId(bmQrBoxInfo.getBoxId())); @@ -348,13 +348,13 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { } } else { return AjaxResult.error(500, "接收失败,无此标准箱信息!"); - } + }*/ bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null) .setInputUser(SecurityUtils.getLoginUser().getUserid()) .setStatus(QrBoxStatusEnum.QR_BOX_STATUS_ON_RECEIVE.getStatus().toString()); return 0 < bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : - AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); + AjaxResult.error(500, HttpCodeEnum.FAIL.getMsg()); } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 6e124147..c2f37589 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -860,7 +860,8 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { if (allMatch) { TmTask tmTask = new TmTask(); tmTask.setTaskId(leaseApplyInfo.getTaskId()); - tmTask.setTaskStatus(LeaseTaskStatusEnum.LEASE_TASK_IN_PROGRESS.getStatus()); + // 出库完成 + tmTask.setTaskStatus(3); result = tmTaskMapper.updateTmTask(tmTask); if (result == 0) { return AjaxResult.error("发布失败,请联系管理员"); diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml index 80320503..cbbdefd4 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml @@ -766,7 +766,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id and mt4.`level` = '1' and mt4.del_flag = '0' WHERE - wsi.lease_unit is null and wsi.lease_project is null + 1 = 1 and wsi.model_id = #{typeId}