From ffb12704174da7040e4e10977335eac20390b2fc Mon Sep 17 00:00:00 2001 From: liyuqi Date: Tue, 17 Jun 2025 16:08:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4wcs=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev_wms_client/src/api/wcsTaskBak.js | 9 + dev_wms_client/src/layout/wcsTaskBak.vue | 302 ++++++++++++++++++ dev_wms_client/src/router/index.js | 1 + .../controller/wms/WcsTaskBakController.java | 28 ++ .../controller/wms/WcsTaskController.java | 2 +- .../model/dto/query/WcsTaskBakQuery.java | 79 +++++ .../model/vo/wms/WcsTaskRecordVo.java | 28 ++ .../IWcsTaskBakControllerService.java | 10 + .../WcsTaskBakControllerServiceImpl.java | 45 +++ 9 files changed, 503 insertions(+), 1 deletion(-) create mode 100644 dev_wms_client/src/api/wcsTaskBak.js create mode 100644 dev_wms_client/src/layout/wcsTaskBak.vue create mode 100644 dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskBakController.java create mode 100644 dev_wms_serve/src/main/java/com/wms_main/model/dto/query/WcsTaskBakQuery.java create mode 100644 dev_wms_serve/src/main/java/com/wms_main/service/controller/IWcsTaskBakControllerService.java create mode 100644 dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/WcsTaskBakControllerServiceImpl.java diff --git a/dev_wms_client/src/api/wcsTaskBak.js b/dev_wms_client/src/api/wcsTaskBak.js new file mode 100644 index 0000000..16d2ce6 --- /dev/null +++ b/dev_wms_client/src/api/wcsTaskBak.js @@ -0,0 +1,9 @@ +import request from "@/http/request"; + +export const queryWcsTaskBaksByPage = (params) => { + return request({ + url: '/wcsTaskBak/queryWcsTaskBaksByPage', + method: 'post', + data: params + }) +} \ No newline at end of file diff --git a/dev_wms_client/src/layout/wcsTaskBak.vue b/dev_wms_client/src/layout/wcsTaskBak.vue new file mode 100644 index 0000000..df9bdaf --- /dev/null +++ b/dev_wms_client/src/layout/wcsTaskBak.vue @@ -0,0 +1,302 @@ + + + + + \ No newline at end of file diff --git a/dev_wms_client/src/router/index.js b/dev_wms_client/src/router/index.js index e8f2514..37bd175 100644 --- a/dev_wms_client/src/router/index.js +++ b/dev_wms_client/src/router/index.js @@ -42,6 +42,7 @@ const routes = [ {path: '/pickPlan', component: () => import('@/layout/pickPlan.vue')}, {path: '/pickTaskBak', component: () => import('@/layout/pickTaskBak.vue')}, {path: '/wcsTask', component: () => import('@/layout/wcsTask.vue')}, + {path: '/wcsTaskBak', component: () => import('@/layout/wcsTaskBak.vue')}, ] }, { diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskBakController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskBakController.java new file mode 100644 index 0000000..0936e31 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskBakController.java @@ -0,0 +1,28 @@ +package com.wms_main.controller.wms; + +import com.wms_main.model.dto.query.WcsTaskBakQuery; +import com.wms_main.model.dto.response.wms.WmsApiResponse; +import com.wms_main.model.vo.wms.PageVo; +import com.wms_main.model.vo.wms.WcsTaskRecordVo; +import com.wms_main.service.controller.IWcsTaskBakControllerService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@ResponseBody +@CrossOrigin +@RequiredArgsConstructor +@RequestMapping("/wms/wcsTaskBak") +public class WcsTaskBakController { + private final IWcsTaskBakControllerService wcsTaskBakControllerService; + + /** + * 分页查询wcs记录 + * @param wcsTaskBakQuery 查询参数 + * @return 查询结果 + */ + @PostMapping("/queryWcsTaskBaksByPage") + public WmsApiResponse> queryWcsTaskBaksByPage(@RequestBody WcsTaskBakQuery wcsTaskBakQuery) { + return wcsTaskBakControllerService.queryWcsTaskBakInfoByPage(wcsTaskBakQuery); + } +} diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskController.java index cdc031a..600d994 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskController.java +++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/WcsTaskController.java @@ -17,7 +17,7 @@ public class WcsTaskController { private final IWcsTaskControllerService wcsTaskControllerService; /** - * 分页查询拣选计划 + * 分页查询wcs任务 * @param wcsTaskQuery 查询参数 * @return 查询结果 */ diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/WcsTaskBakQuery.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/WcsTaskBakQuery.java new file mode 100644 index 0000000..d8071d7 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/WcsTaskBakQuery.java @@ -0,0 +1,79 @@ +package com.wms_main.model.dto.query; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +@EqualsAndHashCode(callSuper = true) +@Data +@AllArgsConstructor +@NoArgsConstructor +public class WcsTaskBakQuery extends PageQuery { + /** + * wcs任务id + */ + @JsonProperty(value = "wcsTaskId") + private String wcsTaskId; + /** + * wcs任务状态 + */ + @JsonProperty(value = "wcsTaskStatus") + private Integer wcsTaskStatus; + /** + * wcs任务类型 + */ + @JsonProperty(value = "wcsTaskType") + private Integer wcsTaskType; + /** + * wcs任务优先级 + */ + @JsonProperty(value = "taskPriority") + private Integer taskPriority; + /** + * 载具号 + */ + @JsonProperty(value = "vehicleId") + private String vehicleId; + /** + * 起点 + */ + @JsonProperty(value = "origin") + private String origin; + /** + * 终点 + */ + @JsonProperty(value = "destination") + private String destination; + /** + * 创建时间 + */ + @JsonProperty(value = "createTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime createTime; + /** + * 发送时间 + */ + @JsonProperty(value = "sendTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime sendTime; + /** + * 完成时间 + */ + @JsonProperty(value = "finishTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime finishTime; + /** + * 备注 + */ + @JsonProperty(value = "remark") + private String remark; +} diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/WcsTaskRecordVo.java b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/WcsTaskRecordVo.java index bb75b93..39c9d75 100644 --- a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/WcsTaskRecordVo.java +++ b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/WcsTaskRecordVo.java @@ -2,6 +2,8 @@ package com.wms_main.model.vo.wms; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import com.wms_main.model.po.TAppWcsTask; +import com.wms_main.model.po.TAppWcsTaskBak; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -77,4 +79,30 @@ public class WcsTaskRecordVo { */ @JsonProperty("remark") private String remark; + + /** + * 将TAppWcsTaskBak转换为WcsTaskRecordVo + * + * @param wcsTaskBak wcs记录实体 + * @return wcs记录视图对象 + */ + public static WcsTaskRecordVo of(TAppWcsTaskBak wcsTaskBak) { + if (wcsTaskBak == null) { + return null; + } + + WcsTaskRecordVo wcsTaskRecordVo = new WcsTaskRecordVo(); + wcsTaskRecordVo.setWcsTaskId(wcsTaskBak.getWcsTaskId()); + wcsTaskRecordVo.setWcsTaskStatus(wcsTaskBak.getWcsTaskStatus()); + wcsTaskRecordVo.setWcsTaskType(wcsTaskBak.getWcsTaskType()); + wcsTaskRecordVo.setTaskPriority(wcsTaskBak.getTaskPriority()); + wcsTaskRecordVo.setVehicleId(wcsTaskBak.getVehicleId()); + wcsTaskRecordVo.setOrigin(wcsTaskBak.getOrigin()); + wcsTaskRecordVo.setDestination(wcsTaskBak.getDestination()); + wcsTaskRecordVo.setCreateTime(wcsTaskBak.getCreateTime()); + wcsTaskRecordVo.setSendTime(wcsTaskBak.getSendTime()); + wcsTaskRecordVo.setFinishTime(wcsTaskBak.getFinishTime()); + wcsTaskRecordVo.setRemark(wcsTaskBak.getRemark()); + return wcsTaskRecordVo; + } } diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/IWcsTaskBakControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IWcsTaskBakControllerService.java new file mode 100644 index 0000000..2ea0c40 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IWcsTaskBakControllerService.java @@ -0,0 +1,10 @@ +package com.wms_main.service.controller; + +import com.wms_main.model.dto.query.WcsTaskBakQuery; +import com.wms_main.model.dto.response.wms.WmsApiResponse; +import com.wms_main.model.vo.wms.PageVo; +import com.wms_main.model.vo.wms.WcsTaskRecordVo; + +public interface IWcsTaskBakControllerService { + public WmsApiResponse> queryWcsTaskBakInfoByPage(WcsTaskBakQuery wcsTaskBakQuery); +} diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/WcsTaskBakControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/WcsTaskBakControllerServiceImpl.java new file mode 100644 index 0000000..e51f825 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/WcsTaskBakControllerServiceImpl.java @@ -0,0 +1,45 @@ +package com.wms_main.service.controller.serviceImpl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wms_main.dao.ITAppWcsTaskBakService; +import com.wms_main.model.dto.query.WcsTaskBakQuery; +import com.wms_main.model.dto.response.wms.WmsApiResponse; +import com.wms_main.model.po.TAppWcsTaskBak; +import com.wms_main.model.vo.wms.PageVo; +import com.wms_main.model.vo.wms.WcsTaskRecordVo; +import com.wms_main.repository.utils.StringUtils; +import com.wms_main.service.controller.IWcsTaskBakControllerService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@Slf4j +public class WcsTaskBakControllerServiceImpl implements IWcsTaskBakControllerService { + private final ITAppWcsTaskBakService appWcsTaskBakService; + + @Override + public WmsApiResponse> queryWcsTaskBakInfoByPage(WcsTaskBakQuery wcsTaskBakQuery) { + if (wcsTaskBakQuery == null) { + return WmsApiResponse.error("查询参数不能为NULL", null); + } + Page page = wcsTaskBakQuery.toMpPage(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .eq(StringUtils.isNotEmpty(wcsTaskBakQuery.getVehicleId()), TAppWcsTaskBak::getVehicleId, wcsTaskBakQuery.getVehicleId()) + .eq(wcsTaskBakQuery.getWcsTaskStatus() != null, TAppWcsTaskBak::getWcsTaskStatus, wcsTaskBakQuery.getWcsTaskStatus()) + .like(StringUtils.isNotEmpty(wcsTaskBakQuery.getOrigin()), TAppWcsTaskBak::getOrigin, wcsTaskBakQuery.getOrigin()) + .like(StringUtils.isNotEmpty(wcsTaskBakQuery.getDestination()), TAppWcsTaskBak::getDestination, wcsTaskBakQuery.getDestination()); + if (wcsTaskBakQuery.getCreateTime() != null) { + lambdaQueryWrapper.ge(TAppWcsTaskBak::getCreateTime, wcsTaskBakQuery.getCreateTime()); + } + if (wcsTaskBakQuery.getSendTime() != null) { + lambdaQueryWrapper.le(TAppWcsTaskBak::getSendTime, wcsTaskBakQuery.getSendTime()); + } + Page poPage = appWcsTaskBakService.page(page, lambdaQueryWrapper); + + PageVo pageVo = PageVo.of(poPage, WcsTaskRecordVo::of); + return WmsApiResponse.success("查询wcs记录成功", pageVo); + } +}