From f7b00ae4c09ac3ba1979b5205eecddf25ed1be98 Mon Sep 17 00:00:00 2001 From: bonus <1203338439@qq.com> Date: Sat, 26 Jul 2025 19:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=80=E6=96=99=E7=BC=96=E7=A0=81=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=EF=BC=8C=E9=80=80=E6=96=99=E4=BB=BB=E5=8A=A1=E7=BB=93?= =?UTF-8?q?=E6=9D=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/service/impl/BackApplyInfoServiceImpl.java | 9 ++++++--- .../mapper/material/back/BackApplyInfoMapper.xml | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 67a3ec3f..ced22826 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -828,11 +828,14 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { for (BackApplyDetails applyDetail : applyDetails) { if (CollectionUtils.isNotEmpty(listL4)) { for (TypeTreeNode typeTreeNode : listL4) { - if (applyDetail.getTypeId().equals(typeTreeNode.getTypeId())) { - if (applyDetail.getPreNum().compareTo(typeTreeNode.getNum()) > 0) { - return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "退料数量不能大于在用数量"); + if(applyDetail.getTypeId()!=null){ + if (applyDetail.getTypeId().equals(typeTreeNode.getTypeId())) { + if (applyDetail.getPreNum().compareTo(typeTreeNode.getNum()) > 0) { + return AjaxResult.error(HttpCodeEnum.FAIL.getCode(), "退料数量不能大于在用数量"); + } } } + } } } diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml index 86f0daac..76f0980d 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/back/BackApplyInfoMapper.xml @@ -1065,7 +1065,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT mm.ma_id AS maId, mm.ma_code AS maCode, - mm.ma_status AS maStatus,AAAAAAAAAAAAAAAAAAAAA + mm.ma_status AS maStatus, sd.dict_label AS maStatusName, mt1.type_name AS typeName, mm.type_id AS typeId,