From 82669b31360656aa89359bced4a0c398d81d91d4 Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Fri, 20 Dec 2024 14:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A0=87=E5=87=86?= =?UTF-8?q?=E7=AE=B1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/domain/vo/BoxInfoBindVo.java | 16 ++++++++++++-- .../service/impl/BmQrBoxServiceImpl.java | 22 +++++++++++++------ .../mapper/material/basic/BmQrBoxMapper.xml | 2 +- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/vo/BoxInfoBindVo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/vo/BoxInfoBindVo.java index 2d3dea87..68a8a59e 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/vo/BoxInfoBindVo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/vo/BoxInfoBindVo.java @@ -1,6 +1,7 @@ package com.bonus.material.basic.domain.vo; import com.bonus.material.basic.domain.BmQrBoxInfo; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.experimental.Accessors; @@ -17,8 +18,19 @@ import java.util.List; @Accessors(chain = true) public class BoxInfoBindVo { - private BmQrBoxInfo boxInfo; + @ApiModelProperty(value = "二维码标准箱ID") + private Long boxId; - private List boxBindList; + @ApiModelProperty(value = "二维码标准箱CODE") + private String boxCode; + + @ApiModelProperty(value = "二维码标准箱名称") + private String boxName; + + @ApiModelProperty(value = "绑定机具总数") + private Integer bindMaTotal; + + @ApiModelProperty(value = "符合条件数量") + private Integer successMaTotal; } 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 e009d1cf..42e1e300 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 @@ -84,17 +84,22 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { if (boxInfos.isEmpty()) { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "标准箱编码不存在"); } else if (boxInfos.size() == 1) { - if (boxInfos.get(0).getBoxId() == null) { + if (boxInfos.get(0).getBoxId() == null || boxInfos.get(0).getBoxCode() == null) { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "标准箱信息异常，请联系运维人员处理"); } - boxInfoBindVo.setBoxInfo(boxInfos.get(0)); + boxInfoBindVo.setBoxId(boxInfos.get(0).getBoxId()); + boxInfoBindVo.setBoxCode(boxInfos.get(0).getBoxCode()); } else { return AjaxResult.warn("该二维码已绑定多个标准箱，请联系运维人员处理"); } - List boxBindList = bmQrBoxMapper.getBoxBindList(boxInfoBindVo.getBoxInfo().getBoxId()); + List boxBindList = bmQrBoxMapper.getBoxBindList(boxInfoBindVo.getBoxId()); boxBindList.removeIf(Objects::isNull); - boxInfoBindVo.setBoxBindList(boxBindList); + boxInfoBindVo.setBindMaTotal(boxBindList.size()); + boxBindList.removeIf(o -> o.getMaStatus() == null); + boxBindList.removeIf(info -> !info.getMaStatus().equals(MaMachineStatusEnum.IN_STORE.getStatus().toString()) && + !info.getMaStatus().equals(MaMachineStatusEnum.NEW_PURCHASE.getStatus().toString())); + boxInfoBindVo.setSuccessMaTotal(boxBindList.size()); return AjaxResult.success(boxInfoBindVo); } @@ -195,7 +200,8 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "驳回失败,无此标准箱信息!"); } bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null).setStatus(QrBoxStatusEnum.QR_BOX_STATUS_REJECT.getStatus().toString()); - return bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) > 0 ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : + return bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) > 0 ? + AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } @@ -215,9 +221,11 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { } else { return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "接收失败,无此标准箱信息!"); } - bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null).setInputUser(SecurityUtils.getUserId()) + bmQrBoxInfo.setBoxCode(null).setBoxName(null).setBoxType(null) + .setInputUser(SecurityUtils.getUserId()) .setStatus(QrBoxStatusEnum.QR_BOX_STATUS_ON_RECEIVE.getStatus().toString()); - return bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) > 0 ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : + return bmQrBoxMapper.updateBmQrcodeInfoById(bmQrBoxInfo) > 0 ? + AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } 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 f344c246..912802ed 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 @@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"