From 9f94a8f2f9fc2d3c1ed5dda00d753344c60ca2a3 Mon Sep 17 00:00:00 2001 From: liyuqi Date: Mon, 16 Jun 2025 10:17:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8B=A3=E9=80=89=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev_wms_client/src/api/pickTaskBak.js | 9 + dev_wms_client/src/layout/pickTaskBak.vue | 278 ++++++++++++++++++ dev_wms_client/src/router/index.js | 1 + .../controller/wms/PickTaskBakController.java | 28 ++ .../model/dto/query/PickTaskBakQuery.java | 69 +++++ .../wms_main/model/vo/wms/PickTaskBakVo.java | 89 ++++++ .../IPickTaskBakControllerService.java | 10 + .../PickTaskBakControllerServiceImpl.java | 45 +++ 8 files changed, 529 insertions(+) create mode 100644 dev_wms_client/src/api/pickTaskBak.js create mode 100644 dev_wms_client/src/layout/pickTaskBak.vue create mode 100644 dev_wms_serve/src/main/java/com/wms_main/controller/wms/PickTaskBakController.java create mode 100644 dev_wms_serve/src/main/java/com/wms_main/model/dto/query/PickTaskBakQuery.java create mode 100644 dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/PickTaskBakVo.java create mode 100644 dev_wms_serve/src/main/java/com/wms_main/service/controller/IPickTaskBakControllerService.java create mode 100644 dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/PickTaskBakControllerServiceImpl.java diff --git a/dev_wms_client/src/api/pickTaskBak.js b/dev_wms_client/src/api/pickTaskBak.js new file mode 100644 index 0000000..7311531 --- /dev/null +++ b/dev_wms_client/src/api/pickTaskBak.js @@ -0,0 +1,9 @@ +import request from "@/http/request"; + +export const queryPickTaskBaksByPage = (params) => { + return request({ + url: '/pickTaskBak/queryPickTaskBaksByPage', + method: 'post', + data: params + }) +} \ No newline at end of file diff --git a/dev_wms_client/src/layout/pickTaskBak.vue b/dev_wms_client/src/layout/pickTaskBak.vue new file mode 100644 index 0000000..eb5c62b --- /dev/null +++ b/dev_wms_client/src/layout/pickTaskBak.vue @@ -0,0 +1,278 @@ + + + + + \ 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 4dec4b9..25a5ff0 100644 --- a/dev_wms_client/src/router/index.js +++ b/dev_wms_client/src/router/index.js @@ -40,6 +40,7 @@ const routes = [ {path: '/equipment', component: () => import('@/layout/equipment.vue')}, {path: '/job', component: () => import('@/layout/job.vue')}, {path: '/pickPlan', component: () => import('@/layout/pickPlan.vue')}, + {path: '/pickTaskBak', component: () => import('@/layout/pickTaskBak.vue')}, ] }, { diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/PickTaskBakController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/PickTaskBakController.java new file mode 100644 index 0000000..5f538ec --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/PickTaskBakController.java @@ -0,0 +1,28 @@ +package com.wms_main.controller.wms; + +import com.wms_main.model.dto.query.PickTaskBakQuery; +import com.wms_main.model.dto.response.wms.WmsApiResponse; +import com.wms_main.model.vo.wms.PageVo; +import com.wms_main.model.vo.wms.PickTaskBakVo; +import com.wms_main.service.controller.IPickTaskBakControllerService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@ResponseBody +@CrossOrigin +@RequiredArgsConstructor +@RequestMapping("/wms/pickTaskBak") +public class PickTaskBakController { + private final IPickTaskBakControllerService pickTaskBakControllerService; + + /** + * 分页查询拣选记录 + * @param pickTaskBakQuery 查询参数 + * @return 查询结果 + */ + @PostMapping("/queryPickTaskBaksByPage") + public WmsApiResponse> queryPickTaskBaksByPage(@RequestBody PickTaskBakQuery pickTaskBakQuery) { + return pickTaskBakControllerService.queryPickBakInfoByPage(pickTaskBakQuery); + } +} diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/PickTaskBakQuery.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/PickTaskBakQuery.java new file mode 100644 index 0000000..db686f4 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/PickTaskBakQuery.java @@ -0,0 +1,69 @@ +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 PickTaskBakQuery extends PageQuery{ + /** + * 任务id + */ + @JsonProperty(value = "pickId") + private String pickId; + /** + * 拣选站台 + */ + @JsonProperty(value = "pickStand") + private String pickStand; + /** + * 载具号 + */ + @JsonProperty(value = "vehicleId") + private String vehicleId; + /** + * 任务状态 + */ + @JsonProperty(value = "pickStatus") + private Integer pickStatus; + /** + * 创建时间 + */ + @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 = "arriveTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime arriveTime; + /** + * 离开时间 + */ + @JsonProperty(value = "leaveTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime leaveTime; +} diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/PickTaskBakVo.java b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/PickTaskBakVo.java new file mode 100644 index 0000000..595fc71 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/PickTaskBakVo.java @@ -0,0 +1,89 @@ +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.TAppPickTaskBak; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * 拣选记录Vo + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class PickTaskBakVo { + /** + * 任务id + */ + @JsonProperty(value = "pickId") + private String pickId; + /** + * 拣选站台 + */ + @JsonProperty(value = "pickStand") + private String pickStand; + /** + * 载具号 + */ + @JsonProperty(value = "vehicleId") + private String vehicleId; + /** + * 任务状态 + */ + @JsonProperty(value = "pickStatus") + private Integer pickStatus; + /** + * 创建时间 + */ + @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 = "arriveTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime arriveTime; + /** + * 离开时间 + */ + @JsonProperty(value = "leaveTime") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime leaveTime; + + /** + * 将Po转化为Vo + * @param po 数据库实体 + * @return 转化结果 + */ + public static PickTaskBakVo of(TAppPickTaskBak po) { + if (po == null) { + return new PickTaskBakVo(); + } + return new PickTaskBakVo( + po.getPickId(), + po.getPickStand(), + po.getVehicleId(), + po.getPickStatus(), + po.getCreateTime(), + po.getSendTime(), + po.getArriveTime(), + po.getLeaveTime() + ); + } +} diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/IPickTaskBakControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IPickTaskBakControllerService.java new file mode 100644 index 0000000..0429576 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IPickTaskBakControllerService.java @@ -0,0 +1,10 @@ +package com.wms_main.service.controller; + +import com.wms_main.model.dto.query.PickTaskBakQuery; +import com.wms_main.model.dto.response.wms.WmsApiResponse; +import com.wms_main.model.vo.wms.PageVo; +import com.wms_main.model.vo.wms.PickTaskBakVo; + +public interface IPickTaskBakControllerService { + WmsApiResponse> queryPickBakInfoByPage(PickTaskBakQuery pickTaskBakQuery); +} diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/PickTaskBakControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/PickTaskBakControllerServiceImpl.java new file mode 100644 index 0000000..e2d9ea8 --- /dev/null +++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/PickTaskBakControllerServiceImpl.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.ITAppPickTaskBakService; +import com.wms_main.model.dto.query.PickTaskBakQuery; +import com.wms_main.model.dto.response.wms.WmsApiResponse; +import com.wms_main.model.po.TAppPickTaskBak; +import com.wms_main.model.vo.wms.PageVo; +import com.wms_main.model.vo.wms.PickTaskBakVo; +import com.wms_main.repository.utils.StringUtils; +import com.wms_main.service.controller.IPickTaskBakControllerService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +@Slf4j +public class PickTaskBakControllerServiceImpl implements IPickTaskBakControllerService { + + private final ITAppPickTaskBakService appPickTaskBakService; + + /** + * 查询拣选记录信息（分页）---实现 + * + * @param pickTaskBakQuery 查询参数 + * @return 查询结果 + */ + @Override + public WmsApiResponse> queryPickBakInfoByPage(PickTaskBakQuery pickTaskBakQuery) { + if (pickTaskBakQuery == null) { + return WmsApiResponse.error("查询参数不能为NULL", null); + } + Page page = pickTaskBakQuery.toMpPage(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .eq(pickTaskBakQuery.getPickStatus() != null, TAppPickTaskBak::getPickStatus, pickTaskBakQuery.getPickStatus()) + .eq(StringUtils.isNotEmpty(pickTaskBakQuery.getVehicleId()), TAppPickTaskBak::getVehicleId, pickTaskBakQuery.getVehicleId()) + .eq(StringUtils.isNotEmpty(pickTaskBakQuery.getPickId()), TAppPickTaskBak::getPickId, pickTaskBakQuery.getPickId()); + Page poPage = appPickTaskBakService.page(page, lambdaQueryWrapper); + + PageVo pageVo = PageVo.of(poPage, PickTaskBakVo::of); + return WmsApiResponse.success("查询拣选记录成功", pageVo); + } +}