diff --git a/src/api/erp/stock/stock/index.ts b/src/api/erp/stock/stock/index.ts
index 7ed7d128..26ecb3ac 100644
--- a/src/api/erp/stock/stock/index.ts
+++ b/src/api/erp/stock/stock/index.ts
@@ -8,9 +8,26 @@ export interface StockUnitStockVO {
stockDisplay?: string
}
+export interface ProductPackagingStockVO {
+ productId?: number
+ productName?: string
+ packagingSchemeId?: number
+ packagingSchemeName?: string
+ totalCount?: number
+ unitName?: string
+ stockDisplay?: string
+ packagingDisplay?: string
+ packageQuantity?: number
+ palletPackageQuantity?: number
+ palletTotalQuantity?: number
+}
+
export interface ProductStockCardVO {
skuCount?: number
stockDisplay?: string
+ totalCount?: number
+ unitName?: string
+ packagingStocks?: ProductPackagingStockVO[]
todayFinishedInDisplay?: string
}
@@ -23,6 +40,9 @@ export interface UnitGroupedStockCardVO {
export interface TodayInCardVO {
orderCount?: number
itemCount?: number
+ productStock?: ProductStockCardVO
+ materialStock?: UnitGroupedStockCardVO
+ sparePartStock?: UnitGroupedStockCardVO
productDisplay?: string
materialDisplay?: string
sparePartDisplay?: string
@@ -31,6 +51,9 @@ export interface TodayInCardVO {
export interface TodayOutCardVO {
orderCount?: number
itemCount?: number
+ materialStock?: UnitGroupedStockCardVO
+ sparePartStock?: UnitGroupedStockCardVO
+ productStock?: ProductStockCardVO
materialDisplay?: string
sparePartDisplay?: string
productDisplay?: string
diff --git a/src/views/erp/stock/move/components/StockMoveItemForm.vue b/src/views/erp/stock/move/components/StockMoveItemForm.vue
index 19f319e0..24aad8f7 100644
--- a/src/views/erp/stock/move/components/StockMoveItemForm.vue
+++ b/src/views/erp/stock/move/components/StockMoveItemForm.vue
@@ -287,7 +287,7 @@ const categoryTypeLabel = computed(() => {
const productColumnLabel = computed(() => categoryTypeLabel.value)
const productPlaceholder = computed(() => `请选择${productColumnLabel.value}`)
const productSelectTitle = computed(() => `选择${productColumnLabel.value}`)
-const getRowUnitName = (row) => row.unitName || '-'
+const getRowUnitName = (row) => row.productUnitName || '-'
watch(
() => props.items,
diff --git a/src/views/erp/stock/overview/index.vue b/src/views/erp/stock/overview/index.vue
index 206703bb..9e5e4ce1 100644
--- a/src/views/erp/stock/overview/index.vue
+++ b/src/views/erp/stock/overview/index.vue
@@ -218,6 +218,14 @@ const displayValue = (value: unknown) => {
const formatCardLine = (label: string, value: unknown) => `${label}: ${displayValue(value)}`
+const formatUnitStocksDisplay = (card?: { unitStocks?: Array<{ stockDisplay?: string }> }, fallback?: string) => {
+ const display = card?.unitStocks
+ ?.map((item) => item?.stockDisplay)
+ .filter((item): item is string => Boolean(item))
+ .join('/')
+ return display || fallback
+}
+
const summaryCards = computed(() => {
const data: StockStatisticsCardsRespVO = statisticsCards.value || {}
const productStock = data.productStock || {}
@@ -265,9 +273,9 @@ const summaryCards = computed(() => {
lines: [
formatCardLine(t('ErpStock.Overview.cardLabels.inboundOrders'), todayIn.orderCount),
formatCardLine(t('ErpStock.Overview.cardLabels.detailLines'), todayIn.itemCount),
- formatCardLine(t('ErpStock.Overview.cardLabels.productIn'), todayIn.productDisplay),
- formatCardLine(t('ErpStock.Overview.cardLabels.materialIn'), todayIn.materialDisplay),
- formatCardLine(t('ErpStock.Overview.cardLabels.sparePartIn'), todayIn.sparePartDisplay)
+ formatCardLine(t('ErpStock.Overview.cardLabels.productIn'), todayIn.productStock?.stockDisplay || todayIn.productDisplay),
+ formatCardLine(t('ErpStock.Overview.cardLabels.materialIn'), formatUnitStocksDisplay(todayIn.materialStock, todayIn.materialDisplay)),
+ formatCardLine(t('ErpStock.Overview.cardLabels.sparePartIn'), formatUnitStocksDisplay(todayIn.sparePartStock, todayIn.sparePartDisplay))
]
},
{
@@ -277,9 +285,9 @@ const summaryCards = computed(() => {
lines: [
formatCardLine(t('ErpStock.Overview.cardLabels.outboundOrders'), todayOut.orderCount),
formatCardLine(t('ErpStock.Overview.cardLabels.detailLines'), todayOut.itemCount),
- formatCardLine(t('ErpStock.Overview.cardLabels.productOut'), todayOut.productDisplay),
- formatCardLine(t('ErpStock.Overview.cardLabels.materialOut'), todayOut.materialDisplay),
- formatCardLine(t('ErpStock.Overview.cardLabels.sparePartOut'), todayOut.sparePartDisplay)
+ formatCardLine(t('ErpStock.Overview.cardLabels.productOut'), todayOut.productStock?.stockDisplay || todayOut.productDisplay),
+ formatCardLine(t('ErpStock.Overview.cardLabels.materialOut'), formatUnitStocksDisplay(todayOut.materialStock, todayOut.materialDisplay)),
+ formatCardLine(t('ErpStock.Overview.cardLabels.sparePartOut'), formatUnitStocksDisplay(todayOut.sparePartStock, todayOut.sparePartDisplay))
]
}
]
diff --git a/src/views/erp/stock/stock/index.vue b/src/views/erp/stock/stock/index.vue
index f2c81fb7..ca6cf008 100644
--- a/src/views/erp/stock/stock/index.vue
+++ b/src/views/erp/stock/stock/index.vue
@@ -150,7 +150,7 @@
-->
- {{ row.purchaseUnitName || row.unitName || '-' }}
+ {{ row.unitName || '-' }}