1. 增加导出

2. 增加入出库记录查询界面

dev_wms_client/src/api/excel.js

@@ -83,6 +83,16 @@ export const exportKittingBomRelationWithExcel = (data) => {
         timeout: 600000
     })
 }
+// 导出物料
+export const exportGoodsExcel = (data) => {
+    return request({
+        url: '/excel/exportGoodsExcel',
+        method: 'post',
+        responseType: 'blob',
+        data: data,
+        timeout: 600000
+    })
+}
 // 导出库存
 export const exportStockExcel = (data) => {
     return request({

dev_wms_client/src/api/taskQuery.js

@@ -8,3 +8,19 @@ export const queryTasksByPage = (params) => {
     data: params
   })
 }
+// 分页查询入库记录
+export const queryInTaskRecordByPage = (params) => {
+  return request({
+    url: '/taskQuery/queryInTaskRecordByPage',
+    method: 'post',
+    data: params
+  })
+}
+// 分页查询出库记录
+export const queryOutTaskRecordByPage = (params) => {
+  return request({
+    url: '/taskQuery/queryOutTaskRecordByPage',
+    method: 'post',
+    data: params
+  })
+}

dev_wms_client/src/layout/goods.vue

@@ -21,6 +21,12 @@
                                     <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
                                     <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
                                 </el-row>
+                                <el-row>
+                                    <el-button style="background-color: #00CED1;" class="btn-search"
+                                        @click="openUploadDialog()">导入数据</el-button>
+                                    <el-button type="success" class="btn-search"
+                                        @click="exportExcel()">导出excel</el-button>
+                                </el-row>
                             </div>
                         </div>
                     </el-form>
@@ -158,6 +164,16 @@
                         </span>
                     </template>
                 </el-dialog>
+                <el-dialog v-model="showUploadDialog" title="上传物料信息" width="40%" draggable :show-close="true">
+                    <fieldset class="search-area">
+                        <legend>导入基础信息</legend>
+                        <UploadExcelBaseGoods></UploadExcelBaseGoods>
+                    </fieldset>
+                    <fieldset class="search-area">
+                        <legend>导入看板信息</legend>
+                        <UploadExcelKanban></UploadExcelKanban>
+                    </fieldset>
+                </el-dialog>
             </div>
         </el-container>
     </el-config-provider>
@@ -167,12 +183,15 @@
 import store from '@/store'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
 import { getGoodsInfoByPage } from '@/api/goods.js'
-import { timeFormatter, wmsTaskTypeFormatter, wmsTaskStatusFormatter } from '@/utils/formatter.js'
+import { exportGoodsExcel } from '@/api/excel.js'
+import { timeFormatter, wmsTaskTypeFormatter, wmsTaskStatusFormatter, dateFormatter } from '@/utils/formatter.js'
 import { ref, reactive, onMounted, nextTick, onBeforeUnmount } from 'vue'
 import { ElMessage } from 'element-plus'
 import { genTableRequest } from '@/utils/generator.js'
 import { labelPosition } from '@/constant/form.js'
 import { loading } from '@/utils/loading'
+import UploadExcelBaseGoods from '@/excel/UploadExcelBaseGoods.vue'
+import UploadExcelKanban from '@/excel/UploadExcelKanban.vue'
 /**
  * 常量定义
  */
@@ -201,6 +220,7 @@ let rowEditFlag = ref(false)
 let goodsId = ''
 let rowEditFormRef = ref()
 let rowFormEntity = reactive({})
+let showUploadDialog = ref(false)
 /**
  * 系统方法
  */
@@ -260,6 +280,9 @@ const handleSortChange = (data) => {
     baseTableQuery.sortBy.set(data.prop, data.order == 'ascending')
     search()
 }
+const openUploadDialog = () => {
+    showUploadDialog.value = true
+}
 const getCurrentRow = (row) => {
     goodsId = row.goodsId
 }
@@ -339,6 +362,38 @@ const submitUpdateRow = (rowFormEntity) => {
         loading.close()
     })
 }
+const exportExcel = () => {
+    const params = {
+        goodsId: searchQueryFormEntity.goodsId,
+        goodsDesc: searchQueryFormEntity.goodsDesc,
+        userName: USER_NAME
+    }
+    exportGoodsExcel(params).then(res => {
+        const link = document.createElement('a');//创建a标签
+        try {
+            // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
+            let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
+            // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
+            let _fileName = '物料基础信息' + dateFormatter(new Date) + '.xlsx'
+            link.style.display = 'none'//隐藏
+
+            // 兼容不同浏览器的URL对象
+            const url = window.URL || window.webkitURL || window.moxURL
+            link.href = url.createObjectURL(blob)
+            link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
+            document.body.appendChild(link)
+            link.click()
+            document.body.removeChild(link)
+            url.revokeObjectURL(link.href)//移除url对象
+        } catch (e) {
+            console.log(e)
+            ElMessage.error('下载文件失败')
+        }
+    }).catch(err => {
+        console.log(err)
+        ElMessage.error('导出失败')
+    })
+}
 </script>
 <style scoped>
 .content {

dev_wms_client/src/layout/inTaskRecord.vue

@@ -1,193 +1,322 @@
 <template>
-    <div style="margin-bottom: 15px">
     <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-input v-model="vehicleIdQuery" style="width: 158px; margin-right: 10px;" placeholder="箱号" />
+                                <el-form-item label="箱号">
-                <el-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号" />
+                                    <el-input v-model="searchQueryFormEntity.vehicleId" @keyup.enter="search()" clearable />
-                <el-date-picker v-model="createTimeQuery" type="date" placeholder="选择创建日期" :shortcuts="shortcuts"
+                                </el-form-item>
-                    style="width: 158px; margin-right: 10px;" clearable />
+                                <el-form-item label="料号">
-                <el-date-picker v-model="finishTimeQuery" type="date" placeholder="选择完成日期" :shortcuts="shortcuts"
+                                    <el-input v-model="searchQueryFormEntity.goodsId" @keyup.enter="search()" clearable />
-                    style="width: 158px; margin-right: 10px;" clearable />
+                                </el-form-item>
-                <el-button type="primary" @click="search()">搜索</el-button>
-                <el-button type="warning" @click="reset()">重置</el-button>
-                <el-button type="success" @click="exportExcel()">导出记录</el-button>
                             </el-row>
-            <br />
+                            <div style="align-content: center;">
-            <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
+                                <el-row>
-                class="table-class" :header-cell-style="{ 'text-align': 'center' }"
+                                    <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
-                :cell-style="{ 'text-align': 'center' }">
+                                    <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
-                <el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
+                                </el-row>
-                <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat"
+                                <el-row>
-                    min-width="120px" />
+                                    <el-button type="success" class="btn-search"
-                <el-table-column prop="vehicleId" label="箱号" min-width="120px" show-overflow-tooltip />
+                                        @click="exportExcel()">导出excel</el-button>
-                <el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip />
+                                </el-row>
-                <el-table-column prop="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip />
+                            </div>
-                <el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip />
+                        </div>
-                <el-table-column prop="origin" label="起点" min-width="120px" />
+                    </el-form>
-                <el-table-column prop="destination" label="终点" min-width="120px" />
+                </fieldset>
-                <el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px" />
+                <div class="table-area">
-                <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px" />
+                    <el-table :data="tableData" stripe border v-loading="tableLoading" class="table-class"
-                <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
+                        :max-height="maxHeight" highlight-current-row @row-click="getCurrentRow"
-                <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
+                        :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
-                <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px"
+                        @sort-change="handleSortChange">
+                        <el-table-column width="65px" fixed="left">
+                            <template v-slot="scope">
+                                <el-radio :label="scope.row.taskId" v-model="taskId">&nbsp;</el-radio>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="taskId" label="任务号" fixed="left" min-width="120px" sortable="custom"
                             show-overflow-tooltip />
-                    <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
+                        <el-table-column prop="taskType" label="任务类型" :formatter="taskTypeFormat" min-width="120px" sortable="custom"
                             show-overflow-tooltip />
-                <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
+                        <el-table-column prop="taskStatus" label="任务状态" :formatter="taskStatusFormat" min-width="120px" sortable="custom"
-                <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
+                            show-overflow-tooltip />
-                    min-width="120px" />
+                        <el-table-column prop="taskPriority" 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="goodsId" label="料号" min-width="120px" fixed="left" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="goodsDesc" label="物料描述"
+                            min-width="120px" sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="opNum" label="操作数量" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="stockNum" label="库存数量" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="origin" label="起点" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="destination" label="终点" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="wcsTaskId" label="wcs任务号" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" fixed="right" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" fixed="right" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="opUser" label="操作用户"  min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="remark" label="备注" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="callStand" label="呼叫站台" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
                     </el-table>
                     <br />
-            <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
+                    <el-pagination v-model:current-page="baseTableQuery.currentPage"
-                :small="false" :disabled="false" :background="false" :default-page-size="10"
+                        v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
-                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
+                        :disabled="false" :background="false" :default-page-size="10" @size-change="search"
-                @current-change="search" />
+                        @current-change="search" layout="total, sizes, prev, pager, next, jumper"
-        </el-config-provider>
+                        :total="baseTableQuery.total" />
                 </div>
+            </div>
+        </el-container>
+    </el-config-provider>
 </template>
 
 <script setup>
 import store from '@/store'
-import { getTaskRecords } from '@/api/record.js'
-import { dateFormatter, taskStatusFormatter, timeFormatter } from '@/utils/formatter.js'
-import { downloadInRecordExcel } from '@/api/excel.js'
 import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-import { errorBox } from '@/utils/myMessageBox.js'
+import { queryInTaskRecordByPage } from '@/api/taskQuery.js'
-</script>
+import { timeFormatter, wmsTaskTypeFormatter, wmsTaskStatusFormatter } from '@/utils/formatter.js'
-<script>
+import { ref, reactive, onMounted, nextTick, onBeforeUnmount } from 'vue'
-export default {
+import { ElMessage } from 'element-plus'
-    name: 'inTaskRecord',
+import { genTableRequest } from '@/utils/generator.js'
-    data() {
+import { labelPosition } from '@/constant/form.js'
-        return {
+/**
-            tasks: [],
+ * 常量定义
+ */
+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({
     currentPage: 1,
     pageSize: 10,
     total: 0,
-            goodsIdQuery: '',
+    sortBy: new Map([['createTime', false]]),// 按照创建时间倒序
-            vehicleIdQuery: '',
+    standId: STAND_ID,
-            loading: true,
+    userName: USER_NAME
-            createTimeQuery: null,
+})
-            finishTimeQuery: null,
+let searchQueryFormEntity = reactive({
-            shortcuts: [
+    vehicleId: '',
-                {
+    goodsId: '',
-                    text: '今天',
+})
-                    value: new Date(),
+let searchQueryFormRef = ref()
-                },
+let taskId = ''
-                {
+/**
-                    text: '昨天',
+ * 系统方法
-                    value: () => {
+ */
-                        const date = new Date()
+onMounted(() => {
-                        date.setTime(date.getTime() - 3600 * 1000 * 24)
+    nextTick(() => {
-                        return date
+        window.addEventListener('resize', resizeHeight)
-                    },
+        search()
-                },
+    })
-            ],
+})
-        }
+onBeforeUnmount(() => {
-    },
+    nextTick(() => {
-    mounted() {
+        window.removeEventListener('resize', resizeHeight)
-        this.search()
+    })
-    },
+})
-    methods: {
+const resizeHeight = () => {
-        dateFormat: (row, column, cellValue, index) => {
+    maxHeight.value = window.innerHeight * 0.55
-            return dateFormatter(cellValue)
+}
-        },
+/**
-        timeFormat: (row, column, cellValue, index) => {
+ * 自定义方法
-            return timeFormatter(cellValue)
+ */
-        },
+// 查询
-        taskStatusFormat: (row, column, cellValue, index) => {
+const search = () => {
-            return taskStatusFormatter(cellValue)
+    tableLoading.value = true
-        },
+    let request = genTableRequest(baseTableQuery)
-        taskTypeFormat: (row, column, cellValue, index) => {
+    // 设定查询参数
-            switch (cellValue) {
+    request.vehicleId = searchQueryFormEntity.vehicleId.trim()
-                case 1: return '入库'
+    request.goodsId = searchQueryFormEntity.goodsId.trim()
-                case 2: return '出库'
+    queryInTaskRecordByPage(request).then((res) => {
-                case 3: return '盘点'
+        const response = res.data
-                case 9: return '移库'
+        if (response.code == 0) {
-                default: return '未知'
+            const data = response.data
-            }
+            if (data != null) {
-        },
+                tableData.value = data.lists
-        search() {
+                baseTableQuery.total = data.total
-            this.loading = true
-            const tableRequest = {
-                pageNo: this.currentPage,
-                pageSize: this.pageSize,
-                taskType: 1,
-                goodsId: this.goodsIdQuery.trim(),
-                vehicleId: this.vehicleIdQuery.trim(),
-                createTime: timeFormatter(this.createTimeQuery),
-                finishTime: timeFormatter(this.finishTimeQuery),
-            }
-            getTaskRecords(tableRequest).then(res => {
-                const tableResponse = res.data
-                if (tableResponse.code == 0) {
-                    this.tasks = tableResponse.returnData.lists
-                    this.total = tableResponse.returnData.total
             } else {
-                    errorBox(tableResponse.message)
+                tableData.value = []
+                baseTableQuery.total = 0
+            }
+        } else {
+            ElMessage.error(response.message)
         }
     }).catch(err => {
         console.log(err)
-                errorBox('查询任务记录错误')
+        ElMessage.error('查询数据异常。')
+    }).finally(() => {
+        tableLoading.value = false
     })
-            this.loading = false
+}
-        },
+const clearQuery = () => {
-        reset() {
+    searchQueryFormEntity.vehicleId = ''
-            this.goodsIdQuery = ''
+    searchQueryFormEntity.goodsId = ''
-            this.vehicleIdQuery = ''
+}
-            this.createTimeQuery = null
+const handleSortChange = (data) => {
-            this.finishTimeQuery = null
+    if (baseTableQuery.sortBy.has(data.prop)) {
-            this.search()
+        baseTableQuery.sortBy.delete(data.prop)
-        },
+    }
-        exportExcel() {
+    baseTableQuery.sortBy.set(data.prop, data.order == 'ascending')
+    search()
+}
+const getCurrentRow = (row) => {
+    taskId = row.taskId
+}
+const timeFormat = (row, column, cellValue, index) => {
+    return timeFormatter(cellValue)
+}
+const taskTypeFormat = (row, column, cellValue, index) => {
+    return wmsTaskTypeFormatter(cellValue)
+}
+const taskStatusFormat = (row, column, cellValue, index) => {
+    return wmsTaskStatusFormatter(cellValue)
+}
+const exportExcel = () => {
+    ElMessage.warning('导出功能暂未开放。')
     const params = {
-                vehicleId: this.vehicleIdQuery.trim(),
+        goodsId: searchQueryFormEntity.goodsId,
-                goodsId: this.goodsIdQuery.trim(),
+        goodsDesc: searchQueryFormEntity.goodsDesc,
-                createTime: timeFormatter(this.createTimeQuery),
+        userName: USER_NAME
-                finishTime: timeFormatter(this.finishTimeQuery),
-                userName: store.getters.getUserName
     }
-            downloadInRecordExcel(params).then(res => {
+    // exportGoodsExcel(params).then(res => {
-                const link = document.createElement('a');//创建a标签
+    //     const link = document.createElement('a');//创建a标签
-                try {
+    //     try {
-                    // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
+    //         // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
-                    let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
+    //         let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
-                    // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
+    //         // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
-                    let _fileName = "导出入库记录" + dateFormatter(new Date) + ".xlsx"
+    //         let _fileName = '物料基础信息' + dateFormatter(new Date) + '.xlsx'
-                    link.style.display = 'none'//隐藏
+    //         link.style.display = 'none'//隐藏
 
-                    // 兼容不同浏览器的URL对象
+    //         // 兼容不同浏览器的URL对象
-                    const url = window.URL || window.webkitURL || window.moxURL
+    //         const url = window.URL || window.webkitURL || window.moxURL
-                    link.href = url.createObjectURL(blob)
+    //         link.href = url.createObjectURL(blob)
-                    link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
+    //         link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
-                    document.body.appendChild(link)
+    //         document.body.appendChild(link)
-                    link.click()
+    //         link.click()
-                    document.body.removeChild(link)
+    //         document.body.removeChild(link)
-                    url.revokeObjectURL(link.href)//移除url对象
+    //         url.revokeObjectURL(link.href)//移除url对象
-                } catch (e) {
+    //     } catch (e) {
-                    console.log(e)
+    //         console.log(e)
-                    errorBox('下载文件失败')
+    //         ElMessage.error('下载文件失败')
-                }
+    //     }
-            }).catch(err => {
+    // }).catch(err => {
-                console.log(err)
+    //     console.log(err)
-                errorBox('导出失败')
+    //     ElMessage.error('导出失败')
-            })
+    // })
-        },
-    },
 }
 </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;
+}
+
+.el-form-item .el-select-v2 {
+    width: 196px;
+}
+
+.table-class {
+    margin: 5px 5px 5px 5px;
+    width: inherit;
+}
+
 .el-pagination {
     padding-left: 5px;
 }
 
-.el-row .el-button {
+.my-autocomplete li {
-    width: 72px;
+    width: 196px;
-    margin-left: 0px;
+    line-height: normal;
-    margin-right: 5px;
+    padding: 7px;
 }
 
-.table-class {
+.my-autocomplete li .name {
-    width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+    font-size: 12px;
+    color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+    color: #ddd;
+}
+
+.my-autocomplete li .goods_id {
+    color: brown;
+}
+
+.my-autocomplete li .goods_name {
+    color: cornflowerblue;
+}
+
+.btn-search {
+    height: 30px;
+    width: 80px;
+    margin: auto 5px 5px auto;
+    color: black;
 }
 </style>

dev_wms_client/src/layout/outTaskRecord.vue

@@ -1,192 +1,322 @@
-
 <template>
-    <div style="margin-bottom: 15px">
     <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-input v-model="goodsIdQuery" style="width: 158px; margin-right: 10px;" placeholder="料号" />
+                                <el-form-item label="箱号">
-                <el-input v-model="vehicleIdQuery" style="width: 158px; margin-right: 10px;" placeholder="箱号" />
+                                    <el-input v-model="searchQueryFormEntity.vehicleId" @keyup.enter="search()" clearable />
-                <el-date-picker v-model="createTimeQuery" type="date" placeholder="选择创建日期" :shortcuts="shortcuts"
+                                </el-form-item>
-                    style="width: 158px; margin-right: 10px;" clearable />
+                                <el-form-item label="料号">
-                <el-date-picker v-model="finishTimeQuery" type="date" placeholder="选择完成日期" :shortcuts="shortcuts"
+                                    <el-input v-model="searchQueryFormEntity.goodsId" @keyup.enter="search()" clearable />
-                    style="width: 158px; margin-right: 10px;" clearable />
+                                </el-form-item>
-                <el-button type="primary" @click="search()">搜索</el-button>
-                <el-button type="warning" @click="reset()">重置</el-button>
-                <el-button type="success" @click="exportExcel()">导出记录</el-button>
                             </el-row>
-            <br />
+                            <div style="align-content: center;">
-            <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
+                                <el-row>
-                class="table-class" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }">
+                                    <el-button type="primary" class="btn-search" @click="search()">查询</el-button>
-                <el-table-column prop="taskId" label="任务号" fixed="left" show-overflow-tooltip min-width="120px" />
+                                    <el-button type="warning" class="btn-search" @click="clearQuery()">清除输入</el-button>
-                <el-table-column prop="taskType" label="任务类型" fixed="left" :formatter="taskTypeFormat" min-width="120px" />
+                                </el-row>
-                <el-table-column prop="vehicleId" label="箱号"  min-width="120px" show-overflow-tooltip />
+                                <el-row>
-                <el-table-column prop="goodsRelated.goodsId" label="料号" min-width="120px" show-overflow-tooltip />
+                                    <el-button type="success" class="btn-search"
-                <el-table-column prop="goodsRelated.goodsName" label="料名" min-width="120px" show-overflow-tooltip />
+                                        @click="exportExcel()">导出excel</el-button>
-                <el-table-column prop="taskGroup" label="任务组" min-width="120px" show-overflow-tooltip />
+                                </el-row>
-                <el-table-column prop="origin" label="起点" min-width="120px" />
+                            </div>
-                <el-table-column prop="destination" label="终点" min-width="120px" />
+                        </div>
-                <el-table-column prop="goodsRelated.opNum" label="操作数量" min-width="120px" />
+                    </el-form>
-                <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px" />
+                </fieldset>
-                <el-table-column prop="taskPriority" label="任务优先级" min-width="120px" />
+                <div class="table-area">
-                <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip />
+                    <el-table :data="tableData" stripe border v-loading="tableLoading" class="table-class"
-                <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
+                        :max-height="maxHeight" highlight-current-row @row-click="getCurrentRow"
-                <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
+                        :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.taskId" v-model="taskId">&nbsp;</el-radio>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="taskId" label="任务号" fixed="left" min-width="120px" sortable="custom"
                             show-overflow-tooltip />
-                <el-table-column prop="userName" label="操作人员姓名" min-width="120px" />
+                        <el-table-column prop="taskType" label="任务类型" :formatter="taskTypeFormat" min-width="120px" sortable="custom"
-                <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
+                            show-overflow-tooltip />
-                    min-width="120px" />
+                        <el-table-column prop="taskStatus" label="任务状态" :formatter="taskStatusFormat" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="taskPriority" 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="goodsId" label="料号" min-width="120px" fixed="left" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="goodsDesc" label="物料描述"
+                            min-width="120px" sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="opNum" label="操作数量" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="stockNum" label="库存数量" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="origin" label="起点" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="destination" label="终点" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="wcsTaskId" label="wcs任务号" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" fixed="right" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" fixed="right" min-width="120px" sortable="custom"
+                            show-overflow-tooltip />
+                        <el-table-column prop="opUser" label="操作用户"  min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="remark" label="备注" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
+                        <el-table-column prop="callStand" label="呼叫站台" min-width="120px"
+                            sortable="custom" show-overflow-tooltip />
                     </el-table>
                     <br />
-            <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[10, 25, 50]"
+                    <el-pagination v-model:current-page="baseTableQuery.currentPage"
-                :small="false" :disabled="false" :background="false" :default-page-size="10"
+                        v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
-                layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="search"
+                        :disabled="false" :background="false" :default-page-size="10" @size-change="search"
-                @current-change="search" />
+                        @current-change="search" layout="total, sizes, prev, pager, next, jumper"
-        </el-config-provider>
+                        :total="baseTableQuery.total" />
                 </div>
+            </div>
+        </el-container>
+    </el-config-provider>
 </template>
 
 <script setup>
-import { getTaskRecords } from '@/api/record.js'
-import { dateFormatter, taskStatusFormatter, timeFormatter } from '@/utils/formatter.js'
-import { downloadOutRecordExcel } from '@/api/excel.js'
-import { errorBox } from '@/utils/myMessageBox.js'
-import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-import { ElMessage } from 'element-plus'
 import store from '@/store'
-</script>
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
-<script>
+import { queryOutTaskRecordByPage } from '@/api/taskQuery.js'
-export default {
+import { timeFormatter, wmsTaskTypeFormatter, wmsTaskStatusFormatter } from '@/utils/formatter.js'
-    name: 'outTaskRecord',
+import { ref, reactive, onMounted, nextTick, onBeforeUnmount } from 'vue'
-    data() {
+import { ElMessage } from 'element-plus'
-        return {
+import { genTableRequest } from '@/utils/generator.js'
-            tasks: [],
+import { labelPosition } from '@/constant/form.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({
     currentPage: 1,
     pageSize: 10,
     total: 0,
-            goodsIdQuery: '',
+    sortBy: new Map([['createTime', false]]),// 按创建时间倒序
-            vehicleIdQuery: '',
+    standId: STAND_ID,
-            loading: true,
+    userName: USER_NAME
-            createTimeQuery: null,
+})
-            finishTimeQuery: null,
+let searchQueryFormEntity = reactive({
-            shortcuts: [
+    vehicleId: '',
-                {
+    goodsId: '',
-                    text: '今天',
+})
-                    value: new Date(),
+let searchQueryFormRef = ref()
-                },
+let taskId = ''
-                {
+/**
-                    text: '昨天',
+ * 系统方法
-                    value: () => {
+ */
-                        const date = new Date()
+onMounted(() => {
-                        date.setTime(date.getTime() - 3600 * 1000 * 24)
+    nextTick(() => {
-                        return date
+        window.addEventListener('resize', resizeHeight)
-                    },
+        search()
-                },
+    })
-            ],
+})
-        }
+onBeforeUnmount(() => {
-    },
+    nextTick(() => {
-    mounted() {
+        window.removeEventListener('resize', resizeHeight)
-        this.search()
+    })
-    },
+})
-    methods: {
+const resizeHeight = () => {
-        dateFormat: (row, column, cellValue, index) => {
+    maxHeight.value = window.innerHeight * 0.55
-            return dateFormatter(cellValue)
+}
-        },
+/**
-        timeFormat: (row, column, cellValue, index) => {
+ * 自定义方法
-            return timeFormatter(cellValue)
+ */
-        },
+// 查询
-        taskStatusFormat: (row, column, cellValue, index) => {
+const search = () => {
-            return taskStatusFormatter(cellValue)
+    tableLoading.value = true
-        },
+    let request = genTableRequest(baseTableQuery)
-        taskTypeFormat: (row, column, cellValue, index) => {
+    // 设定查询参数
-            switch (cellValue) {
+    request.vehicleId = searchQueryFormEntity.vehicleId.trim()
-                case 1: return '入库'
+    request.goodsId = searchQueryFormEntity.goodsId.trim()
-                case 2: return '出库'
+    queryOutTaskRecordByPage(request).then((res) => {
-                case 3: return '盘点'
+        const response = res.data
-                case 9: return '移库'
+        if (response.code == 0) {
-                default: return '未知'
+            const data = response.data
-            }
+            if (data != null) {
-        },
+                tableData.value = data.lists
-        search() {
+                baseTableQuery.total = data.total
-            this.loading = true
-            const tableRequest = {
-                pageNo: this.currentPage,
-                pageSize: this.pageSize,
-                taskType: 2,
-                goodsId: this.goodsIdQuery.trim(),
-                vehicleId: this.vehicleIdQuery.trim(),
-                createTime: timeFormatter(this.createTimeQuery),
-                finishTime: timeFormatter(this.finishTimeQuery),
-            }
-            getTaskRecords(tableRequest).then(res => {
-                const tableResponse = res.data
-                if (tableResponse.code == 0) {
-                    this.tasks = tableResponse.returnData.lists
-                    this.total = tableResponse.returnData.total
             } else {
-                    ElMessage.error(tableResponse.message)
+                tableData.value = []
+                baseTableQuery.total = 0
+            }
+        } else {
+            ElMessage.error(response.message)
         }
     }).catch(err => {
         console.log(err)
-                errorBox('查询任务记录错误')
+        ElMessage.error('查询数据异常。')
+    }).finally(() => {
+        tableLoading.value = false
     })
-            this.loading = false
+}
-        },
+const clearQuery = () => {
-        reset() {
+    searchQueryFormEntity.vehicleId = ''
-            this.goodsIdQuery = ''
+    searchQueryFormEntity.goodsId = ''
-            this.vehicleIdQuery = ''
+}
-            this.createTimeQuery = null
+const handleSortChange = (data) => {
-            this.finishTimeQuery = null
+    if (baseTableQuery.sortBy.has(data.prop)) {
-            this.search()
+        baseTableQuery.sortBy.delete(data.prop)
-        },
+    }
-        exportExcel() {
+    baseTableQuery.sortBy.set(data.prop, data.order == 'ascending')
+    search()
+}
+const getCurrentRow = (row) => {
+    taskId = row.taskId
+}
+const timeFormat = (row, column, cellValue, index) => {
+    return timeFormatter(cellValue)
+}
+const taskTypeFormat = (row, column, cellValue, index) => {
+    return wmsTaskTypeFormatter(cellValue)
+}
+const taskStatusFormat = (row, column, cellValue, index) => {
+    return wmsTaskStatusFormatter(cellValue)
+}
+const exportExcel = () => {
+    ElMessage.warning('导出功能暂未开放。')
     const params = {
-                vehicleId: this.vehicleIdQuery.trim(),
+        goodsId: searchQueryFormEntity.goodsId,
-                goodsId: this.goodsIdQuery.trim(),
+        goodsDesc: searchQueryFormEntity.goodsDesc,
-                createTime: timeFormatter(this.createTimeQuery),
+        userName: USER_NAME
-                finishTime: timeFormatter(this.finishTimeQuery),
-                userName: store.getters.userName
     }
-            downloadOutRecordExcel(params).then(res => {
+    // exportGoodsExcel(params).then(res => {
-                const link = document.createElement('a');//创建a标签
+    //     const link = document.createElement('a');//创建a标签
-                try {
+    //     try {
-                    // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
+    //         // let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'});    //如果后台返回的不是blob对象类型，先定义成blob对象格式，该type导出为xls格式，
-                    let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
+    //         let blob = res.data    //如果后台返回的直接是blob对象类型，直接获取数据
-                    // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
+    //         // let _fileName = res.headers['content-disposition'].split(';')[1].split('=')[1]; //拆解获取文件名，如果后端有给返回文件名的话
-                    let _fileName = "导出出库记录" + dateFormatter(new Date) + ".xlsx"
+    //         let _fileName = '物料基础信息' + dateFormatter(new Date) + '.xlsx'
-                    link.style.display = 'none'//隐藏
+    //         link.style.display = 'none'//隐藏
 
-                    // 兼容不同浏览器的URL对象
+    //         // 兼容不同浏览器的URL对象
-                    const url = window.URL || window.webkitURL || window.moxURL
+    //         const url = window.URL || window.webkitURL || window.moxURL
-                    link.href = url.createObjectURL(blob)
+    //         link.href = url.createObjectURL(blob)
-                    link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
+    //         link.setAttribute('download', _fileName.substring(_fileName.lastIndexOf('_') + 1))
-                    document.body.appendChild(link)
+    //         document.body.appendChild(link)
-                    link.click()
+    //         link.click()
-                    document.body.removeChild(link)
+    //         document.body.removeChild(link)
-                    url.revokeObjectURL(link.href)//移除url对象
+    //         url.revokeObjectURL(link.href)//移除url对象
-                } catch (e) {
+    //     } catch (e) {
-                    console.log(e)
+    //         console.log(e)
-                    errorBox('下载文件失败')
+    //         ElMessage.error('下载文件失败')
-                }
+    //     }
-            }).catch(err => {
+    // }).catch(err => {
-                console.log(err)
+    //     console.log(err)
-                errorBox('导出失败')
+    //     ElMessage.error('导出失败')
-            })
+    // })
-        },
-    },
 }
 </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;
+}
+
+.el-form-item .el-select-v2 {
+    width: 196px;
+}
+
+.table-class {
+    margin: 5px 5px 5px 5px;
+    width: inherit;
+}
+
 .el-pagination {
     padding-left: 5px;
 }
 
-.el-row .el-button {
+.my-autocomplete li {
-    width: 72px;
+    width: 196px;
-    margin-left: 0px;
+    line-height: normal;
-    margin-right: 5px;
+    padding: 7px;
 }
 
-.table-class {
+.my-autocomplete li .name {
-    width: 100%;
+    text-overflow: ellipsis;
+    overflow: hidden;
+}
+
+.my-autocomplete li .addr {
+    font-size: 12px;
+    color: #b4b4b4;
+}
+
+.my-autocomplete li .highlighted .addr {
+    color: #ddd;
+}
+
+.my-autocomplete li .goods_id {
+    color: brown;
+}
+
+.my-autocomplete li .goods_name {
+    color: cornflowerblue;
+}
+
+.btn-search {
+    height: 30px;
+    width: 80px;
+    margin: auto 5px 5px auto;
+    color: black;
 }
 </style>

dev_wms_serve/src/main/java/com/wms_main/controller/wms/ExcelController.java

@@ -138,6 +138,15 @@ public class ExcelController {
         exportExcelEasyPoi.doExportStocks(stockQuery, response);
     }
 
+    /**
+     * 导出物料基础信息
+     * @param goodsQuery 请求
+     */
+    @PostMapping("/exportGoodsExcel")
+    public void exportGoodsExcel(@RequestBody GoodsQuery goodsQuery, HttpServletResponse response) throws IOException {
+        exportExcelEasyPoi.doExportGoods(goodsQuery, response);
+    }
+
     /**
      * 导出库存更新记录
      * @param stockUpdateQuery 请求
@@ -164,4 +173,13 @@ public class ExcelController {
     public void exportKanbanExcel(@RequestBody KanbanQuery kanbanQuery, HttpServletResponse response) throws IOException {
         exportExcelEasyPoi.exportKanbanExcel(kanbanQuery, response);
     }
+
+    /**
+     * 导出看板需求
+     * @param kanbanQuery 请求
+     */
+    @PostMapping("/exportInTaskRecordExcel")
+    public void exportInTaskRecordExcel(@RequestBody WmsTaskQuery wmsTaskQuery, HttpServletResponse response) throws IOException {
+        exportExcelEasyPoi.exportKanbanExcel(kanbanQuery, response);
+    }
 }

dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskQueryController.java

@@ -3,6 +3,7 @@ package com.wms_main.controller.wms;
 import com.wms_main.model.dto.query.WmsTaskQuery;
 import com.wms_main.model.dto.response.wms.WmsApiResponse;
 import com.wms_main.model.vo.wms.PageVo;
+import com.wms_main.model.vo.wms.TaskRecordVo;
 import com.wms_main.model.vo.wms.TaskVo;
 import com.wms_main.service.controller.ITaskQueryControllerService;
 import lombok.RequiredArgsConstructor;
@@ -30,4 +31,26 @@ public class TaskQueryController {
     {
         return taskQueryControllerService.queryTasksByPage(wmsTaskQuery);
     }
+
+    /**
+     * Wms入库记录查询
+     * @param wmsTaskQuery 查询参数
+     * @return 查询结果
+     */
+    @PostMapping("/queryInTaskRecordByPage")
+    public WmsApiResponse<PageVo<TaskRecordVo>> queryInTaskRecordByPage(@RequestBody WmsTaskQuery wmsTaskQuery)
+    {
+        return taskQueryControllerService.queryInTaskRecordByPage(wmsTaskQuery);
+    }
+
+    /**
+     * Wms出库记录查询
+     * @param wmsTaskQuery 查询参数
+     * @return 查询结果
+     */
+    @PostMapping("/queryOutTaskRecordByPage")
+    public WmsApiResponse<PageVo<TaskRecordVo>> queryOutTaskRecordByPage(@RequestBody WmsTaskQuery wmsTaskQuery)
+    {
+        return taskQueryControllerService.queryOutTaskRecordByPage(wmsTaskQuery);
+    }
 }

dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/base/IBaseExportExcelEasyPoi.java

@@ -1,5 +1,6 @@
 package com.wms_main.excel.easypoi.service.base;
 
+import com.wms_main.model.dto.query.GoodsQuery;
 import com.wms_main.model.dto.query.StockQuery;
 import com.wms_main.model.dto.query.StockUpdateQuery;
 import jakarta.servlet.http.HttpServletResponse;
@@ -22,4 +23,10 @@ public interface IBaseExportExcelEasyPoi {
      * @param stockUpdateQuery 查询条件
      */
     void doExportStockUpdate(@RequestBody StockUpdateQuery stockUpdateQuery, HttpServletResponse response) throws IOException;
+
+    /**
+     * 到处物料信息
+     * @param goodsQuery 查询
+     */
+    void doExportGoods(@RequestBody GoodsQuery goodsQuery, HttpServletResponse response) throws IOException;
 }

dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/base/impl/BaseExportExcelEasyPoi.java

@@ -4,13 +4,17 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.wms_main.dao.ITAppGoodsService;
 import com.wms_main.dao.ITAppStockService;
 import com.wms_main.dao.ITAppStockUpdateService;
+import com.wms_main.excel.easypoi.excelTemplate.GoodsExcelTemplate;
 import com.wms_main.excel.easypoi.excelTemplate.StockExcelTemplate;
 import com.wms_main.excel.easypoi.excelTemplate.StockUpdateExcelTemplate;
 import com.wms_main.excel.easypoi.service.base.IBaseExportExcelEasyPoi;
+import com.wms_main.model.dto.query.GoodsQuery;
 import com.wms_main.model.dto.query.StockQuery;
 import com.wms_main.model.dto.query.StockUpdateQuery;
+import com.wms_main.model.po.TAppGoods;
 import com.wms_main.model.po.TAppStock;
 import com.wms_main.model.po.TAppStockUpdate;
 import com.wms_main.repository.utils.StringUtils;
@@ -34,6 +38,8 @@ public class BaseExportExcelEasyPoi implements IBaseExportExcelEasyPoi {
     protected ITAppStockService appStockService;// 库存服务
     @Autowired
     protected ITAppStockUpdateService appStockUpdateService;// 库存更新服务
+    @Autowired
+    protected ITAppGoodsService appGoodsService;// 物料服务
 
     public BaseExportExcelEasyPoi() {
 
@@ -132,6 +138,44 @@ public class BaseExportExcelEasyPoi implements IBaseExportExcelEasyPoi {
         doWriteExcel("库存更新记录", response, resultList, StockUpdateExcelTemplate.class);
     }
 
+    /**
+     * 导出物料信息--实现
+     * @param goodsQuery 查询
+     */
+    @Override
+    public void doExportGoods(GoodsQuery goodsQuery, HttpServletResponse response) throws IOException {
+        if (goodsQuery == null) {
+            throw new IOException("查询参数不能为NULL");
+        }
+        // 库存更新记录查询参数
+        LambdaQueryWrapper<TAppGoods> lambdaQueryWrapper = new LambdaQueryWrapper<TAppGoods>()
+                .like(StringUtils.isNotEmpty(goodsQuery.getGoodsId()), TAppGoods::getGoodsId, goodsQuery.getGoodsId())
+                .like(StringUtils.isNotEmpty(goodsQuery.getGoodsDesc()), TAppGoods::getGoodsDescription, goodsQuery.getGoodsDesc());
+        List<TAppGoods> baseGoodsList = appGoodsService.list(lambdaQueryWrapper);
+        // excel模版列表
+        List<GoodsExcelTemplate> resultList = new ArrayList<>();
+        if (!baseGoodsList.isEmpty()) {
+            for (TAppGoods poData : baseGoodsList) {
+                resultList.add(new GoodsExcelTemplate(
+                        poData.getPlant(),
+                        poData.getGoodsId(),
+                        poData.getGoodsDescription(),
+                        poData.getVendorName(),
+                        poData.getFeedingType(),
+                        poData.getMaxBoxNum(),
+                        poData.getBoxQty(),
+                        poData.getHotPoint(),
+                        poData.getPutArea(),
+                        poData.getIsSled(),
+                        poData.getSledDays()
+                ));
+            }
+        } else {
+            resultList.add(new GoodsExcelTemplate());
+        }
+        doWriteExcel("物料基础信息", response, resultList, GoodsExcelTemplate.class);
+    }
+
     /**
      * 写入excel
      * @param fileDesc 文件描述

dev_wms_serve/src/main/java/com/wms_main/model/dto/query/WmsTaskQuery.java

@@ -1,10 +1,14 @@
 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;
 
 /**
  * wms任务查询
@@ -39,4 +43,18 @@ public class WmsTaskQuery extends PageQuery {
      */
     @JsonProperty("taskStatus")
     private Integer taskStatus;
+    /**
+     * 筛选时间-从
+     */
+    @JsonProperty("fromTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime fromTime;
+    /**
+     * 筛选时间-到
+     */
+    @JsonProperty("toTime")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime toTime;
 }

dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/TaskRecordVo.java

@@ -2,6 +2,7 @@ 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.TAppTaskBak;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -105,4 +106,34 @@ public class TaskRecordVo {
      */
     @JsonProperty("goodsDesc")
     private String goodsDesc;
+
+    /**
+     * 将po转换为vo
+     * @param po po对象
+     * @return vo对象
+     */
+    public static TaskRecordVo of(TAppTaskBak po) {
+        if (po == null) {
+            return new TaskRecordVo();
+        }
+        return new TaskRecordVo(
+                po.getTaskId(),
+                po.getTaskType(),
+                po.getTaskStatus(),
+                po.getTaskPriority(),
+                po.getVehicleId(),
+                po.getOrigin(),
+                po.getDestination(),
+                po.getWcsTaskId(),
+                po.getCreateTime(),
+                po.getFinishTime(),
+                po.getGoodsId(),
+                po.getOpNum(),
+                po.getStockNum(),
+                po.getOpUser(),
+                po.getRemark(),
+                po.getCallStand(),
+                po.getGoodsDesc()
+        );
+    }
 }

dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskQueryControllerService.java

@@ -3,6 +3,7 @@ package com.wms_main.service.controller;
 import com.wms_main.model.dto.query.WmsTaskQuery;
 import com.wms_main.model.dto.response.wms.WmsApiResponse;
 import com.wms_main.model.vo.wms.PageVo;
+import com.wms_main.model.vo.wms.TaskRecordVo;
 import com.wms_main.model.vo.wms.TaskVo;
 
 /**
@@ -15,4 +16,18 @@ public interface ITaskQueryControllerService {
      * @return 查询结果---分页
      */
     WmsApiResponse<PageVo<TaskVo>> queryTasksByPage(WmsTaskQuery wmsTaskQuery);
+
+    /**
+     * 查询入库记录信息---分页
+     * @param wmsTaskQuery 查询参数
+     * @return 查询结果---分页
+     */
+    WmsApiResponse<PageVo<TaskRecordVo>> queryInTaskRecordByPage(WmsTaskQuery wmsTaskQuery);
+
+    /**
+     * 查询出库记录信息---分页
+     * @param wmsTaskQuery 查询参数
+     * @return 查询结果---分页
+     */
+    WmsApiResponse<PageVo<TaskRecordVo>> queryOutTaskRecordByPage(WmsTaskQuery wmsTaskQuery);
 }

dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskQueryControllerServiceImpl.java

@@ -2,11 +2,15 @@ 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.constant.enums.wms.WmsTaskTypeEnums;
+import com.wms_main.dao.ITAppTaskBakService;
 import com.wms_main.dao.ITAppTaskService;
 import com.wms_main.model.dto.query.WmsTaskQuery;
 import com.wms_main.model.dto.response.wms.WmsApiResponse;
 import com.wms_main.model.po.TAppTask;
+import com.wms_main.model.po.TAppTaskBak;
 import com.wms_main.model.vo.wms.PageVo;
+import com.wms_main.model.vo.wms.TaskRecordVo;
 import com.wms_main.model.vo.wms.TaskVo;
 import com.wms_main.repository.utils.StringUtils;
 import com.wms_main.service.controller.ITaskQueryControllerService;
@@ -20,6 +24,7 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class TaskQueryControllerServiceImpl implements ITaskQueryControllerService {
     private final ITAppTaskService appTaskService;// 任务服务
+    private final ITAppTaskBakService appTaskBakService;// 任务记录服务
 
     /**
      * 查询wms任务监控---分页
@@ -43,4 +48,70 @@ public class TaskQueryControllerServiceImpl implements ITaskQueryControllerServi
         PageVo<TaskVo> pageVo = PageVo.of(tasksPage, TaskVo::of);
         return WmsApiResponse.success("查询任务成功。", pageVo);
     }
+
+    /**
+     * 查询入库记录（分页）---实现
+     * @param wmsTaskQuery 查询参数
+     * @return 查询结果
+     */
+    @Override
+    public WmsApiResponse<PageVo<TaskRecordVo>> queryInTaskRecordByPage(WmsTaskQuery wmsTaskQuery) {
+        if (wmsTaskQuery == null) {
+            return WmsApiResponse.error("查询参数不能为NULL", null);
+        }
+        if (wmsTaskQuery.getFromTime() != null && wmsTaskQuery.getToTime() != null) {
+            if (wmsTaskQuery.getFromTime().isAfter(wmsTaskQuery.getToTime())) {
+                return WmsApiResponse.error("from时间不能晚于to时间。", null);
+            }
+        }
+        Page<TAppTaskBak> page = wmsTaskQuery.toMpPage();
+        LambdaQueryWrapper<TAppTaskBak> lambdaQueryWrapper = new LambdaQueryWrapper<TAppTaskBak>()
+                .like(StringUtils.isNotEmpty(wmsTaskQuery.getTaskId()), TAppTaskBak::getTaskId, wmsTaskQuery.getTaskId())
+                .like(StringUtils.isNotEmpty(wmsTaskQuery.getGoodsId()), TAppTaskBak::getGoodsId, wmsTaskQuery.getGoodsId())
+                .like(StringUtils.isNotEmpty(wmsTaskQuery.getVehicleId()), TAppTaskBak::getVehicleId, wmsTaskQuery.getVehicleId())
+                .eq(TAppTaskBak::getTaskType, WmsTaskTypeEnums.IN.getCode());
+        if (wmsTaskQuery.getFromTime() != null) {
+            lambdaQueryWrapper.ge(TAppTaskBak::getCreateTime, wmsTaskQuery.getFromTime());
+        }
+        if (wmsTaskQuery.getToTime() != null) {
+            lambdaQueryWrapper.le(TAppTaskBak::getCreateTime, wmsTaskQuery.getToTime());
+        }
+        Page<TAppTaskBak> inTaskRecordsPage = appTaskBakService.page(page, lambdaQueryWrapper);
+
+        PageVo<TaskRecordVo> pageVo = PageVo.of(inTaskRecordsPage, TaskRecordVo::of);
+        return WmsApiResponse.success("查询入库记录成功。", pageVo);
+    }
+
+    /**
+     * 查询出库记录（分页）---实现
+     * @param wmsTaskQuery 查询参数
+     * @return 查询结果
+     */
+    @Override
+    public WmsApiResponse<PageVo<TaskRecordVo>> queryOutTaskRecordByPage(WmsTaskQuery wmsTaskQuery) {
+        if (wmsTaskQuery == null) {
+            return WmsApiResponse.error("查询参数不能为NULL", null);
+        }
+        if (wmsTaskQuery.getFromTime() != null && wmsTaskQuery.getToTime() != null) {
+            if (wmsTaskQuery.getFromTime().isAfter(wmsTaskQuery.getToTime())) {
+                return WmsApiResponse.error("from时间不能晚于to时间。", null);
+            }
+        }
+        Page<TAppTaskBak> page = wmsTaskQuery.toMpPage();
+        LambdaQueryWrapper<TAppTaskBak> lambdaQueryWrapper = new LambdaQueryWrapper<TAppTaskBak>()
+                .like(StringUtils.isNotEmpty(wmsTaskQuery.getTaskId()), TAppTaskBak::getTaskId, wmsTaskQuery.getTaskId())
+                .like(StringUtils.isNotEmpty(wmsTaskQuery.getGoodsId()), TAppTaskBak::getGoodsId, wmsTaskQuery.getGoodsId())
+                .like(StringUtils.isNotEmpty(wmsTaskQuery.getVehicleId()), TAppTaskBak::getVehicleId, wmsTaskQuery.getVehicleId())
+                .eq(TAppTaskBak::getTaskType, WmsTaskTypeEnums.OUT.getCode());
+        if (wmsTaskQuery.getFromTime() != null) {
+            lambdaQueryWrapper.ge(TAppTaskBak::getCreateTime, wmsTaskQuery.getFromTime());
+        }
+        if (wmsTaskQuery.getToTime() != null) {
+            lambdaQueryWrapper.le(TAppTaskBak::getCreateTime, wmsTaskQuery.getToTime());
+        }
+        Page<TAppTaskBak> outTaskRecordsPage = appTaskBakService.page(page, lambdaQueryWrapper);
+
+        PageVo<TaskRecordVo> pageVo = PageVo.of(outTaskRecordsPage, TaskRecordVo::of);
+        return WmsApiResponse.success("查询出库记录成功。", pageVo);
+    }
 }

dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java

@@ -741,6 +741,11 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
                         workRecords.add(RecordOfWork(work));
                         continue;
                     }
+                    if (work.getWorkStatus() == 2 && work.getLackStatus() == 1) {
+                        // 缺料，添加记录
+                        workRecords.add(RecordOfWork(work));
+                        continue;
+                    }
                     // 判断库内料分配的数量是否需要修正
                     if (work.getIsOut() != 1) {
                         List<TAppStock> thisGoodsOutStocks = allStocks.stream().filter(stock -> stock.getGoodsId().equals(work.getGoodsId())).toList();