-
-
-
- 工作台
-
-
- 物料盘点
-
-
- 工作站：
-
-
- {{ standId }}
-
-
-
-
- 物料盘点
-
-
-
-
-
-
-
-
- {{ workFormEntity.tip }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 下发盘点
+
+ 清除输入
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确认/放行
+
+
+
+
+
+
+
+import {useRoute} from "vue-router";
+import {errorBox, warningBox} from "@/utils/myMessageBox";
+import {ElMessage} from "element-plus";
+import {confirmInventory, getInventoryConfirm, requestInventory} from "@/api/task";
+import {labelPosition} from "@/constant/form";
-
\ No newline at end of file
diff --git a/dev_wms_client/src/layout/kateOrdersTable.vue b/dev_wms_client/src/layout/kateOrdersTable.vue
deleted file mode 100644
index 932eefe..0000000
--- a/dev_wms_client/src/layout/kateOrdersTable.vue
+++ /dev/null
@@ -1,388 +0,0 @@
-
-
-
-
-
- 搜索
- 重置
-
-
- 导入
-
-
-
-
-
-
-
-
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 上次更新
-
-
-
- 再次更新
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/dev_wms_client/src/layout/kitting.vue b/dev_wms_client/src/layout/kitting.vue
index 66698b7..54136a4 100644
--- a/dev_wms_client/src/layout/kitting.vue
+++ b/dev_wms_client/src/layout/kitting.vue
@@ -306,7 +306,6 @@ const route = useRoute()// 路由
onMounted(() => {
nextTick(() => {
initWorkOptions()
- searchKittingGoods()
timer.value = setInterval(() => {
timerTask_1()
}, 1000)
@@ -364,6 +363,8 @@ const timerTask_1 = () => {
getWork()
// 判断是否需要显示料盒信息
ifNeedShowBoxSummary()
+ // 查询当前配料的物料信息
+ searchKittingGoods()
}
// 自定义方法
const solveEnterKey = (e) => {
@@ -446,7 +447,6 @@ const confirmStart = () => {
errorBox('请求错误。')
}).finally(() => {
loading.close()
- searchKittingGoods()
})
}
// 显示料盒总览
@@ -562,7 +562,6 @@ const ifNeedShowBoxSummary = () => {
storeKittingWork.productId = confirmEntity.productId
storeKittingWork.singleProductId = confirmEntity.singleProductId
storeKittingWork.boxNo = confirmEntity.boxNo
- searchKittingGoods()
}
} else {
// 替换store
@@ -603,25 +602,20 @@ const confirmOrRelease = () => {
if (response.code == 0) {
// 设置form
resetConfirmEntity()
- // 继续刷新
- pauseGetWorkFlag.value = false
ElMessage.success(response.message)
} else if (response.code == 400) {
// 设置form
resetConfirmEntity()
// 警告
- pauseGetWorkFlag.value = false
warningBox(response.message)
} else {
// 错误
errorBox(response.message)
}
+ pauseGetWorkFlag.value = false
}).catch(err => {
console.log(err)
errorBox('请求错误，请检查完原因后刷新界面。')
- }).finally(() => {
- // 刷新一下物料显示
- searchKittingGoods()
})
}
const resetConfirmEntity = () => {
diff --git a/dev_wms_client/src/layout/kittingList.vue b/dev_wms_client/src/layout/kittingList.vue
index 59fc408..d8fb569 100644
--- a/dev_wms_client/src/layout/kittingList.vue
+++ b/dev_wms_client/src/layout/kittingList.vue
@@ -8,7 +8,7 @@
-
@@ -450,10 +450,6 @@ const openUploadDialog = () => {
width: 196px;
}
-.el-form-item .el-select-v2 {
- width: 196px;
-}
-
.table-class {
margin: 5px 5px 5px 5px;
width: inherit;
diff --git a/dev_wms_client/src/layout/kittingRelation.vue b/dev_wms_client/src/layout/kittingRelation.vue
index 2cacead..f758815 100644
--- a/dev_wms_client/src/layout/kittingRelation.vue
+++ b/dev_wms_client/src/layout/kittingRelation.vue
@@ -409,10 +409,6 @@ const openUploadDialog = () => {
width: 196px;
}
-.el-form-item .el-select-v2 {
- width: 196px;
-}
-
.table-class {
margin: 5px 5px 5px 5px;
width: inherit;
diff --git a/dev_wms_client/src/layout/pickTaskMonitor.vue b/dev_wms_client/src/layout/pickTaskMonitor.vue
index 8e2995c..bbe0083 100644
--- a/dev_wms_client/src/layout/pickTaskMonitor.vue
+++ b/dev_wms_client/src/layout/pickTaskMonitor.vue
@@ -1,293 +1,278 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 搜索
- 重置
+ 查询
+ 清除输入
+
-
-
-
-
-
-
-
- 编辑
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
diff --git a/dev_wms_client/src/layout/scanForImage.vue b/dev_wms_client/src/layout/scanForImage.vue
index 8467786..280e930 100644
--- a/dev_wms_client/src/layout/scanForImage.vue
+++ b/dev_wms_client/src/layout/scanForImage.vue
@@ -17,6 +17,8 @@ import { requestImageDetail } from '@/api/kateWork.js'
import { isSingleCharacter, isNumber } from '@/utils/stringUtils';
import { onBeforeUnmount, onMounted, reactive } from 'vue';
// 声明变量
+const USER_NAME = store.getters.getUserName
+const STAND_ID = store.getters.getStandId
const fit = 'contain'
let imageData = reactive({
url: '',
@@ -27,8 +29,8 @@ let imageData = reactive({
let inputStr = ''
let imageRequest = reactive({
imageId: '',
- userName: store.getters.getUserName,
- standId: store.getters.getStandId
+ userName: USER_NAME,
+ standId: STAND_ID
})
// 声明系统方法
onMounted(() => {
@@ -39,10 +41,10 @@ onBeforeUnmount(() => {
})
// 声明自定义方法
const handleKeyDown = (event) => {
- if (event.key.toLowerCase() == 'enter') {
+ if (event.key.toLowerCase() === 'enter') {
solveInput()
} else {
- if (event.key.toLowerCase() == 'backspace') {
+ if (event.key.toLowerCase() === 'backspace') {
inputStr = inputStr.substring(0, inputStr.length - 1)
} else if (isSingleCharacter(event.key) || isNumber(event.key)) {
inputStr += event.key
@@ -52,7 +54,7 @@ const handleKeyDown = (event) => {
// 处理输入
const solveInput = () => {
// 空输入
- if (inputStr == '') {
+ if (inputStr === '') {
closePreview('空输入。')
}
// 解析
@@ -62,15 +64,15 @@ const solveInput = () => {
}
// 查询图纸
const findImage = () => {
- if (imageRequest.imageId == '') {
+ if (imageRequest.imageId === '') {
closePreview('请求缺少图纸编号。')
}
requestImageDetail(imageRequest).then(res => {
const response = res.data
- if (response.code == 0) {
+ if (response.code === 0) {
const results = response.data
- if (results == undefined || results.length != 1) {
- closePreview('无图纸。')
+ if (results === undefined || results.length !== 1) {
+ closePreview('无图纸或图纸歧义。')
return
}
const image = results[0]
diff --git a/dev_wms_client/src/layout/stock.vue b/dev_wms_client/src/layout/stock.vue
index 1e3b762..ad6515e 100644
--- a/dev_wms_client/src/layout/stock.vue
+++ b/dev_wms_client/src/layout/stock.vue
@@ -28,12 +28,12 @@
-
-
@@ -550,10 +550,6 @@ const submitStockInfo = () => {
width: 196px;
}
-.el-form-item .el-select-v2 {
- width: 196px;
-}
-
.table-class {
margin: 5px 5px 5px 5px;
width: inherit;
diff --git a/dev_wms_client/src/layout/stockUpdateRecord.vue b/dev_wms_client/src/layout/stockUpdateRecord.vue
index 81fa6cd..c485d82 100644
--- a/dev_wms_client/src/layout/stockUpdateRecord.vue
+++ b/dev_wms_client/src/layout/stockUpdateRecord.vue
@@ -269,10 +269,6 @@ const exportExcel = () => {
width: 196px;
}
-.el-form-item .el-select-v2 {
- width: 196px;
-}
-
.table-class {
margin: 5px 5px 5px 5px;
width: inherit;
diff --git a/dev_wms_client/src/layout/taskMonitor.vue b/dev_wms_client/src/layout/taskMonitor.vue
index 7104e07..4c3dde6 100644
--- a/dev_wms_client/src/layout/taskMonitor.vue
+++ b/dev_wms_client/src/layout/taskMonitor.vue
@@ -1,200 +1,248 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 清除输入
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 清除输入
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev_wms_client/src/layout/vehicle.vue b/dev_wms_client/src/layout/vehicle.vue
index 91112ad..c850d54 100644
--- a/dev_wms_client/src/layout/vehicle.vue
+++ b/dev_wms_client/src/layout/vehicle.vue
@@ -8,17 +8,17 @@
-
-
-
@@ -407,10 +407,6 @@ const submitUpdateRow = (rowFormEntity) => {
width: 196px;
}
-.el-form-item .el-select-v2 {
- width: 196px;
-}
-
.table-class {
margin: 5px 5px 5px 5px;
width: inherit;
diff --git a/dev_wms_client/src/layout/wmsConfigNew.vue b/dev_wms_client/src/layout/wmsConfigNew.vue
index bbf8770..715edf2 100644
--- a/dev_wms_client/src/layout/wmsConfigNew.vue
+++ b/dev_wms_client/src/layout/wmsConfigNew.vue
@@ -1,127 +1,142 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
- 清除输入
-
-
-
-
-
-
-
-
-
-
-
-
-
- 编辑
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 清除输入
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/dev_wms_client/src/layout/workSummary.vue b/dev_wms_client/src/layout/workSummary.vue
index b098f2f..2f45d5c 100644
--- a/dev_wms_client/src/layout/workSummary.vue
+++ b/dev_wms_client/src/layout/workSummary.vue
@@ -8,7 +8,7 @@
-
@@ -689,10 +689,6 @@ const getPrintTabs = (boxSummary) => {
width: 196px;
}
-.el-form-item .el-select-v2 {
- width: 196px;
-}
-
.table-class {
margin: 5px 5px 5px 5px;
width: inherit;
@@ -793,4 +789,9 @@ const getPrintTabs = (boxSummary) => {
font-weight: bold;
text-align: left;
}
+
+.dialog-footer {
+ display: flex;
+ justify-content: center;
+}
\ No newline at end of file
diff --git a/dev_wms_client/src/router/index.js b/dev_wms_client/src/router/index.js
index 3a344ec..6d6925c 100644
--- a/dev_wms_client/src/router/index.js
+++ b/dev_wms_client/src/router/index.js
@@ -1,83 +1,79 @@
-import { createRouter, createWebHashHistory } from 'vue-router'
+import {createRouter, createWebHashHistory} from 'vue-router'
import HomeView from '@/views/HomeView.vue'
import login from '@/views/login.vue'
-import systemCenter from'@/views/SystemCenter.vue'
+import systemCenter from '@/views/SystemCenter.vue'
const routes = [
- {
- path: '/home',
- name: 'home',
- component: HomeView,
- // redirect: '/stock',
- children: [
- { path: '/stock', component: () => import('@/layout/stock.vue')},// 库存
- { path: '/goodsIn', component: () => import('@/layout/goodsIn.vue') },// 入库
- { path: '/goodsOut', component: () => import('@/layout/goodsOut.vue') },// 出库
- { path: '/kitting', component: () => import('@/layout/kitting.vue') },// 配料
- { path: '/inTaskRecord', component: () => import('@/layout/inTaskRecord.vue') },// 入库记录
- { path: '/outTaskRecord', component: () => import('@/layout/outTaskRecord.vue') },// 出库记录
- { path: '/location', component: () => import('@/layout/locationsTable.vue') },// 库位
- { path: '/goods', component: () => import('@/layout/goods.vue') },// 物料
- { path: '/standSettings', component: () => import('@/layout/standSettings.vue') },// 站台（库口）设置
- { path: '/config', component: () => import('@/layout/wmsConfigNew.vue') },// 系统配置
- { path: '/taskMonitor', component: () => import('@/layout/taskMonitor.vue') },// 任务监控
- { path: '/vehicles', component: () => import('@/layout/vehicle.vue') },// 料箱监控
- { path: '/inventory', component: () => import('@/layout/inventory.vue') },// 盘点
- { path: '/inventoryRecord', component: () => import('@/layout/inventoryRecord.vue') },// 盘点记录
- { path: '/wmsLog', component: () => import('@/layout/wmsLog.vue') },// 日志
- { path: '/workSummary', component: () => import('@/layout/workSummary.vue') },// 工作总结
- { path: '/pickTask', component: () => import('@/layout/pickTaskMonitor.vue') },// 拣选任务
- { path: '/clcKanban', component: () => import('@/layout/clcKanban.vue') },// 需求看板
- { path: '/stockUpdateRecord', component: () => import('@/layout/stockUpdateRecord.vue') },// 库存更新记录
- { path: '/roleUser', component: () => import('@/layout/role_user.vue') },// 角色——用户列表
- { path: '/rolePermission', component: () => import('@/layout/role_permission.vue') },// 角色——权限列表
- { path: '/test', component: () => import('@/layout/testView.vue') },// 测试
- { path: '/dbsList', component: () => import('@/layout/dbsList.vue') },// dbs计划
- { path: '/kittingList', component: () => import('@/layout/kittingList.vue') },// 配料单
- { path: '/kittingRelation', component: () => import('@/layout/kittingRelation.vue') },// 配料单
- { path: '/locationVisualization', component: () => import('@/layout/locationVisualization.vue')} // 库位可视化
- ]
- },
- {
- path: '/',
- name: 'login',
- component: login
- },
- {
- path: '/systemCenter',
- name: 'systemCenter',
- component: systemCenter
- },
- {
- path: '/imageDisplay',
- name: 'imageDisplay',
- component: () => import('@/layout/imageDisplay.vue')
- },
- {
- path: '/imageTable',
- name: 'imageTable',
- component: () => import('@/layout/imageTable.vue')
- },
- {
- path: '/scanForImage',
- name: 'scanForImage',
- component: () => import('@/layout/scanForImage.vue')
- }
+ {
+ path: '/home',
+ name: 'home',
+ component: HomeView,
+ // redirect: '/stock',
+ children: [
+ {path: '/stock', component: () => import('@/layout/stock.vue')},// 库存
+ {path: '/goodsIn', component: () => import('@/layout/goodsIn.vue')},// 入库
+ {path: '/goodsOut', component: () => import('@/layout/goodsOut.vue')},// 出库
+ {path: '/kitting', component: () => import('@/layout/kitting.vue')},// 配料
+ {path: '/inTaskRecord', component: () => import('@/layout/inTaskRecord.vue')},// 入库记录
+ {path: '/outTaskRecord', component: () => import('@/layout/outTaskRecord.vue')},// 出库记录
+ {path: '/location', component: () => import('@/layout/locationsTable.vue')},// 库位
+ {path: '/goods', component: () => import('@/layout/goods.vue')},// 物料
+ {path: '/standSettings', component: () => import('@/layout/standSettings.vue')},// 站台（库口）设置
+ {path: '/config', component: () => import('@/layout/wmsConfigNew.vue')},// 系统配置
+ {path: '/taskMonitor', component: () => import('@/layout/taskMonitor.vue')},// 任务监控
+ {path: '/vehicles', component: () => import('@/layout/vehicle.vue')},// 料箱监控
+ {path: '/inventory', component: () => import('@/layout/inventory.vue')},// 盘点
+ {path: '/inventoryRecord', component: () => import('@/layout/inventoryRecord.vue')},// 盘点记录
+ {path: '/wmsLog', component: () => import('@/layout/wmsLog.vue')},// 日志
+ {path: '/workSummary', component: () => import('@/layout/workSummary.vue')},// 工作总结
+ {path: '/pickTask', component: () => import('@/layout/pickTaskMonitor.vue')},// 拣选任务
+ {path: '/outsMonitor', component: () => import('@/layout/OutsMonitor.vue')},// 任务表单
+ {path: '/clcKanban', component: () => import('@/layout/clcKanban.vue')},// 需求看板
+ {path: '/stockUpdateRecord', component: () => import('@/layout/stockUpdateRecord.vue')},// 库存更新记录
+ {path: '/roleUser', component: () => import('@/layout/role_user.vue')},// 角色——用户列表
+ {path: '/rolePermission', component: () => import('@/layout/role_permission.vue')},// 角色——权限列表
+ {path: '/test', component: () => import('@/layout/testView.vue')},// 测试
+ {path: '/dbsList', component: () => import('@/layout/dbsList.vue')},// dbs计划
+ {path: '/kittingList', component: () => import('@/layout/kittingList.vue')},// 配料单
+ {path: '/kittingRelation', component: () => import('@/layout/kittingRelation.vue')},// 对应关系
+ {path: '/imageTable', component: () => import('@/layout/ImageTable.vue')},
+ ]
+ },
+ {
+ path: '/',
+ name: 'login',
+ component: login
+ },
+ {
+ path: '/systemCenter',
+ name: 'systemCenter',
+ component: systemCenter
+ },
+ {
+ path: '/imageDisplay',
+ name: 'imageDisplay',
+ component: () => import('@/layout/imageDisplay.vue')
+ },
+ {
+ path: '/scanForImage',
+ name: 'scanForImage',
+ component: () => import('@/layout/scanForImage.vue')
+ }
]
const router = createRouter({
- base: '/',
- history: createWebHashHistory(),
- routes
+ base: '/',
+ history: createWebHashHistory(),
+ routes
})
// 挂载路由导航守卫
router.beforeEach((to, from, next) => {
- if (to.path === '/') return next()
- // 获取token
- const user = sessionStorage.getItem('user')
- if (!user) return next('/')
- next()
+ if (to.path === '/') return next()
+ // 获取token
+ const user = sessionStorage.getItem('user')
+ if (!user) return next('/')
+ next()
})
export default router
diff --git a/dev_wms_client/src/utils/formatter.js b/dev_wms_client/src/utils/formatter.js
index 0d3702c..359b35a 100644
--- a/dev_wms_client/src/utils/formatter.js
+++ b/dev_wms_client/src/utils/formatter.js
@@ -2,7 +2,7 @@ import moment from "moment";
import { revertSeconds } from '@/utils/dateUtils'
// 时间格式化
export const timeFormatter = (date) => {
- if (date === null || date === undefined) {
+ if (date === null || date === undefined || date === '') {
return ''
}
return moment(date).format('yyyy-MM-DD HH:mm:ss');
@@ -24,13 +24,13 @@ export const dueFormatter = (date) => {
// 库位格式化
export const locationFormatter = (locationId) => {
- if (locationId === null || locationId == undefined) {
+ if (locationId === null || locationId === undefined || locationId === '') {
return ''
}
const locationArray = locationId.split('-')
- if (locationArray.length == 3) {
+ if (locationArray.length === 3) {
return locationArray[0] + '排' + locationArray[1] + '列' + locationArray[2] + '层'
- } else if (locationArray.length == 4) {
+ } else if (locationArray.length === 4) {
return locationArray[0] + '排' + locationArray[1] + '列' + locationArray[2] + '层' + locationArray[3] + '深度'
} else {
return ''
@@ -104,11 +104,11 @@ export const replaceEnglishAndNumberIGAI = (value) => {
}
// 是否格式化
export const yesOrNoFormatter = (value) => {
- return value == 1 ? '是' : '否'
+ return value === 1 ? '是' : '否'
}
// 反转是否格式化
export const converseYesOrNoFormatter = (value) => {
- return value == 0 ? '是' : '否'
+ return value === 0 ? '是' : '否'
}
// 任务类型格式化
export const wmsTaskTypeFormatter = (value) => {
@@ -160,4 +160,44 @@ export const vehicleStatusFormatter = (value) => {
default:
return '未知状态'
}
+}
+// 拣选任务状态
+export const pickTaskStatusFormatter = (value) => {
+ switch (value) {
+ case -2:
+ return '入库用'
+ case -1:
+ return '暂存中'
+ case 0:
+ return '待下发'
+ case 1:
+ return '已下发'
+ case 2:
+ return '执行中'
+ case 3:
+ return '已到达'
+ case 4:
+ return '已离开'
+ case 5:
+ return '拣选取消'
+ default:
+ return '已取消'
+ }
+}
+// 出库单类型格式化
+export const outTaskTypeFormatter = (value) => {
+ switch (value) {
+ case 1:
+ return '空箱出库'
+ case 2:
+ return '普通出库'
+ case 4:
+ return '完整出库'
+ case 5:
+ return '入库使用'
+ case 9:
+ return '紧急出库'
+ default:
+ return '未知类型'
+ }
}
\ No newline at end of file
diff --git a/dev_wms_serve/src/main/java/com/wms_main/WmsMainApplication.java b/dev_wms_serve/src/main/java/com/wms_main/WmsMainApplication.java
index 8661a7e..a1e73ed 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/WmsMainApplication.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/WmsMainApplication.java
@@ -1,13 +1,40 @@
package com.wms_main;
+import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+/**
+ * 系统启动类
+ */
@SpringBootApplication
public class WmsMainApplication {
+ /**
+ * 用于重启程序的上下文
+ */
+ private static ConfigurableApplicationContext context;
+
+ /**
+ * 主函数，程序的入口
+ *
+ * @param args 命令行参数，以字符串数组形式传入
+ */
public static void main(String[] args) {
- SpringApplication.run(WmsMainApplication.class, args);
+ context = SpringApplication.run(WmsMainApplication.class, args);
}
+ /**
+ * 重启程序
+ */
+ public static void restart() {
+ ApplicationArguments args = context.getBean(ApplicationArguments.class);
+ Thread thread = new Thread(() -> {
+ context.close();
+ context = SpringApplication.run(WmsMainApplication.class, args.getSourceArgs());
+ });
+ thread.setDaemon(false);
+ thread.start();
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/constant/enums/jobs/JobTimerTypeEnums.java b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/jobs/JobTimerTypeEnums.java
index 03b9352..aa448c8 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/constant/enums/jobs/JobTimerTypeEnums.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/jobs/JobTimerTypeEnums.java
@@ -3,6 +3,9 @@ package com.wms_main.constant.enums.jobs;
import lombok.AllArgsConstructor;
import lombok.Getter;
+/**
+ * 定时器定时类型
+ */
@Getter
@AllArgsConstructor
public enum JobTimerTypeEnums {
diff --git a/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvResultEnums.java b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvResultEnums.java
new file mode 100644
index 0000000..0347d35
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvResultEnums.java
@@ -0,0 +1,18 @@
+package com.wms_main.constant.enums.wms;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 盘点结果枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum WmsInvResultEnums {
+ NONE(-99, "未盘点"),
+ MINUS(-1, "盘亏"),
+ EQUAL(0, "正常"),
+ PLUS(1, "盘盈");
+ private final Integer code;
+ private final String desc;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvStatusEnums.java b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvStatusEnums.java
new file mode 100644
index 0000000..1de9552
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvStatusEnums.java
@@ -0,0 +1,18 @@
+package com.wms_main.constant.enums.wms;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 盘点状态枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum WmsInvStatusEnums {
+ INIT(0, "初始化"),
+ EXECUTED(1, "已解析"),
+ CONFIRMED(2, "已确认");
+
+ private final Integer code;
+ private final String desc;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvTypeEnums.java b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvTypeEnums.java
new file mode 100644
index 0000000..f11b7d5
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/constant/enums/wms/WmsInvTypeEnums.java
@@ -0,0 +1,16 @@
+package com.wms_main.constant.enums.wms;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 盘点类型枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum WmsInvTypeEnums {
+ INV_TYPE_1(1, "明盘"),
+ INV_TYPE_2(2, "盲盘");
+ private final Integer code;
+ private final String desc;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/KateWorkController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/KateWorkController.java
index bd0407d..9b9a602 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/KateWorkController.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/KateWorkController.java
@@ -113,6 +113,16 @@ public class KateWorkController {
return kateWorkControllerService.requestImageDetail(imageQuery);
}
+ /**
+ * 查询图纸---分页
+ * @param imageQuery 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/queryImagesByPage")
+ public WmsApiResponse> queryImagesByPage(@RequestBody ImageQuery imageQuery) {
+ return kateWorkControllerService.queryImagesByPage(imageQuery);
+ }
+
/**
* 查询DBS数据--分页
* @param dbsQuery 查询参数
@@ -202,4 +212,14 @@ public class KateWorkController {
WmsApiResponse requestPrintBoxTags(@RequestBody KateWorksQuery kateWorksQuery) {
return kateWorkControllerService.requestPrintBoxTags(kateWorksQuery);
}
+
+ /**
+ * 删除当前dbs工单计划
+ * @param dbsRequest 关闭请求
+ * @return 删除结果
+ */
+ @PostMapping("/deleteDbsPlan")
+ public BaseWmsApiResponse deleteDbsPlan(@RequestBody DbsRequest dbsRequest) {
+ return kateWorkControllerService.deleteDbsPlan(dbsRequest);
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java
index ad7cc6f..49c2369 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskController.java
@@ -9,6 +9,7 @@ import com.wms_main.model.dto.response.wcs.BaseWcsApiResponse;
import com.wms_main.model.dto.response.wcs.WcsApiResponse;
import com.wms_main.model.dto.response.wms.BaseWmsApiResponse;
import com.wms_main.model.dto.response.wms.WmsApiResponse;
+import com.wms_main.model.vo.wms.InventoryConfirmVo;
import com.wms_main.model.vo.wms.TaskConfirmVo;
import com.wms_main.service.controller.ITaskControllerService;
import lombok.RequiredArgsConstructor;
@@ -114,4 +115,34 @@ public class TaskController {
public BaseWmsApiResponse confirmCurrentTask(@RequestBody ConfirmTaskRequest confirmTaskRequest) {
return taskControllerService.confirmCurrentTask(confirmTaskRequest);
}
+
+ /**
+ * 下发盘点请求
+ * @param inventoryRequest 盘点请求
+ * @return 请求结果
+ */
+ @PostMapping("/requestInventory")
+ public BaseWmsApiResponse requestInventory(@RequestBody InventoryRequest inventoryRequest) {
+ return taskControllerService.requestInventory(inventoryRequest);
+ }
+
+ /**
+ * 查询盘点任务确认信息
+ * @param inventoryConfirmRequest 请求
+ * @return 请求结果
+ */
+ @PostMapping("/getInventoryConfirm")
+ WmsApiResponse getInventoryConfirm(@RequestBody InventoryConfirmRequest inventoryConfirmRequest) {
+ return taskControllerService.getInventoryConfirm(inventoryConfirmRequest);
+ }
+
+ /**
+ * 确认盘点信息
+ * @param inventoryConfirmRequest 确认请求
+ * @return 处理结果
+ */
+ @PostMapping("/confirmInventory")
+ BaseWmsApiResponse confirmInventory(@RequestBody InventoryConfirmRequest inventoryConfirmRequest) {
+ return taskControllerService.confirmInventory(inventoryConfirmRequest);
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskOperationController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskOperationController.java
index ac5e408..c9e675d 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskOperationController.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskOperationController.java
@@ -1,10 +1,10 @@
package com.wms_main.controller.wms;
+import com.wms_main.model.dto.request.wms.WmsTaskRequest;
+import com.wms_main.model.dto.response.wms.BaseWmsApiResponse;
+import com.wms_main.service.controller.ITaskOperationControllerService;
import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* 任务操作控制类
@@ -16,4 +16,25 @@ import org.springframework.web.bind.annotation.RestController;
@RequiredArgsConstructor
@RequestMapping("/wms/taskOperation")
public class TaskOperationController {
+ private final ITaskOperationControllerService taskOperationControllerService;
+
+ /**
+ * 删除任务
+ * @param wmsTaskRequest 请求
+ * @return 结果
+ */
+ @PostMapping("/deleteWmsTask")
+ public BaseWmsApiResponse deleteWmsTask(@RequestBody WmsTaskRequest wmsTaskRequest) {
+ return taskOperationControllerService.deleteWmsTask(wmsTaskRequest);
+ }
+
+ /**
+ * 更新任务
+ * @param wmsTaskRequest 请求
+ * @return 结果
+ */
+ @PostMapping("/updateWmsTask")
+ public BaseWmsApiResponse updateWmsTask(@RequestBody WmsTaskRequest wmsTaskRequest) {
+ return taskOperationControllerService.updateWmsTask(wmsTaskRequest);
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskQueryController.java b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskQueryController.java
index 6f3efa1..968d469 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskQueryController.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/controller/wms/TaskQueryController.java
@@ -1,10 +1,10 @@
package com.wms_main.controller.wms;
+import com.wms_main.model.dto.query.OutsQuery;
+import com.wms_main.model.dto.query.PickTaskQuery;
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.model.vo.wms.*;
import com.wms_main.service.controller.ITaskQueryControllerService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -53,4 +53,26 @@ public class TaskQueryController {
{
return taskQueryControllerService.queryOutTaskRecordByPage(wmsTaskQuery);
}
+
+ /**
+ * Wms拣选任务分页查询
+ * @param pickTaskQuery 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/queryPickTasksByPage")
+ public WmsApiResponse> queryPickTasksByPage(@RequestBody PickTaskQuery pickTaskQuery)
+ {
+ return taskQueryControllerService.queryPickTasksByPage(pickTaskQuery);
+ }
+
+ /**
+ * 出库单分页查询
+ * @param outsQuery 查询参数
+ * @return 查询结果
+ */
+ @PostMapping("/queryOutsByPage")
+ public WmsApiResponse> queryOutsByPage(@RequestBody OutsQuery outsQuery)
+ {
+ return taskQueryControllerService.queryOutsByPage(outsQuery);
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/dao/ITAppInventoryRecordService.java b/dev_wms_serve/src/main/java/com/wms_main/dao/ITAppInventoryRecordService.java
new file mode 100644
index 0000000..5d6b22b
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/dao/ITAppInventoryRecordService.java
@@ -0,0 +1,10 @@
+package com.wms_main.dao;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms_main.model.po.TAppInventoryRecord;
+
+/**
+ * 盘点任务记录服务接口
+ */
+public interface ITAppInventoryRecordService extends IService {
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/dao/ITAppInventoryService.java b/dev_wms_serve/src/main/java/com/wms_main/dao/ITAppInventoryService.java
new file mode 100644
index 0000000..2730c70
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/dao/ITAppInventoryService.java
@@ -0,0 +1,10 @@
+package com.wms_main.dao;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.wms_main.model.po.TAppInventory;
+
+/**
+ * 盘点任务服务接口
+ */
+public interface ITAppInventoryService extends IService {
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/dao/impl/TAppInventoryRecordServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/dao/impl/TAppInventoryRecordServiceImpl.java
new file mode 100644
index 0000000..910ba8c
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/dao/impl/TAppInventoryRecordServiceImpl.java
@@ -0,0 +1,14 @@
+package com.wms_main.dao.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms_main.dao.ITAppInventoryRecordService;
+import com.wms_main.mapper.AppInventoryRecordMapper;
+import com.wms_main.model.po.TAppInventoryRecord;
+import org.springframework.stereotype.Service;
+
+/**
+ * 盘点记录表服务实现
+ */
+@Service
+public class TAppInventoryRecordServiceImpl extends ServiceImpl implements ITAppInventoryRecordService {
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/dao/impl/TAppInventoryServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/dao/impl/TAppInventoryServiceImpl.java
new file mode 100644
index 0000000..349ce7b
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/dao/impl/TAppInventoryServiceImpl.java
@@ -0,0 +1,14 @@
+package com.wms_main.dao.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.wms_main.dao.ITAppInventoryService;
+import com.wms_main.mapper.AppInventoryMapper;
+import com.wms_main.model.po.TAppInventory;
+import org.springframework.stereotype.Service;
+
+/**
+ * 盘点任务表服务实现
+ */
+@Service
+public class TAppInventoryServiceImpl extends ServiceImpl implements ITAppInventoryService {
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java b/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java
index 8239b35..739bbcc 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/excel/easypoi/service/serviceImpl/ImportExcelEasyPoi.java
@@ -90,7 +90,7 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
|| dbsRawData.getPlanProduction() == null
|| StringUtils.isEmpty(dbsRawData.getFamily())
|| StringUtils.isEmpty(dbsRawData.getTestNo())) {
- continue;
+ return BaseWmsApiResponse.error("存在信息不全的数据行。");
}
if (dbsRawData.getFamily().contains("NGH")) {
// 去除J列的NGH
@@ -131,7 +131,8 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
tAppDbsService.saveBatch(newDbsMapToSave.values());
// 保存导入file记录
saveFileVo(fileVo);
- return BaseWmsApiResponse.success("导入计划成功。");
+ return BaseWmsApiResponse.success("导入计划成功。\n非NGH：" + dbsList.size() + "条，成功：" + newDbsMapToSave.size()
+ + "条。");
} catch (Exception e) {
// 回滚事务
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -166,13 +167,12 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
|| StringUtils.isEmpty(productRawData.getProductId())
|| productRawData.getQuantity1Pair() == null
|| StringUtils.isEmpty(productRawData.getGoodsId())
- || StringUtils.isEmpty(productRawData.getGoodsDesc())
|| productRawData.getQuantityOfPairs() == null
|| StringUtils.isEmpty(productRawData.getBoxNo())) {
- continue;
+ return BaseWmsApiResponse.error("存在信息不全的数据行。");
}
if (StringUtils.isNotEmpty(thisProductId) && !thisProductId.equals(productRawData.getProductId())) {
- continue;
+ return BaseWmsApiResponse.error("存在多个成品号。");
} else {
thisProductId = productRawData.getProductId();
}
@@ -210,7 +210,8 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
tAppImageService.saveOrUpdateBatch(imageList);
// 保存导入file记录
saveFileVo(fileVo);
- return BaseWmsApiResponse.success("导入配料单成功。");
+ return BaseWmsApiResponse.success("导入配料单成功。\n原始：" + productRawDatas.size() + "条，成功：" + productList.size()
+ + "条。\n图纸原始:" + imageRawDatas.size() + "条，成功：" + imageList.size() + "条。");
} catch (Exception e) {
// 回滚事务
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -245,13 +246,12 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
|| StringUtils.isEmpty(productRawData.getSingleProductId())
|| productRawData.getQuantity1Pair() == null
|| StringUtils.isEmpty(productRawData.getGoodsId())
- || StringUtils.isEmpty(productRawData.getGoodsDesc())
|| productRawData.getQuantityOfPairs() == null
|| StringUtils.isEmpty(productRawData.getBoxNo())) {
- continue;
+ return BaseWmsApiResponse.error("存在信息不全的数据行。");
}
if (StringUtils.isNotEmpty(thisProductId) && !thisProductId.equals(productRawData.getSingleProductId())) {
- continue;
+ return BaseWmsApiResponse.error("存在多个服务件成品号。");
} else {
thisProductId = productRawData.getSingleProductId();
}
@@ -289,7 +289,8 @@ public class ImportExcelEasyPoi extends BaseImportExcelEasyPoi implements IImpor
tAppImageService.saveOrUpdateBatch(imageList);
// 保存导入file记录
saveFileVo(fileVo);
- return BaseWmsApiResponse.success("导入服务件配料单成功。");
+ return BaseWmsApiResponse.success("导入服务件配料单成功。\n原始：" + productRawDatas.size() + "条，成功：" + productList.size()
+ + "条。\n图纸原始:" + imageRawDatas.size() + "条，成功：" + imageList.size() + "条。");
} catch (Exception e) {
// 回滚事务
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/dev_wms_serve/src/main/java/com/wms_main/mapper/AppInventoryMapper.java b/dev_wms_serve/src/main/java/com/wms_main/mapper/AppInventoryMapper.java
new file mode 100644
index 0000000..e6a075c
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/mapper/AppInventoryMapper.java
@@ -0,0 +1,13 @@
+package com.wms_main.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms_main.model.po.TAppConfig;
+import com.wms_main.model.po.TAppInventory;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 盘点任务表mapper
+ */
+@Mapper
+public interface AppInventoryMapper extends BaseMapper {
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/mapper/AppInventoryRecordMapper.java b/dev_wms_serve/src/main/java/com/wms_main/mapper/AppInventoryRecordMapper.java
new file mode 100644
index 0000000..41e9438
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/mapper/AppInventoryRecordMapper.java
@@ -0,0 +1,13 @@
+package com.wms_main.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.wms_main.model.po.TAppInventory;
+import com.wms_main.model.po.TAppInventoryRecord;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 盘点记录表mapper
+ */
+@Mapper
+public interface AppInventoryRecordMapper extends BaseMapper {
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/DbsQuery.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/DbsQuery.java
index 99b74e5..75d5d07 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/DbsQuery.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/DbsQuery.java
@@ -1,6 +1,7 @@
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;
@@ -21,59 +22,72 @@ public class DbsQuery extends PageQuery {
/**
* 主键id
*/
+ @JsonProperty("dbsId")
private String dbsId;
/**
* 工单
*/
+ @JsonProperty("workOrder")
private String workOrder;
/**
* dbs原始未处理的零件号，成品号
*/
+ @JsonProperty("productIdOrigin")
private String productIdOrigin;
/**
* 零件号，成品号
*/
+ @JsonProperty("productId")
private String productId;
/**
* 计划开始时间
*/
+ @JsonProperty("planStartDate")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate planStartDate;
/**
* 计划产量/套
*/
+ @JsonProperty("planProduction")
private Integer planProduction;
/**
* Family
*/
+ @JsonProperty("family")
private String family;
/**
* Test No#
*/
+ @JsonProperty("testNo")
private String testNo;
/**
* 状态
*/
+ @JsonProperty("dbsStatus")
private Integer dbsStatus;
/**
* 工作站台
*/
+ @JsonProperty("workStand")
private String workStand;
/**
* 实际工作日期
*/
+ @JsonProperty("realWorkDate")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate realWorkDate;
/**
* 完成时间
*/
+ @JsonProperty("finishTime")
@JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
private LocalDateTime finishTime;
/**
* 备注
*/
+ @JsonProperty("remark")
private String remark;
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/OutsQuery.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/OutsQuery.java
new file mode 100644
index 0000000..02e0337
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/OutsQuery.java
@@ -0,0 +1,79 @@
+package com.wms_main.model.dto.query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 出库单查询
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OutsQuery extends PageQuery {
+ /**
+ * 任务号
+ */
+ @JsonProperty("taskId")
+ private String taskId;
+ /**
+ * 料号
+ */
+ @JsonProperty("goodsId")
+ private String goodsId;
+ /**
+ * 载具号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+ /**
+ * 需求数量
+ */
+ @JsonProperty("needNum")
+ private Integer needNum;
+ /**
+ * 已分发数量
+ */
+ @JsonProperty("distributeNum")
+ private Integer distributeNum;
+ /**
+ * 已拣选数量
+ */
+ @JsonProperty("pickNum")
+ private Integer pickNum;
+ /**
+ * 出库类型
+ */
+ @JsonProperty("outType")
+ private Integer outType;
+ /**
+ * 目的地
+ */
+ @JsonProperty("destination")
+ private String destination;
+ /**
+ * 用户名
+ */
+ @JsonProperty("userName")
+ private String userName;
+ /**
+ * 出库理由
+ * 紧急出库必填
+ */
+ @JsonProperty("reason")
+ private String reason;
+ /**
+ * 请求时间
+ */
+ @JsonProperty("requestTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime requestTime;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/PickTaskQuery.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/PickTaskQuery.java
new file mode 100644
index 0000000..9f4a7c4
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/query/PickTaskQuery.java
@@ -0,0 +1,69 @@
+package com.wms_main.model.dto.query;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 拣选任务查询参数
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PickTaskQuery extends PageQuery {
+ /**
+ * 任务id
+ */
+ @JsonProperty("pickId")
+ private String pickId;
+ /**
+ * 拣选站台
+ */
+ @JsonProperty("pickStand")
+ private String pickStand;
+ /**
+ * 载具号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+ /**
+ * 任务状态
+ */
+ @JsonProperty("pickStatus")
+ private Integer pickStatus;
+ /**
+ * 创建时间
+ */
+ @JsonProperty("createTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ * 发送时间
+ */
+ @JsonProperty("sendTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sendTime;
+ /**
+ * 到达时间
+ */
+ @JsonProperty("arriveTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime arriveTime;
+ /**
+ * 离开时间
+ */
+ @JsonProperty("leaveTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime leaveTime;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/DbsRequest.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/DbsRequest.java
new file mode 100644
index 0000000..7bc44ae
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/DbsRequest.java
@@ -0,0 +1,79 @@
+package com.wms_main.model.dto.request.wms;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * Dbs请求
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DbsRequest extends BaseWmsRequest {
+ /**
+ * 主键id
+ */
+ private String dbsId;
+ /**
+ * 工单
+ */
+ private String workOrder;
+ /**
+ * dbs原始未处理的零件号，成品号
+ */
+ private String productIdOrigin;
+ /**
+ * 零件号，成品号
+ */
+ private String productId;
+ /**
+ * 计划开始时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate planStartDate;
+ /**
+ * 计划产量/套
+ */
+ private Integer planProduction;
+ /**
+ * Family
+ */
+ private String family;
+ /**
+ * Test No#
+ */
+ private String testNo;
+ /**
+ * 状态
+ */
+ private Integer dbsStatus;
+ /**
+ * 工作站台
+ */
+ private String workStand;
+ /**
+ * 实际工作日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate realWorkDate;
+ /**
+ * 完成时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd hh:mm:ss")
+ private LocalDateTime finishTime;
+ /**
+ * 备注
+ */
+ private String remark;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/InventoryConfirmRequest.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/InventoryConfirmRequest.java
new file mode 100644
index 0000000..888a261
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/InventoryConfirmRequest.java
@@ -0,0 +1,37 @@
+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 InventoryConfirmRequest extends BaseWmsRequest {
+ /**
+ * 盘点任务号
+ */
+ @JsonProperty("inventoryId")
+ private String inventoryId;
+ /**
+ * 料号
+ */
+ @JsonProperty("goodsId")
+ private String goodsId;
+ /**
+ * 箱号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+ /**
+ * 确认数量
+ */
+ @JsonProperty("confirmNum")
+ private Integer confirmNum;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/InventoryRequest.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/InventoryRequest.java
new file mode 100644
index 0000000..8bdbd8a
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/InventoryRequest.java
@@ -0,0 +1,27 @@
+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 InventoryRequest extends BaseWmsRequest {
+ /**
+ * 料号
+ */
+ @JsonProperty("goodsId")
+ private String goodsId;
+ /**
+ * 箱号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/WmsTaskRequest.java b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/WmsTaskRequest.java
new file mode 100644
index 0000000..a4511dd
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/dto/request/wms/WmsTaskRequest.java
@@ -0,0 +1,110 @@
+package com.wms_main.model.dto.request.wms;
+
+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任务请求
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class WmsTaskRequest extends BaseWmsRequest {
+ /**
+ * 任务ID
+ */
+ @JsonProperty("taskId")
+ private String taskId;
+ /**
+ * 任务类型
+ */
+ @JsonProperty("taskType")
+ private Integer taskType;
+ /**
+ * 任务状态
+ */
+ @JsonProperty("taskStatus")
+ private Integer taskStatus;
+ /**
+ * 任务优先级
+ */
+ @JsonProperty("taskPriority")
+ private Integer taskPriority;
+ /**
+ * 载具号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+ /**
+ * 起点
+ */
+ @JsonProperty("origin")
+ private String origin;
+ /**
+ * 终点
+ */
+ @JsonProperty("destination")
+ private String destination;
+ /**
+ * wcs任务id
+ */
+ @JsonProperty("wcsTaskId")
+ private String wcsTaskId;
+ /**
+ * 创建时间
+ */
+ @JsonProperty("createTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ * 完成时间
+ */
+ @JsonProperty("finishTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime finishTime;
+ /**
+ * 料号
+ */
+ @JsonProperty("goodsId")
+ private String goodsId;
+ /**
+ * 操作数量
+ */
+ @JsonProperty("opNum")
+ private Integer opNum;
+ /**
+ * 库存数量
+ */
+ @JsonProperty("stockNum")
+ private Integer stockNum;
+ /**
+ * 操纵用户
+ */
+ @JsonProperty("opUser")
+ private String opUser;
+ /**
+ * 备注
+ */
+ @JsonProperty("remark")
+ private String remark;
+ /**
+ * 申请出库的站台
+ */
+ @JsonProperty("callStand")
+ private String callStand;
+ /**
+ * 物料描述
+ */
+ @JsonProperty("goodsDesc")
+ private String goodsDesc;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppInventory.java b/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppInventory.java
new file mode 100644
index 0000000..a8f45e3
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppInventory.java
@@ -0,0 +1,93 @@
+package com.wms_main.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 盘点任务
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "t_app_inventory", autoResultMap = true)
+public class TAppInventory {
+ /**
+ * 盘点id
+ */
+ @TableId(value = "inventory_id")
+ private String inventoryId;
+ /**
+ * 料号
+ */
+ @TableField(value = "goods_id")
+ private String goodsId;
+ /**
+ * 载具号
+ */
+ @TableField(value = "vehicle_id")
+ private String vehicleId;
+ /**
+ * 库存数量
+ * 只记录盘点确认时间点
+ */
+ @TableField(value = "stock_num")
+ private Integer stockNum;
+ /**
+ * 确认数量
+ */
+ @TableField(value = "confirm_num")
+ private Integer confirmNum;
+ /**
+ * 盘点站台
+ */
+ @TableField(value = "inv_stand")
+ private String invStand;
+ /**
+ * 盘点人
+ */
+ @TableField(value = "inv_user")
+ private String invUser;
+ /**
+ * 盘点类型：1：明盘；2：盲盘
+ */
+ @TableField(value = "inv_type")
+ private Integer invType;
+ /**
+ * 盘点状态
+ * 0. 初始化
+ * 1. 已解析
+ * 2. 已确认
+ */
+ @TableField(value = "inv_status")
+ private Integer invStatus;
+ /**
+ * 盘点结果
+ * -99：未盘
+ * -1: 盘亏
+ * 0: 正常
+ * 1: 盘盈
+ */
+ @TableField(value = "inv_result")
+ private Integer invResult;
+ /**
+ * 盘点任务创建时间
+ */
+ @TableField(value = "inv_create_time")
+ private LocalDateTime invCreateTime;
+ /**
+ * 盘点确认时间
+ */
+ @TableField(value = "inv_confirm_time")
+ private LocalDateTime invConfirmTime;
+ /**
+ * 这个字段用于合并哪些任务是同一时间下发的
+ */
+ @TableField(value = "inv_order_id")
+ private String invOrderId;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppInventoryRecord.java b/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppInventoryRecord.java
new file mode 100644
index 0000000..b518afc
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppInventoryRecord.java
@@ -0,0 +1,93 @@
+package com.wms_main.model.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * 盘点记录
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "t_app_inventory_record", autoResultMap = true)
+public class TAppInventoryRecord {
+ /**
+ * 盘点id
+ */
+ @TableId(value = "inventory_id")
+ private String inventoryId;
+ /**
+ * 料号
+ */
+ @TableField(value = "goods_id")
+ private String goodsId;
+ /**
+ * 载具号
+ */
+ @TableField(value = "vehicle_id")
+ private String vehicleId;
+ /**
+ * 库存数量
+ * 只记录盘点确认时间点
+ */
+ @TableField(value = "stock_num")
+ private Integer stockNum;
+ /**
+ * 确认数量
+ */
+ @TableField(value = "confirm_num")
+ private Integer confirmNum;
+ /**
+ * 盘点站台
+ */
+ @TableField(value = "inv_stand")
+ private String invStand;
+ /**
+ * 盘点人
+ */
+ @TableField(value = "inv_user")
+ private String invUser;
+ /**
+ * 盘点类型：1：明盘；2：盲盘
+ */
+ @TableField(value = "inv_type")
+ private Integer invType;
+ /**
+ * 盘点状态
+ * 1. 初始化
+ * 2. 已解析
+ * 3. 数量确认
+ * 4. 盘点关闭
+ */
+ @TableField(value = "inv_status")
+ private Integer invStatus;
+ /**
+ * 盘点结果
+ * -1: 盘亏
+ * 0: 正常
+ * 1: 盘盈
+ */
+ @TableField(value = "inv_result")
+ private Integer invResult;
+ /**
+ * 盘点任务创建时间
+ */
+ @TableField(value = "inv_create_time")
+ private LocalDateTime invCreateTime;
+ /**
+ * 盘点确认时间
+ */
+ @TableField(value = "inv_confirm_time")
+ private LocalDateTime invConfirmTime;
+ /**
+ * 这个字段用于合并哪些任务是同一时间下发的
+ */
+ @TableField(value = "inv_order_id")
+ private String invOrderId;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppStock.java b/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppStock.java
index d582ee3..939f0d1 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppStock.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/po/TAppStock.java
@@ -7,7 +7,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -99,4 +98,14 @@ public class TAppStock {
*/
@TableField(value = "sled")
private Integer sled;
+ /**
+ * 上次盘点任务号
+ */
+ @TableField(value = "last_inventory_id")
+ private String lastInventoryId;
+ /**
+ * 上次盘点时间
+ */
+ @TableField(value = "last_inventory_time")
+ private LocalDateTime lastInventoryTime;
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/ImageVo.java b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/ImageVo.java
index 200dc35..711c36a 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/ImageVo.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/ImageVo.java
@@ -4,15 +4,17 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.wms_main.model.po.TAppImage;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
/**
* 图纸Vo
*/
+@EqualsAndHashCode(callSuper = true)
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class ImageVo {
+public class ImageVo extends BaseImportVo {
/**
* 图纸id
*/
@@ -55,4 +57,25 @@ public class ImageVo {
*/
@JsonProperty("imageType")
private Integer imageType;
+
+ /**
+ * 将po对象转换为vo对象
+ * @param po po对象
+ * @return vo
+ */
+ public static ImageVo ofPo(TAppImage po)
+ {
+ ImageVo imageVo = new ImageVo();
+ if (po == null) {
+ return imageVo;
+ }
+ imageVo.setImageId(po.getImageId());
+ imageVo.setProductId(po.getProductId());
+ imageVo.setBoxNo(po.getBoxNo());
+ imageVo.setImagePath(po.getImagePath());
+ imageVo.setImageName(po.getImageName());
+// imageVo.setImageDetail(po.getImageDetail());
+ imageVo.setImageType(po.getImageType());
+ return imageVo;
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/InventoryConfirmVo.java b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/InventoryConfirmVo.java
new file mode 100644
index 0000000..00a470e
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/InventoryConfirmVo.java
@@ -0,0 +1,40 @@
+package com.wms_main.model.vo.wms;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 盘点确认界面显示Vo
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class InventoryConfirmVo {
+ /**
+ * 盘点任务号
+ */
+ @JsonProperty("inventoryId")
+ private String inventoryId;
+ /**
+ * 料号
+ */
+ @JsonProperty("goodsId")
+ private String goodsId;
+ /**
+ * 载具号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+ /**
+ * 库存数量
+ */
+ @JsonProperty("stockNum")
+ private Integer stockNum;
+ /**
+ * 确认数量
+ */
+ @JsonProperty("confirmNum")
+ private Integer confirmNum;
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/OutsVo.java b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/OutsVo.java
new file mode 100644
index 0000000..c023940
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/OutsVo.java
@@ -0,0 +1,102 @@
+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.TAppOuts;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 出库单Vo
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OutsVo {
+ /**
+ * 任务号
+ */
+ @JsonProperty("taskId")
+ private String taskId;
+ /**
+ * 料号
+ */
+ @JsonProperty("goodsId")
+ private String goodsId;
+ /**
+ * 载具号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+ /**
+ * 需求数量
+ */
+ @JsonProperty("needNum")
+ private Integer needNum;
+ /**
+ * 已分发数量
+ */
+ @JsonProperty("distributeNum")
+ private Integer distributeNum;
+ /**
+ * 已拣选数量
+ */
+ @JsonProperty("pickNum")
+ private Integer pickNum;
+ /**
+ * 出库类型
+ */
+ @JsonProperty("outType")
+ private Integer outType;
+ /**
+ * 目的地
+ */
+ @JsonProperty("destination")
+ private String destination;
+ /**
+ * 用户名
+ */
+ @JsonProperty("userName")
+ private String userName;
+ /**
+ * 出库理由
+ * 紧急出库必填
+ */
+ @JsonProperty("reason")
+ private String reason;
+ /**
+ * 请求时间
+ */
+ @JsonProperty("requestTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime requestTime;
+
+ /**
+ * 将po转换为vo
+ * @param po 数据库实体
+ * @return 转化结果
+ */
+ public static OutsVo of(TAppOuts po) {
+ if (po == null) {
+ return new OutsVo();
+ }
+ return new OutsVo(
+ po.getTaskId(),
+ po.getGoodsId(),
+ po.getVehicleId(),
+ po.getNeedNum(),
+ po.getDistributeNum(),
+ po.getPickNum(),
+ po.getOutType(),
+ po.getDestination(),
+ po.getUserName(),
+ po.getReason(),
+ po.getRequestTime()
+ );
+ }
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/PickTaskVo.java b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/PickTaskVo.java
new file mode 100644
index 0000000..8569ee5
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/PickTaskVo.java
@@ -0,0 +1,89 @@
+package com.wms_main.model.vo.wms;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.wms_main.model.po.TAppPickTask;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+/**
+ * 拣选任务Vo
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PickTaskVo {
+ /**
+ * 任务id
+ */
+ @JsonProperty("pickId")
+ private String pickId;
+ /**
+ * 拣选站台
+ */
+ @JsonProperty("pickStand")
+ private String pickStand;
+ /**
+ * 载具号
+ */
+ @JsonProperty("vehicleId")
+ private String vehicleId;
+ /**
+ * 任务状态
+ */
+ @JsonProperty("pickStatus")
+ private Integer pickStatus;
+ /**
+ * 创建时间
+ */
+ @JsonProperty("createTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime createTime;
+ /**
+ * 发送时间
+ */
+ @JsonProperty("sendTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sendTime;
+ /**
+ * 到达时间
+ */
+ @JsonProperty("arriveTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime arriveTime;
+ /**
+ * 离开时间
+ */
+ @JsonProperty("leaveTime")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime leaveTime;
+
+ /**
+ * 将Po转化为Vo
+ * @param po 数据库实体
+ * @return 转化结果
+ */
+ public static PickTaskVo of(TAppPickTask po) {
+ if (po == null) {
+ return new PickTaskVo();
+ }
+ return new PickTaskVo(
+ po.getPickId(),
+ po.getPickStand(),
+ po.getVehicleId(),
+ po.getPickStatus(),
+ po.getCreateTime(),
+ po.getSendTime(),
+ po.getArriveTime(),
+ po.getLeaveTime()
+ );
+ }
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/TaskVo.java b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/TaskVo.java
index 4ac0204..5eec9dd 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/TaskVo.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/model/vo/wms/TaskVo.java
@@ -105,7 +105,7 @@ public class TaskVo {
* 物料描述
*/
@JsonProperty("goodsDesc")
- private String goodsDesc;
+ private String goodsDesc;
/**
* 将po转换为vo
diff --git a/dev_wms_serve/src/main/java/com/wms_main/quartz/JobStarter.java b/dev_wms_serve/src/main/java/com/wms_main/quartz/JobStarter.java
index 4b44111..0ee0689 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/quartz/JobStarter.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/quartz/JobStarter.java
@@ -5,6 +5,9 @@ import lombok.RequiredArgsConstructor;
import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
+/**
+ * 定时任务启动类
+ */
@Component
@RequiredArgsConstructor
public class JobStarter implements CommandLineRunner {
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/business/IConveyTaskService.java b/dev_wms_serve/src/main/java/com/wms_main/service/business/IConveyTaskService.java
index 89682e7..1aa356f 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/business/IConveyTaskService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/business/IConveyTaskService.java
@@ -2,11 +2,10 @@ package com.wms_main.service.business;
import com.wms_main.model.bo.wms.WmsPickTask;
import com.wms_main.model.po.TAppPickTask;
-import com.wms_main.model.po.TAppStock;
+import com.wms_main.model.vo.wms.InventoryConfirmVo;
import com.wms_main.model.vo.wms.TaskConfirmVo;
import com.wms_main.model.vo.wms.WorkConfirmVo;
-import java.util.List;
import java.util.Map;
/**
@@ -49,4 +48,11 @@ public interface IConveyTaskService {
* @return 结果
*/
TaskConfirmVo getCurrentStandTask(TAppPickTask thisPickTask);
+
+ /**
+ * 获取这个载具的盘点确认信息
+ * @param vehicleId 载具号
+ * @return 盘点确认信息
+ */
+ InventoryConfirmVo getInventoryConfirm(String vehicleId);
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/business/IStockDataService.java b/dev_wms_serve/src/main/java/com/wms_main/service/business/IStockDataService.java
index b967772..8552c76 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/business/IStockDataService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/business/IStockDataService.java
@@ -15,8 +15,9 @@ public interface IStockDataService {
* @param stockConfirm 库存确认信息
* @param standId 站台号
* @param userName 用户名
+ * @param inventoryId 盘点任务号
*/
- void updateStockInfo(StockConfirmEntity stockConfirm, String standId, String userName, String reason);
+ void updateStockInfo(StockConfirmEntity stockConfirm, String standId, String userName, String reason, String inventoryId);
/**
* 查询库存预警值
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/ConveyTaskServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/ConveyTaskServiceImpl.java
index 441cf14..107bb87 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/ConveyTaskServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/ConveyTaskServiceImpl.java
@@ -17,6 +17,7 @@ import com.wms_main.model.dto.request.wcs.WcsReleaseBoxRequest;
import com.wms_main.model.dto.response.wcs.BaseWcsApiResponse;
import com.wms_main.model.dto.response.wcs.WcsApiResponse;
import com.wms_main.model.po.*;
+import com.wms_main.model.vo.wms.InventoryConfirmVo;
import com.wms_main.model.vo.wms.TaskConfirmVo;
import com.wms_main.model.vo.wms.WorkConfirmVo;
import com.wms_main.repository.utils.StringUtils;
@@ -51,6 +52,7 @@ public class ConveyTaskServiceImpl implements IConveyTaskService {
private final ITAppStockService appStockService;// 库存服务
private final AppCommon appCommon;
private final ITAppVehicleService appVehicleService;// 载具服务
+ private final ITAppInventoryService appInventoryService;// 盘点服务
/**
* 取消拣选任务实现
@@ -457,4 +459,50 @@ public class ConveyTaskServiceImpl implements IConveyTaskService {
return resultVo;
}
+
+ /**
+ * 获取这个载具的盘点确认信息
+ * @param vehicleId 载具号
+ * @return 盘点确认信息
+ */
+ @Override
+ public InventoryConfirmVo getInventoryConfirm(String vehicleId) {
+ // 获取这个箱子的盘点任务
+ List inventoryList = appInventoryService.list(new LambdaQueryWrapper()
+ .eq(TAppInventory::getVehicleId, vehicleId));
+ if (inventoryList == null || inventoryList.isEmpty()) {
+ return null;
+ }
+ List goodsIds = inventoryList.stream().map(TAppInventory::getGoodsId).distinct().toList();
+ // 查询这个箱子的库存信息
+ List stockList = appStockService.list(new LambdaQueryWrapper()
+ .eq(TAppStock::getVehicleId, vehicleId)
+ .in(TAppStock::getGoodsId, goodsIds));
+ if (stockList == null || stockList.isEmpty()) {
+ return null;
+ }
+ // 将这些库存根据料号Map一下， 并汇总库存数量
+ Map sumNumByGoodsMap = new HashMap<>();
+ for (TAppStock stock : stockList) {
+ if (sumNumByGoodsMap.containsKey(stock.getGoodsId())) {
+ sumNumByGoodsMap.replace(stock.getGoodsId(), sumNumByGoodsMap.get(stock.getGoodsId()) + stock.getRealNum());
+ } else {
+ sumNumByGoodsMap.put(stock.getGoodsId(), stock.getRealNum());
+ }
+ }
+ for (TAppInventory inventory : inventoryList) {
+ if (sumNumByGoodsMap.containsKey(inventory.getGoodsId())) {
+ // 返回盘点确认信息
+ InventoryConfirmVo inventoryConfirmVo = new InventoryConfirmVo();
+ inventoryConfirmVo.setInventoryId(inventory.getInventoryId());
+ inventoryConfirmVo.setGoodsId(inventory.getGoodsId());
+ inventoryConfirmVo.setVehicleId(inventory.getVehicleId());
+ inventoryConfirmVo.setStockNum(sumNumByGoodsMap.get(inventory.getGoodsId()));
+ inventoryConfirmVo.setConfirmNum(sumNumByGoodsMap.get(inventory.getGoodsId()));
+ // 返回结果
+ return inventoryConfirmVo;
+ }
+ }
+ return null;
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java
index 85cb36d..9df6f83 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StackerTaskServiceImpl.java
@@ -65,6 +65,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
* 输送线任务服务
*/
private final IConveyTaskService conveyTaskService;
+ /**
+ * 库存更新服务
+ */
+ private final ITAppStockUpdateService appStockUpdateService;
/**
* 业务通用
*/
@@ -311,6 +315,8 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
List goodsIds = new ArrayList<>();
// 新的库存信息
List newStockList = new ArrayList<>();
+ // 库存更新记录
+ List stockUpdateList = new ArrayList<>();
// 入库记录
List newTaskBakList = new ArrayList<>();
// 需要删除的任务id
@@ -352,7 +358,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
}
}
// 新库存，增加库存信息
- newStockList.add(new TAppStock(
+ TAppStock thisTimeNewStock = new TAppStock(
UUIDUtils.getNewUUID(),
vehicleId,
thisVehicleInTask.getDestination(),
@@ -368,8 +374,24 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
thisVehicleInTask.getOpNum(),
thisVehicleInTask.getGoodsDesc(),
expireDate,
- sledDays
- ));
+ sledDays,
+ null,
+ null
+ );
+ newStockList.add(thisTimeNewStock);
+ // 库存更新记录
+ TAppStockUpdate stockUpdate = new TAppStockUpdate(
+ UUIDUtils.getNewUUID(),
+ thisTimeNewStock.getVehicleId(),
+ thisTimeNewStock.getGoodsId(),
+ thisTimeNewStock.getFirstInTime(),
+ 0,
+ thisTimeNewStock.getRealNum(),
+ thisVehicleInTask.getOrigin() + "：入库",
+ LocalDateTime.now(),
+ thisVehicleInTask.getOpUser()
+ );
+ stockUpdateList.add(stockUpdate);
}
}
// 当前载具是否是空载具
@@ -414,6 +436,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
if (!newStockList.isEmpty()) {
appStockService.saveOrUpdateBatch(newStockList);
}
+ // 增加库存更新记录
+ if (!stockUpdateList.isEmpty()) {
+ appStockUpdateService.saveBatch(stockUpdateList);
+ }
// 添加任务记录
if (!newTaskBakList.isEmpty()) {
appTaskBakService.saveBatch(newTaskBakList);
@@ -455,6 +481,8 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
List goodsIds = new ArrayList<>();
// 新的库存信息
List newStockList = new ArrayList<>();
+ // 库存更新记录
+ List stockUpdateList = new ArrayList<>();
// 待删除的库存信息
List needDeleteStockIds = new ArrayList<>();
// 入库记录
@@ -506,7 +534,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
}
if (oldStockList.isEmpty()) {
// 新库存，增加库存信息
- newStockList.add(new TAppStock(
+ TAppStock thisTimeNewStock = new TAppStock(
UUIDUtils.getNewUUID(),
vehicleId,
thisVehicleInTask.getDestination(),
@@ -522,8 +550,24 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
thisVehicleInTask.getOpNum(),
thisVehicleInTask.getGoodsDesc(),
expireDate,
- sledDays
- ));
+ sledDays,
+ null,
+ null
+ );
+ newStockList.add(thisTimeNewStock);
+ // 库存更新记录
+ TAppStockUpdate stockUpdate = new TAppStockUpdate(
+ UUIDUtils.getNewUUID(),
+ thisTimeNewStock.getVehicleId(),
+ thisTimeNewStock.getGoodsId(),
+ thisTimeNewStock.getFirstInTime(),
+ 0,
+ thisTimeNewStock.getRealNum(),
+ thisVehicleInTask.getOrigin() + "：入库",
+ LocalDateTime.now(),
+ thisVehicleInTask.getOpUser()
+ );
+ stockUpdateList.add(stockUpdate);
} else {
// 更新已有库存信息
if (oldStockList.size() > 1) {
@@ -535,7 +579,7 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
.mapToInt(TAppStock::getTotalNum)
.sum();
// 新库存，增加库存信息
- newStockList.add(new TAppStock(
+ TAppStock thisTimeOldNewStock = new TAppStock(
UUIDUtils.getNewUUID(),
vehicleId,
thisVehicleInTask.getDestination(),
@@ -551,8 +595,24 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
originSum + thisVehicleInTask.getOpNum(),
thisVehicleInTask.getGoodsDesc(),
expireDate,
- sledDays
- ));
+ sledDays,
+ null,
+ null
+ );
+ newStockList.add(thisTimeOldNewStock);
+ // 库存更新记录
+ TAppStockUpdate stockUpdate = new TAppStockUpdate(
+ UUIDUtils.getNewUUID(),
+ thisTimeOldNewStock.getVehicleId(),
+ thisTimeOldNewStock.getGoodsId(),
+ thisTimeOldNewStock.getFirstInTime(),
+ originSum,
+ thisTimeOldNewStock.getRealNum(),
+ thisVehicleInTask.getOrigin() + "：入库",
+ LocalDateTime.now(),
+ thisVehicleInTask.getOpUser()
+ );
+ stockUpdateList.add(stockUpdate);
needDeleteStockIds.addAll(oldStockList.stream()
.map(TAppStock::getStockId)
.toList());
@@ -568,6 +628,19 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
oldStock.setLastUpdateUser(thisVehicleInTask.getOpUser());
oldStock.setStockStatus(WmsStockStatusEnums.OK.getCode());
newStockList.add(oldStock);
+ // 库存更新记录
+ TAppStockUpdate stockUpdate = new TAppStockUpdate(
+ UUIDUtils.getNewUUID(),
+ oldStock.getVehicleId(),
+ oldStock.getGoodsId(),
+ oldStock.getFirstInTime(),
+ oldStock.getRealNum() - thisVehicleInTask.getOpNum(),
+ oldStock.getRealNum(),
+ thisVehicleInTask.getOrigin() + "：入库",
+ LocalDateTime.now(),
+ thisVehicleInTask.getOpUser()
+ );
+ stockUpdateList.add(stockUpdate);
}
}
}
@@ -618,6 +691,10 @@ public class StackerTaskServiceImpl implements IStackerTaskService {
if (!newStockList.isEmpty()) {
appStockService.saveOrUpdateBatch(newStockList);
}
+ // 增加库存更新记录
+ if (!stockUpdateList.isEmpty()) {
+ appStockUpdateService.saveBatch(stockUpdateList);
+ }
// 添加任务记录
if (!newTaskBakList.isEmpty()) {
appTaskBakService.saveBatch(newTaskBakList);
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StockDataServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StockDataServiceImpl.java
index 4e55150..de29794 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StockDataServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/business/serviceImpl/StockDataServiceImpl.java
@@ -41,7 +41,7 @@ public class StockDataServiceImpl implements IStockDataService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void updateStockInfo(StockConfirmEntity stockConfirm, String standId, String userName, String reason) {
+ public void updateStockInfo(StockConfirmEntity stockConfirm, String standId, String userName, String reason, String inventoryId) {
if (stockConfirm == null || StringUtils.isEmpty(stockConfirm.getVehicleId()) || StringUtils.isEmpty(stockConfirm.getGoodsId())
|| stockConfirm.getRealRemainQty() == null) {
return;
@@ -59,7 +59,12 @@ public class StockDataServiceImpl implements IStockDataService {
List stockUpdateList = new ArrayList<>();
// 剩余数量
int remainQty = stockConfirm.getRealRemainQty();
- for (TAppStock stock : stockList) {
+ for (int i = 0; i < stockList.size(); i++) {
+ TAppStock stock = stockList.get(i);
+ if (StringUtils.isNotEmpty(inventoryId)) {
+ stock.setLastInventoryId(inventoryId);
+ stock.setLastInventoryTime(LocalDateTime.now());
+ }
if (remainQty <= 0) {
// 需要移除的库存
removeStocks.add(stock);
@@ -78,11 +83,8 @@ public class StockDataServiceImpl implements IStockDataService {
stockUpdateList.add(stockUpdate);
continue;
}
- if (stock.getRealNum() <= remainQty) {
- // 库存不变
- remainQty -= stock.getRealNum();
- } else {
- // 增加库存更新记录
+ if ((i == stockList.size() - 1) || stock.getRealNum() > remainQty) {
+ // 最先进的库存，剩余数量全部分配给他
TAppStockUpdate stockUpdate = new TAppStockUpdate(
UUIDUtils.getNewUUID(),
stock.getVehicleId(),
@@ -93,13 +95,16 @@ public class StockDataServiceImpl implements IStockDataService {
standId + "：" + reason,
LocalDateTime.now(),
userName
- );
+ );
stockUpdateList.add(stockUpdate);
stock.setRealNum(remainQty);
stock.setLastUpdateTime(LocalDateTime.now());
remainQty = 0;
// 添加更新库存列表
updateStocks.add(stock);
+ } else {
+ // 库存不变
+ remainQty -= stock.getRealNum();
}
}
// 删除库存
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/IKateWorkControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IKateWorkControllerService.java
index b5d76d6..44a7da0 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/IKateWorkControllerService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/IKateWorkControllerService.java
@@ -90,6 +90,13 @@ public interface IKateWorkControllerService {
*/
WmsApiResponse> queryKittingBomByPage(KittingBomQuery kittingBomQuery);
+ /**
+ * 查询图纸列表---分页
+ * @param imageQuery 查询参数
+ * @return 查询结果---分页
+ */
+ WmsApiResponse> queryImagesByPage(ImageQuery imageQuery);
+
/**
* 查询配料单对应关系列表---分页
* @param kittingBomRelationQuery 查询参数
@@ -138,4 +145,11 @@ public interface IKateWorkControllerService {
* @return 需要打印的料盒标签
*/
WmsApiResponse requestPrintBoxTags(KateWorksQuery kateWorksQuery);
+
+ /**
+ * 删除dbs计划
+ * @param dbsRequest 删除请求
+ * @return 删除结果
+ */
+ BaseWmsApiResponse deleteDbsPlan(DbsRequest dbsRequest);
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskControllerService.java
index f25213c..4e54634 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskControllerService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskControllerService.java
@@ -9,6 +9,7 @@ import com.wms_main.model.dto.response.wcs.BaseWcsApiResponse;
import com.wms_main.model.dto.response.wcs.WcsApiResponse;
import com.wms_main.model.dto.response.wms.BaseWmsApiResponse;
import com.wms_main.model.dto.response.wms.WmsApiResponse;
+import com.wms_main.model.vo.wms.InventoryConfirmVo;
import com.wms_main.model.vo.wms.TaskConfirmVo;
/**
@@ -77,4 +78,25 @@ public interface ITaskControllerService {
* @return 处理结果
*/
BaseWmsApiResponse confirmCurrentTask(ConfirmTaskRequest confirmTaskRequest);
+
+ /**
+ * 下发盘点请求
+ * @param inventoryRequest 盘点请求
+ * @return 请求结果
+ */
+ BaseWmsApiResponse requestInventory(InventoryRequest inventoryRequest);
+
+ /**
+ * 查询盘点任务确认信息
+ * @param inventoryConfirmRequest 请求
+ * @return 请求结果
+ */
+ WmsApiResponse getInventoryConfirm(InventoryConfirmRequest inventoryConfirmRequest);
+
+ /**
+ * 确认盘点信息
+ * @param inventoryConfirmRequest 确认请求
+ * @return 处理结果
+ */
+ BaseWmsApiResponse confirmInventory(InventoryConfirmRequest inventoryConfirmRequest);
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskOperationControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskOperationControllerService.java
index 540cb61..7db65eb 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskOperationControllerService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskOperationControllerService.java
@@ -1,8 +1,23 @@
package com.wms_main.service.controller;
+import com.wms_main.model.dto.request.wms.WmsTaskRequest;
+import com.wms_main.model.dto.response.wms.BaseWmsApiResponse;
+
/**
* 任务操作控制类 服务接口
*/
public interface ITaskOperationControllerService {
+ /**
+ * 删除Wms任务
+ * @param wmsTaskRequest 请求参数
+ * @return 删除结果
+ */
+ BaseWmsApiResponse deleteWmsTask(WmsTaskRequest wmsTaskRequest);
+ /**
+ * 更新Wms任务
+ * @param wmsTaskRequest 请求参数
+ * @return 更新结果
+ */
+ BaseWmsApiResponse updateWmsTask(WmsTaskRequest wmsTaskRequest);
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskQueryControllerService.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskQueryControllerService.java
index dd073bb..c397449 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskQueryControllerService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/ITaskQueryControllerService.java
@@ -1,10 +1,10 @@
package com.wms_main.service.controller;
+import com.wms_main.model.dto.query.OutsQuery;
+import com.wms_main.model.dto.query.PickTaskQuery;
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.model.vo.wms.*;
/**
* 任务查询控制类 服务接口
@@ -30,4 +30,18 @@ public interface ITaskQueryControllerService {
* @return 查询结果---分页
*/
WmsApiResponse> queryOutTaskRecordByPage(WmsTaskQuery wmsTaskQuery);
+
+ /**
+ * 查询拣选任务信息---分页
+ * @param pickTaskQuery 查询参数
+ * @return 查询结果---分页
+ */
+ WmsApiResponse> queryPickTasksByPage(PickTaskQuery pickTaskQuery);
+
+ /**
+ * 查询出库单信息---分页
+ * @param outsQuery 查询参数
+ * @return 查询结果---分页
+ */
+ WmsApiResponse> queryOutsByPage(OutsQuery outsQuery);
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java
index dd2b4ec..522026c 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/KateWorkControllerServiceImpl.java
@@ -56,6 +56,7 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
private final ITAppKanbanService appKanbanService;// 看板服务
private final ITAppWorkRecordService appWorkRecordService;// 工作记录服务
private final ITAppPickPlanService appPickPlanService;// 拣选计划服务
+ private final ITAppInventoryService appInventoryService;// 盘点任务服务
private final AppCommon appCommon;
/**
@@ -402,7 +403,7 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
}
}
// 更新库存信息
- stockDataService.updateStockInfo(confirmWorkRequest.getStockConfirm(), confirmWorkRequest.getStandId(), confirmWorkRequest.getUserName(), "配料拣选");
+ stockDataService.updateStockInfo(confirmWorkRequest.getStockConfirm(), confirmWorkRequest.getStandId(), confirmWorkRequest.getUserName(), "配料拣选", null);
// 查询库存获得当前载具中存储的库存列表
LambdaQueryWrapper stockQueryWrapper = new LambdaQueryWrapper()
.eq(TAppStock::getVehicleId, thisPickTask.getVehicleId())
@@ -419,6 +420,14 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
if (taskConfirmVo != null) {
return BaseWmsApiResponse.warn("当前载具还有其他拣选任务，请切换到出库界面进行拣配。");
}
+ // 判断当前载具是否还有盘点任务
+ List goodsIds = stockList.stream().map(TAppStock::getGoodsId).distinct().toList();
+ List inventoryTasks = appInventoryService.list(new LambdaQueryWrapper()
+ .eq(TAppInventory::getVehicleId, thisPickTask.getVehicleId())
+ .in(TAppInventory::getGoodsId, goodsIds));
+ if (inventoryTasks != null && !inventoryTasks.isEmpty()) {
+ return BaseWmsApiResponse.warn("当前载具还有盘点任务，请切换到盘点界面进行拣配。");
+ }
} else {
// 取消后续拣选任务
conveyTaskService.cancelOtherStandPickTasks(thisPickTask.getVehicleId(), thisPickTask.getPickStand());
@@ -814,7 +823,7 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
imageIp,
image.getImagePath(),
image.getImageName(),
- FileUtils.getImageDetail(imageList.getFirst().getImagePath(), imageList.getFirst().getImageName()),
+ FileUtils.getImageDetail(image.getImagePath(), image.getImageName()),
image.getImageType());
imageVoList.add(imageVo);
}
@@ -880,6 +889,25 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
}
}
+ /**
+ * 查询图纸列表（分页）---实现
+ * @param imageQuery 查询参数
+ * @return 查询结果
+ */
+ @Override
+ public WmsApiResponse> queryImagesByPage(ImageQuery imageQuery) {
+ Page page = imageQuery.toMpPage();
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper()
+ .like(StringUtils.isNotEmpty(imageQuery.getImageId()), TAppImage::getImageId, imageQuery.getImageId())
+ .like(StringUtils.isNotEmpty(imageQuery.getProductId()), TAppImage::getProductId, imageQuery.getProductId())
+ .like(StringUtils.isNotEmpty(imageQuery.getBoxNo()), TAppImage::getBoxNo, imageQuery.getBoxNo())
+ .eq(imageQuery.getImageType() != null, TAppImage::getImageType, imageQuery.getImageType());
+ Page pagePo = appImageService.page(page, lambdaQueryWrapper);
+
+ PageVo pageVo = PageVo.of(pagePo, ImageVo::ofPo);
+ return WmsApiResponse.success("查询图纸数据成功", pageVo);
+ }
+
/**
* 配料单对应关系实现---分页
*
@@ -1183,6 +1211,38 @@ public class KateWorkControllerServiceImpl implements IKateWorkControllerService
return WmsApiResponse.success("获取料盒标签数据成功。", boxSummary);
}
+ /**
+ * 删除dbs计划---实现
+ * @param dbsRequest 删除请求
+ * @return 删除结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BaseWmsApiResponse deleteDbsPlan(DbsRequest dbsRequest) {
+ if (dbsRequest == null) {
+ // 请求为空
+ return BaseWmsApiResponse.error("请求为空。");
+ }
+ if (StringUtils.isEmpty(dbsRequest.getDbsId()) && StringUtils.isEmpty(dbsRequest.getWorkOrder())) {
+ return BaseWmsApiResponse.error("dbsId、工单号必须输入一个。");
+ }
+ // 查询对应的dbs信息
+ List targetDbsList = appDbsService.list(new LambdaQueryWrapper()
+ .eq(StringUtils.isNotEmpty(dbsRequest.getDbsId()), TAppDbs::getDbsId, dbsRequest.getDbsId())
+ .eq(StringUtils.isNotEmpty(dbsRequest.getWorkOrder()), TAppDbs::getWorkOrder, dbsRequest.getWorkOrder()));
+ if (targetDbsList == null || targetDbsList.isEmpty()) {
+ // 未查询到对应的dbs信息
+ return BaseWmsApiResponse.error("未查询到对应的dbs信息。");
+ }
+ TAppDbs targetDbs = targetDbsList.getFirst();
+ if (!Objects.equals(targetDbs.getDbsStatus(), DbsStatusEnums.NEW.getValue())) {
+ // 当前dbs状态为关闭
+ return BaseWmsApiResponse.error("当前DBS已经在做，无法删除。");
+ }
+ // 删除dbs
+ return appDbsService.removeById(targetDbs.getDbsId()) ? BaseWmsApiResponse.success("删除DBS成功。") : BaseWmsApiResponse.error("删除DBS失败。");
+ }
+
/**
* 获取服务件成品号的物料需求
*
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java
index c2456a2..afbc3ae 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskControllerServiceImpl.java
@@ -10,6 +10,7 @@ import com.wms_main.constant.enums.wms.*;
import com.wms_main.dao.*;
import com.wms_main.model.bo.wcs.WcsStackerTask;
import com.wms_main.model.bo.wms.GoodsInfoForTask;
+import com.wms_main.model.bo.wms.StockConfirmEntity;
import com.wms_main.model.bo.wms.TaskConfirmEntity;
import com.wms_main.model.bo.wms.WmsPickTask;
import com.wms_main.model.dto.request.wcs.WcsBoxArriveRequest;
@@ -21,6 +22,7 @@ import com.wms_main.model.dto.response.wcs.WcsApiResponse;
import com.wms_main.model.dto.response.wms.BaseWmsApiResponse;
import com.wms_main.model.dto.response.wms.WmsApiResponse;
import com.wms_main.model.po.*;
+import com.wms_main.model.vo.wms.InventoryConfirmVo;
import com.wms_main.model.vo.wms.TaskConfirmVo;
import com.wms_main.model.vo.wms.WorkConfirmVo;
import com.wms_main.repository.utils.ConvertUtils;
@@ -60,6 +62,8 @@ public class TaskControllerServiceImpl implements ITaskControllerService {
private final IStockDataService stockDataService;// 库存数据服务
private final ITAppOutsRecordService appOutsRecordService;// 出库单记录服务
private final ITAppPickPlanService appPickPlanService;// 拣选计划服务
+ private final ITAppInventoryService appInventoryService;// 盘点任务服务
+ private final ITAppInventoryRecordService appInventoryRecordService;// 盘点记录服务
private final AppCommon appCommon;
/**
@@ -267,6 +271,10 @@ public class TaskControllerServiceImpl implements ITaskControllerService {
}
}
} else if (stockOutRequest.getOutType().equals(WmsOutTypeEnums.EMERGE.getCode())) {
+ if (!appStandService.exists(new LambdaQueryWrapper().eq(TAppStand::getStandId, stockOutRequest.getDestination())
+ .eq(TAppStand::getStandType, 1))) {
+ return BaseWmsApiResponse.error("非拣选站台不允许紧急出库。");
+ }
// 判断理由是否输入
if (StringUtils.isEmpty(stockOutRequest.getReason())) {
return BaseWmsApiResponse.error("请求错误：紧急出库必须输入原因。");
@@ -712,7 +720,7 @@ public class TaskControllerServiceImpl implements ITaskControllerService {
}
}
// 更新库存信息
- stockDataService.updateStockInfo(confirmTaskRequest.getStockConfirm(), confirmTaskRequest.getStandId(), confirmTaskRequest.getUserName(), "出库拣选");
+ stockDataService.updateStockInfo(confirmTaskRequest.getStockConfirm(), confirmTaskRequest.getStandId(), confirmTaskRequest.getUserName(), "出库拣选", null);
// 查询库存获得当前载具中存储的库存列表
LambdaQueryWrapper stockQueryWrapper = new LambdaQueryWrapper()
.eq(TAppStock::getVehicleId, thisPickTask.getVehicleId())
@@ -729,6 +737,235 @@ public class TaskControllerServiceImpl implements ITaskControllerService {
if (resultVo != null) {
return BaseWmsApiResponse.warn("当前载具还有工作，请切换到拣配界面进行拣配。");
}
+ // 判断当前载具是否还有盘点任务
+ List goodsIds = stockList.stream().map(TAppStock::getGoodsId).distinct().toList();
+ List inventoryTasks = appInventoryService.list(new LambdaQueryWrapper()
+ .eq(TAppInventory::getVehicleId, thisPickTask.getVehicleId())
+ .in(TAppInventory::getGoodsId, goodsIds));
+ if (inventoryTasks != null && !inventoryTasks.isEmpty()) {
+ return BaseWmsApiResponse.warn("当前载具还有盘点任务，请切换到盘点界面进行拣配。");
+ }
+ } else {
+ // 取消后续拣选任务
+ conveyTaskService.cancelOtherStandPickTasks(thisPickTask.getVehicleId(), thisPickTask.getPickStand());
+ }
+ // 放行
+ if (conveyTaskService.releaseStandVehicle(thisPickTask)) {
+ return BaseWmsApiResponse.success("确认成功。");
+ } else {
+ // 回滚事务
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return BaseWmsApiResponse.error("释放箱子失败。");
+ }
+ }
+
+ /**
+ * 请求盘点---实现
+ * @param inventoryRequest 盘点请求
+ * @return 请求结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BaseWmsApiResponse requestInventory(InventoryRequest inventoryRequest) {
+ if (inventoryRequest == null) {
+ return BaseWmsApiResponse.error("请求为NULL。");
+ }
+ if (StringUtils.isEmpty(inventoryRequest.getStandId())) {
+ return BaseWmsApiResponse.error("请求缺少信息，请输入站台号。");
+ }
+ if (!appStandService.exists(new LambdaQueryWrapper().eq(TAppStand::getStandId, inventoryRequest.getStandId())
+ .eq(TAppStand::getStandType, 1))) {
+ return BaseWmsApiResponse.error("非拣选站台不允许盘点。");
+ }
+ if (StringUtils.isEmpty(inventoryRequest.getGoodsId())) {
+ return BaseWmsApiResponse.error("请求缺少信息，请输入料号。");
+ }
+ // 判断这个料有没有还没盘点完的任务
+ List inventoryList = appInventoryService.list(new LambdaQueryWrapper()
+ .eq(TAppInventory::getGoodsId, inventoryRequest.getGoodsId())
+ .eq(StringUtils.isNotEmpty(inventoryRequest.getVehicleId()), TAppInventory::getVehicleId, inventoryRequest.getVehicleId()));
+ if (inventoryList != null && !inventoryList.isEmpty()) {
+ String errMsg = StringUtils.isNotEmpty(inventoryRequest.getVehicleId()) ? "载具：" + inventoryRequest.getVehicleId() : "";
+ return BaseWmsApiResponse.error(errMsg + "料号：" + inventoryRequest.getGoodsId() + "还有盘点任务未完成。");
+ }
+ // 查询库存，创建盘点任务
+ List stockList = appStockService.list(new LambdaQueryWrapper()
+ .eq(TAppStock::getGoodsId, inventoryRequest.getGoodsId())
+ .eq(StringUtils.isNotEmpty(inventoryRequest.getVehicleId()), TAppStock::getVehicleId, inventoryRequest.getVehicleId()));
+ if (stockList == null || stockList.isEmpty()) {
+ return BaseWmsApiResponse.error("物料" + inventoryRequest.getGoodsId() + "没有库存。");
+ }
+ // 根据载具号map一下
+ Map inventoryByVehicleMap = new HashMap<>();
+ // 盘点单号
+ String orderId = UUIDUtils.getNewUUID();
+ for (TAppStock stock : stockList) {
+ if (!inventoryByVehicleMap.containsKey(stock.getVehicleId())) {
+ // 添加盘点任务
+ TAppInventory inventoryTask = new TAppInventory(
+ UUIDUtils.getNewUUID(),
+ inventoryRequest.getGoodsId(),
+ stock.getVehicleId(),
+ null,
+ null,
+ inventoryRequest.getStandId(),
+ inventoryRequest.getUserName(),
+ WmsInvTypeEnums.INV_TYPE_1.getCode(),
+ WmsInvStatusEnums.INIT.getCode(),
+ WmsInvResultEnums.NONE.getCode(),
+ LocalDateTime.now(),
+ null,
+ orderId
+ );
+ inventoryByVehicleMap.put(stock.getVehicleId(), inventoryTask);
+ }
+ }
+ if (!inventoryByVehicleMap.isEmpty()) {
+ appInventoryService.saveBatch(inventoryByVehicleMap.values());
+ }
+ // 保存盘点任务
+ return BaseWmsApiResponse.success("创建盘点任务成功。");
+ }
+
+ /**
+ * 查询盘点确认信息
+ * @param inventoryConfirmRequest 请求
+ * @return 查询结果
+ */
+ @Override
+ public WmsApiResponse getInventoryConfirm(InventoryConfirmRequest inventoryConfirmRequest) {
+ // 判断请求是否参数完备
+ if (inventoryConfirmRequest == null) {
+ return WmsApiResponse.error("请求参数为空。", null);
+ }
+ if (StringUtils.isEmpty(inventoryConfirmRequest.getStandId())) {
+ return WmsApiResponse.error("请求参数缺少站台号。", null);
+ }
+ // 查询当前站台的拣选任务
+ List pickTaskList = appPickTaskService.list(new LambdaQueryWrapper()
+ .eq(TAppPickTask::getPickStand, inventoryConfirmRequest.getStandId())
+ .eq(TAppPickTask::getPickStatus, WmsPickTaskStatusEnum.ARRIVE.getCode()));
+ if (pickTaskList == null || pickTaskList.isEmpty()) {
+ return WmsApiResponse.error("当前站台没有箱子到达, 请检查。", null);
+ }
+ if (pickTaskList.size() > 1) {
+ return WmsApiResponse.error("当前站台有多个箱子到达，请检查。", null);
+ }
+ // 获取当前拣选任务
+ TAppPickTask thisPickTask = pickTaskList.getFirst();
+ InventoryConfirmVo inventoryConfirmVo = conveyTaskService.getInventoryConfirm(thisPickTask.getVehicleId());
+ if (inventoryConfirmVo != null) {
+ // 返回结果
+ return WmsApiResponse.success("查询盘点确认信息成功。", inventoryConfirmVo);
+ }
+ return WmsApiResponse.instanceOf(WmsApiResponseCodeEnums.WARNING.getCode(),"当前箱子没有要盘点的任务，请放行。", null);
+ }
+
+ /**
+ * 确认盘点信息
+ * @param inventoryConfirmRequest 确认请求
+ * @return 处理结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BaseWmsApiResponse confirmInventory(InventoryConfirmRequest inventoryConfirmRequest) {
+ if (inventoryConfirmRequest == null) {
+ return BaseWmsApiResponse.error("请求信息为空。");
+ }
+ if (StringUtils.isEmpty(inventoryConfirmRequest.getStandId())) {
+ return BaseWmsApiResponse.error("请求信息缺少站台号。");
+ }
+ // 查询当前站台上的已到达的拣选任务
+ List pickTaskList = appPickTaskService.list(new LambdaQueryWrapper()
+ .eq(TAppPickTask::getPickStand, inventoryConfirmRequest.getStandId())
+ .eq(TAppPickTask::getPickStatus, WmsPickTaskStatusEnum.ARRIVE.getCode()));
+ if (pickTaskList == null || pickTaskList.isEmpty()) {
+ return BaseWmsApiResponse.error("当前站台没有箱子到达, 请检查。");
+ }
+ if (pickTaskList.size() > 1) {
+ return BaseWmsApiResponse.error("当前站台有多个箱子到达，请检查。");
+ }
+ // 当前站台到达的拣选任务
+ TAppPickTask thisPickTask = pickTaskList.getFirst();
+ if (StringUtils.isNotEmpty(inventoryConfirmRequest.getInventoryId())) {
+ TAppInventory targetInventory = appInventoryService.getById(inventoryConfirmRequest.getInventoryId());
+ if (targetInventory != null) {
+ if (!Objects.equals(targetInventory.getVehicleId(), thisPickTask.getVehicleId())) {
+ // 盘点的载具号与当前站台到达的拣选任务载具号不一致，请检查。
+ return BaseWmsApiResponse.error("盘点的载具号与当前站台到达的载具号不一致，请检查。");
+ }
+ if (inventoryConfirmRequest.getConfirmNum() == null || inventoryConfirmRequest.getConfirmNum() < 0) {
+ return BaseWmsApiResponse.error("请求信息中的盘点确认数量不正确。");
+ }
+ // 添加盘点记录
+ TAppInventoryRecord inventoryRecord = new TAppInventoryRecord();
+ inventoryRecord.setInventoryId(inventoryConfirmRequest.getInventoryId());
+ inventoryRecord.setGoodsId(targetInventory.getGoodsId());
+ inventoryRecord.setVehicleId(targetInventory.getVehicleId());
+ // 查询这个载具-料号对应的库存数量
+ List thisVehicleAndGoodsStock = appStockService.list(new LambdaQueryWrapper()
+ .eq(TAppStock::getVehicleId, targetInventory.getVehicleId())
+ .eq(TAppStock::getGoodsId, targetInventory.getGoodsId()));
+ int stockNum = 0;
+ if (thisVehicleAndGoodsStock != null && !thisVehicleAndGoodsStock.isEmpty()) {
+ // 获取realNum总和
+ stockNum = thisVehicleAndGoodsStock.stream().mapToInt(TAppStock::getRealNum).sum();
+ }
+ inventoryRecord.setStockNum(stockNum);
+ inventoryRecord.setConfirmNum(inventoryConfirmRequest.getConfirmNum());
+ inventoryRecord.setInvStand(inventoryConfirmRequest.getStandId());
+ inventoryRecord.setInvUser(inventoryConfirmRequest.getUserName());
+ inventoryRecord.setInvType(WmsInvTypeEnums.INV_TYPE_1.getCode());
+ inventoryRecord.setInvStatus(WmsInvStatusEnums.CONFIRMED.getCode());
+ if (stockNum < inventoryConfirmRequest.getConfirmNum()) {
+ // 盘盈
+ inventoryRecord.setInvResult(WmsInvResultEnums.PLUS.getCode());
+ } else if (stockNum == inventoryConfirmRequest.getConfirmNum()) {
+ // 正常
+ inventoryRecord.setInvResult(WmsInvResultEnums.EQUAL.getCode());
+ } else {
+ // 盘亏
+ inventoryRecord.setInvResult(WmsInvResultEnums.MINUS.getCode());
+ }
+ inventoryRecord.setInvCreateTime(targetInventory.getInvCreateTime());
+ inventoryRecord.setInvConfirmTime(LocalDateTime.now());
+ inventoryRecord.setInvOrderId(targetInventory.getInventoryId());
+ appInventoryRecordService.save(inventoryRecord);
+ // 移除任务表
+ appInventoryService.removeById(inventoryConfirmRequest.getInventoryId());
+ // 根据盘点确认信息更新库存
+ StockConfirmEntity stockConfirm = new StockConfirmEntity();
+ stockConfirm.setVehicleId(targetInventory.getVehicleId());
+ stockConfirm.setGoodsId(targetInventory.getGoodsId());
+ stockConfirm.setRealRemainQty(inventoryConfirmRequest.getConfirmNum());
+ // 更新库存信息
+ stockDataService.updateStockInfo(stockConfirm, inventoryConfirmRequest.getStandId(), inventoryConfirmRequest.getUserName(), "盘点确认", targetInventory.getInventoryId());
+ } else {
+ return BaseWmsApiResponse.error("请求的盘点任务号未查到对应的盘点任务。");
+ }
+ }
+ // 查询库存获得当前载具中存储的库存列表
+ LambdaQueryWrapper stockQueryWrapper = new LambdaQueryWrapper()
+ .eq(TAppStock::getVehicleId, thisPickTask.getVehicleId());
+ List stockList = appStockService.list(stockQueryWrapper);
+ // 界面直接点击确认/放行
+ if (!stockList.isEmpty()) {
+ // 判断是否还有其他盘点任务
+ List otherInventoryList = appInventoryService.list(new LambdaQueryWrapper()
+ .eq(TAppInventory::getVehicleId, thisPickTask.getVehicleId())
+ .ne(TAppInventory::getInventoryId, inventoryConfirmRequest.getInventoryId()));
+ if (otherInventoryList != null && !otherInventoryList.isEmpty()) {
+ return BaseWmsApiResponse.error("当前载具还有其他的盘点任务，请继续盘点。");
+ }
+ // 判断还有没有当前站台的其他拣选任务
+ TaskConfirmVo taskConfirmVo = conveyTaskService.getCurrentStandTask(thisPickTask);
+ if (taskConfirmVo != null) {
+ return BaseWmsApiResponse.warn("当前载具还有紧急出库任务，请切换到出库界面信息进行拣配。");
+ }
+ WorkConfirmVo resultVo = conveyTaskService.getCurrentStandWork(thisPickTask);
+ if (resultVo != null) {
+ return BaseWmsApiResponse.warn("当前载具还有工作，请切换到拣配界面进行拣配。");
+ }
} else {
// 取消后续拣选任务
conveyTaskService.cancelOtherStandPickTasks(thisPickTask.getVehicleId(), thisPickTask.getPickStand());
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskOperationControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskOperationControllerServiceImpl.java
index cbf30c5..594705f 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskOperationControllerServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskOperationControllerServiceImpl.java
@@ -1,8 +1,28 @@
package com.wms_main.service.controller.serviceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.wms_main.constant.enums.wcs.WcsStackerTaskStatusEnums;
+import com.wms_main.constant.enums.wms.WmsStackerTaskStatusEnums;
+import com.wms_main.dao.ITAppTaskBakService;
+import com.wms_main.dao.ITAppTaskService;
+import com.wms_main.dao.ITAppWcsTaskBakService;
+import com.wms_main.dao.ITAppWcsTaskService;
+import com.wms_main.model.dto.request.wms.WmsTaskRequest;
+import com.wms_main.model.dto.response.wms.BaseWmsApiResponse;
+import com.wms_main.model.po.TAppTask;
+import com.wms_main.model.po.TAppTaskBak;
+import com.wms_main.model.po.TAppWcsTask;
+import com.wms_main.model.po.TAppWcsTaskBak;
+import com.wms_main.repository.utils.ConvertUtils;
+import com.wms_main.repository.utils.StringUtils;
import com.wms_main.service.controller.ITaskOperationControllerService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Objects;
/**
* 任务操作控制类 服务实现
@@ -10,5 +30,170 @@ import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class TaskOperationControllerServiceImpl implements ITaskOperationControllerService {
+ private final ITAppTaskService appTaskService;// wms任务服务
+ private final ITAppTaskBakService appTaskBakService;// wms任务记录服务
+ private final ITAppWcsTaskService appWcsTaskService;// wcs任务服务
+ private final ITAppWcsTaskBakService appWcsTaskBakService;// wcs任务记录服务
+ /**
+ * 删除wms任务
+ * @param wmsTaskRequest 请求参数
+ * @return 删除结果
+ */
+ @Override
+ public BaseWmsApiResponse deleteWmsTask(WmsTaskRequest wmsTaskRequest) {
+ if (wmsTaskRequest == null) {
+ return BaseWmsApiResponse.error("请求参数不能为NULL");
+ }
+ if (StringUtils.isEmpty(wmsTaskRequest.getTaskId())) {
+ return BaseWmsApiResponse.error("请求参数不完整，缺少taskId。");
+ }
+ // 查询对应的任务
+ List tasks = appTaskService.list(new LambdaQueryWrapper()
+ .eq(TAppTask::getTaskId, wmsTaskRequest.getTaskId()));
+ if (tasks == null || tasks.isEmpty()) {
+ return BaseWmsApiResponse.error("未查询到对应的任务");
+ }
+ TAppTask targetTask = tasks.getFirst();
+ return appTaskService.removeById(targetTask.getTaskId()) ? BaseWmsApiResponse.success("删除任务成功。") : BaseWmsApiResponse.error("删除任务失败。");
+ }
+
+ /**
+ * 更新wms任务
+ * @param wmsTaskRequest 请求参数
+ * @return 更新结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public BaseWmsApiResponse updateWmsTask(WmsTaskRequest wmsTaskRequest) {
+ if (wmsTaskRequest == null) {
+ return BaseWmsApiResponse.error("请求参数不能为NULL");
+ }
+ if (StringUtils.isEmpty(wmsTaskRequest.getTaskId())) {
+ return BaseWmsApiResponse.error("请求参数不完整，缺少taskId。");
+ }
+ // 查询对应的任务
+ List tasks = appTaskService.list(new LambdaQueryWrapper()
+ .eq(TAppTask::getTaskId, wmsTaskRequest.getTaskId()));
+ if (tasks == null || tasks.isEmpty()) {
+ return BaseWmsApiResponse.error("未查询到对应的任务");
+ }
+ TAppTask targetTask = tasks.getFirst();
+ // 更新除任务状态之外的其他信息
+ updateDetailInfoExceptStatus(targetTask, wmsTaskRequest);
+ // 判断任务状态是否变更
+ if (!Objects.equals(targetTask.getTaskStatus(), wmsTaskRequest.getTaskStatus())) {
+ // 如果是取消任务
+ if (Objects.equals(wmsTaskRequest.getTaskStatus(), WmsStackerTaskStatusEnums.CANCEL.getCode())) {
+ // 判断当前任务状态是已发送、正在执行、已完成状态，那么不允许修改状态
+ if (!Objects.equals(targetTask.getTaskStatus(), WmsStackerTaskStatusEnums.TEMP.getCode()) &&
+ !Objects.equals(targetTask.getTaskStatus(), WmsStackerTaskStatusEnums.WAIT.getCode())) {
+ return BaseWmsApiResponse.error("当前任务已生成wcs任务，如需取消，请先取消对应的wcs任务。");
+ }
+ // 将这个载具的任务删除，并存进备份表
+ List thisVehicleTasks = appTaskService.list(new LambdaQueryWrapper()
+ .eq(TAppTask::getVehicleId, targetTask.getVehicleId())
+ .eq(TAppTask::getTaskType, targetTask.getTaskType()));
+ List thisVehicleTasksBak = thisVehicleTasks.stream()
+ .map(task -> new TAppTaskBak(
+ task.getTaskId(),
+ task.getTaskType(),
+ WmsStackerTaskStatusEnums.CANCEL.getCode(),
+ task.getTaskPriority(),
+ task.getVehicleId(),
+ task.getOrigin(),
+ task.getDestination(),
+ task.getWcsTaskId(),
+ task.getCreateTime(),
+ task.getFinishTime(),
+ task.getGoodsId(),
+ task.getOpNum(),
+ task.getStockNum(),
+ task.getOpUser(),
+ task.getRemark(),
+ task.getCallStand(),
+ task.getGoodsDesc()
+ )).toList();
+ if (appTaskService.removeByIds(thisVehicleTasks.stream().map(TAppTask::getTaskId).toList())) {
+ return appTaskBakService.saveBatch(thisVehicleTasksBak) ? BaseWmsApiResponse.success("取消任务成功。") : BaseWmsApiResponse.error("取消任务失败，添加任务记录失败。");
+ } else {
+ return BaseWmsApiResponse.error("取消任务失败，删除任务失败。");
+ }
+ } else if (Objects.equals(wmsTaskRequest.getTaskStatus(), WmsStackerTaskStatusEnums.FINISH.getCode())) {
+ // 将对应的wcs任务完成，并存进备份表
+ List wcsTasks = appWcsTaskService.list(new LambdaQueryWrapper()
+ .eq(TAppWcsTask::getWcsTaskId, targetTask.getWcsTaskId()));
+ if (wcsTasks != null && !wcsTasks.isEmpty()) {
+ TAppWcsTask wcsTask = wcsTasks.getFirst();
+ // 移除wcs任务，并向wcs备份表添加记录
+ TAppWcsTaskBak wcsTaskBak = new TAppWcsTaskBak(
+ wcsTask.getWcsTaskId(),
+ WcsStackerTaskStatusEnums.FINISH.getCode(),
+ wcsTask.getWcsTaskType(),
+ wcsTask.getTaskPriority(),
+ wcsTask.getVehicleId(),
+ wcsTask.getOrigin(),
+ wcsTask.getDestination(),
+ wcsTask.getCreateTime(),
+ wcsTask.getSendTime(),
+ wcsTask.getFinishTime(),
+ wmsTaskRequest.getUserName() + "手动完成"
+ );
+ appWcsTaskService.removeById(wcsTask.getWcsTaskId());
+ appWcsTaskBakService.save(wcsTaskBak);
+ }
+ // 更新这个箱子的任务为完成状态
+ appTaskService.update(
+ new LambdaUpdateWrapper()
+ .set(TAppTask::getTaskStatus, WmsStackerTaskStatusEnums.FINISH.getCode())
+ .eq(TAppTask::getTaskType, targetTask.getTaskType())
+ .eq(TAppTask::getVehicleId, targetTask.getVehicleId())
+ );
+ return BaseWmsApiResponse.success("完成任务成功。");
+ } else {
+ // 更新任务状态
+ targetTask.setTaskStatus(wmsTaskRequest.getTaskStatus());
+ // 更新任务信息
+ appTaskService.updateById(targetTask);
+ // 更新这个箱子其他任务的状态
+ appTaskService.update(
+ new LambdaUpdateWrapper()
+ .set(TAppTask::getTaskStatus, wmsTaskRequest.getTaskStatus())
+ .eq(TAppTask::getTaskType, targetTask.getTaskType())
+ .eq(TAppTask::getVehicleId, targetTask.getVehicleId())
+ .ne(TAppTask::getTaskId, targetTask.getTaskId())
+ );
+ // 转化wcs任务状态
+ Integer wcsTaskStatus = ConvertUtils.convertWmsTaskStatusToWcsStackerTaskStatus(wmsTaskRequest.getTaskStatus());
+ appWcsTaskService.update(new LambdaUpdateWrapper()
+ .set(TAppWcsTask::getWcsTaskStatus, wcsTaskStatus)
+ .eq(TAppWcsTask::getWcsTaskId, targetTask.getWcsTaskId()));
+ return BaseWmsApiResponse.success("更新任务信息成功。");
+ }
+ } else {
+ // 只更新数据
+ return appTaskService.updateById(targetTask) ? BaseWmsApiResponse.success("更新任务信息成功。") : BaseWmsApiResponse.error("更新任务信息失败。");
+ }
+ }
+
+ /**
+ * 更新详情
+ * @param targetTask 目标任务
+ * @param wmsTaskRequest 请求信息
+ */
+ private void updateDetailInfoExceptStatus(TAppTask targetTask, WmsTaskRequest wmsTaskRequest) {
+ targetTask.setTaskType(wmsTaskRequest.getTaskType());
+ targetTask.setTaskPriority(wmsTaskRequest.getTaskPriority());
+ targetTask.setVehicleId(wmsTaskRequest.getVehicleId());
+ targetTask.setOrigin(wmsTaskRequest.getOrigin());
+ targetTask.setDestination(wmsTaskRequest.getDestination());
+ targetTask.setWcsTaskId(wmsTaskRequest.getWcsTaskId());
+ targetTask.setGoodsId(wmsTaskRequest.getGoodsId());
+ targetTask.setOpNum(wmsTaskRequest.getOpNum());
+ targetTask.setStockNum(wmsTaskRequest.getStockNum());
+ targetTask.setOpUser(wmsTaskRequest.getOpUser());
+ targetTask.setRemark(wmsTaskRequest.getRemark());
+ targetTask.setCallStand(wmsTaskRequest.getCallStand());
+ targetTask.setGoodsDesc(wmsTaskRequest.getGoodsDesc());
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskQueryControllerServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskQueryControllerServiceImpl.java
index b0312c1..75dc6a8 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskQueryControllerServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/controller/serviceImpl/TaskQueryControllerServiceImpl.java
@@ -3,15 +3,19 @@ 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.ITAppOutsService;
+import com.wms_main.dao.ITAppPickTaskService;
import com.wms_main.dao.ITAppTaskBakService;
import com.wms_main.dao.ITAppTaskService;
+import com.wms_main.model.dto.query.OutsQuery;
+import com.wms_main.model.dto.query.PickTaskQuery;
import com.wms_main.model.dto.query.WmsTaskQuery;
import com.wms_main.model.dto.response.wms.WmsApiResponse;
+import com.wms_main.model.po.TAppOuts;
+import com.wms_main.model.po.TAppPickTask;
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.model.vo.wms.*;
import com.wms_main.repository.utils.StringUtils;
import com.wms_main.service.controller.ITaskQueryControllerService;
import lombok.RequiredArgsConstructor;
@@ -25,6 +29,8 @@ import org.springframework.stereotype.Service;
public class TaskQueryControllerServiceImpl implements ITaskQueryControllerService {
private final ITAppTaskService appTaskService;// 任务服务
private final ITAppTaskBakService appTaskBakService;// 任务记录服务
+ private final ITAppPickTaskService appPickTaskService;// 拣选任务服务
+ private final ITAppOutsService appOutsService;// 出库单服务
/**
* 查询wms任务监控---分页
@@ -114,4 +120,48 @@ public class TaskQueryControllerServiceImpl implements ITaskQueryControllerServi
PageVo pageVo = PageVo.of(outTaskRecordsPage, TaskRecordVo::of);
return WmsApiResponse.success("查询出库记录成功。", pageVo);
}
+
+ /**
+ * 分页查询拣选任务---实现
+ * @param pickTaskQuery 查询参数
+ * @return 查询结果
+ */
+ @Override
+ public WmsApiResponse> queryPickTasksByPage(PickTaskQuery pickTaskQuery) {
+ if (pickTaskQuery == null) {
+ return WmsApiResponse.error("查询参数不能为NULL", null);
+ }
+ Page page = pickTaskQuery.toMpPage();
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper()
+ .like(StringUtils.isNotEmpty(pickTaskQuery.getPickId()), TAppPickTask::getPickId, pickTaskQuery.getPickId())
+ .like(StringUtils.isNotEmpty(pickTaskQuery.getPickStand()), TAppPickTask::getPickStand, pickTaskQuery.getPickStand())
+ .like(StringUtils.isNotEmpty(pickTaskQuery.getVehicleId()), TAppPickTask::getVehicleId, pickTaskQuery.getVehicleId())
+ .eq(pickTaskQuery.getPickStatus() != null, TAppPickTask::getPickStatus, pickTaskQuery.getPickStatus());
+ Page tasksPage = appPickTaskService.page(page, lambdaQueryWrapper);
+
+ PageVo pageVo = PageVo.of(tasksPage, PickTaskVo::of);
+ return WmsApiResponse.success("查询拣选任务成功。", pageVo);
+ }
+
+ /**
+ * 分页查询出库单---实现
+ * @param outsQuery 查询参数
+ * @return 查询结果
+ */
+ @Override
+ public WmsApiResponse> queryOutsByPage(OutsQuery outsQuery) {
+ if (outsQuery == null) {
+ return WmsApiResponse.error("查询参数不能为NULL", null);
+ }
+ Page page = outsQuery.toMpPage();
+ LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper()
+ .like(StringUtils.isNotEmpty(outsQuery.getTaskId()), TAppOuts::getTaskId, outsQuery.getTaskId())
+ .like(StringUtils.isNotEmpty(outsQuery.getGoodsId()), TAppOuts::getGoodsId, outsQuery.getGoodsId())
+ .like(StringUtils.isNotEmpty(outsQuery.getVehicleId()), TAppOuts::getVehicleId, outsQuery.getVehicleId())
+ .eq(outsQuery.getOutType() != null, TAppOuts::getOutType, outsQuery.getOutType());
+ Page outsPage = appOutsService.page(page, lambdaQueryWrapper);
+
+ PageVo pageVo = PageVo.of(outsPage, OutsVo::of);
+ return WmsApiResponse.success("查询出库单成功。", pageVo);
+ }
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IJobService.java b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IJobService.java
index 6b1ca67..ca1dbc0 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IJobService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IJobService.java
@@ -3,19 +3,42 @@ package com.wms_main.service.quartz_job;
import com.wms_main.quartz.config.JobBean;
/**
- * 定时任务服务实现
+ * 定时任务服务
*/
public interface IJobService {
+ /**
+ * 创建任务
+ * @param jobBean 任务信息
+ */
void createJob(JobBean jobBean);
-
+ /**
+ * 删除定时任务
+ * @param jobName 任务名
+ */
void deleteJob(String jobName);
-
+ /**
+ * 修改定时任务
+ * @param jobBean 任务信息
+ */
void modifyJob(JobBean jobBean);
-
+ /**
+ * 暂停定时任务
+ * @param jobName 任务名
+ */
void pauseJob(String jobName);
-
+ /**
+ * 恢复定时任务
+ * @param jobName 任务名
+ */
void resumeJob(String jobName);
-
+ /**
+ * 立即执行一次任务
+ * @param jobName 任务名
+ */
void runJobOnce(String jobName);
+ /**
+ * 初始化所有的定时任务
+ * 只创建启用的
+ */
void initAllJobs();
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IOutsExecutorService.java b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IOutsExecutorService.java
index 068f1bf..0a6c2c9 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IOutsExecutorService.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/IOutsExecutorService.java
@@ -25,4 +25,9 @@ public interface IOutsExecutorService {
* 修复出库单
*/
void repairOuts();
+
+ /**
+ * 执行盘点
+ */
+ void executeInventory();
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/OutsExecutor.java b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/OutsExecutor.java
index 892cd4a..da5a5c9 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/OutsExecutor.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/OutsExecutor.java
@@ -39,5 +39,11 @@ public class OutsExecutor implements Job {
} catch (Exception e) {
log.error("处理出库单失败{}", StringUtils.objectToString(e));
}
+ // 处理盘点单
+ try {
+ outsExecutorService.executeInventory();
+ } catch (Exception e) {
+ log.error("处理盘点单失败{}", StringUtils.objectToString(e));
+ }
}
}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/WmsTaskFinisher.java b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/WmsTaskFinisher.java
index ce0330d..9c39589 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/WmsTaskFinisher.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/job_executor/WmsTaskFinisher.java
@@ -39,7 +39,7 @@ public class WmsTaskFinisher implements Job {
*/
@Override
public void execute(JobExecutionContext jobExecutionContext) {
- // 获取到所有待下发的任务
+ // 获取到所有已完成的任务
List waitFinishWmsTaskList = appTaskService.list(
new LambdaQueryWrapper()
.eq(TAppTask::getTaskStatus, WmsStackerTaskStatusEnums.FINISH.getCode())
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java
index cc33491..14b889c 100644
--- a/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/quartz_job/serviceImpl/OutsExecutorServiceImpl.java
@@ -40,6 +40,7 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
private final ITAppPickPlanService appPickPlanService;// 拣选计划服务
private final IStockDataService stockDataService;// 库存数据服务
private final ITAppOutsRecordService appOutsRecordService;// 出库单记录服务
+ private final ITAppInventoryService appInventoryService;// 盘点任务服务
private final AppCommon appCommon;// 应用共通数据
/**
@@ -197,12 +198,13 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
/**
* 处理出库（入库用）请求
- * @param equipVehicleMap 载具与载具编号的映射
- * @param appOuts 出库单
- * @param allStocks 所有库存
- * @param pickTasks 拣选任务
- * @param newOutWmsTasks 新的出库任务
- * @param newPickTasks 新的拣选任务
+ *
+ * @param equipVehicleMap 载具与载具编号的映射
+ * @param appOuts 出库单
+ * @param allStocks 所有库存
+ * @param pickTasks 拣选任务
+ * @param newOutWmsTasks 新的出库任务
+ * @param newPickTasks 新的拣选任务
* @param thisTimeOutVehicleIds 本次出库的载具列表
*/
private void solveOutForIn(Map equipVehicleMap, TAppOuts appOuts, List allStocks, List pickTasks, List newOutWmsTasks, List newPickTasks, List thisTimeOutVehicleIds) {
@@ -326,10 +328,6 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
// 不是这个料
continue;
}
-// if (StringUtils.isNotEmpty(appOuts.getVehicleId()) && !Objects.equals(stock.getVehicleId(), appOuts.getVehicleId())) {
-// // 紧急出库选择了箱号
-// continue;
-// }
String stockId = stockDataService.getFirstInStock(stock.getGoodsId(), allStocks);
if (StringUtils.isNotEmpty(stockId) && !Objects.equals(stockId, stock.getStockId())) {
// 不是当前物料最先进的库存
@@ -409,12 +407,12 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
oldPickTasks = pickTasks.stream().filter(pickTask ->
Objects.equals(pickTask.getPickStand(), appOuts.getDestination())
&& pickTask.getVehicleId().equals(stock.getVehicleId())
- && !Objects.equals(pickTask.getPickStatus(), WmsPickTaskStatusEnum.FOR_IN.getCode())).toList();
+ && !Objects.equals(pickTask.getPickStatus(), WmsPickTaskStatusEnum.FOR_IN.getCode())).toList();
}
// 新生成的拣选任务
List newOldPickTasks = newPickTasks.stream().filter(pickTask -> pickTask.getVehicleId().equals(stock.getVehicleId())
&& Objects.equals(pickTask.getPickStand(), appOuts.getDestination())
- && !Objects.equals(pickTask.getPickStatus(), WmsPickTaskStatusEnum.FOR_IN.getCode())).toList();
+ && !Objects.equals(pickTask.getPickStatus(), WmsPickTaskStatusEnum.FOR_IN.getCode())).toList();
// 生成拣选任务
if (oldPickTasks.isEmpty() && newOldPickTasks.isEmpty()) {
newPickTasks.add(new TAppPickTask(
@@ -742,8 +740,8 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
continue;
}
if (work.getWorkStatus() == 2 && work.getLackStatus() == 1) {
- // 缺料，添加记录
- workRecords.add(RecordOfWork(work));
+ // 缺料，不算完成
+ ifAllFinished = false;
continue;
}
// 判断库内料分配的数量是否需要修正
@@ -835,7 +833,7 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void repairStandWorks() {
+ public void repairStandWorks() {
// 查找到所有的可用的拣选站台
List standList = appStandService.list(new LambdaQueryWrapper()
.eq(TAppStand::getStandType, 1)
@@ -943,6 +941,143 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
}
}
+ /**
+ * 处理盘点任务
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void executeInventory() {
+ // 查询对应的盘点任务
+ List waitExecuteInventoryList = appInventoryService.list(new LambdaQueryWrapper()
+ .eq(TAppInventory::getInvStatus, WmsInvStatusEnums.INIT.getCode()));
+ if (waitExecuteInventoryList == null || waitExecuteInventoryList.isEmpty()) {
+ // 没有需要解析的盘点任务
+ return;
+ }
+ // 筛选出对应载具号
+ List vehicleIds = waitExecuteInventoryList.stream().map(TAppInventory::getVehicleId).distinct().toList();
+ if (vehicleIds.isEmpty()) {
+ // 没有对应载具号
+ return;
+ }
+ // 查询对应的库存信息
+ List targetStocks = appStockService.list(new LambdaQueryWrapper()
+ .in(TAppStock::getVehicleId, vehicleIds)
+ .le(TAppStock::getStockStatus, WmsStockStatusEnums.OUTED.getCode())
+ .orderByAsc(TAppStock::getFirstInTime));
+ // 拣选任务
+ List pickTasks = appPickTaskService.list(new LambdaQueryWrapper()
+ .in(TAppPickTask::getVehicleId, vehicleIds));
+ // 需要保存的信息
+ List newOutWmsTasks = new ArrayList<>();// 新的出库任务
+ List newPickTasks = new ArrayList<>();// 新的拣选任务
+ List thisTimeOutVehicleIds = new ArrayList<>();// 本次出库载具
+ // 获取可用堆垛机
+ List usableStackers = appEquipmentService.list(new LambdaQueryWrapper()
+ .eq(TAppEquipment::getEquipmentType, 1)
+ .eq(TAppEquipment::getEquipmentStatus, WmsUsableStatusEnums.USABLE.getCode()));
+ Map equipVehicleMap = new HashMap<>();
+ getVehicleEquipMap("", true, equipVehicleMap, usableStackers);
+ for (TAppInventory inventory : waitExecuteInventoryList) {
+ // 查找
+ for (TAppStock stock : targetStocks) {
+ if (thisTimeOutVehicleIds.contains(stock.getVehicleId())) {
+ // 设置这个箱子的库存都为出库中
+ stock.setStockStatus(WmsStockStatusEnums.OUTING.getCode());
+ }
+ if (!Objects.equals(inventory.getGoodsId(), stock.getGoodsId())) {
+ // 不是这个料
+ continue;
+ }
+ if (!Objects.equals(stock.getVehicleId(), inventory.getVehicleId())) {
+ // 不是这个箱子
+ continue;
+ }
+ if (Objects.equals(stock.getStockStatus(), WmsStockStatusEnums.OK.getCode()) && ifThisLocationCantOut(stock.getLocationId(), equipVehicleMap)) {
+ // 当前堆垛机已经无法生成新的出库任务了
+ continue;
+ }
+ // 拣选任务状态
+ int pickTaskStatus = WmsPickTaskStatusEnum.TEMP.getCode();
+ // 库存正常
+ if (Objects.equals(stock.getStockStatus(), WmsStockStatusEnums.OK.getCode())) {
+ // 需要生成出库任务
+ newOutWmsTasks.add(new TAppTask(
+ UUIDUtils.getNewUUID(),
+ WmsTaskTypeEnums.OUT.getCode(),
+ 0,
+ 2,
+ stock.getVehicleId(),
+ stock.getLocationId(),
+ null,
+ null,
+ LocalDateTime.now(),
+ null,
+ AppConstant.EMPTY_GOODS_ID,
+ 0,
+ 0,
+ inventory.getInvUser(),
+ "",
+ inventory.getInvStand(),
+ ""
+ ));
+ stock.setStockStatus(WmsStockStatusEnums.OUTING.getCode());
+ thisTimeOutVehicleIds.add(stock.getVehicleId());
+ updateVehicleEquipMapByLocation(equipVehicleMap, stock.getVehicleId(), stock.getLocationId());
+ }
+ // 如果是已经出库的库存
+ if (Objects.equals(stock.getStockStatus(), WmsStockStatusEnums.OUTED.getCode())) {
+ pickTaskStatus = WmsPickTaskStatusEnum.WAIT.getCode();
+ }
+ // 已有的拣选任务
+ List oldPickTasks = new ArrayList<>();
+ if (pickTasks != null) {
+ oldPickTasks = pickTasks.stream().filter(pickTask ->
+ Objects.equals(pickTask.getPickStand(), inventory.getInvStand())
+ && pickTask.getVehicleId().equals(stock.getVehicleId())
+ && !Objects.equals(pickTask.getPickStatus(), WmsPickTaskStatusEnum.FOR_IN.getCode())).toList();
+ }
+ // 新生成的拣选任务
+ List newOldPickTasks = newPickTasks.stream().filter(pickTask -> pickTask.getVehicleId().equals(stock.getVehicleId())
+ && Objects.equals(pickTask.getPickStand(), inventory.getInvStand())
+ && !Objects.equals(pickTask.getPickStatus(), WmsPickTaskStatusEnum.FOR_IN.getCode())).toList();
+ // 生成拣选任务
+ if (oldPickTasks.isEmpty() && newOldPickTasks.isEmpty()) {
+ newPickTasks.add(new TAppPickTask(
+ UUIDUtils.getNewUUID(),
+ inventory.getInvStand(),
+ stock.getVehicleId(),
+ pickTaskStatus,
+ LocalDateTime.now(),
+ null, null, null
+ ));
+ }
+ // 设置盘点状态
+ inventory.setInvStatus(WmsInvStatusEnums.EXECUTED.getCode());
+ }
+ }
+ // 更新盘点信息
+ appInventoryService.updateBatchById(waitExecuteInventoryList);
+ // 保存出库任务
+ if (!newOutWmsTasks.isEmpty()) {
+ appTaskService.saveBatch(newOutWmsTasks);
+ }
+ // 保存拣选任务
+ if (!newPickTasks.isEmpty()) {
+ appPickTaskService.saveBatch(newPickTasks);
+ }
+ // 更新载具信息
+ if (!thisTimeOutVehicleIds.isEmpty()) {
+ appVehicleService.update(new LambdaUpdateWrapper()
+ .set(TAppVehicle::getVehicleStatus, WmsVehicleStatusEnums.OUT.getCode())
+ .in(TAppVehicle::getVehicleId, thisTimeOutVehicleIds));
+ // 更新库存状态
+ appStockService.update(new LambdaUpdateWrapper()
+ .set(TAppStock::getStockStatus, WmsStockStatusEnums.OUTING.getCode())
+ .in(TAppStock::getVehicleId, thisTimeOutVehicleIds));
+ }
+ }
+
/**
* 转化记录
*
@@ -1191,8 +1326,9 @@ public class OutsExecutorServiceImpl implements IOutsExecutorService {
/**
* 添加待删除序号以及记录
- * @param outIds 待删除id列表
- * @param thisOuts 待删除outs
+ *
+ * @param outIds 待删除id列表
+ * @param thisOuts 待删除outs
* @param addRecords 待添加的记录
*/
private void addRemovingOutsAndRecord(List outIds, TAppOuts thisOuts, List addRecords) {
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/system/ISystemService.java b/dev_wms_serve/src/main/java/com/wms_main/service/system/ISystemService.java
new file mode 100644
index 0000000..fe5ad9f
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/system/ISystemService.java
@@ -0,0 +1,16 @@
+package com.wms_main.service.system;
+
+/**
+ * 系统服务接口
+ */
+public interface ISystemService {
+ /**
+ * 重启系统
+ */
+ boolean restartSystem();
+
+ /**
+ * 重新加载配置
+ */
+ boolean reloadConfig();
+}
diff --git a/dev_wms_serve/src/main/java/com/wms_main/service/system/serviceImpl/SystemServiceImpl.java b/dev_wms_serve/src/main/java/com/wms_main/service/system/serviceImpl/SystemServiceImpl.java
new file mode 100644
index 0000000..9beaa90
--- /dev/null
+++ b/dev_wms_serve/src/main/java/com/wms_main/service/system/serviceImpl/SystemServiceImpl.java
@@ -0,0 +1,45 @@
+package com.wms_main.service.system.serviceImpl;
+
+import com.wms_main.WmsMainApplication;
+import com.wms_main.app.AppCommon;
+import com.wms_main.dao.ITAppConfigService;
+import com.wms_main.service.system.ISystemService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 系统服务接口实现
+ */
+@Service
+@RequiredArgsConstructor
+public class SystemServiceImpl implements ISystemService {
+ /**
+ * 应用共通数据
+ */
+ private final AppCommon appCommon;
+
+ /**
+ * 重启系统
+ * @return 重启结果
+ */
+ @Override
+ public boolean restartSystem() {
+ try {
+ WmsMainApplication.restart();
+ } catch (Exception e) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * 重载配置
+ * @return 重载结果
+ */
+ @Override
+ public boolean reloadConfig() {
+ return appCommon.initConfigMap();
+ }
+}
diff --git a/dev_wms_serve/src/main/resources/application.yml b/dev_wms_serve/src/main/resources/application.yml
index cab094d..3523c4a 100644
--- a/dev_wms_serve/src/main/resources/application.yml
+++ b/dev_wms_serve/src/main/resources/application.yml
@@ -9,13 +9,13 @@ spring:
# username: developer
# password: developer
# 本地
-# url: jdbc:mysql://localhost:3306/wms_kate_wuxi_test?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
-# username: root
-# password: liangzhou
+ url: jdbc:mysql://localhost:3306/wms_kate_wuxi?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+ username: root
+ password: liangzhou
# 卡特服务器
- url: jdbc:mysql://10.90.83.37:3306/wms_kate_wuxi?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
- username: developer
- password: baokai
+# url: jdbc:mysql://10.90.83.37:3306/wms_kate_wuxi?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+# username: developer
+# password: baokai
profiles:
active: online
diff --git a/dev_wms_serve/src/main/resources/mapper/AppInventoryMapper.xml b/dev_wms_serve/src/main/resources/mapper/AppInventoryMapper.xml
new file mode 100644
index 0000000..de4f2e8
--- /dev/null
+++ b/dev_wms_serve/src/main/resources/mapper/AppInventoryMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/dev_wms_serve/src/main/resources/mapper/AppInventoryRecordMapper.xml b/dev_wms_serve/src/main/resources/mapper/AppInventoryRecordMapper.xml
new file mode 100644
index 0000000..b1f4200
--- /dev/null
+++ b/dev_wms_serve/src/main/resources/mapper/AppInventoryRecordMapper.xml
@@ -0,0 +1,5 @@
+
+
+
+
+