diff --git a/dev_wms_client/package-lock.json b/dev_wms_client/package-lock.json index e538c66..5e94a4d 100644 --- a/dev_wms_client/package-lock.json +++ b/dev_wms_client/package-lock.json @@ -4254,9 +4254,23 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001434", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", - "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==" + "version": "1.0.30001715", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", + "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ] }, "node_modules/case-sensitive-paths-webpack-plugin": { "version": "2.4.0", @@ -15376,9 +15390,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001434", - "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001434.tgz", - "integrity": "sha512-aOBHrLmTQw//WFa2rcF1If9fa3ypkC1wzqqiKHgfdrXTWcU8C4gKVZT77eQAPWN1APys3+uQ0Df07rKauXGEYA==" + "version": "1.0.30001715", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz", + "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==" }, "case-sensitive-paths-webpack-plugin": { "version": "2.4.0", diff --git a/dev_wms_client/src/api/config.js b/dev_wms_client/src/api/config.js index 73e8a9a..812b713 100644 --- a/dev_wms_client/src/api/config.js +++ b/dev_wms_client/src/api/config.js @@ -1,18 +1,24 @@ import request from "@/http/request"; -const getConfigs = () => { - return request.get('/config/getConfigs') +export const updateConfig = (params) => { + return request({ + url: '/config/updateConfig', + method: 'post', + data: params, + timeout: 10000 + }) } -const updateConfig = (params) => { - return request.post('/config/updateConfig', params) +export const queryConfigsByPage = (params) => { + return request({ + url: '/config/queryConfigsByPage', + method: 'post', + data: params, + timeout: 10000 + }) } -const getConfigsByPage = (params) => { - return request.post('/config/getConfigsByPage', params) -} - -const restartSystem = (params) => { +export const restartSystem = (params) => { return request({ url: '/system/restartSystem', method: 'post', @@ -21,19 +27,11 @@ const restartSystem = (params) => { }) } -const reloadConfig = (params) => { +export const reloadConfig = (params) => { return request({ url: '/system/reloadConfig', method: 'post', data: params, timeout: 10000 }) -} - -export { - getConfigs, - getConfigsByPage, - updateConfig, - restartSystem, - reloadConfig } \ No newline at end of file diff --git a/dev_wms_client/src/api/goods.js b/dev_wms_client/src/api/goods.js index df1a397..007d460 100644 --- a/dev_wms_client/src/api/goods.js +++ b/dev_wms_client/src/api/goods.js @@ -8,27 +8,15 @@ export const getGoodsInfoByPage = (params) => { url: '/goods/getGoodsInfoByPage', method: 'post', data: params - }); -}; - + }) +} /** - * 更新物料信息 + * 根据物料id查询物料信息 */ -export const updateGoodsInfo = (params) => { +export const getGoodsInfoByGoodsId = (params) => { return request({ - url: '/goods/updateGoodsInfo', - method: 'post', + url: '/goods/getGoodsInfoByGoodsId', + method: 'get', data: params - }); -}; - -/** - * 关闭物料使用 - */ -export const closeGoodsInfo = (params) => { - return request({ - url: '/goods/closeGoodsInfo', - method: 'post', - data: params - }); -}; \ No newline at end of file + }) +} \ No newline at end of file diff --git a/dev_wms_client/src/api/kateWork.js b/dev_wms_client/src/api/kateWork.js index cf74558..546c0f7 100644 --- a/dev_wms_client/src/api/kateWork.js +++ b/dev_wms_client/src/api/kateWork.js @@ -179,4 +179,13 @@ export const deleteDbsPlan = (params) => { data: params, timeout: 5000 }) +} +// 获取物料需求 +export const getGoodsRequirement = (params) => { + return request({ + url: '/kate/getGoodsRequirement', + method: 'post', + data: params, + timeout: 5000 + }) } \ No newline at end of file diff --git a/dev_wms_client/src/api/location.js b/dev_wms_client/src/api/location.js index 7629fe3..9771210 100644 --- a/dev_wms_client/src/api/location.js +++ b/dev_wms_client/src/api/location.js @@ -1,48 +1,9 @@ import request from "@/http/request"; -const getLocations = (params) => { +export const queryLocationsByPage = (params) => { return request({ - url: '/location/getLocationsByPage', + url: '/location/queryLocationsByPage', method: 'post', data: params }) -} - -const updateLocation = (params) => { - return request({ - url: '/location/updateLocation', - method: 'post', - data: params - }) -} - -const getELocationsByPage = (params) => { - return request({ - url: '/location/getELocationsByPage', - method: 'post', - data: params - }) -} - -const updateELocationInfo = (params) => { - return request({ - url: '/location/updateELocationInfo', - method: 'post', - data: params - }) -} - -const getAllLocations = () => { - return request({ - url: '/location/getAllLocations', - method: 'get' - }) -} - -export { - getLocations, - updateLocation, - getELocationsByPage, - updateELocationInfo, - getAllLocations } \ No newline at end of file diff --git a/dev_wms_client/src/components/appTag.vue b/dev_wms_client/src/components/appTag.vue index 5050cb0..f908080 100644 --- a/dev_wms_client/src/components/appTag.vue +++ b/dev_wms_client/src/components/appTag.vue @@ -1,94 +1,90 @@ diff --git a/dev_wms_client/src/components/sideMenu.vue b/dev_wms_client/src/components/sideMenu.vue index 676e6a9..29dc8c4 100644 --- a/dev_wms_client/src/components/sideMenu.vue +++ b/dev_wms_client/src/components/sideMenu.vue @@ -1,39 +1,41 @@ \ No newline at end of file diff --git a/dev_wms_client/src/constant/options.js b/dev_wms_client/src/constant/options.js index bbe3637..7dbd93d 100644 --- a/dev_wms_client/src/constant/options.js +++ b/dev_wms_client/src/constant/options.js @@ -263,4 +263,26 @@ export const outTypeOptions = [ value: 9, label: '紧急出库' } +] +// 是否锁定枚举 +export const lockOptions = [ + { + value: 0, + label: '未锁定' + }, + { + value: 1, + label: '已锁定' + } +] +// 是否空闲枚举 +export const occupyOptions = [ + { + value: 0, + label: '空闲' + }, + { + value: 1, + label: '占用' + } ] \ No newline at end of file diff --git a/dev_wms_client/src/http/request.js b/dev_wms_client/src/http/request.js index 6211cff..2f11de9 100644 --- a/dev_wms_client/src/http/request.js +++ b/dev_wms_client/src/http/request.js @@ -1,7 +1,7 @@ import axios from 'axios' const request = axios.create({ - baseURL: 'https://s4wwjasrsp01.ap.cat.com/wmsServer/wms', + baseURL: 'http://localhost:12315/wms', timeout: 5000 }) diff --git a/dev_wms_client/src/layout/OutsMonitor.vue b/dev_wms_client/src/layout/OutsMonitor.vue index e2fa667..1479b99 100644 --- a/dev_wms_client/src/layout/OutsMonitor.vue +++ b/dev_wms_client/src/layout/OutsMonitor.vue @@ -62,14 +62,14 @@ - +
- - - - - -
@@ -43,10 +33,6 @@ - 生成看板 - 导出看板 @@ -90,13 +76,12 @@ - - \ 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 54136a4..75561e1 100644 --- a/dev_wms_client/src/layout/kitting.vue +++ b/dev_wms_client/src/layout/kitting.vue @@ -22,6 +22,11 @@ :value="item"/> + + + @@ -96,11 +101,15 @@ + + + - @@ -111,11 +120,11 @@ - + - - + @@ -260,7 +269,8 @@ let workFormEntity = reactive({ singleProductId: '', boxNo: '', goodsId: '', - planStartDate: null + planStartDate: null, + kittingRemark: '' }) let workFormQuery = reactive({ workOrder: '', @@ -319,7 +329,7 @@ onBeforeUnmount(() => { }) // 监视路由 watch(() => route.path, (newVal, oldVal) => { - if (newVal == '/kitting') { + if (newVal === '/kitting') { timer.value = setInterval(() => { timerTask_1() }, 1000) @@ -331,29 +341,30 @@ watch(() => route.path, (newVal, oldVal) => { } }) watch(() => workFormEntity.workOrder, (newVal, oldVal) => { - if (newVal == '') { + if (newVal === '') { workFormEntity.productIdOrigin = '' workFormEntity.productId = '' workFormEntity.singleProductId = '' workFormEntity.boxNo = '' workFormEntity.goodsId = '' + workFormEntity.kittingRemark = '' } }) watch(() => workFormEntity.productId, (newVal, oldVal) => { - if (newVal != oldVal) { + if (newVal !== oldVal) { workFormEntity.singleProductId = '' workFormEntity.boxNo = '' workFormEntity.goodsId = '' } }) watch(() => workFormEntity.singleProductId, (newVal, oldVal) => { - if (newVal != oldVal) { + if (newVal !== oldVal) { workFormEntity.boxNo = '' workFormEntity.goodsId = '' } }) watch(() => workFormEntity.boxNo, (newVal, oldVal) => { - if (newVal != oldVal) { + if (newVal !== oldVal) { workFormEntity.goodsId = '' } }) @@ -368,27 +379,28 @@ const timerTask_1 = () => { } // 自定义方法 const solveEnterKey = (e) => { - if (e.key.toLocaleLowerCase() == 'enter') { + if (e.key.toLowerCase() === 'enter') { confirmReleaseBtn.value.$el.click() } } // 初始化工单options const initWorkOptions = () => { const request = { - workOrder: workFormQuery.workOrder != '' ? workFormQuery.workOrder : workFormEntity.workOrder, - singleProductId: workFormQuery.singleProductId != '' ? workFormQuery.singleProductId : workFormEntity.singleProductId, - boxNo: workFormQuery.boxNo != '' ? workFormQuery.boxNo : workFormEntity.boxNo, - goodsId: workFormQuery.goodsId != '' ? workFormQuery.goodsId : workFormEntity.goodsId, + workOrder: workFormQuery.workOrder !== '' ? workFormQuery.workOrder : workFormEntity.workOrder, + singleProductId: workFormQuery.singleProductId !== '' ? workFormQuery.singleProductId : workFormEntity.singleProductId, + boxNo: workFormQuery.boxNo !== '' ? workFormQuery.boxNo : workFormEntity.boxNo, + goodsId: workFormQuery.goodsId !== '' ? workFormQuery.goodsId : workFormEntity.goodsId, planStartDate: dateFormatter(workFormEntity.planStartDate) } optionLoading.value = true queryKateWorks(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { workOptions.workOrder = response.data.workOrder // 设置成品号 workFormEntity.productIdOrigin = response.data.productIdOrigin workFormEntity.productId = response.data.productId + workFormEntity.kittingRemark = response.data.kittingRemark workOptions.singleProductId = response.data.singleProductId workOptions.boxNo = response.data.boxNo workOptions.goodsId = response.data.goodsId @@ -397,6 +409,7 @@ const initWorkOptions = () => { // 重置成品号 workFormEntity.productIdOrigin = '' workFormEntity.productId = '' + workFormEntity.kittingRemark = '' workOptions.singleProductId = [] workOptions.boxNo = [] workOptions.goodsId = [] @@ -420,6 +433,7 @@ const resetWorkFormQuery = () => { workFormEntity.singleProductId = '' workFormEntity.boxNo = '' workFormEntity.goodsId = '' + workFormEntity.kittingRemark = '' } // 确认配料 const confirmStart = () => { @@ -434,7 +448,7 @@ const confirmStart = () => { loading.open() initWorks(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { ElMessage.success(response.message) setTimeout(() => { showBoxSummary() @@ -463,7 +477,7 @@ const showBoxSummary = () => { } getBoxesAndLacks(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { const boxDetailVo = response.data // 获得打印标签数据 getPrintTabs(boxDetailVo.boxSummary) @@ -496,7 +510,7 @@ const getWork = () => { } getCurrentWorks(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { // 设置form confirmEntity.workIndex = response.data.orderConfirm.workIndex confirmEntity.workOrder = response.data.orderConfirm.workOrder @@ -506,6 +520,7 @@ const getWork = () => { confirmEntity.goodsId = response.data.orderConfirm.goodsId confirmEntity.planPickQty = response.data.orderConfirm.planPickQty confirmEntity.realPickQty = response.data.orderConfirm.realPickQty + confirmEntity.kittingRemark = response.data.orderConfirm.kittingRemark confirmEntity.stockId = response.data.stockConfirm.stockId confirmEntity.vehicleId = response.data.stockConfirm.vehicleId confirmEntity.planRemainQty = response.data.stockConfirm.planRemainQty @@ -515,10 +530,10 @@ const getWork = () => { confirmEntity.warningQty = response.data.stockConfirm.warningQty pauseGetWorkFlag.value = true // 如果剩余数量低于预警值,弹框报警 - if (confirmEntity.isOut == 0 && confirmEntity.planRemainQty <= confirmEntity.warningQty) { + if (confirmEntity.isOut === 0 && confirmEntity.planRemainQty <= confirmEntity.warningQty) { warningBox('剩余数量低于预警值,请清点库存数量。') } - } else if (response.code == 400) { + } else if (response.code === 400) { // 警告,弹框 pauseGetWorkFlag.value = true warningBox(response.message) @@ -528,11 +543,13 @@ const getWork = () => { confirmEntity.boxNo = response.data.orderConfirm.boxNo confirmEntity.productId = response.data.orderConfirm.productId confirmEntity.singleProductId = response.data.orderConfirm.singleProductId + confirmEntity.kittingRemark = response.data.orderConfirm.kittingRemark } else { confirmEntity.workOrder = '' confirmEntity.boxNo = '' confirmEntity.productId = '' confirmEntity.singleProductId = '' + confirmEntity.kittingRemark = '' } } }).catch(err => { @@ -543,17 +560,17 @@ const getWork = () => { } // 是否弹出料盒界面 const ifNeedShowBoxSummary = () => { - if (storeKittingWork.workOrder != '') { + if (storeKittingWork.workOrder !== '') { // 需要弹出上一个料盒的缺料打印信息 - if (confirmEntity.workOrder != storeKittingWork.workOrder - || confirmEntity.productId != storeKittingWork.productId - || confirmEntity.singleProductId != storeKittingWork.singleProductId - || confirmEntity.boxNo != storeKittingWork.boxNo) { + if (confirmEntity.workOrder !== storeKittingWork.workOrder + || confirmEntity.productId !== storeKittingWork.productId + || confirmEntity.singleProductId !== storeKittingWork.singleProductId + || confirmEntity.boxNo !== storeKittingWork.boxNo) { printLacks(storeKittingWork.workOrder, storeKittingWork.productId, storeKittingWork.singleProductId, storeKittingWork.boxNo) - if (confirmEntity.workOrder == '') { + if (confirmEntity.workOrder === '') { // 说明当前工单工作已完成,需要弹框提示工作已完成 successBox('当前工单已完成。') - } else if (confirmEntity.boxNo != storeKittingWork.boxNo) { + } else if (confirmEntity.boxNo !== storeKittingWork.boxNo) { // 前一个料盒已完成,需要弹框提示料盒已完成 showBoxSummary() } @@ -599,11 +616,11 @@ const confirmOrRelease = () => { } confirmCurrentWork(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { // 设置form resetConfirmEntity() ElMessage.success(response.message) - } else if (response.code == 400) { + } else if (response.code === 400) { // 设置form resetConfirmEntity() // 警告 @@ -624,6 +641,7 @@ const resetConfirmEntity = () => { confirmEntity.planPickQty = null confirmEntity.realPickQty = null confirmEntity.stockId = '' + confirmEntity.kittingRemark = '' confirmEntity.vehicleId = '' confirmEntity.planRemainQty = null confirmEntity.realRemainQty = null @@ -633,7 +651,7 @@ const resetConfirmEntity = () => { } // 当拣选数量修改时,要对应的修改 const changePlanQty = () => { - if (confirmEntity.isOut == 0 && confirmEntity.realPickQty != confirmEntity.planPickQty) { + if (confirmEntity.isOut === 0 && confirmEntity.realPickQty !== confirmEntity.planPickQty) { // 修正量 const changeQty = confirmEntity.realPickQty - confirmEntity.planPickQty // 修正实际剩余数量 @@ -648,7 +666,7 @@ const requestPrint = () => { // 获得打印数据 const getPrintTabs = (boxSummary) => { printTabs.value = [] - if (boxSummary != undefined) { + if (boxSummary !== undefined) { for (let i = 1; i <= boxSummary.boxQty; i++) { printTabs.value.push( { @@ -675,7 +693,7 @@ const searchKittingGoods = () => { request.boxNo = confirmEntity.boxNo queryWorkingGoodsByPage(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { const data = response.data if (data != null) { currentBoxGoodsList.value = data.lists @@ -695,7 +713,7 @@ const handleSortChange = (data) => { if (baseTableQuery.sortBy.has(data.prop)) { baseTableQuery.sortBy.delete(data.prop) } - baseTableQuery.sortBy.set(data.prop, data.order == 'ascending') + baseTableQuery.sortBy.set(data.prop, data.order.toLowerCase() === 'ascending') searchKittingGoods() } // 打印上一个料盒的缺料信息 @@ -710,7 +728,7 @@ const printLacks = (workOrder, productId, singleProductId, boxNo) => { } getLackGoods(request).then(res => { const response = res.data - if (response.code == 0) { + if (response.code === 0) { lackGoodsForPrint.value = response.data nextTick(() => { printLackGoodsBtn.value.click() diff --git a/dev_wms_client/src/layout/location.vue b/dev_wms_client/src/layout/location.vue deleted file mode 100644 index 633ad65..0000000 --- a/dev_wms_client/src/layout/location.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/dev_wms_client/src/layout/locationsTable.vue b/dev_wms_client/src/layout/locationsTable.vue index 7104e07..8d2111b 100644 --- a/dev_wms_client/src/layout/locationsTable.vue +++ b/dev_wms_client/src/layout/locationsTable.vue @@ -1,200 +1,190 @@ \ No newline at end of file diff --git a/dev_wms_client/src/layout/standSettings.vue b/dev_wms_client/src/layout/standSettings.vue index 5b93127..8d2111b 100644 --- a/dev_wms_client/src/layout/standSettings.vue +++ b/dev_wms_client/src/layout/standSettings.vue @@ -1,337 +1,455 @@ + show-overflow-tooltip sortable="custom" /> - - + show-overflow-tooltip sortable="custom" /> + + + show-overflow-tooltip sortable="custom" />