Commit 151f1882337c88618358c9f357bc4e3e1a11cfa2
1 parent
d1112c05
feat:修复了出库看板接口，查询参数有多个站台时，不返回任务数据的问题
Showing
3 changed files
with
9 additions
and
9 deletions
src/main/java/com/huaheng/api/tv/controller/TvController.java
| ... | ... | @@ -284,10 +284,11 @@ public class TvController extends BaseController { |
| 284 | 284 | public List<ShipmentDetailTv> getShipmentDetailTaskByPort(String par) { |
| 285 | 285 | List<ShipmentDetailTv> returnList = new ArrayList<>(); |
| 286 | 286 | List<TaskDetail> newShipmentDetailList = new ArrayList<>(); |
| 287 | - | |
| 287 | + // 按逗号分隔 par 字符串，得到多个 port | |
| 288 | + List<String> portList = Arrays.asList(par.split(",")); | |
| 288 | 289 | List<TaskHeader> taskHeaderList = taskHeaderService.list(new LambdaQueryWrapper<TaskHeader>() |
| 289 | 290 | .eq(TaskHeader::getInternalTaskType, 200) |
| 290 | - .in(TaskHeader::getPort, par) | |
| 291 | + .in(TaskHeader::getPort, portList) | |
| 291 | 292 | .eq(TaskHeader::getStatus, 50)); |
| 292 | 293 | |
| 293 | 294 | for (TaskHeader taskHeader : taskHeaderList) { |
| ... | ... |
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
| ... | ... | @@ -81,12 +81,12 @@ public class ShippingCombinationService { |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | //如果物料的供需政策为LP的，或者通知单号包含展会字样的，必须匹配通知单号才可以出库，还必须是半成品库或者二厂半成品库 |
| 84 | - if (policy.equals("PL") || noticeNo.contains("展会")) { | |
| 85 | - if (warehouse.equals("038") || warehouse.equals("022")) { | |
| 86 | - String finalNoticeNo = noticeNo; | |
| 87 | - list.removeIf(detail -> !detail.getNoticeCode().equals(finalNoticeNo)); | |
| 88 | - } | |
| 89 | - } | |
| 84 | + //if (policy.equals("PL") || noticeNo.contains("展会")) { | |
| 85 | + // if (warehouse.equals("038") || warehouse.equals("022")) { | |
| 86 | + // String finalNoticeNo = noticeNo; | |
| 87 | + // list.removeIf(detail -> !detail.getNoticeCode().equals(finalNoticeNo)); | |
| 88 | + // } | |
| 89 | + //} | |
| 90 | 90 | |
| 91 | 91 | //排序：主体颜色加喷漆状态、喷漆状态、主体颜色、喷漆状态（底漆）、无颜色、先进先出 |
| 92 | 92 | String finalNoticeNo1 = noticeNo; |
| ... | ... |
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskService.java
| ... | ... | @@ -478,7 +478,6 @@ public class ReceiptTaskService { |
| 478 | 478 | |
| 479 | 479 | //修改任务主表状态，因为立库任务表单头只对应一个货箱，表单详情的任务会同时完成 |
| 480 | 480 | task.setStatus(QuantityConstant.TASK_STATUS_COMPLETED); |
| 481 | - task.setStatus(QuantityConstant.TASK_STATUS_COMPLETED); | |
| 482 | 481 | if (StringUtils.isBlank(ShiroUtils.getName())) { |
| 483 | 482 | task.setLastUpdatedBy(""); |
| 484 | 483 | } else { |
| ... | ... |