From adae16c35c9da4181647b9d815f7a6c9c6431ee8 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 25 九月 2024 15:02:17 +0800
Subject: [PATCH] linux证书兼容
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java | 24 +-----------------------
1 files changed, 1 insertions(+), 23 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java
index c7944ed..06b68e4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaveController.java
@@ -4,9 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
-import com.zy.asrs.wms.asrs.entity.TaskDetl;
import com.zy.asrs.wms.asrs.entity.WaveDetl;
-import com.zy.asrs.wms.asrs.service.TaskDetlService;
import com.zy.asrs.wms.asrs.service.WaveDetlService;
import com.zy.asrs.wms.common.annotation.OperationLog;
import com.zy.asrs.wms.common.domain.BaseParam;
@@ -21,10 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
@RestController
@RequestMapping("/api")
@@ -34,8 +29,6 @@
private WaveService waveService;
@Autowired
private WaveDetlService waveDetlService;
- @Autowired
- private TaskDetlService taskDetlService;
@PreAuthorize("hasAuthority('asrs:wave:list')")
@PostMapping("/wave/page")
@@ -43,21 +36,6 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Wave, BaseParam> pageParam = new PageParam<>(baseParam, Wave.class);
PageParam<Wave, BaseParam> page = waveService.page(pageParam, pageParam.buildWrapper(true));
-
- List<Wave> records = page.getRecords();
- for (Wave record : records) {
- ArrayList<Long> orderDetlIds = new ArrayList<>();
- for (WaveDetl waveDetl : record.getWaveDetlList()) {
- orderDetlIds.add(waveDetl.getOrderId());
- }
-
- List<TaskDetl> taskDetls = taskDetlService.list(new LambdaQueryWrapper<TaskDetl>().in(TaskDetl::getOrderId, orderDetlIds));
- if (taskDetls.isEmpty()) {
- record.setGenerateTask(false);
- }else {
- record.setGenerateTask(true);
- }
- }
return R.ok().add(page);
}
--
Gitblit v1.9.1