@@ -160,11 +133,6 @@
{{ scope.row.warehouseName || '-' }}
-
-
- {{ scope.row.areaName || '-' }}
-
-
@@ -184,9 +152,7 @@
diff --git a/src/views/wms/md/warehouse/area/index.vue b/src/views/wms/md/warehouse/area/index.vue
deleted file mode 100644
index d0d7921ba..000000000
--- a/src/views/wms/md/warehouse/area/index.vue
+++ /dev/null
@@ -1,229 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
-
-
-
- 重置
-
-
-
- 新增
-
-
-
- 导出
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.warehouseName || getWarehouseName(scope.row.warehouseId) }}
-
-
-
-
-
-
-
- 修改
-
-
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue b/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
deleted file mode 100644
index a7035459c..000000000
--- a/src/views/wms/md/warehouse/components/WarehouseAreaSelect.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/views/wms/md/warehouse/index.vue b/src/views/wms/md/warehouse/index.vue
index 178443245..36cdca370 100644
--- a/src/views/wms/md/warehouse/index.vue
+++ b/src/views/wms/md/warehouse/index.vue
@@ -75,14 +75,6 @@
/>
-
-
- 库区
-
-
import { dateFormatter } from '@/utils/formatTime'
import { WarehouseApi, WarehouseVO } from '@/api/wms/md/warehouse'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
import WarehouseForm from './WarehouseForm.vue'
import download from '@/utils/download'
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 2bde086e3..3c43a89ab 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -14,7 +14,6 @@
-
{{ detailData.warehouseName || '-' }}
- {{ detailData.areaName || '-' }}
{{ formatQuantity(detailData.totalQuantity) || '-' }}
@@ -73,7 +72,6 @@ import { formatNullableDate } from '@/utils/formatTime'
import { DICT_TYPE } from '@/utils/dict'
import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
/** WMS 盘库单详情 */
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 98630b782..37eb5f2fc 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -13,11 +13,6 @@
-
-
-
-
-
@@ -111,7 +106,6 @@
@@ -152,9 +146,7 @@ import { FormRules } from 'element-plus'
import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
-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 { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice } from '@/views/wms/utils/format'
import { generateOrderNo } from '@/views/wms/utils/order'
@@ -175,7 +167,6 @@ const formData = ref({
no: undefined,
status: OrderStatusEnum.PREPARE,
warehouseId: undefined,
- areaId: undefined,
totalQuantity: 0,
totalAmount: 0,
remark: undefined,
@@ -237,8 +228,6 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
inventoryId: inventory.id,
warehouseId: inventory.warehouseId,
warehouseName: inventory.warehouseName,
- areaId: inventory.areaId,
- areaName: inventory.areaName,
batchNo: inventory.batchNo,
productionDate: inventory.productionDate,
expirationDate: inventory.expirationDate,
@@ -268,11 +257,6 @@ const handleDeleteDetail = (index: number) => {
refreshTotalAmount()
}
const handleWarehouseChange = () => {
- formData.value.areaId = undefined
- formData.value.details = []
- refreshTotalAmount()
-}
-const handleAreaChange = () => {
formData.value.details = []
refreshTotalAmount()
}
@@ -291,10 +275,6 @@ const validateDetails = (required: boolean) => {
}
for (let i = 0; i < formData.value.details.length; i++) {
const detail = formData.value.details[i]
- if (AREA_ENABLE && !detail.areaId) {
- message.error(`第 ${i + 1} 行明细请选择库区`)
- return false
- }
if (detail.checkQuantity === undefined || detail.checkQuantity < 0) {
message.error(`第 ${i + 1} 行明细实盘数量不能小于 0`)
return false
@@ -374,7 +354,6 @@ const resetForm = () => {
no: generateOrderNo('PK'),
status: OrderStatusEnum.PREPARE,
warehouseId: undefined,
- areaId: undefined,
totalQuantity: 0,
totalAmount: 0,
remark: undefined,
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index ac4742892..3807926c6 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -16,10 +16,7 @@
-
-
-
-
+
-
- 仓库:{{ row.warehouseName || '-' }}
- 库区:{{ row.areaName || '-' }}
-
- {{ row.warehouseName || '-' }}
+ {{ row.warehouseName || '-' }}
@@ -272,9 +265,7 @@ import { defaultShortcuts, formatNullableDate } from '@/utils/formatTime'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { CheckOrderApi, CheckOrderVO } from '@/api/wms/order/check'
import { CheckOrderDetailVO } from '@/api/wms/order/check/detail'
-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 { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
@@ -317,7 +308,6 @@ const getDefaultQueryParams = () => ({
no: undefined as string | undefined,
status: undefined as number | undefined,
warehouseId: undefined as number | undefined,
- areaId: undefined as number | undefined,
orderDate: undefined as string[] | undefined,
totalQuantityMin: undefined as number | undefined,
totalQuantityMax: undefined as number | undefined,
@@ -363,9 +353,6 @@ const resetQuery = () => {
Object.assign(queryParams, getDefaultQueryParams())
handleQuery()
}
-const handleWarehouseChange = () => {
- queryParams.areaId = undefined
-}
const handleExpandChange = async (row: CheckOrderVO) => {
if (!row.id || detailMap[row.id]) return
detailMap[row.id] = await CheckOrderApi.getCheckOrderDetailListByOrderId(row.id)
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index 7f1184392..e0be44deb 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -13,17 +13,11 @@
/>
-
-
-
- {{ detailData.sourceWarehouseName || '-' }} / {{ detailData.sourceAreaName || '-' }}
-
- {{ detailData.sourceWarehouseName || '-' }}
+
+ {{ detailData.sourceWarehouseName || '-' }}
-
-
- {{ detailData.targetWarehouseName || '-' }} / {{ detailData.targetAreaName || '-' }}
-
- {{ detailData.targetWarehouseName || '-' }}
+
+ {{ detailData.targetWarehouseName || '-' }}
{{ formatQuantity(detailData.totalQuantity) || '-' }}
@@ -80,7 +74,6 @@ import { formatNullableDate } from '@/utils/formatTime'
import { DICT_TYPE } from '@/utils/dict'
import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
import { formatPrice, formatQuantity, formatSumPrice, formatSumQuantity } from '@/views/wms/utils/format'
/** WMS 移库单详情 */
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index 9a827f2ec..e06757ee1 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -13,29 +13,11 @@
-
-
-
-
-
-
-
-
-
-
@@ -84,7 +66,6 @@
规格编号:{{ row.skuCode }}
-
{{ formatQuantity(row.availableQuantity) || '-' }}
@@ -127,7 +108,6 @@
@@ -168,9 +148,7 @@ import { FormRules } from 'element-plus'
import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
import InventorySelect, { InventorySelectRow } from '@/views/wms/inventory/components/InventorySelect.vue'
-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 { OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
import { formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION, sumPrice, sumQuantity } from '@/views/wms/utils/format'
import { generateOrderNo } from '@/views/wms/utils/order'
@@ -191,9 +169,7 @@ const formData = ref({
no: undefined,
status: OrderStatusEnum.PREPARE,
sourceWarehouseId: undefined,
- sourceAreaId: undefined,
targetWarehouseId: undefined,
- targetAreaId: undefined,
totalQuantity: 0,
totalAmount: 0,
remark: undefined,
@@ -252,10 +228,7 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
skuName: inventory.skuName,
sourceWarehouseId: inventory.warehouseId,
sourceWarehouseName: inventory.warehouseName,
- sourceAreaId: inventory.areaId,
- sourceAreaName: inventory.areaName,
targetWarehouseId: formData.value.targetWarehouseId,
- targetAreaId: formData.value.targetAreaId,
batchNo: inventory.batchNo,
productionDate: inventory.productionDate,
expirationDate: inventory.expirationDate,
@@ -283,8 +256,7 @@ const isInventorySelected = (inventory: InventorySelectRow) =>
(formData.value.details || []).some((detail) => {
return (
detail.skuId === inventory.skuId &&
- detail.sourceWarehouseId === inventory.warehouseId &&
- detail.sourceAreaId === inventory.areaId
+ detail.sourceWarehouseId === inventory.warehouseId
)
})
@@ -294,24 +266,16 @@ const handleDeleteDetail = (index: number) => {
}
const handleSourceWarehouseChange = () => {
- formData.value.sourceAreaId = undefined
- formData.value.details = []
- refreshTotalAmount()
-}
-const handleSourceAreaChange = () => {
formData.value.details = []
refreshTotalAmount()
}
const handleTargetWarehouseChange = () => {
- formData.value.targetAreaId = undefined
refreshTargetToDetails()
}
-const handleTargetAreaChange = () => refreshTargetToDetails()
const refreshTargetToDetails = () => {
const details = formData.value.details || []
details.forEach((detail) => {
detail.targetWarehouseId = formData.value.targetWarehouseId
- detail.targetAreaId = formData.value.targetAreaId
})
}
const refreshTotalAmount = () => {
@@ -320,6 +284,10 @@ const refreshTotalAmount = () => {
/** 校验明细 */
const validateDetails = (required: boolean) => {
+ if (formData.value.sourceWarehouseId === formData.value.targetWarehouseId) {
+ message.error('来源仓库和目标仓库不能相同')
+ return false
+ }
if (!formData.value.details?.length) {
if (required) {
message.error('至少包含一条移库明细')
@@ -327,19 +295,8 @@ const validateDetails = (required: boolean) => {
}
return true
}
- if (
- formData.value.sourceWarehouseId === formData.value.targetWarehouseId &&
- formData.value.sourceAreaId === formData.value.targetAreaId
- ) {
- message.error('来源仓库库区和目标仓库库区不能相同')
- return false
- }
for (let i = 0; i < formData.value.details.length; i++) {
const detail = formData.value.details[i]
- if (AREA_ENABLE && (!detail.sourceAreaId || !detail.targetAreaId)) {
- message.error(`第 ${i + 1} 行明细请选择来源和目标库区`)
- return false
- }
if (!detail.quantity || detail.quantity <= 0) {
message.error(`第 ${i + 1} 行明细移库数量必须大于 0`)
return false
@@ -423,9 +380,7 @@ const resetForm = () => {
no: generateOrderNo('YK'),
status: OrderStatusEnum.PREPARE,
sourceWarehouseId: undefined,
- sourceAreaId: undefined,
targetWarehouseId: undefined,
- targetAreaId: undefined,
totalQuantity: 0,
totalAmount: 0,
remark: undefined,
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 3c27f4c87..2a6c7fa8c 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -199,28 +199,20 @@
-
- 仓库:{{ row.sourceWarehouseName || '-' }}
- 库区:{{ row.sourceAreaName || '-' }}
-
- {{ row.sourceWarehouseName || '-' }}
+ {{ row.sourceWarehouseName || '-' }}
-
- 仓库:{{ row.targetWarehouseName || '-' }}
- 库区:{{ row.targetAreaName || '-' }}
-
- {{ row.targetWarehouseName || '-' }}
+ {{ row.targetWarehouseName || '-' }}
@@ -286,7 +278,6 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
import { MovementOrderApi, MovementOrderVO } from '@/api/wms/order/movement'
import { MovementOrderDetailVO } from '@/api/wms/order/movement/detail'
import WarehouseSelect from '@/views/wms/md/warehouse/components/WarehouseSelect.vue'
-import { AREA_ENABLE } from '@/views/wms/utils/config'
import { OrderDeleteStatusList, OrderStatusEnum, OrderUpdateStatusList } from '@/views/wms/utils/constants'
import { formatPrice, formatQuantity, PRICE_PRECISION, QUANTITY_PRECISION } from '@/views/wms/utils/format'
import UserSelectV2 from '@/views/system/user/components/UserSelectV2.vue'
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index fc779d3a4..5dda7c68b 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -30,9 +30,6 @@
{{ detailData.bizOrderNo || '-' }}
-
- {{ detailData.areaName || '-' }}
-
{{ formatQuantity(detailData.totalQuantity) || '-' }}
@@ -74,7 +71,6 @@