diff --git a/src/api/wms/instockDetail/types.ts b/src/api/wms/instockDetail/types.ts index 27d90a4..2c4a3c6 100644 --- a/src/api/wms/instockDetail/types.ts +++ b/src/api/wms/instockDetail/types.ts @@ -81,6 +81,21 @@ export interface InstockDetailVO { */ apportionQty: number; + /** + * 采购数量(来自采购订单) + */ + purchaseQty?: number; + + /** + * 已入库数量(来自采购订单统计) + */ + instockedQty?: number; + + /** + * 剩余可入库数量(来自采购订单统计) + */ + remainingQty?: number; + } @@ -162,6 +177,21 @@ export interface InstockDetailForm extends BaseEntity { */ apportionQty?: number; + /** + * 采购数量(来自采购订单) + */ + purchaseQty?: number; + + /** + * 已入库数量(来自采购订单统计) + */ + instockedQty?: number; + + /** + * 剩余可入库数量(来自采购订单统计) + */ + remainingQty?: number; + } export interface InstockDetailQuery extends PageQuery { diff --git a/src/api/wms/instockRecord/types.ts b/src/api/wms/instockRecord/types.ts index 5658e69..f889155 100644 --- a/src/api/wms/instockRecord/types.ts +++ b/src/api/wms/instockRecord/types.ts @@ -80,6 +80,11 @@ export interface InstockRecordVO { } export interface InstockRecordForm extends BaseEntity { + /** + * 入库记录ID + */ + instockRecordId?: string | number; + /** * 入库单号 */ diff --git a/src/api/wms/wmsPurchaseOrderDetail/index.ts b/src/api/wms/wmsPurchaseOrderDetail/index.ts index c960db5..935323c 100644 --- a/src/api/wms/wmsPurchaseOrderDetail/index.ts +++ b/src/api/wms/wmsPurchaseOrderDetail/index.ts @@ -75,3 +75,16 @@ export function getWmsPurchaseOrderDetailList (query) { params: query }); }; + +/** + * 查询采购订单-物料列表(带已入库数量统计) + * @param query + * @returns {*} + */ +export const getWmsPurchaseOrderDetailWithStatistics = (query?: WmsPurchaseOrderDetailQuery): AxiosPromise => { + return request({ + url: '/wms/wmsPurchaseOrderDetail/listWithInstockedQty', + method: 'get', + params: query + }); +}; diff --git a/src/api/wms/wmsPurchaseOrderDetail/types.ts b/src/api/wms/wmsPurchaseOrderDetail/types.ts index b89e130..45d8b8d 100644 --- a/src/api/wms/wmsPurchaseOrderDetail/types.ts +++ b/src/api/wms/wmsPurchaseOrderDetail/types.ts @@ -54,6 +54,16 @@ export interface WmsPurchaseOrderDetailVO { */ tenantId: string | number; + /** + * 已入库数量 + */ + instockedQty?: number; + + /** + * 剩余可入库数量 + */ + remainingQty?: number; + } export interface WmsPurchaseOrderDetailForm extends BaseEntity { diff --git a/src/views/wms/baseMaterialInfo/index.vue b/src/views/wms/baseMaterialInfo/index.vue index e1743af..0d2432e 100644 --- a/src/views/wms/baseMaterialInfo/index.vue +++ b/src/views/wms/baseMaterialInfo/index.vue @@ -212,10 +212,10 @@ @@ -224,10 +224,10 @@ @@ -267,7 +267,8 @@ const { apply_flag, inner_tube_flag, auto_outstock_flag, mes_batch_flag, active_flag, sale_type, deleted_flag, tire_markings, material_classfication, mes_low_value_consumable_flag, is_high_value,inspection_request -} = toRefs(proxy?.useDict('apply_flag', 'inner_tube_flag', 'always_flag', 'mes_accessories_flag', 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag', +} = toRefs(proxy?.useDict('apply_flag', 'inner_tube_flag', 'always_flag', 'mes_accessories_flag', + 'auto_outstock_flag', 'mes_batch_flag', 'active_flag', 'sale_type', 'deleted_flag', 'tire_markings', 'material_classfication', 'mes_low_value_consumable_flag', 'is_high_value', 'inspection_request' )); diff --git a/src/views/wms/instockOrderCopy/index.vue b/src/views/wms/instockOrderCopy/index.vue index dfad3b9..860644b 100644 --- a/src/views/wms/instockOrderCopy/index.vue +++ b/src/views/wms/instockOrderCopy/index.vue @@ -324,6 +324,22 @@ + + + + + + + + + + + + + + + --> - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + @@ -382,17 +382,17 @@ > - - - - - - + + + + + + + + + + + + + + + + + + + + +