wms / wms_tianjinggelinmei · Commits

Commit 9d51c6df728f25da6d0c4db5edfae9558e19a127

Authored by 易文鹏
1 parent 8694a33a

电视机接口调整

Inline Side-by-side
Showing 2 changed files with 22 additions and 8 deletions
src/main/java/com/huaheng/api/general/service/BigScreenService.java
  View file @9d51c6d
... ... @@ -31,10 +31,11 @@ public class BigScreenService {
31 31  
32 32 public List<BigScreenTask> selectReceiptTask() {
33 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 39 List<BigScreenTask> bigScreenTaskList = new ArrayList<>();
39 40  
40 41 for (TaskHeader taskHeader : taskHeaders) {
... ... @@ -50,6 +51,8 @@ public class BigScreenService {
50 51 bigScreenTask.setMaterialCode(taskDetail.getMaterialCode());
51 52 if (taskHeader.getStatus().toString().equals("1")) {
52 53 bigScreenTask.setStatus("创建状态");
  54 + } else if (taskHeader.getStatus().toString().equals("100")) {
  55 + bigScreenTask.setStatus("任务完成");
53 56 } else {
54 57 bigScreenTask.setStatus("执行状态");
55 58 }
... ... @@ -59,6 +62,9 @@ public class BigScreenService {
59 62 if (taskHeader.getTaskType().toString().equals("200")) {
60 63 bigScreenTask.setTaskType("补充入库");
61 64 }
  65 + //if (taskHeader.getTaskType().toString().equals("900")) {
  66 + // bigScreenTask.setTaskType("盘点任务");
  67 + //}
62 68 bigScreenTaskList.add(bigScreenTask);
63 69 }
64 70 return bigScreenTaskList;
... ... @@ -66,14 +72,16 @@ public class BigScreenService {
66 72  
67 73 public List<BigScreenTask> selectShipmentTask() {
68 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 81 List<BigScreenTask> bigScreenTaskList = new ArrayList<>();
73 82  
74 83 for (TaskHeader taskHeader : taskHeaders) {
75 84 TaskDetail taskDetail = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId())).get(0);
76   -
77 85 BigScreenTask bigScreenTask = new BigScreenTask();
78 86 bigScreenTask.setQty(taskDetail.getQty());
79 87 bigScreenTask.setMaterialName(taskDetail.getMaterialName());
... ... @@ -84,6 +92,8 @@ public class BigScreenService {
84 92 bigScreenTask.setContainerCode(taskHeader.getContainerCode());
85 93 if (taskHeader.getStatus().toString().equals("1")) {
86 94 bigScreenTask.setStatus("创建状态");
  95 + } else if (taskHeader.getStatus().toString().equals("100")) {
  96 + bigScreenTask.setStatus("任务完成");
87 97 } else {
88 98 bigScreenTask.setStatus("执行状态");
89 99 }
... ... @@ -93,6 +103,9 @@ public class BigScreenService {
93 103 if (taskHeader.getTaskType().toString().equals("400")) {
94 104 bigScreenTask.setTaskType("分拣出库");
95 105 }
  106 + //if (taskHeader.getTaskType().toString().equals("900")) {
  107 + // bigScreenTask.setTaskType("盘点任务");
  108 + //}
96 109 bigScreenTaskList.add(bigScreenTask);
97 110 }
98 111 return bigScreenTaskList;
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
  View file @9d51c6d
... ... @@ -987,6 +987,7 @@ public class WorkTaskService {
987 987 taskDetail.setToLocation(taskHeader.getToLocation());
988 988 taskDetail.setContainerCode(taskHeader.getContainerCode());
989 989 taskDetail.setFromInventoryId(inventoryDetail.getId());
  990 + taskDetail.setQty(inventoryDetail.getQty());
990 991 taskDetail.setToInventoryId(inventoryDetail.getId());
991 992 taskDetail.setMaterialCode(inventoryDetail.getMaterialCode());
992 993 taskDetail.setMaterialName(inventoryDetail.getMaterialName());
... ...