From dc61857ff2e0c60549f000db648eda5f62acb802 Mon Sep 17 00:00:00 2001 From: zhengxuming Date: Tue, 12 Aug 2025 10:18:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=A9=BA=E8=BD=BD=E5=85=B7=E5=87=BA?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ios_manage/service/impl/PdaIosInServiceImpl.java | 2 +- .../nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java | 4 +++- .../main/java/org/nl/wms/warehouse_manage/enums/IOSEnum.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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 81aba7d..b672da5 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 @@ -672,7 +672,7 @@ public class PdaIosInServiceImpl implements PdaIosInService { .count() != dto.getParam_list().size()) { throw new BadRequestException("存在重复的点位或托盘号，请核对！"); } - + //查询字典表 List dictList = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(Dict::getCode, "MATERIAL_MODEL_SECT")); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java index abed17f..c5c6d81 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/util/tasks/VehicleOutTask.java @@ -28,6 +28,7 @@ import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Collections; /** * @Author: gbx @@ -165,9 +166,10 @@ public class VehicleOutTask extends AbstractTask { iSchBasePointService.update( new UpdateWrapper().lambda() .eq(SchBasePoint::getPoint_code, taskObj.getPoint_code2()) - .set(SchBasePoint::getVehicle_code, null) + .set(SchBasePoint::getVehicle_code, taskObj.getVehicle_code()) .set(SchBasePoint::getIos_id, null) .set(SchBasePoint::getPoint_status,"2")); + } @Transactional(rollbackFor = Exception.class) 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 ea52c2b..bc475e4 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 @@ -42,7 +42,7 @@ public enum IOSEnum { )), // 点位状态 - POINT_STATUS(MapOf.of("无货", "1", "有货", "2" )), + POINT_STATUS(MapOf.of("无货", "1", "空载具", "2" , "有货", "3" )), // 单据创建类型 CREATE_MODE(MapOf.of("PC产生", "1", "终端产生", "2", "外部接口产生", "3")),