Commit 9d51c6df728f25da6d0c4db5edfae9558e19a127
1 parent
8694a33a
电视机接口调整
Showing
2 changed files
with
22 additions
and
8 deletions
src/main/java/com/huaheng/api/general/service/BigScreenService.java
| @@ -31,10 +31,11 @@ public class BigScreenService { | @@ -31,10 +31,11 @@ public class BigScreenService { | ||
| 31 | 31 | ||
| 32 | public List<BigScreenTask> selectReceiptTask() { | 32 | public List<BigScreenTask> selectReceiptTask() { |
| 33 | List<TaskHeader> taskHeaders = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>() | 33 | List<TaskHeader> taskHeaders = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>() |
| 34 | - .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//小于任务完成 | ||
| 35 | - .eq(TaskHeader::getZoneCode,"B") | ||
| 36 | - .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT, | ||
| 37 | - QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT));//整盘入库、补充入库 | 34 | + .eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//任务完成 |
| 35 | + .eq(TaskHeader::getZoneCode, "B") | ||
| 36 | + .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT, QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)//整盘入库、补充入库 | ||
| 37 | + .orderByDesc(TaskHeader::getCreated) | ||
| 38 | + .last("limit 10")); | ||
| 38 | List<BigScreenTask> bigScreenTaskList = new ArrayList<>(); | 39 | List<BigScreenTask> bigScreenTaskList = new ArrayList<>(); |
| 39 | 40 | ||
| 40 | for (TaskHeader taskHeader : taskHeaders) { | 41 | for (TaskHeader taskHeader : taskHeaders) { |
| @@ -50,6 +51,8 @@ public class BigScreenService { | @@ -50,6 +51,8 @@ public class BigScreenService { | ||
| 50 | bigScreenTask.setMaterialCode(taskDetail.getMaterialCode()); | 51 | bigScreenTask.setMaterialCode(taskDetail.getMaterialCode()); |
| 51 | if (taskHeader.getStatus().toString().equals("1")) { | 52 | if (taskHeader.getStatus().toString().equals("1")) { |
| 52 | bigScreenTask.setStatus("创建状态"); | 53 | bigScreenTask.setStatus("创建状态"); |
| 54 | + } else if (taskHeader.getStatus().toString().equals("100")) { | ||
| 55 | + bigScreenTask.setStatus("任务完成"); | ||
| 53 | } else { | 56 | } else { |
| 54 | bigScreenTask.setStatus("执行状态"); | 57 | bigScreenTask.setStatus("执行状态"); |
| 55 | } | 58 | } |
| @@ -59,6 +62,9 @@ public class BigScreenService { | @@ -59,6 +62,9 @@ public class BigScreenService { | ||
| 59 | if (taskHeader.getTaskType().toString().equals("200")) { | 62 | if (taskHeader.getTaskType().toString().equals("200")) { |
| 60 | bigScreenTask.setTaskType("补充入库"); | 63 | bigScreenTask.setTaskType("补充入库"); |
| 61 | } | 64 | } |
| 65 | + //if (taskHeader.getTaskType().toString().equals("900")) { | ||
| 66 | + // bigScreenTask.setTaskType("盘点任务"); | ||
| 67 | + //} | ||
| 62 | bigScreenTaskList.add(bigScreenTask); | 68 | bigScreenTaskList.add(bigScreenTask); |
| 63 | } | 69 | } |
| 64 | return bigScreenTaskList; | 70 | return bigScreenTaskList; |
| @@ -66,14 +72,16 @@ public class BigScreenService { | @@ -66,14 +72,16 @@ public class BigScreenService { | ||
| 66 | 72 | ||
| 67 | public List<BigScreenTask> selectShipmentTask() { | 73 | public List<BigScreenTask> selectShipmentTask() { |
| 68 | List<TaskHeader> taskHeaders = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>() | 74 | List<TaskHeader> taskHeaders = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>() |
| 69 | - .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//小于任务完成 | ||
| 70 | - .eq(TaskHeader::getZoneCode,"B") | ||
| 71 | - .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, QuantityConstant.TASK_TYPE_SORTINGSHIPMENT));//整盘出库、分拣出库 | 75 | + .eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//任务完成 |
| 76 | + .eq(TaskHeader::getZoneCode, "B") | ||
| 77 | + .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)//整盘出库、分拣出库 | ||
| 78 | + .orderByDesc(TaskHeader::getCreated) | ||
| 79 | + .last("limit 10")); | ||
| 80 | + | ||
| 72 | List<BigScreenTask> bigScreenTaskList = new ArrayList<>(); | 81 | List<BigScreenTask> bigScreenTaskList = new ArrayList<>(); |
| 73 | 82 | ||
| 74 | for (TaskHeader taskHeader : taskHeaders) { | 83 | for (TaskHeader taskHeader : taskHeaders) { |
| 75 | TaskDetail taskDetail = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId())).get(0); | 84 | TaskDetail taskDetail = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId())).get(0); |
| 76 | - | ||
| 77 | BigScreenTask bigScreenTask = new BigScreenTask(); | 85 | BigScreenTask bigScreenTask = new BigScreenTask(); |
| 78 | bigScreenTask.setQty(taskDetail.getQty()); | 86 | bigScreenTask.setQty(taskDetail.getQty()); |
| 79 | bigScreenTask.setMaterialName(taskDetail.getMaterialName()); | 87 | bigScreenTask.setMaterialName(taskDetail.getMaterialName()); |
| @@ -84,6 +92,8 @@ public class BigScreenService { | @@ -84,6 +92,8 @@ public class BigScreenService { | ||
| 84 | bigScreenTask.setContainerCode(taskHeader.getContainerCode()); | 92 | bigScreenTask.setContainerCode(taskHeader.getContainerCode()); |
| 85 | if (taskHeader.getStatus().toString().equals("1")) { | 93 | if (taskHeader.getStatus().toString().equals("1")) { |
| 86 | bigScreenTask.setStatus("创建状态"); | 94 | bigScreenTask.setStatus("创建状态"); |
| 95 | + } else if (taskHeader.getStatus().toString().equals("100")) { | ||
| 96 | + bigScreenTask.setStatus("任务完成"); | ||
| 87 | } else { | 97 | } else { |
| 88 | bigScreenTask.setStatus("执行状态"); | 98 | bigScreenTask.setStatus("执行状态"); |
| 89 | } | 99 | } |
| @@ -93,6 +103,9 @@ public class BigScreenService { | @@ -93,6 +103,9 @@ public class BigScreenService { | ||
| 93 | if (taskHeader.getTaskType().toString().equals("400")) { | 103 | if (taskHeader.getTaskType().toString().equals("400")) { |
| 94 | bigScreenTask.setTaskType("分拣出库"); | 104 | bigScreenTask.setTaskType("分拣出库"); |
| 95 | } | 105 | } |
| 106 | + //if (taskHeader.getTaskType().toString().equals("900")) { | ||
| 107 | + // bigScreenTask.setTaskType("盘点任务"); | ||
| 108 | + //} | ||
| 96 | bigScreenTaskList.add(bigScreenTask); | 109 | bigScreenTaskList.add(bigScreenTask); |
| 97 | } | 110 | } |
| 98 | return bigScreenTaskList; | 111 | return bigScreenTaskList; |
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
| @@ -987,6 +987,7 @@ public class WorkTaskService { | @@ -987,6 +987,7 @@ public class WorkTaskService { | ||
| 987 | taskDetail.setToLocation(taskHeader.getToLocation()); | 987 | taskDetail.setToLocation(taskHeader.getToLocation()); |
| 988 | taskDetail.setContainerCode(taskHeader.getContainerCode()); | 988 | taskDetail.setContainerCode(taskHeader.getContainerCode()); |
| 989 | taskDetail.setFromInventoryId(inventoryDetail.getId()); | 989 | taskDetail.setFromInventoryId(inventoryDetail.getId()); |
| 990 | + taskDetail.setQty(inventoryDetail.getQty()); | ||
| 990 | taskDetail.setToInventoryId(inventoryDetail.getId()); | 991 | taskDetail.setToInventoryId(inventoryDetail.getId()); |
| 991 | taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); | 992 | taskDetail.setMaterialCode(inventoryDetail.getMaterialCode()); |
| 992 | taskDetail.setMaterialName(inventoryDetail.getMaterialName()); | 993 | taskDetail.setMaterialName(inventoryDetail.getMaterialName()); |