From 9d51c6df728f25da6d0c4db5edfae9558e19a127 Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Thu, 10 Nov 2022 22:16:08 +0800
Subject: [PATCH] 电视机接口调整
---
src/main/java/com/huaheng/api/general/service/BigScreenService.java | 29 +++++++++++++++++++++--------
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java | 1 +
2 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/huaheng/api/general/service/BigScreenService.java b/src/main/java/com/huaheng/api/general/service/BigScreenService.java
index f287db8..9d00a7b 100644
--- a/src/main/java/com/huaheng/api/general/service/BigScreenService.java
+++ b/src/main/java/com/huaheng/api/general/service/BigScreenService.java
@@ -31,10 +31,11 @@ public class BigScreenService {
public List<BigScreenTask> selectReceiptTask() {
List<TaskHeader> taskHeaders = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
- .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//小于任务完成
- .eq(TaskHeader::getZoneCode,"B")
- .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT,
- QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT));//整盘入库、补充入库
+ .eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//任务完成
+ .eq(TaskHeader::getZoneCode, "B")
+ .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT, QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)//整盘入库、补充入库
+ .orderByDesc(TaskHeader::getCreated)
+ .last("limit 10"));
List<BigScreenTask> bigScreenTaskList = new ArrayList<>();
for (TaskHeader taskHeader : taskHeaders) {
@@ -50,6 +51,8 @@ public class BigScreenService {
bigScreenTask.setMaterialCode(taskDetail.getMaterialCode());
if (taskHeader.getStatus().toString().equals("1")) {
bigScreenTask.setStatus("创建状态");
+ } else if (taskHeader.getStatus().toString().equals("100")) {
+ bigScreenTask.setStatus("任务完成");
} else {
bigScreenTask.setStatus("执行状态");
}
@@ -59,6 +62,9 @@ public class BigScreenService {
if (taskHeader.getTaskType().toString().equals("200")) {
bigScreenTask.setTaskType("补充入库");
}
+ //if (taskHeader.getTaskType().toString().equals("900")) {
+ // bigScreenTask.setTaskType("盘点任务");
+ //}
bigScreenTaskList.add(bigScreenTask);
}
return bigScreenTaskList;
@@ -66,14 +72,16 @@ public class BigScreenService {
public List<BigScreenTask> selectShipmentTask() {
List<TaskHeader> taskHeaders = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
- .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//小于任务完成
- .eq(TaskHeader::getZoneCode,"B")
- .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, QuantityConstant.TASK_TYPE_SORTINGSHIPMENT));//整盘出库、分拣出库
+ .eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED)//任务完成
+ .eq(TaskHeader::getZoneCode, "B")
+ .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLESHIPMENT, QuantityConstant.TASK_TYPE_SORTINGSHIPMENT)//整盘出库、分拣出库
+ .orderByDesc(TaskHeader::getCreated)
+ .last("limit 10"));
+
List<BigScreenTask> bigScreenTaskList = new ArrayList<>();
for (TaskHeader taskHeader : taskHeaders) {
TaskDetail taskDetail = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId())).get(0);
-
BigScreenTask bigScreenTask = new BigScreenTask();
bigScreenTask.setQty(taskDetail.getQty());
bigScreenTask.setMaterialName(taskDetail.getMaterialName());
@@ -84,6 +92,8 @@ public class BigScreenService {
bigScreenTask.setContainerCode(taskHeader.getContainerCode());
if (taskHeader.getStatus().toString().equals("1")) {
bigScreenTask.setStatus("创建状态");
+ } else if (taskHeader.getStatus().toString().equals("100")) {
+ bigScreenTask.setStatus("任务完成");
} else {
bigScreenTask.setStatus("执行状态");
}
@@ -93,6 +103,9 @@ public class BigScreenService {
if (taskHeader.getTaskType().toString().equals("400")) {
bigScreenTask.setTaskType("分拣出库");
}
+ //if (taskHeader.getTaskType().toString().equals("900")) {
+ // bigScreenTask.setTaskType("盘点任务");
+ //}
bigScreenTaskList.add(bigScreenTask);
}
return bigScreenTaskList;
diff --git a/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java b/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
index 50ad8b7..3e7e397 100644
--- a/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
+++ b/src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskService.java
@@ -987,6 +987,7 @@ public class WorkTaskService {
taskDetail.setToLocation(taskHeader.getToLocation());
taskDetail.setContainerCode(taskHeader.getContainerCode());
taskDetail.setFromInventoryId(inventoryDetail.getId());
+ taskDetail.setQty(inventoryDetail.getQty());
taskDetail.setToInventoryId(inventoryDetail.getId());
taskDetail.setMaterialCode(inventoryDetail.getMaterialCode());
taskDetail.setMaterialName(inventoryDetail.getMaterialName());
--
libgit2 0.22.2