diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java index cd4ae4f..0dfbd6a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.modules.common.exception.BadRequestException; +import org.nl.modules.common.utils.RedisUtils; import org.nl.modules.common.utils.SecurityUtils; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.core.bean.WQLObject; @@ -227,6 +228,9 @@ public class HandlingTask extends AbstractAcsTask { jsonStart.put("update_time", DateUtil.now()); pointTab.update(jsonStart); } else if (StrUtil.equals(region_codeS, RegionTypeEnum.GT4.getCode())) { + RedisUtils redisUtils = SpringContextHolder.getBean(RedisUtils.class); + redisUtils.del(jsonTask.getString("vehicle_code")); + redisUtils.del(jsonTask.getString("vehicle_code") + "-ivt_qty"); //修改终点库存 ivtEnd.put("vehicle_type", jsonTask.getString("vehicle_type")); ivtEnd.put("vehicle_code", jsonTask.getString("vehicle_code")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java index 7ecee58..e4a9c9e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java @@ -148,24 +148,25 @@ public class StructivtServiceImpl implements StructivtService { throw new BadRequestException("选择物料编码必须选择托盘编号"); } if (StrUtil.isNotBlank(dto.getVehicle_code())) { - if (ObjectUtil.isNotEmpty(dto.getMaterial_id())) { - redisUtils.set(dto.getVehicle_code(), dto.getMaterial_id().toString()); - redisUtils.set(dto.getVehicle_code() + "-ivt_qty", "1"); - } else { - redisUtils.del(dto.getVehicle_code()); - redisUtils.del(dto.getVehicle_code() + "-ivt_qty"); - } +// if (ObjectUtil.isNotEmpty(dto.getMaterial_id())) { + redisUtils.set(dto.getVehicle_code(), String.valueOf(dto.getMaterial_id())); + redisUtils.set(dto.getVehicle_code() + "-ivt_qty", "1"); +// } +// else { +// redisUtils.del(dto.getVehicle_code()); +// redisUtils.del(dto.getVehicle_code() + "-ivt_qty"); +// } } WQLObject wo_point = WQLObject.getWQLObject("sch_base_point"); // 找主表获取之前的数据 StructivtDto structivtDto = this.findById(dto.getStockrecord_id()); if (structivtDto == null) throw new BadRequestException("被删除或无权限,操作失败!"); String region_code = structivtDto.getRegion_code(); - if (StrUtil.isBlank(dto.getVehicle_code()) - || !dto.getVehicle_code().equals(structivtDto.getVehicle_code())) { - redisUtils.del(structivtDto.getVehicle_code()); - redisUtils.del(structivtDto.getVehicle_code() + "-ivt_qty"); - } +// if (StrUtil.isBlank(dto.getVehicle_code()) +// || !dto.getVehicle_code().equals(structivtDto.getVehicle_code())) { +// redisUtils.del(structivtDto.getVehicle_code()); +// redisUtils.del(structivtDto.getVehicle_code() + "-ivt_qty"); +// } Long currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName();