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

opt:任务状态反馈；

Browse Source
This commit is contained in:
gongbaoxiong
2026-06-18 17:43:32 +08:00
parent 2a7b6169fc
commit e8fcd659d9
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.basedata_manage.service.dao.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.nl.wms.basedata_manage.service.dao.Structattr; import org.nl.wms.basedata_manage.service.dao.Structattr;
import org.nl.wms.basedata_manage.service.dao.StructattrVechielDto; import org.nl.wms.basedata_manage.service.dao.StructattrVechielDto;
@@ -17,6 +18,6 @@ public interface StructattrMapper extends BaseMapper<Structattr>{
List<StructattrVechielDto> collectVehicle(Map query); List<StructattrVechielDto> collectVehicle(Map query);
List<Structattr> getctnextcode(); List<Structattr> getctnextcode(@Param("sect_code") String sectCode);
} }

3
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/mapper/StructattrMapper.xml
View File

@@ -64,6 +64,9 @@
s.* s.*
FROM st_ivt_structattr s FROM st_ivt_structattr s
WHERE s.stor_type = '1' WHERE s.stor_type = '1'
<if test="sect_code != null and sect_code != ''">
AND s.sect_code = #{sect_code}
</if>
AND AND
s.storagevehicle_code IS NULL s.storagevehicle_code IS NULL
AND s.is_used = 1 AND s.is_used = 1

2
nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/StructattrServiceImpl.java
View File

@@ -508,7 +508,7 @@ public class StructattrServiceImpl extends ServiceImpl<StructattrMapper, Structa
List<Structattr> list = this.list(query); List<Structattr> list = this.list(query);
//特殊载具规则 //特殊载具规则
if ("BCPCTZB".equals(param.getStoragevehicle_type()) || "DJQCT".equals(param.getStoragevehicle_type())) { if ("BCPCTZB".equals(param.getStoragevehicle_type()) || "DJQCT".equals(param.getStoragevehicle_type())) {
list = structattrMapper.getctnextcode(); list = structattrMapper.getctnextcode(param.getSect_code());
//只入234层 //只入234层
} else if ("DJQMZB".equals(param.getStoragevehicle_type())) { } else if ("DJQMZB".equals(param.getStoragevehicle_type())) {
list.removeIf(r -> r.getLayer_num().equals(1)); list.removeIf(r -> r.getLayer_num().equals(1));

6
nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/logging/impl/SysLogServiceImpl.java
View File

@@ -57,9 +57,13 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
LambdaQueryWrapper<SysLog> lam = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysLog> lam = new LambdaQueryWrapper<>();
lam.eq(ObjectUtil.isNotEmpty(log_type), SysLog::getLog_type, log_type) lam.eq(ObjectUtil.isNotEmpty(log_type), SysLog::getLog_type, log_type)
.eq(ObjectUtil.isNotEmpty(username), SysLog::getUsername, username) .eq(ObjectUtil.isNotEmpty(username), SysLog::getUsername, username)
.like(ObjectUtil.isNotEmpty(blurry), SysLog::getDescription, blurry)
.le(ObjectUtil.isNotEmpty(end_time), SysLog::getCreate_time, end_time) .le(ObjectUtil.isNotEmpty(end_time), SysLog::getCreate_time, end_time)
.ge(ObjectUtil.isNotEmpty(begin_time), SysLog::getCreate_time, begin_time) .ge(ObjectUtil.isNotEmpty(begin_time), SysLog::getCreate_time, begin_time)
.and(wrapper -> {
wrapper.like(ObjectUtil.isNotEmpty(blurry), SysLog::getDescription, blurry)
.or()
.like(ObjectUtil.isNotEmpty(blurry), SysLog::getParams, blurry);
})
.orderByDesc(SysLog::getCreate_time); .orderByDesc(SysLog::getCreate_time);
IPage<SysLog> page = new Page<>(pageable.getPage()+1, pageable.getSize()); IPage<SysLog> page = new Page<>(pageable.getPage()+1, pageable.getSize());
logMapper.selectPage(page, lam); logMapper.selectPage(page, lam);