From 1bad63826590d9dee3de54960308a9d192d2aa29 Mon Sep 17 00:00:00 2001 From: zhengxuming <739390650@QQ.COM> Date: Wed, 5 Nov 2025 14:09:21 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/enums/PackageInfoIvtEnum.java | 2 +- .../service/impl/MesToWmsServiceImpl.java | 15 +++------------ .../service/impl/PdaIosInServiceImpl.java | 7 +++++-- .../service/dict/impl/SysDictServiceImpl.java | 4 ++++ .../nl/wms/warehouse_manage/enums/IOSEnum.java | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java index d502f78..b2ef9ca 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/PackageInfoIvtEnum.java @@ -56,7 +56,7 @@ public enum PackageInfoIvtEnum { public String check(String code) { for (Map.Entry entry : this.getCode().entrySet()) { - if (entry.getValue().equals("code")) { + if (entry.getValue().equals(code)) { return entry.getValue(); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java index e318e00..d560704 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext_manage/service/impl/MesToWmsServiceImpl.java @@ -106,18 +106,9 @@ public class MesToWmsServiceImpl implements MesToWmsService { @Autowired private PdaIosInService pdaIosInService; - @Autowired - private ISectattrService iSectattrService; - @Autowired private IMdPbStoragevehicleinfoService iMdPbStoragevehicleinfoService; - /** - * 基础物料服务 - */ - @Autowired - private IMdMeMaterialbaseService iMdMeMaterialbaseService; - /** * 字典服务 */ @@ -453,7 +444,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { @Override @SneakyThrows - @Transactional + @Transactional(rollbackFor = Exception.class) public MesResponse backMaterial(MesBackMaterialRequestDto dto) { MDC.put(TagNameEnum.TAG_NAME.getTag(), TagNameEnum.MES_BACK_MATERIAL.getTag()); log.info("MES下发设备退料信息输入参数：-------------------: {}", dto); @@ -609,7 +600,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { .reduce(Double::sum).orElse(0.0); // 查询库区 - Sectattr sectDao = iSectattrService.getById(whereJson.getString("sect_id")); + Sectattr sectDao = sectattrService.getById(whereJson.getString("sect_id")); // 组织主表数据 Map jsonMst = new HashMap<>(); jsonMst.put("stor_id", sectDao.getStor_id()); @@ -624,7 +615,7 @@ public class MesToWmsServiceImpl implements MesToWmsService { ArrayList tableData = new ArrayList<>(); HashMap dtl = new HashMap<>(); GroupPlate plateDao = plateDaoList.get(0); - MdMeMaterialbase materDao = materialbaseService.getByCode(plateDao.getMaterial_id(), true); + MdMeMaterialbase materDao = materialbaseService.getByCode(plateDao.getMaterial_code(), true); dtl.put("storagevehicle_code", plateDao.getStoragevehicle_code()); dtl.put("material_id", materDao.getMaterial_id()); dtl.put("material_code", materDao.getMaterial_code()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index 2a38ee1..7ba708c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -842,8 +842,12 @@ public class PdaIosInServiceImpl implements PdaIosInService { } @Override - @Transactional + @Transactional(rollbackFor = Exception.class) public PdaResponse zwConfirmIn(ZwConfirmInDto dtoList) { + // 空值检查 + if (dtoList == null || CollectionUtils.isEmpty(dtoList.getParam_list())) { + throw new BadRequestException("参数列表不能为空"); + } Map> paramMap = dtoList.getParam_list().stream() .collect(Collectors.groupingBy(ZwConfirmInParamDto::getForm_data_code)); @@ -1021,7 +1025,6 @@ public class PdaIosInServiceImpl implements PdaIosInService { whereJson.put("priority","1"); whereJson.put("form_data_code", entry.getValue().get(0).getForm_data_code()); - jsonObjectList.add(whereJson); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java index b698a78..aa9ebd6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/dict/impl/SysDictServiceImpl.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; @@ -137,6 +138,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme throw new BadRequestException(LangProcess.msg("error_ParamExist", dict.getCode())); // 判断是否有空的值 List selectOne = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dict.getCode())); + if (CollectionUtils.isEmpty(selectOne)) { + throw new BadRequestException("字典配置不存在，请先创建字典主项"); + } Dict dic = selectOne.get(0); if (ObjectUtil.isEmpty(dic.getLabel())) { // 空就赋值 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java index c98306b..d99c796 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java @@ -81,7 +81,7 @@ public enum IOSEnum { public String check(String code) { for (Map.Entry entry : this.getCode().entrySet()) - if (entry.getValue().equals("code")) { + if (entry.getValue().equals(code)) { return entry.getValue(); } throw new BadRequestException(this.name() + "对应类型" + code + "未定义");