linweidong
/
besure_server
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:修改生产整体概况返回

Browse Source
ck
HuangHuiKang 1 month ago
parent a8fb7cd262
commit 92feeb7f84
2 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File

74
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dashboard/DashboardController.java
Unescape Escape View File

@ -134,44 +134,44 @@ public class DashboardController {
.collect(Collectors.groupingBy(TaskDO::getStatus, Collectors.counting())); .collect(Collectors.groupingBy(TaskDO::getStatus, Collectors.counting()));
// 生产任务总数 // 生产任务总数
TaskRespVO.Item item = new TaskRespVO.Item(); TaskRespVO.Item item = new TaskRespVO.Item();
item.setKey("1"); item.setKey("11");
item.setLabel("生产任务总数"); item.setLabel("生产任务总数");
item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>() item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
.betweenIfPresent(TaskDO::getCreateTime, taskReqVO.getStartTime()))); // 创建时间 .betweenIfPresent(TaskDO::getCreateTime, taskReqVO.getStartTime()))); // 创建时间
taskItems.add(item); taskItems.add(item);
// 未开工任务数 // // 未开工任务数
item = new TaskRespVO.Item(); // item = new TaskRespVO.Item();
item.setKey("2"); // item.setKey("2");
item.setLabel("未开工任务数"); // item.setLabel("未开工任务数");
Collection<Long> count1 = new ArrayList<>(); // Collection<Long> count1 = new ArrayList<>();
count1.add(1L); // count1.add(1L);
count1.add(2L); // count1.add(2L);
count1.add(3L); // count1.add(3L);
item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>() // item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
.in(TaskDO::getStatus, count1) // .in(TaskDO::getStatus, count1)
.betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime()))); // 下达时间 // .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime()))); // 下达时间
taskItems.add(item); // taskItems.add(item);
// 生产中任务数 // // 生产中任务数
item = new TaskRespVO.Item(); // item = new TaskRespVO.Item();
item.setKey("3"); // item.setKey("3");
item.setLabel("生产中任务数"); // item.setLabel("生产中任务数");
Collection<Long> count2 = new ArrayList<>(); // Collection<Long> count2 = new ArrayList<>();
count2.add(4L); // count2.add(4L);
item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>() // item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
.in(TaskDO::getStatus, count2) // .in(TaskDO::getStatus, count2)
.betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime()))); // .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime())));
taskItems.add(item); // taskItems.add(item);
// 完工任务数 // // 完工任务数
item = new TaskRespVO.Item(); // item = new TaskRespVO.Item();
item.setKey("4"); // item.setKey("4");
item.setLabel("完工任务数"); // item.setLabel("完工任务数");
Collection<Long> count3 = new ArrayList<>(); // Collection<Long> count3 = new ArrayList<>();
count3.add(5L); // count3.add(5L);
count3.add(6L); // count3.add(6L);
item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>() // item.setValue(taskMapper.selectCount(new LambdaQueryWrapperX<TaskDO>()
.in(TaskDO::getStatus, count3) // .in(TaskDO::getStatus, count3)
.betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime()))); // .betweenIfPresent(TaskDO::getOrderDate, taskReqVO.getStartTime())));
taskItems.add(item); // taskItems.add(item);
// 生产计划总数 // 生产计划总数
@ -242,6 +242,12 @@ public class DashboardController {
planItems.add(item); planItems.add(item);
for (TaskStatusEnum taskStatusEnum : TaskStatusEnum.values()) { for (TaskStatusEnum taskStatusEnum : TaskStatusEnum.values()) {
if (TaskStatusEnum.已排产.equals(taskStatusEnum)
|| TaskStatusEnum.开工.equals(taskStatusEnum)
|| TaskStatusEnum.完工.equals(taskStatusEnum)
|| TaskStatusEnum.入库.equals(taskStatusEnum)) {
continue;
}
item = new TaskRespVO.Item(); item = new TaskRespVO.Item();
item.setKey(String.valueOf(taskStatusEnum.getValue())); item.setKey(String.valueOf(taskStatusEnum.getValue()));
item.setLabel(taskStatusEnum.name()); item.setLabel(taskStatusEnum.name());

8
yudao-module-mes/yudao-module-mes-biz/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/task/vo/TaskStatusEnum.java
Unescape Escape View File

@ -39,10 +39,10 @@ public enum TaskStatusEnum {
public static List<Integer> getEnablePlanStatus(){ public static List<Integer> getEnablePlanStatus(){
List<Integer> statusList = new ArrayList<>(); List<Integer> statusList = new ArrayList<>();
statusList.add(TaskStatusEnum.下达.getValue()); statusList.add(TaskStatusEnum.下达.getValue());
statusList.add(TaskStatusEnum.已排产.getValue()); // statusList.add(TaskStatusEnum.已排产.getValue());
statusList.add(TaskStatusEnum.开工.getValue()); // statusList.add(TaskStatusEnum.开工.getValue());
statusList.add(TaskStatusEnum.完工.getValue()); // statusList.add(TaskStatusEnum.完工.getValue());
statusList.add(TaskStatusEnum.入库.getValue()); // statusList.add(TaskStatusEnum.入库.getValue());
statusList.add(TaskStatusEnum.部分排产.getValue()); statusList.add(TaskStatusEnum.部分排产.getValue());
statusList.add(TaskStatusEnum.待生产.getValue()); statusList.add(TaskStatusEnum.待生产.getValue());
statusList.add(TaskStatusEnum.生产中.getValue()); statusList.add(TaskStatusEnum.生产中.getValue());

Write Preview
Loading…
Cancel
Save