feat:修复了出库看板接口，查询参数有多个站台时，不返回任务数据的问题

易文鹏
1 parent d1112c05
Showing 3 changed files with 9 additions and 9 deletions
src/main/java/com/huaheng/api/tv/controller/TvController.java
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
@@ -284,10 +284,11 @@ public class TvController extends BaseController {
     public List<ShipmentDetailTv> getShipmentDetailTaskByPort(String par) {
         List<ShipmentDetailTv> returnList = new ArrayList<>();
         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)
-                .in(TaskHeader::getPort, par)
+                .in(TaskHeader::getPort, portList)
                 .eq(TaskHeader::getStatus, 50));
         for (TaskHeader taskHeader : taskHeaderList) {
@@ -81,12 +81,12 @@ public class ShippingCombinationService {
         }
         //如果物料的供需政策为LP的，或者通知单号包含展会字样的，必须匹配通知单号才可以出库，还必须是半成品库或者二厂半成品库
-        if (policy.equals("PL") || noticeNo.contains("展会")) {
-            if (warehouse.equals("038") || warehouse.equals("022")) {
-                String finalNoticeNo = noticeNo;
-                list.removeIf(detail -> !detail.getNoticeCode().equals(finalNoticeNo));
-            }
-        }
+        //if (policy.equals("PL") || noticeNo.contains("展会")) {
+        //    if (warehouse.equals("038") || warehouse.equals("022")) {
+        //        String finalNoticeNo = noticeNo;
+        //        list.removeIf(detail -> !detail.getNoticeCode().equals(finalNoticeNo));
+        //    }
+        //}
         //排序：主体颜色加喷漆状态、喷漆状态、主体颜色、喷漆状态（底漆）、无颜色、先进先出
         String finalNoticeNo1 = noticeNo;
@@ -478,7 +478,6 @@ public class ReceiptTaskService {
         //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成
         task.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
-        task.setStatus(QuantityConstant.TASK_STATUS_COMPLETED);
         if (StringUtils.isBlank(ShiroUtils.getName())) {
             task.setLastUpdatedBy("");
         } else {