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

rev:修改异常入库分配规则

Browse Source
This commit is contained in:
zhangzq
2024-11-13 19:54:16 +08:00
parent 80eb98ddcd
commit c06bb252a0
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/common/utils/RedissonUtils.java
View File

@@ -1,6 +1,7 @@
package org.nl.common.utils; package org.nl.common.utils;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.exception.BadRequestException; import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.domain.interfaces.LockProcess; import org.nl.common.domain.interfaces.LockProcess;
import org.nl.common.domain.interfaces.ReturnLockProcess; import org.nl.common.domain.interfaces.ReturnLockProcess;
@@ -13,6 +14,7 @@ import java.util.concurrent.TimeUnit;
* @author ZZQ * @author ZZQ
* @Date 2023/3/27 10:30 * @Date 2023/3/27 10:30
*/ */
@Slf4j
public class RedissonUtils { public class RedissonUtils {
/** /**
* *
@@ -37,6 +39,7 @@ public class RedissonUtils {
throw new BadRequestException("当前业务:"+key+"正在执行请稍后再试"); throw new BadRequestException("当前业务:"+key+"正在执行请稍后再试");
} }
}catch (Exception ex){ }catch (Exception ex){
log.error("key:"+ex.getMessage());
throw ex; throw ex;
}finally { }finally {
if (lock.isHeldByCurrentThread() && lock.isLocked()){ if (lock.isHeldByCurrentThread() && lock.isLocked()){

1
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -313,7 +313,6 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
.set("remark", stIvtStructattr.getStruct_code() + "入满异常重新分配货位" + new_struct_code) .set("remark", stIvtStructattr.getStruct_code() + "入满异常重新分配货位" + new_struct_code)
.eq("proc_inst_id", vehicleCode.getProc_inst_id())); .eq("proc_inst_id", vehicleCode.getProc_inst_id()));
} }
this.update(new UpdateWrapper<SchBaseTask>() this.update(new UpdateWrapper<SchBaseTask>()
.set("point_code2", new_struct_code) .set("point_code2", new_struct_code)
.set("remark", stIvtStructattr.getStruct_code() + "入满异常重新分配货位" + new_struct_code) .set("remark", stIvtStructattr.getStruct_code() + "入满异常重新分配货位" + new_struct_code)