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

opt:5.21号回温出库同仓位重复出库问题分析并优化；任务查询默认显示未完成的

Browse Source
This commit is contained in:
zds
2025-05-22 10:32:34 +08:00
parent f7513845ee
commit 3f04ee9fde
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -70,24 +70,24 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
String point_code = ObjectUtil.isNotEmpty(whereJson.get("point_code")) ? whereJson.get("point_code").toString() : null;
String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time")) ? whereJson.get("begin_time").toString() : null;
String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time")) ? whereJson.get("end_time").toString() : null;
String more_task_status = ObjectUtil.isNotEmpty(whereJson.get("more_task_status")) ? whereJson.get("more_task_status").toString() : null;
List<String> collect = ObjectUtil.isNotEmpty(more_task_status) ? Arrays.stream(more_task_status.split(",")).collect(Collectors.toList()) : null;
String more_task_status = ObjectUtil.isNotEmpty(whereJson.get("task_status")) ? whereJson.get("task_status").toString() : null;
String unFinished = null;
if (collect != null) {
if (collect.contains(TaskStatus.UNFINISHED.getCode())) {
collect = null;
if(ObjectUtil.isNotEmpty(more_task_status)){
if (more_task_status.contains(TaskStatus.UNFINISHED.getCode())) {
unFinished = TaskStatus.EXECUTING.getCode();
more_task_status = "";
}
}
LambdaQueryWrapper<SchBaseTask> lam = new LambdaQueryWrapper<>();
lam.eq(ObjectUtil.isNotEmpty(task_code), SchBaseTask::getTask_code, task_code)
.eq(ObjectUtil.isNotEmpty(vehicle_code), SchBaseTask::getVehicle_code, vehicle_code)
.eq(ObjectUtil.isNotEmpty(point_code), SchBaseTask::getPoint_code1, point_code)
.ge(ObjectUtil.isNotEmpty(begin_time), SchBaseTask::getCreate_time, begin_time)
.le(ObjectUtil.isNotEmpty(end_time), SchBaseTask::getCreate_time, end_time)
.in(ObjectUtil.isNotEmpty(collect), SchBaseTask::getTask_status, collect)
.eq(ObjectUtil.isNotEmpty(more_task_status), SchBaseTask::getTask_status, more_task_status)
.le(ObjectUtil.isNotEmpty(unFinished), SchBaseTask::getTask_status, unFinished)
.orderByDesc(SchBaseTask::getUpdate_time);
.orderByDesc(SchBaseTask::getCreate_time);
IPage<SchBaseTask> pages = new Page<>(page.getPage() + 1, page.getSize());
schBaseTaskMapper.selectPage(pages, lam);
return pages;

8
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/workorder/service/impl/WorkorderServiceImpl.java
View File

@@ -319,11 +319,11 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
}
@Override
//@Transactional(rollbackFor = Exception.class)
public void batchCreateTask(){
String config_code = "YCLCKTask";
//查询可生成任务的工单
List<YCLKCDto> list = workorderMapper.getYlOutDetail();
log.info("batchCreateTask查询list数量:"+list.size());
if(list.size()>0){
// 查询任务配置信息
SchBaseTaskconfig taskConfig = taskConfigService.getOne(new LambdaQueryWrapper<SchBaseTaskconfig>()
@@ -334,7 +334,13 @@ public class WorkorderServiceImpl extends ServiceImpl<WorkorderMapper, Workorder
// 获取申请的任务
List<SchBaseTask> unFinishTasksByTaskConfig = taskService.findTasksByTaskStatus(config_code, TaskStatus.APPLY);
JSONObject param=new JSONObject();
Map<String,YCLKCDto> maps = new HashMap<String,YCLKCDto>();
for(YCLKCDto workorder : list){
maps.put(workorder.getPointCode(),workorder);
}
Collection<YCLKCDto> newlist = maps.values();
log.info("batchCreateTask查询newlist数量:"+newlist.size());
for(YCLKCDto workorder : newlist){
//子载具
String vehicle_code2 = workorder.getSubTray();
//母载具

9
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -53,8 +53,6 @@
<el-form-item label="任务状态">
<el-select
v-model="query.task_status"
multiple
style="width: 360px"
placeholder="任务状态"
class="filter-item"
clearable
@@ -148,6 +146,9 @@ export default {
url: 'api/schBaseTask',
idField: 'task_id',
sort: 'task_code,desc',
query: {
task_status: '7'
},
optShow: {
add: false,
edit: false,
@@ -178,10 +179,6 @@ export default {
return this.dict.label.create_mode[row.create_mode]
},
handTaskStatus(value) {
this.crud.query.more_task_status = null
if (value) {
this.crud.query.more_task_status = value.toString()
}
this.crud.toQuery()
},
getTaskStatusList() {