diff --git a/src/api/wms/inventory/history/index.ts b/src/api/wms/inventory/history/index.ts
index 8b563c46f..10a997d7b 100644
--- a/src/api/wms/inventory/history/index.ts
+++ b/src/api/wms/inventory/history/index.ts
@@ -15,9 +15,6 @@ export interface InventoryHistoryVO {
quantity?: number
beforeQuantity?: number
afterQuantity?: number
- batchNo?: string
- productionDate?: Date
- expirationDate?: Date
amount?: number
remark?: string
orderId?: number
diff --git a/src/api/wms/order/check/detail/index.ts b/src/api/wms/order/check/detail/index.ts
index 4e10ad248..221130f27 100644
--- a/src/api/wms/order/check/detail/index.ts
+++ b/src/api/wms/order/check/detail/index.ts
@@ -12,9 +12,6 @@ export interface CheckOrderDetailVO {
inventoryId?: number
warehouseId?: number
warehouseName?: string
- batchNo?: string
- productionDate?: Date
- expirationDate?: Date
receiptTime?: Date
quantity?: number
checkQuantity?: number
diff --git a/src/api/wms/order/movement/detail/index.ts b/src/api/wms/order/movement/detail/index.ts
index 5e3e31ff5..be7cc2d22 100644
--- a/src/api/wms/order/movement/detail/index.ts
+++ b/src/api/wms/order/movement/detail/index.ts
@@ -13,9 +13,6 @@ export interface MovementOrderDetailVO {
sourceWarehouseName?: string
targetWarehouseId?: number
targetWarehouseName?: string
- batchNo?: string
- productionDate?: Date
- expirationDate?: Date
quantity?: number
availableQuantity?: number
amount?: number
diff --git a/src/api/wms/order/receipt/detail/index.ts b/src/api/wms/order/receipt/detail/index.ts
index e1e629d67..c9961949e 100644
--- a/src/api/wms/order/receipt/detail/index.ts
+++ b/src/api/wms/order/receipt/detail/index.ts
@@ -11,9 +11,6 @@ export interface ReceiptOrderDetailVO {
skuName?: string
warehouseId?: number
warehouseName?: string
- batchNo?: string
- productionDate?: Date
- expirationDate?: Date
quantity?: number
amount?: number
remark?: string
diff --git a/src/api/wms/order/shipment/detail/index.ts b/src/api/wms/order/shipment/detail/index.ts
index 4156a29ee..11b07322e 100644
--- a/src/api/wms/order/shipment/detail/index.ts
+++ b/src/api/wms/order/shipment/detail/index.ts
@@ -11,9 +11,6 @@ export interface ShipmentOrderDetailVO {
skuName?: string
warehouseId?: number
warehouseName?: string
- batchNo?: string
- productionDate?: Date
- expirationDate?: Date
quantity?: number
availableQuantity?: number
amount?: number
diff --git a/src/views/wms/inventory/components/InventorySelect.vue b/src/views/wms/inventory/components/InventorySelect.vue
index 739e9ea69..1ecfba9e9 100644
--- a/src/views/wms/inventory/components/InventorySelect.vue
+++ b/src/views/wms/inventory/components/InventorySelect.vue
@@ -129,9 +129,6 @@ import { InventoryApi, InventoryVO } from '@/api/wms/inventory'
import { formatQuantity } from '@/views/wms/utils/format'
export interface InventorySelectRow extends InventoryVO {
- batchNo?: string
- productionDate?: Date
- expirationDate?: Date
amount?: number
availableQuantity?: number
}
diff --git a/src/views/wms/inventory/history/index.vue b/src/views/wms/inventory/history/index.vue
index db4afff75..2ee3a5e07 100644
--- a/src/views/wms/inventory/history/index.vue
+++ b/src/views/wms/inventory/history/index.vue
@@ -156,17 +156,6 @@
-
-
-
-
- 生产日期:{{ formatDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-
-
- 过期日期:{{ formatDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-
-
-
diff --git a/src/views/wms/order/check/CheckOrderDetail.vue b/src/views/wms/order/check/CheckOrderDetail.vue
index 3c43a89ab..751a446ab 100644
--- a/src/views/wms/order/check/CheckOrderDetail.vue
+++ b/src/views/wms/order/check/CheckOrderDetail.vue
@@ -49,7 +49,6 @@
规格编号:{{ row.skuCode }}
-
{{ formatQuantity(row.quantity) || '-' }}
diff --git a/src/views/wms/order/check/CheckOrderForm.vue b/src/views/wms/order/check/CheckOrderForm.vue
index 37eb5f2fc..3889cc2d7 100644
--- a/src/views/wms/order/check/CheckOrderForm.vue
+++ b/src/views/wms/order/check/CheckOrderForm.vue
@@ -61,7 +61,6 @@
规格编号:{{ row.skuCode }}
-
{{ formatQuantity(row.quantity) || '-' }}
@@ -228,9 +227,6 @@ const buildDetail = (inventory: InventorySelectRow): CheckOrderDetailVO => ({
inventoryId: inventory.id,
warehouseId: inventory.warehouseId,
warehouseName: inventory.warehouseName,
- batchNo: inventory.batchNo,
- productionDate: inventory.productionDate,
- expirationDate: inventory.expirationDate,
quantity: inventory.availableQuantity,
checkQuantity: inventory.availableQuantity,
availableQuantity: inventory.availableQuantity,
diff --git a/src/views/wms/order/check/index.vue b/src/views/wms/order/check/index.vue
index 3807926c6..383eb8a7c 100644
--- a/src/views/wms/order/check/index.vue
+++ b/src/views/wms/order/check/index.vue
@@ -164,7 +164,6 @@
规格编号:{{ detail.skuCode }}
-
{{ formatQuantity(detail.quantity) }}
diff --git a/src/views/wms/order/movement/MovementOrderDetail.vue b/src/views/wms/order/movement/MovementOrderDetail.vue
index e0be44deb..6adcc1e5b 100644
--- a/src/views/wms/order/movement/MovementOrderDetail.vue
+++ b/src/views/wms/order/movement/MovementOrderDetail.vue
@@ -56,7 +56,6 @@
规格编号:{{ row.skuCode }}
-
{{ formatQuantity(row.quantity) || '-' }}
diff --git a/src/views/wms/order/movement/MovementOrderForm.vue b/src/views/wms/order/movement/MovementOrderForm.vue
index e06757ee1..09e8fc5ca 100644
--- a/src/views/wms/order/movement/MovementOrderForm.vue
+++ b/src/views/wms/order/movement/MovementOrderForm.vue
@@ -66,7 +66,6 @@
规格编号:{{ row.skuCode }}
-
{{ formatQuantity(row.availableQuantity) || '-' }}
@@ -229,9 +228,6 @@ const buildDetail = (inventory: InventorySelectRow): MovementOrderDetailVO => ({
sourceWarehouseId: inventory.warehouseId,
sourceWarehouseName: inventory.warehouseName,
targetWarehouseId: formData.value.targetWarehouseId,
- batchNo: inventory.batchNo,
- productionDate: inventory.productionDate,
- expirationDate: inventory.expirationDate,
quantity: undefined,
availableQuantity: inventory.availableQuantity,
amount: undefined,
diff --git a/src/views/wms/order/movement/index.vue b/src/views/wms/order/movement/index.vue
index 2a6c7fa8c..7a6cae489 100644
--- a/src/views/wms/order/movement/index.vue
+++ b/src/views/wms/order/movement/index.vue
@@ -169,7 +169,6 @@
规格编号:{{ detail.skuCode }}
-
{{ formatQuantity(detail.quantity) }}
diff --git a/src/views/wms/order/receipt/ReceiptOrderDetail.vue b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
index 5dda7c68b..d54b2c981 100644
--- a/src/views/wms/order/receipt/ReceiptOrderDetail.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderDetail.vue
@@ -71,17 +71,6 @@
-
-
-
- {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-
-
-
-
- {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-
-
{{ formatQuantity(scope.row.quantity) || '-' }}
diff --git a/src/views/wms/order/receipt/ReceiptOrderForm.vue b/src/views/wms/order/receipt/ReceiptOrderForm.vue
index 57e740c4d..bd75af044 100644
--- a/src/views/wms/order/receipt/ReceiptOrderForm.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderForm.vue
@@ -107,33 +107,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
({
skuId: sku.id,
skuCode: sku.code,
skuName: sku.name,
- batchNo: undefined,
- productionDate: undefined,
- expirationDate: undefined,
quantity: undefined,
amount: undefined,
remark: undefined
@@ -313,7 +283,7 @@ const buildDetail = (sku: ItemSkuVO): ReceiptOrderDetailVO => ({
/** 添加商品 */
const handleAddDetail = () => {
- skuSelectRef.value?.open()
+ skuSelectRef.value?.open(getSelectedSkuIds())
}
/** 选择商品 SKU */
@@ -322,10 +292,24 @@ const handleSelectSku = (skus: ItemSkuVO[]) => {
return
}
formData.value.details = formData.value.details || []
- skus.forEach((sku) => formData.value.details!.push(buildDetail(sku)))
+ const selectedSkuIds = new Set(getSelectedSkuIds())
+ skus.forEach((sku) => {
+ if (!sku.id || selectedSkuIds.has(sku.id)) {
+ return
+ }
+ formData.value.details!.push(buildDetail(sku))
+ selectedSkuIds.add(sku.id)
+ })
refreshTotalAmount()
}
+/** 获得已选 SKU 编号 */
+const getSelectedSkuIds = () => {
+ return (formData.value.details || [])
+ .map((detail) => detail.skuId)
+ .filter((id): id is number => !!id)
+}
+
/** 删除明细 */
const handleDeleteDetail = (index: number) => {
formData.value.details?.splice(index, 1)
diff --git a/src/views/wms/order/receipt/ReceiptOrderPrint.vue b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
index 45b54246c..dbc636705 100644
--- a/src/views/wms/order/receipt/ReceiptOrderPrint.vue
+++ b/src/views/wms/order/receipt/ReceiptOrderPrint.vue
@@ -23,21 +23,6 @@
| 商品信息 |
规格信息 |
-
- 批号
- |
-
- 生产日期
- |
-
- 过期日期
- |
数量 |
金额(元) |
备注 |
@@ -53,15 +38,6 @@
{{ detail.skuName || '-' }}
编号:{{ detail.skuCode }}
-
- {{ detail.batchNo || '-' }}
- |
-
- {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
- |
-
- {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
- |
{{ formatQuantity(detail.quantity) || '-' }}
|
@@ -95,7 +71,7 @@ defineOptions({ name: 'WmsReceiptOrderPrint' })
const printData = ref({}) // 打印数据
const printButtonRef = ref() // 打印按钮
-const tableColumnCount = 8
+const tableColumnCount = 5
const printObj = ref({
id: 'wmsReceiptOrderPrint',
popTitle: ' ',
diff --git a/src/views/wms/order/receipt/index.vue b/src/views/wms/order/receipt/index.vue
index 24b13eb3b..7f5596ede 100644
--- a/src/views/wms/order/receipt/index.vue
+++ b/src/views/wms/order/receipt/index.vue
@@ -237,17 +237,6 @@
-
-
-
-
- 生产日期:{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
-
-
- 过期日期:{{ formatNullableDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
-
-
-
{{ formatQuantity(detailScope.row.quantity) }}
diff --git a/src/views/wms/order/shipment/ShipmentOrderDetail.vue b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
index 59f605cff..868dc0563 100644
--- a/src/views/wms/order/shipment/ShipmentOrderDetail.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderDetail.vue
@@ -71,17 +71,6 @@
-
-
-
- {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-
-
-
-
- {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-
-
{{ formatQuantity(scope.row.quantity) || '-' }}
diff --git a/src/views/wms/order/shipment/ShipmentOrderForm.vue b/src/views/wms/order/shipment/ShipmentOrderForm.vue
index 4522059f3..cf75f4db7 100644
--- a/src/views/wms/order/shipment/ShipmentOrderForm.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderForm.vue
@@ -107,21 +107,6 @@
-
-
- {{ scope.row.batchNo || '-' }}
-
-
-
-
- {{ formatNullableDate(scope.row.productionDate, 'YYYY-MM-DD') }}
-
-
-
-
- {{ formatNullableDate(scope.row.expirationDate, 'YYYY-MM-DD') }}
-
-
{{ formatQuantity(scope.row.availableQuantity) || '-' }}
@@ -304,9 +289,6 @@ const buildDetail = (inventory: InventorySelectRow): ShipmentOrderDetailVO => ({
skuName: inventory.skuName,
warehouseId: inventory.warehouseId,
warehouseName: inventory.warehouseName,
- batchNo: inventory.batchNo,
- productionDate: inventory.productionDate,
- expirationDate: inventory.expirationDate,
quantity: undefined,
availableQuantity: inventory.availableQuantity,
amount: undefined,
diff --git a/src/views/wms/order/shipment/ShipmentOrderPrint.vue b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
index 0e20a0fa7..e3e655310 100644
--- a/src/views/wms/order/shipment/ShipmentOrderPrint.vue
+++ b/src/views/wms/order/shipment/ShipmentOrderPrint.vue
@@ -23,21 +23,6 @@
| 商品信息 |
规格信息 |
-
- 批号
- |
-
- 生产日期
- |
-
- 过期日期
- |
数量 |
金额(元) |
备注 |
@@ -53,15 +38,6 @@
{{ detail.skuName || '-' }}
编号:{{ detail.skuCode }}
-
- {{ detail.batchNo || '-' }}
- |
-
- {{ formatNullableDate(detail.productionDate, 'YYYY-MM-DD') }}
- |
-
- {{ formatNullableDate(detail.expirationDate, 'YYYY-MM-DD') }}
- |
{{ formatQuantity(detail.quantity) || '-' }}
|
@@ -95,7 +71,7 @@ defineOptions({ name: 'WmsShipmentOrderPrint' })
const printData = ref({}) // 打印数据
const printButtonRef = ref() // 打印按钮
-const tableColumnCount = 8
+const tableColumnCount = 5
const printObj = ref({
id: 'wmsShipmentOrderPrint',
popTitle: ' ',
diff --git a/src/views/wms/order/shipment/index.vue b/src/views/wms/order/shipment/index.vue
index 19f439183..2fcf29b51 100644
--- a/src/views/wms/order/shipment/index.vue
+++ b/src/views/wms/order/shipment/index.vue
@@ -237,17 +237,6 @@
-
-
-
-
- 生产日期:{{ formatNullableDate(detailScope.row.productionDate, 'YYYY-MM-DD') }}
-
-
- 过期日期:{{ formatNullableDate(detailScope.row.expirationDate, 'YYYY-MM-DD') }}
-
-
-
{{ formatQuantity(detailScope.row.quantity) }}