diff --git a/.gitignore b/.gitignore index cda7538..30ad416 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,8 @@ build/ ### VS Code ### .vscode/ .myumldata + + +###vue### +jeecg-boot-master/ant-design-vue-jeecg/node_modules/ +ant-design-vue-jeecg/dist.zip \ No newline at end of file diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java new file mode 100644 index 0000000..729c33a --- /dev/null +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/TaskController.java @@ -0,0 +1,61 @@ +package org.jeecg.modules.wms.api.mobile.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import io.swagger.annotations.Api; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.wms.api.mobile.entity.TvTaskVo; +import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail; +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader; +import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskDetailServiceImpl; +import org.jeecg.modules.wms.task.taskHeader.service.impl.TaskHeaderServiceImpl; +import org.jeecg.utils.StringUtils; +import org.jeecg.utils.constant.QuantityConstant; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + */ +@Api(tags = "Mobile") +@RestController +@RequestMapping("/api/mobile/task") +public class TaskController { + + @Resource + private TaskHeaderServiceImpl taskHeaderService; + + @Resource + private TaskDetailServiceImpl taskDetailService; + + @GetMapping("taskOfStation") + public Result<List<TvTaskVo>> importExcel(String code) { + List<String> stationList = new ArrayList<>(); + if (StringUtils.isNotEmpty(code)) { + stationList = Arrays.asList(code.split(",")); + } + + LambdaQueryWrapper<TaskHeader> hQuery = Wrappers.lambdaQuery(); + hQuery.eq(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_ARRIVED_STATION) + .in(stationList.size() > 0, TaskHeader::getToPortCode, stationList); + List<TaskHeader> headers = taskHeaderService.list(hQuery); + + List<TvTaskVo> list = new ArrayList<>(); + for (TaskHeader header : headers) { + TvTaskVo vo = new TvTaskVo(); + LambdaQueryWrapper<TaskDetail> dQuery = Wrappers.lambdaQuery(); + dQuery.eq(TaskDetail::getTaskHeaderId, header.getId()); + List<TaskDetail> details = taskDetailService.list(dQuery); + + vo.setTaskHeader(header); + vo.setTaskDetailList(details); + list.add(vo); + } + return Result.OK("", list); + } +} diff --git a/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/entity/TvTaskVo.java b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/entity/TvTaskVo.java new file mode 100644 index 0000000..5d442b6 --- /dev/null +++ b/huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/entity/TvTaskVo.java @@ -0,0 +1,13 @@ +package org.jeecg.modules.wms.api.mobile.entity; + +import lombok.Data; +import org.jeecg.modules.wms.task.taskHeader.entity.TaskDetail; +import org.jeecg.modules.wms.task.taskHeader.entity.TaskHeader; + +import java.util.List; + +@Data +public class TvTaskVo { + private TaskHeader taskHeader; + private List<TaskDetail> taskDetailList; +}