root/rongLiHongFeng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev 更新

Browse Source
This commit is contained in:
gengby
2023-04-06 19:34:42 +08:00
parent 2fb546bc48
commit 13551f81a3
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/handling/HandlingTask.java
View File

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.nl.modules.common.exception.BadRequestException; 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.common.utils.SecurityUtils;
import org.nl.modules.system.util.CodeUtil; import org.nl.modules.system.util.CodeUtil;
import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.core.bean.WQLObject;
@@ -227,6 +228,9 @@ public class HandlingTask extends AbstractAcsTask {
jsonStart.put("update_time", DateUtil.now()); jsonStart.put("update_time", DateUtil.now());
pointTab.update(jsonStart); pointTab.update(jsonStart);
} else if (StrUtil.equals(region_codeS, RegionTypeEnum.GT4.getCode())) { } 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_type", jsonTask.getString("vehicle_type"));
ivtEnd.put("vehicle_code", jsonTask.getString("vehicle_code")); ivtEnd.put("vehicle_code", jsonTask.getString("vehicle_code"));

25
lms/nladmin-system/src/main/java/org/nl/wms/st/structivt/service/impl/StructivtServiceImpl.java
View File

@@ -148,24 +148,25 @@ public class StructivtServiceImpl implements StructivtService {
throw new BadRequestException("选择物料编码必须选择托盘编号"); throw new BadRequestException("选择物料编码必须选择托盘编号");
} }
if (StrUtil.isNotBlank(dto.getVehicle_code())) { if (StrUtil.isNotBlank(dto.getVehicle_code())) {
if (ObjectUtil.isNotEmpty(dto.getMaterial_id())) { // if (ObjectUtil.isNotEmpty(dto.getMaterial_id())) {
redisUtils.set(dto.getVehicle_code(), dto.getMaterial_id().toString()); redisUtils.set(dto.getVehicle_code(), String.valueOf(dto.getMaterial_id()));
redisUtils.set(dto.getVehicle_code() + "-ivt_qty", "1"); redisUtils.set(dto.getVehicle_code() + "-ivt_qty", "1");
} else { // }
redisUtils.del(dto.getVehicle_code()); // else {
redisUtils.del(dto.getVehicle_code() + "-ivt_qty"); // redisUtils.del(dto.getVehicle_code());
} // redisUtils.del(dto.getVehicle_code() + "-ivt_qty");
// }
} }
WQLObject wo_point = WQLObject.getWQLObject("sch_base_point"); WQLObject wo_point = WQLObject.getWQLObject("sch_base_point");
// 找主表获取之前的数据 // 找主表获取之前的数据
StructivtDto structivtDto = this.findById(dto.getStockrecord_id()); StructivtDto structivtDto = this.findById(dto.getStockrecord_id());
if (structivtDto == null) throw new BadRequestException("被删除或无权限，操作失败!"); if (structivtDto == null) throw new BadRequestException("被删除或无权限，操作失败!");
String region_code = structivtDto.getRegion_code(); String region_code = structivtDto.getRegion_code();
if (StrUtil.isBlank(dto.getVehicle_code()) // if (StrUtil.isBlank(dto.getVehicle_code())
|| !dto.getVehicle_code().equals(structivtDto.getVehicle_code())) { // || !dto.getVehicle_code().equals(structivtDto.getVehicle_code())) {
redisUtils.del(structivtDto.getVehicle_code()); // redisUtils.del(structivtDto.getVehicle_code());
redisUtils.del(structivtDto.getVehicle_code() + "-ivt_qty"); // redisUtils.del(structivtDto.getVehicle_code() + "-ivt_qty");
} // }
Long currentUserId = SecurityUtils.getCurrentUserId(); Long currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName(); String nickName = SecurityUtils.getCurrentNickName();