From bbaaa3d7de21f7162b3989929ed8c074cc515db9 Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Tue, 5 Aug 2025 09:44:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../decisioner/impl/diy/FIFOAndVehicleHandler.java | 2 +- .../service/strategyConfig/enums/StragegyTypeEnum.java | 2 +- .../ios_manage/service/impl/PdaIosOutServiceImpl.java | 9 +++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFOAndVehicleHandler.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFOAndVehicleHandler.java index f567ca2..5393107 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFOAndVehicleHandler.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/decisioner/impl/diy/FIFOAndVehicleHandler.java @@ -36,7 +36,7 @@ public class FIFOAndVehicleHandler extends Decisioner handler(List list, JSONObject param) { //如果是空托盘出库任务，则执行空托盘出库 - if (StragegyTypeEnum.STRAGEGY_TYPE.code("空托盘").equals(param.getString("strategyType"))) { + if (StragegyTypeEnum.STRAGEGY_TYPE.code("空托盘").equals(param.getString("stragegyType"))) { //查新空托盘 //当前条件只有id，批次 log.info("---------执行空托盘出库分配规则---------"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/enums/StragegyTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/enums/StragegyTypeEnum.java index 8a808af..1c2868e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/enums/StragegyTypeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/decision_manage/service/strategyConfig/enums/StragegyTypeEnum.java @@ -19,7 +19,7 @@ import java.util.Map; public enum StragegyTypeEnum { // 策略类型 - STRAGEGY_TYPE(MapOf.of("1", "空托盘", "2", "正常策略")) + STRAGEGY_TYPE(MapOf.of( "空托盘","1", "正常策略","2")) ; private Map code; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index 452012e..63219da 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -248,9 +248,9 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { if (qty > 6) { throw new BadRequestException("一次性只能输入小于7以内的载具数量"); } - queryWrapper.eq(MdMeMaterialbase::getMaterial_id, StatusEnum.VEHICLE_TYPE.code("空料箱")); + queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空料箱")); } else { - queryWrapper.eq(MdMeMaterialbase::getMaterial_id, StatusEnum.VEHICLE_TYPE.code("空托盘")); + queryWrapper.eq(MdMeMaterialbase::getMaterial_code, StatusEnum.VEHICLE_TYPE.code("空托盘")); } MdMeMaterialbase materDao = iMdMeMaterialbaseService.getOne(queryWrapper); if (materDao == null) { @@ -258,10 +258,7 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { } whereJson.put("material_id", materDao.getMaterial_id()); whereJson.put("material_code", materDao.getMaterial_code()); - Sectattr sectattr = iSectattrService.getById(new LambdaQueryWrapper<>(Sectattr.class) - .eq(Sectattr::getSect_id, whereJson.getString("sect_id")) - .eq(Sectattr::getIs_used, BaseDataEnum.IS_YES_NOT.code("是")) - ); + Sectattr sectattr = iSectattrService.getById(whereJson.getString("sect_id")); if (ObjectUtil.isEmpty(sectattr)) { throw new BadRequestException("该仓位所属的库区已禁用，请先启用该库区!"); }