提交拣选记录表单

2025-06-16 10:17:40 +08:00 · 2025-06-16 10:17:40 +08:00 · 9f94a8f2f9
commit 9f94a8f2f9
parent 43bd5b65a1
8 changed files with 529 additions and 0 deletions
--- a/dev_wms_client/src/api/pickTaskBak.js
+++ 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
+    })
+}
--- a/dev_wms_client/src/layout/pickTaskBak.vue
+++ b/dev_wms_client/src/layout/pickTaskBak.vue
@ -0,0 +1,278 @@
+<template>
+  <el-config-provider :locale="zhCn">
+    <el-container class="content">
+      <div class="work-area">
+        <fieldset class="search-area">
+          <el-form ref="searchQueryFormRef" :model="searchQueryFormEntity" :label-position="labelPosition"
+                   label-width="158px" style="max-width: 100%" status-icon>
+            <div style="display: flex;justify-content: space-between;">
+              <el-row>
+                <el-form-item label="任务状态">
+                  <el-select-v2 style="width: 196px" v-model="searchQueryFormEntity.pickStatus" placeholder="任务状态"
+                               :options="addAllOptionOfOptions(pickingTaskStatusOptions)"
+                               @change="search()"></el-select-v2>
+                </el-form-item>
+                <el-form-item label="箱号">
+                  <el-input v-model="searchQueryFormEntity.vehicleId" @keyup.enter="search()" clearable />
+                </el-form-item>
+                <el-form-item label="拣选站台">
+                  <el-input v-model="searchQueryFormEntity.pickStand" @keyup.enter="search()" clearable />
+                </el-form-item>
+              </el-row>
+              <div style="align-content: center;">
+                <el-row>
+                  <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
+                  <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
+                </el-row>
+              </div>
+            </div>
+          </el-form>
+        </fieldset>
+        <div class="table-area">
+          <el-table :data="tableData" stripe border v-loading="tableLoading" class="table-class"
+                    :max-height="maxHeight" highlight-current-row @row-click="getCurrentRow"
+                    :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
+                    @sort-change="handleSortChange">
+            <el-table-column width="65px" fixed="left">
+              <template v-slot="scope">
+                <el-radio :label="scope.row.pickId" v-model="pickId">&nbsp;</el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column prop="pickId" label="任务号" fixed="left" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="pickStatus" label="任务状态" :formatter="pickStatusFormat" fixed="right" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="pickStand" label="拣选站台" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="vehicleId" label="箱号" fixed="left" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="sendTime" label="发送时间" :formatter="timeFormat" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="arriveTime" label="到达时间" :formatter="timeFormat" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+            <el-table-column prop="leaveTime" label="离开时间" :formatter="timeFormat" min-width="120px" sortable="custom"
+                             show-overflow-tooltip />
+          </el-table>
+          <br />
+          <el-pagination v-model:current-page="baseTableQuery.pageNo"
+                         v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
+                         :disabled="false" :background="false" :default-page-size="10" @size-change="handleSizeChange"
+                         @current-change="handleCurrentChange" layout="total, sizes, prev, pager, next, jumper"
+                         :total="baseTableQuery.total" />
+        </div>
+      </div>
+    </el-container>
+  </el-config-provider>
+</template>
+
+<script setup>
+import store from '@/store'
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
+import { queryPickTaskBaksByPage } from '@/api/pickTaskBak.js'
+import { ref, reactive, onMounted, nextTick, onBeforeUnmount } from 'vue'
+import { ElMessage } from 'element-plus'
+import { labelPosition } from '@/constant/form.js'
+import { pickingTaskStatusOptions } from '@/constant/options.js'
+import { addAllOptionOfOptions } from '@/utils/generator.js'
+import { timeFormatter, pickTaskStatusFormatter } from '@/utils/formatter.js'
+
+/**
+ * 常量定义
+ */
+const STAND_ID = store.getters.getStandId
+const USER_NAME = store.getters.getUserName
+
+/**
+ * 变量定义
+ */
+let maxHeight = ref(window.innerHeight * 0.55)
+let tableLoading = ref(false)
+let tableData = ref([])
+let baseTableQuery = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  total: 0,
+  sortBy: [{
+    asc: true,
+    column: ''
+  }],
+  standId: STAND_ID,
+  userName: USER_NAME
+})
+let searchQueryFormEntity = reactive({
+  vehicleId: '',
+  pickStand: '',
+  pickStatus: -99
+})
+let searchQueryFormRef = ref()
+let pickId = ref('')
+
+/**
+ * 系统方法
+ */
+onMounted(() => {
+  nextTick(() => {
+    window.addEventListener('resize', resizeHeight)
+    search()
+  })
+})
+
+onBeforeUnmount(() => {
+  nextTick(() => {
+    window.removeEventListener('resize', resizeHeight)
+  })
+})
+
+const resizeHeight = () => {
+  maxHeight.value = window.innerHeight * 0.55
+}
+
+/**
+ * 自定义方法
+ */
+// 查询
+const search = () => {
+  tableLoading.value = true
+  let request = {
+    pageNo: baseTableQuery.pageNo,
+    pageSize: baseTableQuery.pageSize,
+    sortBy: baseTableQuery.sortBy,
+    pickStand: searchQueryFormEntity.pickStand.trim(),
+    vehicleId: searchQueryFormEntity.vehicleId.trim(),
+    pickStatus: searchQueryFormEntity.pickStatus === -99 ? null : searchQueryFormEntity.pickStatus
+  }
+
+  queryPickTaskBaksByPage(request).then((res) => {
+    const response = res.data
+    if (response.code === 0) {
+      const data = response.data
+      if (data != null) {
+        tableData.value = data.lists
+        baseTableQuery.total = data.total
+      } else {
+        tableData.value = []
+        baseTableQuery.total = 0
+      }
+    } else {
+      ElMessage.error(response.message)
+    }
+  }).catch(err => {
+    console.log(err)
+    ElMessage.error('查询数据异常。')
+  }).finally(() => {
+    tableLoading.value = false
+  })
+}
+
+const clearQuery = () => {
+  searchQueryFormEntity.vehicleId = ''
+  searchQueryFormEntity.pickStand = ''
+  searchQueryFormEntity.pickStatus = -99
+}
+
+const handleSortChange = (data) => {
+  const columnMap = {
+    'pickId': 'pick_id',
+    'pickStand': 'pick_stand',
+    'vehicleId': 'vehicle_id',
+    'pickStatus': 'pick_status',
+    'createTime': 'create_time',
+    'sendTime': 'send_time',
+    'arriveTime': 'arrive_time',
+    'leaveTime': 'leave_time'
+  }
+  baseTableQuery.sortBy[0].column = columnMap[data.prop] || data.prop
+  baseTableQuery.sortBy[0].asc = data.order === 'ascending'
+  search()
+}
+
+const handleSizeChange = (val) => {
+  baseTableQuery.pageSize = val
+  search()
+}
+
+const handleCurrentChange = (val) => {
+  baseTableQuery.pageNo = val
+  search()
+}
+
+const getCurrentRow = (row) => {
+  pickId.value = row.pickId
+}
+
+const timeFormat = (row, column, cellValue) => {
+  return timeFormatter(cellValue)
+}
+
+const pickStatusFormat = (row, column, cellValue) => {
+  return pickTaskStatusFormatter(cellValue)
+}
+</script>
+
+<style scoped>
+.content {
+  display: flex;
+  width: 100%;
+}
+
+.work-area {
+  width: 100%;
+  /* padding: 5px; */
+}
+
+.search-area {
+  margin: auto;
+  min-height: fit-content;
+  max-height: 40%;
+  margin-bottom: 10px;
+  min-width: inherit;
+  border: solid 1px;
+  border-radius: 10px;
+  box-shadow: 0px 15px 10px -15px #000;
+  overflow: auto;
+  padding: 10px;
+}
+
+.table-area {
+  margin: auto;
+  min-height: fit-content;
+  max-height: 60%;
+  margin-bottom: 10px;
+  min-width: inherit;
+  border: solid 1px;
+  border-radius: 10px;
+  box-shadow: 0px 15px 10px -15px #000;
+  overflow: auto;
+  padding: 10px;
+}
+
+.el-form-item {
+  margin: 5px 5px 5px 5px;
+}
+
+.el-form-item .el-input {
+  width: 196px;
+}
+
+.el-form-item .el-input-number {
+  width: 196px;
+}
+
+.table-class {
+  margin: 5px 5px 5px 5px;
+  width: inherit;
+}
+
+.el-pagination {
+  padding-left: 5px;
+}
+
+.btn-search {
+  height: 30px;
+  width: 80px;
+  margin: auto 5px 5px auto;
+  color: black;
+}
+</style>
--- 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')},
        ]
    },
    {
--- 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
@ -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<PageVo<PickTaskBakVo>> queryPickTaskBaksByPage(@RequestBody PickTaskBakQuery pickTaskBakQuery) {
+        return pickTaskBakControllerService.queryPickBakInfoByPage(pickTaskBakQuery);
+    }
+}
--- 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
@ -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;
+}
--- 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
@ -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()
+        );
+    }
+}
--- 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
@ -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<PageVo<PickTaskBakVo>> queryPickBakInfoByPage(PickTaskBakQuery pickTaskBakQuery);
+}
--- 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
@ -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<PageVo<PickTaskBakVo>> queryPickBakInfoByPage(PickTaskBakQuery pickTaskBakQuery) {
+        if (pickTaskBakQuery == null) {
+            return WmsApiResponse.error("查询参数不能为NULL", null);
+        }
+        Page<TAppPickTaskBak> page = pickTaskBakQuery.toMpPage();
+        LambdaQueryWrapper<TAppPickTaskBak> lambdaQueryWrapper = new LambdaQueryWrapper<TAppPickTaskBak>()
+                .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<TAppPickTaskBak> poPage = appPickTaskBakService.page(page, lambdaQueryWrapper);
+
+        PageVo<PickTaskBakVo> pageVo = PageVo.of(poPage, PickTaskBakVo::of);
+        return WmsApiResponse.success("查询拣选记录成功", pageVo);
+    }
+}