diff --git a/klp-ui/src/api/wms/actualWarehouse.js b/klp-ui/src/api/wms/actualWarehouse.js index ac82cd13..dc32ac2b 100644 --- a/klp-ui/src/api/wms/actualWarehouse.js +++ b/klp-ui/src/api/wms/actualWarehouse.js @@ -119,3 +119,17 @@ export function mergeActualWarehouse(payload) { } }) } + +/** + * 强制释放库位 + */ +export function forceReleaseLocation(actualWarehouseId) { + if (!actualWarehouseId) { + throw new Error('actualWarehouseId is required'); + } + return request({ + url: '/wms/actualWarehouse/release/' + actualWarehouseId, + method: 'put', + timeout: 100000, + }) +} \ No newline at end of file diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue index 9a72273e..ba2ad4e4 100644 --- a/klp-ui/src/views/wms/coil/merge.vue +++ b/klp-ui/src/views/wms/coil/merge.vue @@ -751,8 +751,6 @@ export default { coilId: item.coilId, enterCoilNo: item.enterCoilNo, currentCoilNo: item.currentCoilNo, - itemType: item.itemType, - itemId: item.itemId, materialType: item.materialType, })) }; diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue index 02e34cef..5113026a 100644 --- a/klp-ui/src/views/wms/coil/split.vue +++ b/klp-ui/src/views/wms/coil/split.vue @@ -620,8 +620,6 @@ export default { enterCoilNo: this.motherCoil.enterCoilNo, // 入场钢卷号(必填) currentCoilNo: this.motherCoil.currentCoilNo, materialType: this.motherCoil.materialType, - itemType: this.motherCoil.itemType, - itemId: this.motherCoil.itemId, hasMergeSplit: 1, // 1表示分条 newCoils: this.splitList.map(item => ({ ...item, diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue index 8a938e2c..7542b94b 100644 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue +++ b/klp-ui/src/views/wms/warehouse/components/WarehouseBird.vue @@ -53,7 +53,8 @@ 初始化库位 + :canToggle="canToggle" :canRelease="canRelease" + @split-warehouse="handleSplitWarehouse" @merge-warehouse="handleMergeWarehouse" @release-warehouse="handleReleaseWarehouse"/> @@ -73,6 +74,14 @@ export default { id: { type: String, default: '' + }, + canToggle: { + default: true, + type: Boolean + }, + canRelease: { + default: false, + type: Boolean } }, data() { @@ -84,7 +93,7 @@ export default { total: 0, columnCount: 0, columnDetail: {} - } + }, }; }, watch: { @@ -104,6 +113,10 @@ export default { handleMergeWarehouse(warehouse) { this.$emit('merge-warehouse', warehouse); }, + + handleReleaseWarehouse(warehouse) { + this.$emit('release-warehouse', warehouse); + }, /** * 解析第三级库位编码 * 新规则: diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue deleted file mode 100644 index d68259e4..00000000 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseGrid.vue +++ /dev/null @@ -1,367 +0,0 @@ - - - - - \ No newline at end of file diff --git a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue index 80ec8ae5..bdc2f232 100644 --- a/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue +++ b/klp-ui/src/views/wms/warehouse/components/WarehouseInterlaced.vue @@ -11,7 +11,7 @@ {{ col }}