liyuqi/202501-Wms-Kate-Wuxi
1
0
Fork 0
forked from BaoKaiWms/202501-Wms-Kate-Wuxi
Code Pull Requests Activity

Merge branch 'master' of http://112.4.208.194:3000/BaoKaiWms/202501-Wms-Kate-Wuxi

Browse Source
This commit is contained in:
李宇奇 2025-06-10 08:53:46 +08:00
commit 6ce608bfa0
44 changed files with 28643 additions and 634 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev_wms_client/src/api/excel.js
View File

@ -53,6 +53,16 @@ export const uploadExcelProductExtend = (data) => {
timeout: 600000
})
}
// 上传盘点请求清单
export const uploadExcelInventoryRequest = (data) => {
return request({
url: '/excel/importInventoryRequest',
method: 'post',
data: data,
timeout: 600000
})
}
// 导出dbs
export const exportDbsWithExcel = (data) => {
return request({

11
dev_wms_client/src/api/kateWork.js
View File

@ -188,4 +188,13 @@ export const getGoodsRequirement = (params) => {
data: params,
timeout: 5000
})
}
}
// 删除配料单
export const deleteKittingBom = (params) => {
return request({
url: '/kate/deleteKittingBom',
method: 'post',
data: params,
timeout: 5000
})
}

8
dev_wms_client/src/api/taskQuery.js
View File

@ -39,4 +39,12 @@ export const queryOutsByPage = (params) => {
method: 'post',
data: params
})
}
// 分页查询盘点信息
export const queryInventoryRecordByPage = (params) => {
return request({
url: '/taskQuery/queryInventoryRecordByPage',
method: 'post',
data: params
})
}

19
dev_wms_client/src/constant/options.js
View File

@ -285,4 +285,23 @@ export const occupyOptions = [
value: 1,
label: '占用'
}
]
// 盘点结果枚举
export const invResultOptions = [
{
value: -99,
label: '未盘'
},
{
value: -1,
label: '盘亏'
},
{
value: 0,
label: '正常'
},
{
value: 1,
label: '盘盈'
}
]

98
dev_wms_client/src/excel/UploadExcelInventory.vue Normal file
View File

@ -0,0 +1,98 @@
<template>
<el-upload ref="uploadRef" :on-preview="previewFile" :limit="1" :on-change="changeFile" :auto-upload="false"
:data="uploadForm.data">
<template #trigger>
<el-button type="primary">选取盘点请求文件</el-button>
</template>
<el-button style="margin-left: 10px;" type="success" @click="uploadBaseGoods">上传盘点请求列表</el-button>
</el-upload>
</template>
<script setup>
import store from '@/store'
import {ref, reactive} from 'vue';
import {uploadExcelBaseGoods, uploadExcelInventoryRequest} from '@/api/excel.js'
import {ElMessage} from 'element-plus'
import {errorBox} from '@/utils/myMessageBox';
import {sizeFormatter} from '@/utils/formatter.js'
import {loading} from '@/utils/loading.js'
import {getHashString} from '@/utils/hashUtils.js'
var currentHash = ''
const file = ref()
const uploadForm = reactive({
data: {
fileId: '',
name: '',
type: '',
size: null,
hash: '',
userName: store.getters.getUserName,
standId: store.getters.getStandId
}
})
const changeFile = (uploadFile) => {
file.value = uploadFile
uploadForm.data = {
fileId: file.value.raw.uid,
name: file.value.raw.name,
type: file.value.raw.type,
size: sizeFormatter(file.value.raw.size),
hash: getHashString(uploadFile),
userName: store.getters.getUserName,
standId: store.getters.getStandId
}
}
const uploadRef = ref()
const uploadBaseGoods = () => {
if (uploadForm === undefined || file.value === undefined) {
errorBox('请选择文件之后再上传')
return
}
if (currentHash !== '' && currentHash === uploadForm.data.hash) {
errorBox('请勿重复上传')
return
}
currentHash = uploadForm.data.hash
const jsonStr = JSON.stringify(uploadForm.data);
const blob = new Blob([jsonStr], {
type: 'application/json'
});
let formData = new FormData();
// 这里很重要 file.value.raw才是真实的file文件，file.value只是一个Proxy代理对象
formData.append("fileVo", blob);
formData.append("file", file.value.raw);
loading.open('导入中...')
uploadExcelInventoryRequest(formData).then(res => {
if (res.data.code === 0) {
ElMessage.success(res.data.message)
clearFileInfos()
} else {
errorBox(res.data.message)
}
}).catch(err => {
console.log(err)
errorBox('上传错误')
}).finally(() => {
currentHash = ''
loading.close()
})
}
const clearFileInfos = () => {
// 清空选择的文件项
uploadRef.value.clearFiles()
uploadForm.data = {
fileId: '',
name: '',
type: '',
size: null,
hash: '',
userName: store.getters.getUserName,
standId: store.getters.getStandId
}
file.value = undefined
}
const previewFile = () => {
}
</script>
<style scoped></style>

5
dev_wms_client/src/layout/goodsOut.vue
View File

@ -286,7 +286,7 @@ const confirmOut = () => {
userName: USER_NAME,
standId: STAND_ID
}
loading.open('请求中，请稍等...')
loading.open('处理中...')
requireStockOut(request).then(res => {
const response = res.data
if (response.code === 0) {
@ -328,6 +328,7 @@ const confirmOrRelease = () => {
standId: STAND_ID,
userName: USER_NAME
}
loading.open('确认中...')
confirmCurrentTask(request).then(res => {
const response = res.data
if (response.code === 0) {
@ -345,6 +346,8 @@ const confirmOrRelease = () => {
}).catch(err => {
console.log(err)
errorBox('请求错误，请检查完原因后刷新界面。')
}).finally(() => {
loading.close()
})
}
// 当拣选数量修改时，要对应的修改

31
dev_wms_client/src/layout/inventory.vue
View File

@ -24,6 +24,10 @@
style="height: 50px; width: 100px; margin: auto 5px auto 5px; font-size: large; color: black;"
@click="clearInput()">清除输入
</el-button>
<el-button type="success"
style="height: 50px; width: 100px; margin: auto 5px auto 5px; font-size: large; color: black;"
@click="openUploadDialog()">批量盘点
</el-button>
</el-row>
</div>
</el-form>
@ -59,6 +63,12 @@
</div>
</el-form>
</fieldset>
<el-dialog v-model="showUploadDialog" title="上传盘点清单" width="40%" draggable :show-close="true">
<fieldset class="search-area">
<legend>上传盘点清单</legend>
<UploadExcelInventory></UploadExcelInventory>
</fieldset>
</el-dialog>
</div>
</el-container>
</el-config-provider>
@ -73,6 +83,8 @@ import {errorBox, warningBox} from "@/utils/myMessageBox";
import {ElMessage} from "element-plus";
import {confirmInventory, getInventoryConfirm, requestInventory} from "@/api/task";
import {labelPosition} from "@/constant/form";
import UploadExcelInventory from "@/excel/UploadExcelInventory.vue";
import {loading} from "@/utils/loading";
const STAND_ID = store.getters.getStandId
const USER_NAME = store.getters.getUserName
@ -94,6 +106,7 @@ let confirmEntity = reactive({
})
const confirmRules = reactive({})
let pauseGetPickFlag = ref(false)
let showUploadDialog = ref(false)
// 系统
onMounted(() => {
nextTick(() => {
@ -156,7 +169,7 @@ const getInventory = () => {
const sendInventoryRequest = () => {
inventoryRequestFormEntity.goodsId = inventoryRequestFormEntity.goodsId.trim().toUpperCase()
inventoryRequestFormEntity.vehicleId = inventoryRequestFormEntity.vehicleId.trim().toUpperCase()
if (inventoryRequestFormEntity.goodsId == '') {
if (inventoryRequestFormEntity.goodsId === '') {
ElMessage.error("料号为必须项。")
return
}
@ -166,9 +179,10 @@ const sendInventoryRequest = () => {
standId: STAND_ID,
userName: USER_NAME
}
loading.open('处理中...')
requestInventory(request).then(res => {
const response = res.data
if (response.code == 0) {
if (response.code === 0) {
ElMessage.success(response.message)
pauseGetPickFlag.value = false
} else {
@ -177,6 +191,8 @@ const sendInventoryRequest = () => {
}).catch(err => {
console.log(err)
ElMessage.error("发生异常。")
}).finally(() => {
loading.close()
})
}
// 确认/放行
@ -190,14 +206,15 @@ const confirmOrRelease = () => {
standId:STAND_ID,
userName: USER_NAME
}
loading.open('处理中...')
confirmInventory(request).then(res => {
const response = res.data
if (response.code == 0) {
if (response.code === 0) {
// 设置form
resetConfirmEntity()
ElMessage.success(response.message)
pauseGetPickFlag.value = false
} else if (response.code == 400) {
} else if (response.code === 400) {
// 设置form
resetConfirmEntity()
warningBox(response.message)
@ -209,6 +226,8 @@ const confirmOrRelease = () => {
}).catch(err => {
console.log(err)
errorBox('请求错误，请检查完原因后刷新界面。')
}).finally(() => {
loading.close()
})
}
// 重置确认信息
@ -224,6 +243,10 @@ const clearInput = () => {
inventoryRequestFormEntity.goodsId = ''
inventoryRequestFormEntity.vehicleId = ''
}
// 打开上传界面
const openUploadDialog = () => {
showUploadDialog.value = true
}
</script>
<style scoped>

207
dev_wms_client/src/layout/inventoryRecord.vue
View File

@ -7,33 +7,28 @@
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.queryType" placeholder="查询类型"
:options="queryTypeOptions"
@change="search()"></el-select-v2>
</el-form-item>
<el-form-item label="盘点结果">
<el-select-v2 style="width: 196px" v-model="searchQueryFormEntity.invResult" placeholder="盘点结果"
:options="addAllOptionOfOptions(invResultOptions, DEFAULT_TOTAL_OPTIONS)"
@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.goodsId" @keyup.enter="search()" clearable/>
</el-form-item>
<el-form-item label="创建时间from">
<el-date-picker v-model="searchQueryFormEntity.fromTime" type="datetime"
placeholder="请选择from时间" :shortcuts="shortcuts"
style="width: 196px;" clearable/>
</el-form-item>
<el-form-item label="创建时间to">
<el-date-picker v-model="searchQueryFormEntity.toTime" type="datetime"
placeholder="请选择to时间" :shortcuts="shortcuts"
style="width: 196px;" 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>
<el-row>
<el-button type="success" class="btn-search"
@click="exportExcel()">导出excel
</el-button>
</el-row>
</div>
</div>
</el-form>
@ -45,47 +40,39 @@
@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>
<el-radio :label="scope.row.inventoryId" v-model="inventoryId">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column prop="taskId" label="任务号" fixed="left" min-width="120px" sortable="custom"
<el-table-column prop="inventoryId" label="任务号" fixed="left" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="taskType" label="任务类型" :formatter="taskTypeFormat" min-width="120px"
<el-table-column prop="goodsId" label="料号" min-width="120px"
sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="taskStatus" label="任务状态" :formatter="taskStatusFormat" min-width="120px"
sortable="custom"
<el-table-column prop="vehicleId" label="箱号" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="taskPriority" label="优先级" min-width="120px" sortable="custom"
<el-table-column prop="stockNum" 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="物料描述"
<el-table-column prop="confirmNum" label="确认数量"
min-width="120px" sortable="custom" show-overflow-tooltip/>
<el-table-column prop="opNum" label="操作数量" min-width="120px" sortable="custom"
<el-table-column prop="invStand" label="盘点站台" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="stockNum" label="库存数量" min-width="120px"
<el-table-column prop="invUser" label="盘点人" min-width="120px"
sortable="custom" show-overflow-tooltip/>
<el-table-column prop="origin" label="起点" min-width="120px" sortable="custom"
<el-table-column prop="invType" label="盘点类型" :formatter="invTypeFormat" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="destination" label="终点" min-width="120px"
<el-table-column prop="invStatus" label="任务状态" :formatter="invStatusFormat" min-width="120px"
sortable="custom" show-overflow-tooltip/>
<el-table-column prop="wcsTaskId" label="wcs任务号" min-width="120px" sortable="custom"
<el-table-column prop="invResult" label="盘点结果" :formatter="invResultFormat" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" fixed="right" min-width="120px"
<el-table-column prop="invCreateTime" label="创建时间" :formatter="timeFormat" min-width="120px"
sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" fixed="right" min-width="120px"
<el-table-column prop="invConfirmTime" label="确认时间" :formatter="timeFormat" min-width="120px"
sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="invOrderId" label="任务组" 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="baseTableQuery.currentPage"
@ -102,19 +89,21 @@
<script setup>
import store from '@/store'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import {queryInTaskRecordByPage} from '@/api/taskQuery.js'
import {timeFormatter, wmsTaskTypeFormatter, wmsTaskStatusFormatter, dateFormatter} from '@/utils/formatter.js'
import {queryInventoryRecordByPage} from '@/api/taskQuery.js'
import {timeFormatter} 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, shortcuts} from '@/constant/form.js'
import {exportInTaskRecordExcel} from '@/api/excel.js'
import {labelPosition} from '@/constant/form.js'
import {invResultOptions} from '@/constant/options.js'
import {addAllOptionOfOptions} from '@/utils/generator.js'
/**
* 常量定义
*/
const STAND_ID = store.getters.getStandId
const USER_NAME = store.getters.getUserName
const DEFAULT_TOTAL_OPTIONS = 99
/**
* 变量定义
*/
@ -125,18 +114,28 @@ let baseTableQuery = reactive({
currentPage: 1,
pageSize: 10,
total: 0,
sortBy: new Map([['createTime', false]]),// 按照创建时间倒序
sortBy: new Map([['invCreateTime', true]]),// 按照成品号顺序排序
standId: STAND_ID,
userName: USER_NAME
})
let searchQueryFormEntity = reactive({
vehicleId: '',
goodsId: '',
fromTime: null,
toTime: null
invResult: DEFAULT_TOTAL_OPTIONS,
queryType: 1
})
let searchQueryFormRef = ref()
let taskId = ''
let inventoryId = ''
const queryTypeOptions = [
{
label: '未关闭',
value: 1
},
{
label: '已关闭',
value: 2
}
]
/**
* 系统方法
*/
@ -164,9 +163,9 @@ const search = () => {
// 设定查询参数
request.vehicleId = searchQueryFormEntity.vehicleId.trim()
request.goodsId = searchQueryFormEntity.goodsId.trim()
request.fromTime = searchQueryFormEntity.fromTime == null ? null : timeFormatter(searchQueryFormEntity.fromTime)
request.toTime = searchQueryFormEntity.toTime == null ? null : timeFormatter(searchQueryFormEntity.toTime)
queryInTaskRecordByPage(request).then((res) => {
request.invResult = searchQueryFormEntity.invResult === DEFAULT_TOTAL_OPTIONS ? null : searchQueryFormEntity.invResult
request.queryType = searchQueryFormEntity.queryType// 查询类型
queryInventoryRecordByPage(request).then((res) => {
const response = res.data
if (response.code === 0) {
const data = response.data
@ -190,61 +189,57 @@ const search = () => {
const clearQuery = () => {
searchQueryFormEntity.vehicleId = ''
searchQueryFormEntity.goodsId = ''
searchQueryFormEntity.fromTime = null
searchQueryFormEntity.toTime = null
}
const handleSortChange = (data) => {
if (baseTableQuery.sortBy.has(data.prop)) {
baseTableQuery.sortBy.delete(data.prop)
}
baseTableQuery.sortBy.set(data.prop, data.order == 'ascending')
baseTableQuery.sortBy.set(data.prop, data.order === 'ascending')
search()
}
const getCurrentRow = (row) => {
taskId = row.taskId
inventoryId = row.inventoryId
}
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 = () => {
const params = {
goodsId: searchQueryFormEntity.goodsId,
vehicleId: searchQueryFormEntity.vehicleId,
fromTime: searchQueryFormEntity.fromTime == null ? null : timeFormatter(searchQueryFormEntity.fromTime),
toTime: searchQueryFormEntity.toTime == null ? null : timeFormatter(searchQueryFormEntity.toTime),
userName: USER_NAME
// 盘点任务状态format
const invStatusFormat = (row, column, cellValue, index) => {
switch (cellValue) {
case 0:
return '初始化'
case 1:
return '已解析'
case 2:
return '已确认'
default:
return '未知状态'
}
}
// 盘点类型format
const invTypeFormat = (row, column, cellValue, index) => {
if (cellValue === 1) {
return '明盘'
} else if (cellValue === 2) {
return '盲盘'
} else {
return '未知类型'
}
}
// 盘点结果format
const invResultFormat = (row, column, cellValue, index) => {
switch (cellValue) {
case -99:
return '未盘'
case -1:
return '盘亏'
case 0:
return '正常'
case 1:
return '盘盈'
default:
return '未知结果'
}
exportInTaskRecordExcel(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>
@ -305,6 +300,34 @@ const exportExcel = () => {
padding-left: 5px;
}
.my-autocomplete li {
width: 196px;
line-height: normal;
padding: 7px;
}
.my-autocomplete li .name {
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;

5
dev_wms_client/src/layout/kitting.vue
View File

@ -445,7 +445,7 @@ const confirmStart = () => {
standId: standId,
userName: userName
}
loading.open()
loading.open('处理中...')
initWorks(request).then(res => {
const response = res.data
if (response.code === 0) {
@ -616,6 +616,7 @@ const confirmOrRelease = () => {
standId: standId,
userName: userName
}
loading.open('确认中...')
confirmCurrentWork(request).then(res => {
const response = res.data
if (response.code === 0) {
@ -635,6 +636,8 @@ const confirmOrRelease = () => {
}).catch(err => {
console.log(err)
errorBox('请求错误，请检查完原因后刷新界面。')
}).finally(() => {
loading.close()
})
}
const resetConfirmEntity = () => {

670
dev_wms_client/src/layout/kittingList.vue
View File

@ -1,205 +1,101 @@
<template>
<el-config-provider :locale="zhCn">
<el-container class="content">
<div class="work-area">
<fieldset class="search-area">
<el-form ref="kittingBomQueryFormRef" :model="kittingBomQueryFormEntity"
: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="kittingBomQueryFormEntity.bomType" placeholder="配料单类型"
:options="kittingBomTypeOptions" @change="search()"></el-select-v2>
</el-form-item>
<el-form-item label="机型">
<el-input v-model="kittingBomQueryFormEntity.model" @keyup.enter="search()" clearable />
</el-form-item>
<el-form-item label="成品号">
<el-input v-model="kittingBomQueryFormEntity.productId" @keyup.enter="search()" clearable />
</el-form-item>
<el-form-item label="原材料号">
<el-input v-model="kittingBomQueryFormEntity.goodsId" @keyup.enter="search()" clearable />
</el-form-item>
<el-form-item label="料盒号">
<el-input v-model="kittingBomQueryFormEntity.boxNo" @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>
<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>
</fieldset>
<div class="table-area">
<el-table :data="displayKittingList" 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.templateId" v-model="templateId">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column prop="bomType" label="配料单类型" fixed="left" min-width="120px" sortable="custom"
:formatter="bomTypeFormat" show-overflow-tooltip />
<el-table-column prop="model" label="机型" min-width="120px" sortable="custom"
show-overflow-tooltip />
<el-table-column prop="productId" :label="kittingBomQueryFormEntity.bomType == 1 ? '成品号' : '服务件成品号'" fixed="left" min-width="120px" sortable="custom"
show-overflow-tooltip />
<el-table-column prop="goodsId" label="原材料号" min-width="120px" sortable="custom"
show-overflow-tooltip />
<el-table-column prop="goodsDescription" label="物料描述" min-width="120px" sortable="custom"
show-overflow-tooltip />
<el-table-column prop="quantity1Pair" label="单套数量" min-width="120px" sortable="custom"
show-overflow-tooltip />
<el-table-column prop="boxNo" label="料盒号" min-width="120px" sortable="custom"
show-overflow-tooltip />
<el-table-column prop="quantityOfPair" label="套数" min-width="120px" sortable="custom"
show-overflow-tooltip />
<!-- <el-table-column fixed="right" label="操作" width="120px">
<template v-slot="scope">
<el-button plain type="primary" @click="editCurrentRowStock(scope.row)">编辑</el-button>
</template>
</el-table-column> -->
</el-table>
<br />
<el-pagination v-model:current-page="baseTableQuery.currentPage"
v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
:disabled="false" :background="false" :default-page-size="10" @size-change="search"
@current-change="search" layout="total, sizes, prev, pager, next, jumper"
:total="baseTableQuery.total" />
</div>
<!-- <el-dialog v-model="dialogVisible" title="库存信息" width="40%" draggable :show-close="false">
<el-form ref="stockFormRef" :model="stockFormEntity" :label-position="labelPosition"
label-width="100px" style="max-width: 100%" :rules="rules" status-icon>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="库存编号" prop="stockId">
<el-input v-model="stockFormEntity.stockId" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="箱号" prop="vehicleId">
<el-input v-model="stockFormEntity.vehicleId" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="料号" prop="goodsId">
<el-input v-model="stockFormEntity.goodsId" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="料名" prop="goodsName">
<el-input v-model="stockFormEntity.goodsName" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="入库数量" prop="totalNum">
<el-input-number v-model.number="stockFormEntity.totalNum" controls-position="right"
:min="0" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="剩余数量（为0时删除库存）" prop="remainNum">
<el-input-number v-model.number="stockFormEntity.remainNum"
controls-position="right" :min="0" :max="stockFormEntity.totalNum" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="库位" prop="locationId">
<el-input v-model="stockFormEntity.locationId" clearable />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="未使用天数" prop="noUseDays">
<el-input-number v-model.number="stockFormEntity.noUseDays"
controls-position="right" :min="0" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="库存状态" prop="stockStatus">
<el-select-v2 v-model="stockFormEntity.stockStatus" placeholder="请选择库存状态"
:options="stockStatusOptions"></el-select-v2>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料状态" prop="goodsStatus">
<el-select-v2 v-model="stockFormEntity.goodsStatus" placeholder="请选择物料状态"
:options="goodsStatusOptions"></el-select-v2>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="盘点任务号" prop="inventoryTaskId">
<el-input v-model="stockFormEntity.inventoryTaskId" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否盘点" prop="isInventory">
<el-input v-model="stockFormEntity.isInventory" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="创建时间" prop="createTime">
<el-input v-model="stockFormEntity.createTime" disabled />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="最近更新时间" prop="lastUpdateTime">
<el-input v-model="stockFormEntity.lastUpdateTime" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="最近更新用户" prop="lastUpdateUser">
<el-input v-model="stockFormEntity.lastUpdateUser" disabled />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click="submitStockInfo(stockFormEntity)">
确定
</el-button>
</span>
</template>
</el-dialog> -->
<el-dialog v-model="showKittingBomUploadDialog" title="上传配料单" width="40%" draggable :show-close="true">
<fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType == 1">
<legend>导入非服务件配料单</legend>
<UploadExcelProduct></UploadExcelProduct>
</fieldset>
<fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType == 2">
<legend>导入服务件配料单</legend>
<UploadExcelSingleProduct></UploadExcelSingleProduct>
</fieldset>
</el-dialog>
<el-config-provider :locale="zhCn">
<el-container class="content">
<div class="work-area">
<fieldset class="search-area">
<el-form ref="kittingBomQueryFormRef" :model="kittingBomQueryFormEntity"
: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="kittingBomQueryFormEntity.bomType"
placeholder="配料单类型"
:options="kittingBomTypeOptions" @change="search()"></el-select-v2>
</el-form-item>
<el-form-item label="机型">
<el-input v-model="kittingBomQueryFormEntity.model" @keyup.enter="search()" clearable/>
</el-form-item>
<el-form-item label="成品号">
<el-input v-model="kittingBomQueryFormEntity.productId" @keyup.enter="search()" clearable/>
</el-form-item>
<el-form-item label="原材料号">
<el-input v-model="kittingBomQueryFormEntity.goodsId" @keyup.enter="search()" clearable/>
</el-form-item>
<el-form-item label="料盒号">
<el-input v-model="kittingBomQueryFormEntity.boxNo" @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>
<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-container>
</el-config-provider>
</el-form>
</fieldset>
<div class="table-area">
<el-table :data="displayKittingList" 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.templateId" v-model="templateId">&nbsp;</el-radio>
</template>
</el-table-column>
<el-table-column prop="bomType" label="配料单类型" fixed="left" min-width="120px" sortable="custom"
:formatter="bomTypeFormat" show-overflow-tooltip/>
<el-table-column prop="model" label="机型" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="productId"
:label="kittingBomQueryFormEntity.bomType === 1 ? '成品号' : '服务件成品号'" fixed="left"
min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="goodsId" label="原材料号" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="goodsDescription" label="物料描述" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="quantity1Pair" label="单套数量" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="boxNo" label="料盒号" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column prop="quantityOfPair" label="套数" min-width="120px" sortable="custom"
show-overflow-tooltip/>
<el-table-column fixed="right" label="操作" width="120px">
<template v-slot="scope">
<el-button plain type="danger" @click="deleteThisProduct(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<br/>
<el-pagination v-model:current-page="baseTableQuery.currentPage"
v-model:page-size="baseTableQuery.pageSize" :page-sizes="[10, 25, 50]" :small="false"
:disabled="false" :background="false" :default-page-size="10" @size-change="search"
@current-change="search" layout="total, sizes, prev, pager, next, jumper"
:total="baseTableQuery.total"/>
</div>
<el-dialog v-model="showKittingBomUploadDialog" title="上传配料单" width="40%" draggable :show-close="true">
<fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType === 1">
<legend>导入非服务件配料单</legend>
<UploadExcelProduct></UploadExcelProduct>
</fieldset>
<fieldset class="search-area" v-if="kittingBomQueryFormEntity.bomType === 2">
<legend>导入服务件配料单</legend>
<UploadExcelSingleProduct></UploadExcelSingleProduct>
</fieldset>
</el-dialog>
</div>
</el-container>
</el-config-provider>
</template>
<script setup>
@ -207,17 +103,20 @@ import store from '@/store'
import zhCn from 'element-plus/dist/locale/zh-cn.mjs'
import UploadExcelProduct from '@/excel/UploadExcelProduct.vue'
import UploadExcelSingleProduct from '@/excel/UploadExcelSingleProduct.vue'
import { queryKittingBomByPage } from '@/api/kateWork.js'
import { 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 { kittingBomTypeOptions } from '@/constant/options.js'
import { exportKittingBomWithExcel } from '@/api/excel.js'
import {deleteKittingBom, queryKittingBomByPage} from '@/api/kateWork.js'
import {dateFormatter} from '@/utils/formatter.js'
import {ref, reactive, onMounted, nextTick, onBeforeUnmount} from 'vue'
import {ElMessage, ElMessageBox} from 'element-plus'
import {genTableRequest} from '@/utils/generator.js'
import {labelPosition} from '@/constant/form.js'
import {kittingBomTypeOptions} from '@/constant/options.js'
import {exportKittingBomWithExcel} from '@/api/excel.js'
import {loading} from "@/utils/loading";
/**
* 常量定义
*/
const USER_NAME = store.getters.getUserName
const STAND_ID = store.getters.getStandId
/**
* 变量定义
*/
@ -225,272 +124,263 @@ let maxHeight = ref(window.innerHeight * 0.55)
let tableLoading = ref(false)
let displayKittingList = ref([])
let baseTableQuery = reactive({
currentPage: 1,
pageSize: 10,
total: 0,
sortBy: new Map([['productId', true]]),// 按照成品号顺序排序
standId: store.getters.getStandId,
userName: store.getters.getUserName
currentPage: 1,
pageSize: 10,
total: 0,
sortBy: new Map([['productId', true]]),// 按照成品号顺序排序
standId: STAND_ID,
userName: USER_NAME
})
let kittingBomQueryFormEntity = reactive({
bomType: 1,
model: '',
productId: '',
goodsId: '',
boxNo: ''
bomType: 1,
model: '',
productId: '',
goodsId: '',
boxNo: ''
})
let kittingBomQueryFormRef = ref()
let showKittingBomEditFlag = ref(false)
let templateId = ''
let kittingBomEditFormRef = ref()
let dbsEditFormEntity = reactive({})
let showKittingBomUploadDialog = ref(false)
/**
* 系统方法
*/
onMounted(() => {
nextTick(() => {
window.addEventListener('resize', resizeHeight)
search()
})
nextTick(() => {
window.addEventListener('resize', resizeHeight)
search()
})
})
onBeforeUnmount(() => {
nextTick(() => {
window.removeEventListener('resize', resizeHeight)
})
nextTick(() => {
window.removeEventListener('resize', resizeHeight)
})
})
const resizeHeight = () => {
maxHeight.value = window.innerHeight * 0.55
maxHeight.value = window.innerHeight * 0.55
}
/**
* 自定义方法
*/
// 查询
const search = () => {
tableLoading.value = true
let request = genTableRequest(baseTableQuery)
// 设定查询参数
request.bomType = kittingBomQueryFormEntity.bomType
request.model = kittingBomQueryFormEntity.model.trim()
request.productId = kittingBomQueryFormEntity.productId.trim()
request.goodsId = kittingBomQueryFormEntity.goodsId.trim()
request.boxNo = kittingBomQueryFormEntity.boxNo.trim()
queryKittingBomByPage(request).then((res) => {
const response = res.data
if (response.code == 0) {
const data = response.data
if (data != null) {
displayKittingList.value = data.lists
baseTableQuery.total = data.total
} else {
displayKittingList.value = []
baseTableQuery.total = 0
}
} else {
ElMessage.error(response.message)
}
}).catch(err => {
console.log(err)
ElMessage.error('查询配料单异常。')
}).finally(() => {
tableLoading.value = false
})
tableLoading.value = true
let request = genTableRequest(baseTableQuery)
// 设定查询参数
request.bomType = kittingBomQueryFormEntity.bomType
request.model = kittingBomQueryFormEntity.model.trim()
request.productId = kittingBomQueryFormEntity.productId.trim()
request.goodsId = kittingBomQueryFormEntity.goodsId.trim()
request.boxNo = kittingBomQueryFormEntity.boxNo.trim()
queryKittingBomByPage(request).then((res) => {
const response = res.data
if (response.code === 0) {
const data = response.data
if (data != null) {
displayKittingList.value = data.lists
baseTableQuery.total = data.total
} else {
displayKittingList.value = []
baseTableQuery.total = 0
}
} else {
ElMessage.error(response.message)
}
}).catch(err => {
console.log(err)
ElMessage.error('查询配料单异常。')
}).finally(() => {
tableLoading.value = false
})
}
const clearQuery = () => {
kittingBomQueryFormEntity.model = ''
kittingBomQueryFormEntity.productId = ''
kittingBomQueryFormEntity.goodsId = ''
kittingBomQueryFormEntity.boxNo = ''
kittingBomQueryFormEntity.model = ''
kittingBomQueryFormEntity.productId = ''
kittingBomQueryFormEntity.goodsId = ''
kittingBomQueryFormEntity.boxNo = ''
}
const bomTypeFormat = (row, column, cellValue, index) => {
switch (cellValue) {
case 1:
return '非服务件'
case 2:
return '服务件'
default:
return '未知类型'
}
switch (cellValue) {
case 1:
return '非服务件'
case 2:
return '服务件'
default:
return '未知类型'
}
}
const handleSortChange = (data) => {
if (baseTableQuery.sortBy.has(data.prop)) {
baseTableQuery.sortBy.delete(data.prop)
}
baseTableQuery.sortBy.set(data.prop, data.order == 'ascending')
search()
if (baseTableQuery.sortBy.has(data.prop)) {
baseTableQuery.sortBy.delete(data.prop)
}
baseTableQuery.sortBy.set(data.prop, data.order.toLowerCase() === 'ascending')
search()
}
const getCurrentRow = (row) => {
templateId = row.templateId
templateId = row.templateId
}
const exportExcel = () => {
const params = {
bomType: kittingBomQueryFormEntity.bomType,
model: kittingBomQueryFormEntity.model,
productId: kittingBomQueryFormEntity.productId,
rgoodsId: kittingBomQueryFormEntity.goodsId,
boxNo: kittingBomQueryFormEntity.boxNo
}
exportKittingBomWithExcel(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]; //拆解获取文件名，如果后端有给返回文件名的话
const preName = kittingBomQueryFormEntity.bomType == 1 ? '非服务件' : '服务件'
let _fileName = preName + '配料单' + dateFormatter(new Date) + '.xlsx'
link.style.display = 'none'//隐藏
const params = {
bomType: kittingBomQueryFormEntity.bomType,
model: kittingBomQueryFormEntity.model,
productId: kittingBomQueryFormEntity.productId,
goodsId: kittingBomQueryFormEntity.goodsId,
boxNo: kittingBomQueryFormEntity.boxNo
}
exportKittingBomWithExcel(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]; //拆解获取文件名，如果后端有给返回文件名的话
const preName = kittingBomQueryFormEntity.bomType === 1 ? '非服务件' : '服务件'
let _fileName = preName + '配料单' + 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('导出失败')
})
}
const editCurrentRowStock = (row) => {
this.stockFormEntity = {
stockId: row.stockId,
locationId: row.locationId,
vehicleId: row.vehicleId,
stockStatus: row.stockStatus,
createTime: row.createTime,
lastUpdateTime: row.lastUpdateTime,
lastUpdateUser: row.lastUpdateUser,
isInventory: row.isInventory,
inventoryTaskId: row.inventoryTaskId,
noUseDays: row.noUseDays,
goodsId: row.goodsId,
goodsName: row.goodsName,
goodsStatus: row.goodsStatus,
remainNum: row.remainNum,
totalNum: row.totalNum
// 兼容不同浏览器的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('下载文件失败')
}
this.dialogVisible = true
}).catch(err => {
console.log(err)
ElMessage.error('导出失败')
})
}
const submitStockInfo = () => {
// 删除当前成品的配料单
const deleteThisProduct = (row) => {
const toDeleteProductId = row.productId
ElMessageBox.confirm(
'当前操作会删除' + toDeleteProductId + '的整个配料单' + '。\n是否确认',
'警告',
{
confirmButtonText: '确认',
cancelButtonText: '取消',
type: 'warning',
}
).then(() => {
const request = {
stockId: this.stockFormEntity.stockId,
locationId: this.stockFormEntity.locationId,
vehicleId: this.stockFormEntity.vehicleId,
stockStatus: this.stockFormEntity.stockStatus,
goodsId: this.stockFormEntity.goodsId,
goodsStatus: this.stockFormEntity.goodsStatus,
remainNum: this.stockFormEntity.remainNum,
userName: store.getters.getUserName
bomType: row.bomType,
productId: row.productId,
userName: USER_NAME,
standId: STAND_ID
}
updateStockInfo(request).then(res => {
if (res.data.code == 0) {
this.dialogVisible = false
ElMessage.success('更新库存成功')
this.search()
} else {
errorBox(res.data.message)
}
loading.open('删除中...')
deleteKittingBom(request).then(res => {
const response = res.data
if (response.code === 0) {
ElMessage.success(response.message)
} else {
ElMessage.error(response.message)
}
}).catch(err => {
console.log(err)
errorBox('更新库存失败')
console.log(err)
ElMessage.error('删除异常')
}).finally(() => {
search()
loading.close()
})
}).catch((err) => {
console.log(err)
ElMessage.info('操作取消')
})
}
const openUploadDialog = () => {
showKittingBomUploadDialog.value = true
showKittingBomUploadDialog.value = true
}
</script>
<style scoped>
.content {
display: flex;
width: 100%;
display: flex;
width: 100%;
}
.work-area {
width: 100%;
/* padding: 5px; */
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;
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;
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;
margin: 5px 5px 5px 5px;
}
.el-form-item .el-input {
width: 196px;
width: 196px;
}
.table-class {
margin: 5px 5px 5px 5px;
width: inherit;
margin: 5px 5px 5px 5px;
width: inherit;
}
.el-pagination {
padding-left: 5px;
padding-left: 5px;
}
.my-autocomplete li {
width: 196px;
line-height: normal;
padding: 7px;
width: 196px;
line-height: normal;
padding: 7px;
}
.my-autocomplete li .name {
text-overflow: ellipsis;
overflow: hidden;
text-overflow: ellipsis;
overflow: hidden;
}
.my-autocomplete li .addr {
font-size: 12px;
color: #b4b4b4;
font-size: 12px;
color: #b4b4b4;
}
.my-autocomplete li .highlighted .addr {
color: #ddd;
color: #ddd;
}
.my-autocomplete li .goods_id {
color: brown;
color: brown;
}
.my-autocomplete li .goods_name {
color: cornflowerblue;
color: cornflowerblue;
}
.btn-search {
height: 30px;
width: 80px;
margin: auto 5px 5px auto;
color: black;
height: 30px;
width: 80px;
margin: auto 5px 5px auto;
color: black;
}
</style>

4
dev_wms_client/src/layout/workSummary.vue
View File

@ -178,13 +178,13 @@
<el-row :gutter="16">
<el-col :span="12" :offset="0">
<el-form-item label="工作状态">
<el-select-v2 v-model="rowFormEntity.workStatus" placeholder="请选择工作状态"
<el-select-v2 style="width: 196px;" v-model="rowFormEntity.workStatus" placeholder="请选择工作状态"
:options="workStatusOptions"></el-select-v2>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="缺料状态">
<el-select-v2 v-model="rowFormEntity.lackStatus" placeholder="请选择缺料状态"
<el-select-v2 style="width: 196px;" v-model="rowFormEntity.lackStatus" placeholder="请选择缺料状态"
:options="lackStatusOptions"></el-select-v2>
</el-form-item>
</el-col>

9
dev_wms_client/src/utils/generator.js
View File

@ -20,13 +20,14 @@ export const genTableRequest = (baseTableQuery) => {
/**
* 向options中添加全部这个选项
* @param {*} options
* @returns
* @param {*} options
* @param defaultValue
* @returns
*/
export const addAllOptionOfOptions = (options) => {
export const addAllOptionOfOptions = (options, defaultValue) => {
const allOption = [
{
value: -99,
value: defaultValue === undefined || defaultValue === null ? -99 : defaultValue,
label: '全部'
}
]

12
dev_wms_serve/src/main/java/com/wms_main/controller/wms/ExcelController.java
View File

@ -42,6 +42,18 @@ public class ExcelController {
return importExcelEasyPoi.doImportBaseGoods(file, fileVo);
}
/**
* 导入盘点清单
* @param file 文件
* @param fileVo 文件信息
* @return 导入结果
* @throws Exception 异常
*/
@PostMapping("/importInventoryRequest")
public BaseWmsApiResponse importInventoryRequest(@RequestPart("file") MultipartFile file, @RequestPart("fileVo") FileVo fileVo) throws Exception {
return importExcelEasyPoi.doImportInventoryRequest(file, fileVo);
}
/**
* 导入看板数据
* @param file 文件

10
dev_wms_serve/src/main/java/com/wms_main/controller/wms/KateWorkController.java
View File

@ -232,4 +232,14 @@ public class KateWorkController {
public BaseWmsApiResponse deleteDbsPlan(@RequestBody DbsRequest dbsRequest) {
return kateWorkControllerService.deleteDbsPlan(dbsRequest);
}
/**
* 删除配料单
* @param kittingBomRequest 删除请求
* @return 删除结果
*/
@PostMapping("/deleteKittingBom")
public BaseWmsApiResponse deleteKittingBom(@RequestBody KittingBomRequest kittingBomRequest) {
return kateWorkControllerService.deleteKittingBom(kittingBomRequest);
}
}

2
dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java
View File

@ -126,6 +126,8 @@ public class TaskController {
return taskControllerService.requestInventory(inventoryRequest);
}
/**
* 查询盘点任务确认信息
* @param inventoryConfirmRequest 请求

2
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/ApiReceiveLogExcelTemplate.java
View File

@ -57,6 +57,6 @@ public class ApiReceiveLogExcelTemplate {
/**
* 日志记录时间
*/
@Excel(name = "log_time")
@Excel(name = "log_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime logTime;
}

2
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/ApiSendLogExcelTemplate.java
View File

@ -72,7 +72,7 @@ public class ApiSendLogExcelTemplate {
/**
* 请求时间
*/
@Excel(name = "request_time")
@Excel(name = "request_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime requestTime;
/**
* 响应时间

21
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/DbsExcelTemplate.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
import java.time.LocalDateTime;
/**
* excel模板
@ -80,4 +81,24 @@ public class DbsExcelTemplate {
*/
@Excel(name = "备注")
private String remark;
/**
* 状态
*/
@Excel(name = "状态", replace = {"未开始_0", "已开始_1", "已完成_2"})
private Integer dbsStatus;
/**
* 工作站台
*/
@Excel(name = "工作站台")
private String workStand;
/**
* 实际工作日期
*/
@Excel(name = "实际工作日期")
private LocalDate realWorkDate;
/**
* 完成时间
*/
@Excel(name = "完成时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
}

2
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/DbsRecordExcelTemplateForSave.java
View File

@ -98,7 +98,7 @@ public class DbsRecordExcelTemplateForSave {
/**
* 完成时间
*/
@Excel(name = "finish_time")
@Excel(name = "finish_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
* K料备注

45
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/GoodsRequireExcelTemplate.java
View File

@ -1,45 +0,0 @@
package com.wms_main.excel.easypoi.excelTemplate;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 物料需求excel模版
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class GoodsRequireExcelTemplate {
/**
* 料号
*/
private String goodsId;
/**
* 描述
*/
private String goodsDesc;
/**
* 需求数量
*/
private Integer needQty;
/**
* 库存数量
*/
private Integer stockQty;
/**
* 缺少数量
*/
private Integer lackQty;
/**
* 物料类型
* 1: 看板 2: MRP
*/
private String goodsType;
/**
* 库存类型
* 1: 库内料 2：库外料
*/
private String stockType;
}

4
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/InventoryRecordExcelTemplateForSave.java
View File

@ -75,12 +75,12 @@ public class InventoryRecordExcelTemplateForSave {
/**
* 盘点任务创建时间
*/
@Excel(name = "inv_create_time")
@Excel(name = "inv_create_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime invCreateTime;
/**
* 盘点确认时间
*/
@Excel(name = "inv_confirm_time")
@Excel(name = "inv_confirm_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime invConfirmTime;
/**
* 这个字段用于合并哪些任务是同一时间下发的

21
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/ImageTemplate.java → dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/InventoryRequestExcelTemplate.java
View File

@ -5,15 +5,18 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 导入带图片的excel模板
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
public class ImageTemplate {
@Excel(name = "id")
private String imageId;
@Excel(name = "图片", type = 2, savePath = "D:\\image")
private String imageTest;
@NoArgsConstructor
public class InventoryRequestExcelTemplate {
/**
* 料号
*/
@Excel(name = "料号")
private String goodsId;
/**
* 箱号
*/
@Excel(name = "箱号")
private String vehicleId;
}

4
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/KateWorkExcelTemplate.java
View File

@ -84,12 +84,12 @@ public class KateWorkExcelTemplate {
/**
* 创建时间
*/
@Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 完成时间
*/
@Excel(name = "完成时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
* 缺料状态

2
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/OutsRecordExcelTemplateForSave.java
View File

@ -68,6 +68,6 @@ public class OutsRecordExcelTemplateForSave {
/**
* 请求时间
*/
@Excel(name = "request_time")
@Excel(name = "request_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime requestTime;
}

8
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/PickTaskBakExcelTemplate.java
View File

@ -37,21 +37,21 @@ public class PickTaskBakExcelTemplate {
/**
* 创建时间
*/
@Excel(name = "create_time")
@Excel(name = "create_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 发送时间
*/
@Excel(name = "send_time")
@Excel(name = "send_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime sendTime;
/**
* 到达时间
*/
@Excel(name = "arrive_time")
@Excel(name = "arrive_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime arriveTime;
/**
* 离开时间
*/
@Excel(name = "leave_time")
@Excel(name = "leave_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime leaveTime;
}

6
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/StockExcelTemplate.java
View File

@ -48,7 +48,7 @@ public class StockExcelTemplate {
/**
* 初次入库时间
*/
@Excel(name = "初次入库时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "初次入库时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime firstInTime;
/**
* 初次入库用户
@ -58,7 +58,7 @@ public class StockExcelTemplate {
/**
* 上次更新时间
*/
@Excel(name = "上次更新时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "上次更新时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime lastUpdateTime;
/**
* 上次更新用户
@ -88,7 +88,7 @@ public class StockExcelTemplate {
/**
* 有效期
*/
@Excel(name = "有限期止", format = "yyyy-MM-dd")
@Excel(name = "有限期止", exportFormat = "yyyy-MM-dd")
private LocalDate expireDate;
/**
* sled 天数

4
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/StockUpdateExcelTemplate.java
View File

@ -32,7 +32,7 @@ public class StockUpdateExcelTemplate {
/**
* 初次入库时间
*/
@Excel(name = "初次入库时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "初次入库时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime firstInTime;
/**
* 原数量
@ -52,7 +52,7 @@ public class StockUpdateExcelTemplate {
/**
* 更新时间
*/
@Excel(name = "更新时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "更新时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
* 更新用户

4
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/StockUpdateRecordExcelTemplateForSave.java
View File

@ -32,7 +32,7 @@ public class StockUpdateRecordExcelTemplateForSave {
/**
* 首次入库时间
*/
@Excel(name = "first_in_time")
@Excel(name = "first_in_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime firstInTime;
/**
* 原数量
@ -52,7 +52,7 @@ public class StockUpdateRecordExcelTemplateForSave {
/**
* 更新时间
*/
@Excel(name = "update_time")
@Excel(name = "update_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
/**
* 更新用户

4
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/TaskRecordExcelTemplate.java
View File

@ -57,12 +57,12 @@ public class TaskRecordExcelTemplate {
/**
* 创建时间
*/
@Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "创建时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 完成时间
*/
@Excel(name = "完成时间", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "完成时间", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
* 料号

6
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/WcsTaskBakExcelTemplate.java
View File

@ -52,17 +52,17 @@ public class WcsTaskBakExcelTemplate {
/**
* 创建时间
*/
@Excel(name = "create_time")
@Excel(name = "create_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 发送时间
*/
@Excel(name = "send_time")
@Excel(name = "send_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime sendTime;
/**
* 完成时间
*/
@Excel(name = "finish_time")
@Excel(name = "finish_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
* 备注

4
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/WmsTaskBakExcelTemplate.java
View File

@ -57,12 +57,12 @@ public class WmsTaskBakExcelTemplate {
/**
* 创建时间
*/
@Excel(name = "create_time")
@Excel(name = "create_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 完成时间
*/
@Excel(name = "finish_time")
@Excel(name = "finish_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
* 料号

4
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/excelTemplate/WorkRecordExcelTemplateForSave.java
View File

@ -78,12 +78,12 @@ public class WorkRecordExcelTemplateForSave {
/**
* 创建时间
*/
@Excel(name = "create_time")
@Excel(name = "create_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 完成时间
*/
@Excel(name = "finish_time")
@Excel(name = "finish_time", exportFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime finishTime;
/**
* 缺料状态

16
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/IImportExcelEasyPoi.java
View File

@ -6,13 +6,6 @@ import com.wms_main.model.vo.others.FileVo;
import org.springframework.web.multipart.MultipartFile;
public interface IImportExcelEasyPoi extends IBaseImportExcelEasyPoi {
/**
* 执行道路
* @param file 文件
* @return 结果
* @throws Exception 异常
*/
BaseWmsApiResponse doImportExcel(MultipartFile file) throws Exception;
/**
* 导入dbs
@ -67,4 +60,13 @@ public interface IImportExcelEasyPoi extends IBaseImportExcelEasyPoi {
* @throws Exception 异常
*/
BaseWmsApiResponse doImportKanban(MultipartFile file, FileVo fileVo) throws Exception;
/**
* 导入盘点请求
* @param file 文件
* @param fileVo 文件信息
* @return 导入结果
* @throws Exception 异常
*/
BaseWmsApiResponse doImportInventoryRequest(MultipartFile file, FileVo fileVo) throws Exception;
}

6
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ExportExcelEasyPoi.java
View File

@ -58,7 +58,11 @@ public class ExportExcelEasyPoi extends BaseExportExcelEasyPoi implements IExpor
dbs.getFamily(),
dbs.getTestNo(),
dbs.getKittingRemark(),
dbs.getRemark()
dbs.getRemark(),
dbs.getDbsStatus(),
dbs.getWorkStand(),
dbs.getRealWorkDate(),
dbs.getFinishTime()
));
}
} else {

199
dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java
View File

@ -6,6 +6,9 @@ import cn.hutool.core.io.FileUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.wms_main.app.AppCommon;
import com.wms_main.constant.enums.others.DbsStatusEnums;
import com.wms_main.constant.enums.wms.WmsInvResultEnums;
import com.wms_main.constant.enums.wms.WmsInvStatusEnums;
import com.wms_main.constant.enums.wms.WmsInvTypeEnums;
import com.wms_main.dao.*;
import com.wms_main.excel.easypoi.excelTemplate.*;
import com.wms_main.excel.easypoi.service.IImportExcelEasyPoi;
@ -22,7 +25,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.multipart.MultipartFile;
import java.io.File;
import java.io.FileInputStream;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;
@ -37,32 +39,10 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
private final ITAppKanbanService tAppKanbanService;// 看板服务
private final ITAppProductExtendService tAppProductExtendService;// 总成-单片对应关系服务
private final ITAppSingleProductService tAppSingleProductService;// 单片服务
private final ITAppInventoryService tAppInventoryService;// 盘点请求服务
private final ITAppStockService tAppStockService;// 库存服务
private final AppCommon appCommon;
@Override
public BaseWmsApiResponse doImportExcel(MultipartFile file) throws Exception {
ImportParams params = new ImportParams();
params.setHeadRows(1);
params.setSheetNum(1);
// params.setNeedSave(false);
//解析后的图片字段存放的是图片的地址，需要在GoodsModel中配置图片存放路径
List<ImageTemplate> result = ExcelImportUtil.importExcel(file.getInputStream(), ImageTemplate.class, params);
for (ImageTemplate imageModel : result) {
if (StringUtils.isNotEmpty(imageModel.getImageTest())) {
//将图片文件转为base64图片
File file1 = new File(imageModel.getImageTest());
FileInputStream inputStream = new FileInputStream(file1);
byte[] buffer = new byte[inputStream.available()];
if (inputStream.read(buffer) == -1) {
inputStream.close();
}
StringBuilder imageBase64 = new StringBuilder(Base64.getEncoder().encodeToString(buffer));
imageModel.setImageTest(new String(imageBase64));
}
}
return BaseWmsApiResponse.success();
}
/**
* 导入dbs的实现
*
@ -486,6 +466,175 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
}
}
/**
* 导入盘点请求---实现
* @param file 文件
* @param fileVo 文件信息
* @return 导入结果
* @throws Exception 异常
*/
@Override
@Transactional(rollbackFor = Exception.class)
public BaseWmsApiResponse doImportInventoryRequest(MultipartFile file, FileVo fileVo) throws Exception {
// 设置解析条件
ImportParams inventoryRequestImportparams = new ImportParams();
inventoryRequestImportparams.setHeadRows(1);
inventoryRequestImportparams.setSheetNum(1);
// 解析excel文件
List<InventoryRequestExcelTemplate> inventoryRequestRawDatas = ExcelImportUtil.importExcel(file.getInputStream(), InventoryRequestExcelTemplate.class, inventoryRequestImportparams);
// 查询到目前已经存在的所有的盘点任务
List<TAppInventory> existInventoryList = tAppInventoryService.list();
// 生成料号为key，箱号列表为值的map
Map<String, List<String>> goodsToVehicleListMap = new HashMap<>();
// 根据载具号map一下
Map<String, String> vehicleToGoodsMap = new HashMap<>();
for (TAppInventory inventory : existInventoryList) {
// 料号map
if (goodsToVehicleListMap.containsKey(inventory.getGoodsId())) {
List<String> oldVehicleList = new ArrayList<>(goodsToVehicleListMap.get(inventory.getGoodsId()));
oldVehicleList.add(inventory.getVehicleId());
goodsToVehicleListMap.replace(inventory.getGoodsId(), oldVehicleList);
} else {
goodsToVehicleListMap.put(inventory.getGoodsId(), List.of(inventory.getVehicleId()));
}
// 箱号map
if (!vehicleToGoodsMap.containsKey(inventory.getVehicleId())) {
vehicleToGoodsMap.put(inventory.getVehicleId(), inventory.getGoodsId());
}
}
// 处理导入的数据，筛选出料号
List<String> needInventoryGoodsIds = new ArrayList<>();
for (InventoryRequestExcelTemplate inventoryRequestRawData : inventoryRequestRawDatas) {
if (StringUtils.isEmpty(inventoryRequestRawData.getGoodsId())) {
return BaseWmsApiResponse.error("存在数据行信息不全，料号必须输入。");
}
if (goodsToVehicleListMap.containsKey(inventoryRequestRawData.getGoodsId())) {
// 存在料号，再判断是不是包含箱号
if (StringUtils.isNotEmpty(inventoryRequestRawData.getVehicleId())) {
// 获取到料箱列表值
List<String> vehicleList = goodsToVehicleListMap.get(inventoryRequestRawData.getGoodsId());
if (!vehicleList.contains(inventoryRequestRawData.getVehicleId())) {
// 这个箱号没有被盘点过
needInventoryGoodsIds.add(inventoryRequestRawData.getGoodsId());
}
}
} else {
needInventoryGoodsIds.add(inventoryRequestRawData.getGoodsId());
}
}
if (needInventoryGoodsIds.isEmpty()) {
return BaseWmsApiResponse.error("没有能够盘点的请求。");
}
// 查询库存
List<TAppStock> stockList = tAppStockService.list(new LambdaQueryWrapper<TAppStock>()
.in(TAppStock::getGoodsId, needInventoryGoodsIds));
if (stockList == null || stockList.isEmpty()) {
return BaseWmsApiResponse.error("没有库存能够满足盘点请求。");
}
// 新生成的盘点任务
Map<String, TAppInventory> inventoryByVehicleMap = new HashMap<>();
// 盘点单号
String orderId = UUIDUtils.getNewUUID();
// 生成盘点任务
for (InventoryRequestExcelTemplate inventoryRequest : inventoryRequestRawDatas) {
if (goodsToVehicleListMap.containsKey(inventoryRequest.getGoodsId())) {
// 判断这个请求是否包含箱号
if (StringUtils.isNotEmpty(inventoryRequest.getVehicleId())) {
List<String> vehicleList = new ArrayList<>(goodsToVehicleListMap.get(inventoryRequest.getGoodsId()));
if (!vehicleList.contains(inventoryRequest.getVehicleId())) {
// 生成一个新的盘点任务
for (TAppStock stock : stockList) {
if (!Objects.equals(stock.getGoodsId(), inventoryRequest.getGoodsId())) {
// 料号不对应
continue;
}
if (StringUtils.isNotEmpty(inventoryRequest.getVehicleId()) && !Objects.equals(stock.getVehicleId(), inventoryRequest.getVehicleId())) {
// 箱号不对应
continue;
}
if (!inventoryByVehicleMap.containsKey(stock.getVehicleId()) && !vehicleToGoodsMap.containsKey(stock.getVehicleId())) {
// 添加盘点任务
TAppInventory inventoryTask = new TAppInventory(
UUIDUtils.getNewUUID(),
inventoryRequest.getGoodsId(),
stock.getVehicleId(),
null,
null,
fileVo.getStandId(),
fileVo.getUserName(),
WmsInvTypeEnums.INV_TYPE_1.getCode(),
WmsInvStatusEnums.INIT.getCode(),
WmsInvResultEnums.NONE.getCode(),
LocalDateTime.now(),
null,
orderId
);
inventoryByVehicleMap.put(stock.getVehicleId(), inventoryTask);
vehicleList.add(stock.getVehicleId());
if (StringUtils.isNotEmpty(inventoryRequest.getVehicleId()) && Objects.equals(stock.getVehicleId(), inventoryRequest.getVehicleId())) {
// 已经生成了该箱号的盘点任务，那么跳出循环
break;
}
}
}
goodsToVehicleListMap.put(inventoryRequest.getGoodsId(), vehicleList);
}
}
} else {
List<String> thisTimeAddVehicleList = new ArrayList<>();
// 那么要生成任务
for (TAppStock stock : stockList) {
if (!Objects.equals(stock.getGoodsId(), inventoryRequest.getGoodsId())) {
// 料号不对应
continue;
}
if (StringUtils.isNotEmpty(inventoryRequest.getVehicleId()) && !Objects.equals(stock.getVehicleId(), inventoryRequest.getVehicleId())) {
// 箱号不对应
continue;
}
if (!inventoryByVehicleMap.containsKey(stock.getVehicleId()) && !vehicleToGoodsMap.containsKey(stock.getVehicleId())) {
// 添加盘点任务
TAppInventory inventoryTask = new TAppInventory(
UUIDUtils.getNewUUID(),
inventoryRequest.getGoodsId(),
stock.getVehicleId(),
null,
null,
fileVo.getStandId(),
fileVo.getUserName(),
WmsInvTypeEnums.INV_TYPE_1.getCode(),
WmsInvStatusEnums.INIT.getCode(),
WmsInvResultEnums.NONE.getCode(),
LocalDateTime.now(),
null,
orderId
);
inventoryByVehicleMap.put(stock.getVehicleId(), inventoryTask);
thisTimeAddVehicleList.add(stock.getVehicleId());
if (StringUtils.isNotEmpty(inventoryRequest.getVehicleId()) && Objects.equals(stock.getVehicleId(), inventoryRequest.getVehicleId())) {
// 已经生成了该箱号的盘点任务，那么跳出循环
break;
}
}
}
if (!thisTimeAddVehicleList.isEmpty()) {
goodsToVehicleListMap.put(inventoryRequest.getGoodsId(), thisTimeAddVehicleList);
}
}
}
// 保存盘点任务信息
if (!inventoryByVehicleMap.isEmpty()) {
// 保存盘点任务
tAppInventoryService.saveBatch(inventoryByVehicleMap.values());
// 保存文件信息
saveFileVo(fileVo);
return BaseWmsApiResponse.success("处理批量盘点清单成功。");
} else {
return BaseWmsApiResponse.warn("未生成新的盘点任务，可能是之前的盘点任务仍未处理完。");
}
}
/**
* 保存fileVo信息
*

36
dev_wms_serve/src/main/java/com/wms_main/filter/RequestLogFilter.java
View File

@ -58,24 +58,24 @@ public class RequestLogFilter extends HttpFilter {
RequestLog logInfo = new RequestLog(method, uri, remoteHost, remoteAddr, requestContentString, String.valueOf(status), responseContentString);
log.info(logInfo.toString());
// 增加存储数据库的操作
new Thread(() -> {
try {
TSysLog logForDb = new TSysLog(
UUIDUtils.getNewUUID(),
logInfo.getMethod(),
logInfo.getUri(),
logInfo.getRemoteHost(),
logInfo.getRemoteAddr(),
logInfo.getRequestContent(),
logInfo.getStatus(),
logInfo.getResponseContent(),
LocalDateTime.now()
);
sysLogService.save(logForDb);
} catch (Exception e) {
log.error("记录日志失败。", e);
}
}).start();
// new Thread(() -> {
// try {
// TSysLog logForDb = new TSysLog(
// UUIDUtils.getNewUUID(),
// logInfo.getMethod(),
// logInfo.getUri(),
// logInfo.getRemoteHost(),
// logInfo.getRemoteAddr(),
// logInfo.getRequestContent(),
// logInfo.getStatus(),
// logInfo.getResponseContent(),
// LocalDateTime.now()
// );
// sysLogService.save(logForDb);
// } catch (Exception e) {
// log.error("记录日志失败。", e);
// }
// }).start();
// 把缓存的响应数据，响应给客户端
responseWrapper.copyBodyToResponse();

4
dev_wms_serve/src/main/java/com/wms_main/model/dto/query/KittingBomQuery.java
View File

@ -16,8 +16,8 @@ import lombok.NoArgsConstructor;
public class KittingBomQuery extends PageQuery {
/**
* 配料单类型
* 1：总成
* 2：单片
* 1：非服务件
* 2：服务件
*/
@JsonProperty("bomType")
private Integer bomType;

44
dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/KittingBomRequest.java Normal file
View File

@ -0,0 +1,44 @@
package com.wms_main.model.dto.request.wms;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* 配料单请求
*/
@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
public class KittingBomRequest extends BaseWmsRequest{
/**
* 配料单类型
* 1：非服务件
* 2：服务件
*/
@JsonProperty("bomType")
private Integer bomType;
/**
* 机型
*/
@JsonProperty("model")
private String model;
/**
* 成品号
*/
@JsonProperty("productId")
private String productId;
/**
* 原材料号
*/
@JsonProperty("goodsId")
private String goodsId;
/**
* 料盒号
*/
@JsonProperty("boxNo")
private String boxNo;
}

5
dev_wms_serve/src/main/java/com/wms_main/model/vo/others/FileVo.java
View File

@ -42,4 +42,9 @@ public class FileVo {
*/
@JsonProperty("userName")
private String userName;
/**
* 站台号
*/
@JsonProperty("standId")
private String standId;
}

7
dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/InventoryRecordVo.java
View File

@ -61,10 +61,9 @@ public class InventoryRecordVo {
private Integer invType;
/**
* 盘点状态
* 1. 初始化
* 2. 已解析
* 3. 数量确认
* 4. 盘点关闭
* 0. 初始化
* 1. 已解析
* 2. 已确认
*/
@JsonProperty("invStatus")
private Integer invStatus;

7
dev_wms_serve/src/main/java/com/wms_main/service/controller/IKateWorkControllerService.java
View File

@ -159,4 +159,11 @@ public interface IKateWorkControllerService {
* @return 删除结果
*/
BaseWmsApiResponse deleteDbsPlan(DbsRequest dbsRequest);
/**
* 删除配料单
* @param kittingBomRequest 删除请求
* @return 删除结果
*/
BaseWmsApiResponse deleteKittingBom(KittingBomRequest kittingBomRequest);
}

30
dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java
View File

@ -1331,6 +1331,36 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
return appDbsService.removeById(targetDbs.getDbsId()) ? BaseWmsApiResponse.success("删除DBS成功。") : BaseWmsApiResponse.error("删除DBS失败。");
}
/**
* 删除配料单---实现
* @param kittingBomRequest 删除请求
* @return 删除结果
*/
@Override
@Transactional(rollbackFor = Exception.class)
public BaseWmsApiResponse deleteKittingBom(KittingBomRequest kittingBomRequest) {
if (kittingBomRequest == null) {
// 请求为NULL
return BaseWmsApiResponse.error("请求参数不能为NULL。");
}
if (kittingBomRequest.getBomType() == null || StringUtils.isEmpty(kittingBomRequest.getProductId())) {
return BaseWmsApiResponse.error("请求参数中，配料单类型bomType与成品号productId为必须项。");
}
if (kittingBomRequest.getBomType() == 1) {
// 删除非服务件配料单
LambdaQueryWrapper<TAppProduct> deleteWrapper = new LambdaQueryWrapper<TAppProduct>()
.eq(TAppProduct::getProductId, kittingBomRequest.getProductId());
return appProductService.remove(deleteWrapper) ? BaseWmsApiResponse.success("删除非服务件配料单成功。") : BaseWmsApiResponse.error("删除非服务件配料单失败。");
} else if (kittingBomRequest.getBomType() == 2) {
// 删除非服务件配料单
LambdaQueryWrapper<TAppSingleProduct> deleteServiceWrapper = new LambdaQueryWrapper<TAppSingleProduct>()
.eq(TAppSingleProduct::getProductId, kittingBomRequest.getProductId());
return appSingleProductService.remove(deleteServiceWrapper) ? BaseWmsApiResponse.success("删除服务件配料单成功。") : BaseWmsApiResponse.error("删除服务件配料单失败。");
} else {
return BaseWmsApiResponse.error("请求参数中，配料单类型bomType错误。");
}
}
/**
* 获取服务件成品号的物料需求
*

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

@ -193,6 +193,7 @@ public class TaskQueryControllerServiceImpl implements ITaskQueryControllerServi
// 查询盘点请求
Page<TAppInventory> page = inventoryQuery.toMpPage();
LambdaQueryWrapper<TAppInventory> lambdaQueryWrapper = new LambdaQueryWrapper<TAppInventory>()
.like(StringUtils.isNotEmpty(inventoryQuery.getInventoryId()), TAppInventory::getInventoryId, inventoryQuery.getInventoryId())
.like(StringUtils.isNotEmpty(inventoryQuery.getGoodsId()), TAppInventory::getGoodsId, inventoryQuery.getGoodsId())
.like(StringUtils.isNotEmpty(inventoryQuery.getVehicleId()), TAppInventory::getVehicleId, inventoryQuery.getVehicleId())
.eq(inventoryQuery.getInvResult() != null, TAppInventory::getInvResult, inventoryQuery.getInvResult());
@ -203,6 +204,7 @@ public class TaskQueryControllerServiceImpl implements ITaskQueryControllerServi
// 默认；查询盘点记录
Page<TAppInventoryRecord> page = inventoryQuery.toMpPage();
LambdaQueryWrapper<TAppInventoryRecord> lambdaQueryWrapper = new LambdaQueryWrapper<TAppInventoryRecord>()
.like(StringUtils.isNotEmpty(inventoryQuery.getInventoryId()), TAppInventoryRecord::getInventoryId, inventoryQuery.getInventoryId())
.like(StringUtils.isNotEmpty(inventoryQuery.getGoodsId()), TAppInventoryRecord::getGoodsId, inventoryQuery.getGoodsId())
.like(StringUtils.isNotEmpty(inventoryQuery.getVehicleId()), TAppInventoryRecord::getVehicleId, inventoryQuery.getVehicleId())
.eq(inventoryQuery.getInvResult() != null, TAppInventoryRecord::getInvResult, inventoryQuery.getInvResult());

27677
dev_wms_serve/src/main/resources/sql/wms_kate_wuxi.sql Normal file
View File

File diff suppressed because it is too large Load Diff