feat:蓝牙打印出库物料明细新增原仓库编码和原仓库名称字段

易文鹏
1 parent f94c385c
Showing 3 changed files with 37 additions and 2 deletions
src/main/java/com/huaheng/api/mes/controller/MesReceiptController.java
src/main/java/com/huaheng/api/tv/controller/TvController.java
src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.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);
     }
@@ -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);
@@ -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;
 }