diff --git a/src/api/wms/inventory/history/index.ts b/src/api/wms/inventory/history/index.ts index c2db7d786..8b563c46f 100644 --- a/src/api/wms/inventory/history/index.ts +++ b/src/api/wms/inventory/history/index.ts @@ -12,8 +12,6 @@ export interface InventoryHistoryVO { skuName?: string warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string quantity?: number beforeQuantity?: number afterQuantity?: number diff --git a/src/api/wms/inventory/index.ts b/src/api/wms/inventory/index.ts index 3f8d65a6d..aa18ca302 100644 --- a/src/api/wms/inventory/index.ts +++ b/src/api/wms/inventory/index.ts @@ -12,8 +12,6 @@ export interface InventoryVO { skuName?: string warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string quantity?: number remark?: string createTime?: Date diff --git a/src/api/wms/md/warehouse/area/index.ts b/src/api/wms/md/warehouse/area/index.ts deleted file mode 100644 index 9ef9c3ad4..000000000 --- a/src/api/wms/md/warehouse/area/index.ts +++ /dev/null @@ -1,50 +0,0 @@ -import request from '@/config/axios' - -// WMS 库区 VO -export interface WarehouseAreaVO { - id?: number - code?: string - name?: string - warehouseId?: number - warehouseName?: string - remark?: string - createTime?: Date -} - -// WMS 库区 API -export const WarehouseAreaApi = { - // 查询库区分页 - getWarehouseAreaPage: async (params: any) => { - return await request.get({ url: '/wms/warehouse-area/page', params }) - }, - - // 查询库区精简列表 - getWarehouseAreaSimpleList: async (warehouseId?: number) => { - return await request.get({ url: '/wms/warehouse-area/simple-list', params: { warehouseId } }) - }, - - // 查询库区详情 - getWarehouseArea: async (id: number) => { - return await request.get({ url: '/wms/warehouse-area/get?id=' + id }) - }, - - // 新增库区 - createWarehouseArea: async (data: WarehouseAreaVO) => { - return await request.post({ url: '/wms/warehouse-area/create', data }) - }, - - // 修改库区 - updateWarehouseArea: async (data: WarehouseAreaVO) => { - return await request.put({ url: '/wms/warehouse-area/update', data }) - }, - - // 删除库区 - deleteWarehouseArea: async (id: number) => { - return await request.delete({ url: '/wms/warehouse-area/delete?id=' + id }) - }, - - // 导出库区 - exportWarehouseArea: async (params) => { - return await request.download({ url: '/wms/warehouse-area/export-excel', params }) - } -} diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts index 9c1f679ff..4e10ad248 100644 --- a/src/api/wms/order/check/detail/index.ts +++ b/src/api/wms/order/check/detail/index.ts @@ -12,8 +12,6 @@ export interface CheckOrderDetailVO { inventoryId?: number warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string batchNo?: string productionDate?: Date expirationDate?: Date diff --git a/src/api/wms/order/check/index.ts b/src/api/wms/order/check/index.ts index be3c3dbbd..9edfee0b1 100644 --- a/src/api/wms/order/check/index.ts +++ b/src/api/wms/order/check/index.ts @@ -9,8 +9,6 @@ export interface CheckOrderVO { remark?: string warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string totalQuantity?: number totalAmount?: number details?: CheckOrderDetailVO[] diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts index b38be4f34..5e3e31ff5 100644 --- a/src/api/wms/order/movement/detail/index.ts +++ b/src/api/wms/order/movement/detail/index.ts @@ -11,12 +11,8 @@ export interface MovementOrderDetailVO { skuName?: string sourceWarehouseId?: number sourceWarehouseName?: string - sourceAreaId?: number - sourceAreaName?: string targetWarehouseId?: number targetWarehouseName?: string - targetAreaId?: number - targetAreaName?: string batchNo?: string productionDate?: Date expirationDate?: Date diff --git a/src/api/wms/order/movement/index.ts b/src/api/wms/order/movement/index.ts index b5fcf41a9..45344245d 100644 --- a/src/api/wms/order/movement/index.ts +++ b/src/api/wms/order/movement/index.ts @@ -9,12 +9,8 @@ export interface MovementOrderVO { remark?: string sourceWarehouseId?: number sourceWarehouseName?: string - sourceAreaId?: number - sourceAreaName?: string targetWarehouseId?: number targetWarehouseName?: string - targetAreaId?: number - targetAreaName?: string totalQuantity?: number totalAmount?: number details?: MovementOrderDetailVO[] diff --git a/src/api/wms/order/receipt/detail/index.ts b/src/api/wms/order/receipt/detail/index.ts index 7d6990a39..e1e629d67 100644 --- a/src/api/wms/order/receipt/detail/index.ts +++ b/src/api/wms/order/receipt/detail/index.ts @@ -11,8 +11,6 @@ export interface ReceiptOrderDetailVO { skuName?: string warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string batchNo?: string productionDate?: Date expirationDate?: Date diff --git a/src/api/wms/order/receipt/index.ts b/src/api/wms/order/receipt/index.ts index 3defe4216..d3bfcd5f1 100644 --- a/src/api/wms/order/receipt/index.ts +++ b/src/api/wms/order/receipt/index.ts @@ -13,8 +13,6 @@ export interface ReceiptOrderVO { remark?: string warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string totalQuantity?: number totalAmount?: number details?: ReceiptOrderDetailVO[] diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts index 1ceaf25e4..4156a29ee 100644 --- a/src/api/wms/order/shipment/detail/index.ts +++ b/src/api/wms/order/shipment/detail/index.ts @@ -11,8 +11,6 @@ export interface ShipmentOrderDetailVO { skuName?: string warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string batchNo?: string productionDate?: Date expirationDate?: Date diff --git a/src/api/wms/order/shipment/index.ts b/src/api/wms/order/shipment/index.ts index b9dc2fb59..b77d603f2 100644 --- a/src/api/wms/order/shipment/index.ts +++ b/src/api/wms/order/shipment/index.ts @@ -13,8 +13,6 @@ export interface ShipmentOrderVO { remark?: string warehouseId?: number warehouseName?: string - areaId?: number - areaName?: string totalQuantity?: number totalAmount?: number details?: ShipmentOrderDetailVO[] diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index a2ea1fbd9..ac59b3ab0 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -127,29 +127,6 @@ const remainingRouter: AppRouteRecordRaw[] = [ } ] }, - { - path: '/wms', - component: Layout, - name: 'Wms', - meta: { - hidden: true - }, - children: [ - { - path: 'md/warehouse/area/:warehouseId', - component: () => import('@/views/wms/md/warehouse/area/index.vue'), - name: 'WmsWarehouseArea', - meta: { - title: '库区管理', - noCache: true, - hidden: true, - canTo: true, - icon: '', - activeMenu: '/wms/md/warehouse' - } - } - ] - }, { path: '/codegen', component: Layout, diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue new file mode 100644 index 000000000..739e9ea69 --- /dev/null +++ b/src/views/wms/inventory/components/InventorySelect.vue @@ -0,0 +1,260 @@ + + + + diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue index fdf017bab..db4afff75 100644 --- a/src/views/wms/inventory/history/index.vue +++ b/src/views/wms/inventory/history/index.vue @@ -35,18 +35,7 @@ /> - - - - + - + @@ -207,9 +190,7 @@ import { dateFormatter, defaultShortcuts, formatDate } from '@/utils/formatTime' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { InventoryHistoryApi, InventoryHistoryVO } from '@/api/wms/inventory/history' -import WarehouseAreaSelect from '@/views/wms/md/warehouse/components/WarehouseAreaSelect.vue' import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue' -import { AREA_ENABLE } from '@/views/wms/utils/config' import { formatPrice, formatQuantity } from '@/views/wms/utils/format' /** WMS 库存流水 */ @@ -228,7 +209,6 @@ const queryParams = reactive({ skuCode: undefined as string | undefined, skuName: undefined as string | undefined, warehouseId: undefined as number | undefined, - areaId: undefined as number | undefined, createTime: undefined as string[] | undefined }) const queryFormRef = ref() // 搜索的表单 @@ -257,11 +237,6 @@ const resetQuery = () => { handleQuery() } -/** 仓库变化 */ -const handleWarehouseChange = () => { - queryParams.areaId = undefined -} - /** 初始化 */ onMounted(async () => { await getList() diff --git a/src/views/wms/inventory/index/index.vue b/src/views/wms/inventory/index/index.vue index 4ff9416a3..abf0e22c0 100644 --- a/src/views/wms/inventory/index/index.vue +++ b/src/views/wms/inventory/index/index.vue @@ -21,18 +21,7 @@ - - - - + - - - - + - - - - - - - - - - - - -