diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java index 496874659..e4adda0cf 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/auto/AutoSendVehicleToDjq.java @@ -120,7 +120,7 @@ public class AutoSendVehicleToDjq extends Prun{ } else { packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("管制区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->待检区)")); packageList = packageList.stream() - .filter(r -> r.getPoint_status().equals("4")) + .filter(r -> !r.getPoint_status().equals("4")) .collect(Collectors.toList()); if (ObjectUtils.isEmpty(packageList)) { packageList = packageinfoivtService.checkEndPointTask(PackageInfoIvtEnum.POINT_STATUS.code("待检区"), PackageInfoIvtEnum.IVT_STATUS.code("空"), PackageInfoIvtEnum.TASK_POINT_TYPE.code("放货任务"), PackageInfoIvtEnum.SORT_TYPE.code("升序"), PackageInfoIvtEnum.TASK_TYPE.code("补空(装箱区->管制区)")); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 41bcb4423..bb0582380 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -129,7 +129,7 @@ public class InBoxManageServiceImpl implements InBoxManageService { }else { //判断托盘重量是否为空或小于等于0 String qty = vehicle_ext.getString("qty"); - if (StrUtil.isEmpty(qty) || Integer.parseInt(qty) <= 0){ + if (StrUtil.isEmpty(qty) || Double.parseDouble(qty) <= 0){ throw new BadRequestException("托盘【"+vehicleCode2+"】在系统的重量有误,请在载具维护页面中维护托盘实际重量!"); } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java index 095be7c75..5d2275c2b 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/BakingServiceImpl.java @@ -268,6 +268,9 @@ public class BakingServiceImpl implements BakingService { case "B2": reging_id = RegionTypeEnum.B2_HKZC.getId(); break; + case "B1": + reging_id = RegionTypeEnum.B1_HKZC.getId(); + break; default: break; } @@ -478,6 +481,9 @@ public class BakingServiceImpl implements BakingService { case "A4": reging_id = RegionTypeEnum.D_HKZC.getId(); break; + case "B1": + reging_id = RegionTypeEnum.B1_HKZC.getId(); + break; case "B2": reging_id = RegionTypeEnum.B2_HKZC.getId(); break;