From e155f1007a7d7685e0c180f7ed066098b67db3f3 Mon Sep 17 00:00:00 2001
From: yiwenpeng <ywp303@163.com>
Date: Sun, 28 Apr 2024 16:27:58 +0800
Subject: [PATCH] feat:蓝牙打印出库物料明细新增原仓库编码和原仓库名称字段
---
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java | 5 +++++
src/main/java/com/huaheng/api/tv/controller/TvController.java | 22 ++++++++++++++++++++--
src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java | 12 ++++++++++++
3 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java b/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
index 5f5b936..6f7b197 100644
--- a/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
+++ b/src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
@@ -1020,6 +1020,11 @@ public class MesReceiptController extends BaseController {
if (list.isEmpty()) {
return AjaxResult.error("没有查询到数据");
}
+ for (ShipmentDetail shipmentDetail : list) {
+ ShipmentHeader shipmentHeader = shipmentHeaderService.getById(shipmentDetail.getShipmentId());
+ shipmentDetail.setWarehouse(shipmentHeader.getWarehouse());
+ shipmentDetail.setWarehouseName(shipmentHeader.getWarehouseName());
+ }
return AjaxResult.success(list);
}
diff --git a/src/main/java/com/huaheng/api/tv/controller/TvController.java b/src/main/java/com/huaheng/api/tv/controller/TvController.java
index 9a28617..08c4b9b 100644
--- a/src/main/java/com/huaheng/api/tv/controller/TvController.java
+++ b/src/main/java/com/huaheng/api/tv/controller/TvController.java
@@ -49,6 +49,7 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.*;
+import java.time.LocalDateTime;
import java.util.*;
@RestController
@@ -286,11 +287,28 @@ public class TvController extends BaseController {
List<TaskDetail> newShipmentDetailList = new ArrayList<>();
// 按逗号分隔 par 字符串，得到多个 port
List<String> portList = Arrays.asList(par.split(","));
- List<TaskHeader> taskHeaderList = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
- .eq(TaskHeader::getInternalTaskType, 200)
+ // 获取当前时间
+ LocalDateTime now = LocalDateTime.now();
+ // 计算两分钟前后的时间范围
+ LocalDateTime startTime = now.minusMinutes(2);
+ LocalDateTime endTime = now.plusMinutes(2);
+ // 查询分拣任务
+ List<TaskHeader> taskHeaderList1 = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
+ .eq(TaskHeader::getTaskType, 400)
.in(TaskHeader::getPort, portList)
.eq(TaskHeader::getStatus, 50));
+ // 查询整出任务
+ List<TaskHeader> taskHeaderList2 = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>()
+ .eq(TaskHeader::getTaskType, 300)
+ .in(TaskHeader::getPort, portList)
+ .eq(TaskHeader::getStatus, 100)
+ .between(TaskHeader::getLastUpdated, startTime, endTime));
+ // 合并两种任务
+ List<TaskHeader> taskHeaderList = new ArrayList<>();
+ taskHeaderList.addAll(taskHeaderList1);
+ taskHeaderList.addAll(taskHeaderList2);
+
for (TaskHeader taskHeader : taskHeaderList) {
List<TaskDetail> taskDetailList = taskDetailService.list(new LambdaQueryWrapper<TaskDetail>().eq(TaskDetail::getTaskId, taskHeader.getId()));
newShipmentDetailList.addAll(taskDetailList);
diff --git a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
index 4725295..519516e 100644
--- a/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
+++ b/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
@@ -386,4 +386,16 @@ public class ShipmentDetail implements Serializable {
@TableField(value = "preMergerWorkshop")
@ApiModelProperty(value = "合并前车间")
private String preMergerWorkshop;
+
+ /**
+ * 原仓库编码
+ */
+ @TableField(exist = false)
+ private String warehouse;
+
+ /**
+ * 原仓库名称
+ */
+ @TableField(exist = false)
+ private String warehouseName;
}
--
libgit2 0.22.2